Refactored text search in file

Author: kala13x

src/sys/xfs.c

@@ -1172,83 +1172,83 @@ static int XFile_CheckCriteria(xfile_search_t *pSearch, const char *pPath, const
         if (pSearch->bInsensitive) xstrcase((char*)pBuffer, XSTR_LOWER);
         int nPosit = xstrsrc(pBuffer, pSearch->sText);
 
-        if (nPosit >= 0)
+        if (nPosit < 0)
         {
-            if (pSearch->bSearchLines)
+            XByteBuffer_Clear(&buffer);
+            return XSTDNON;
+        }
+
+        if (pSearch->bSearchLines)
+        {
+            xarray_t *pArr = xstrsplite(pBuffer, "\n");
+            if (pArr != NULL)
             {
-                xarray_t *pArr = xstrsplite(pBuffer, "\n");
-                if (pArr != NULL)
+                size_t i = 0;
+                for (i = 0; i < pArr->nUsed; i++)
                 {
-                    size_t i = 0;
-                    for (i = 0; i < pArr->nUsed; i++)
+                    char *pLine = (char*)XArray_GetData(pArr, i);
+                    if (xstrsrc(pLine, pSearch->sText) >= 0)
                     {
-                        char *pLine = (char*)XArray_GetData(pArr, i);
-                        if (xstrsrc(pLine, pSearch->sText) >= 0)
+                        xfile_entry_t *pEntry = XFile_NewEntry(pName, pPath, pStat);
+                        if (pEntry == NULL)
+                        {
+                            XFile_ErrorCallback(pSearch, "Failed to alloc entry: %s", pPath);
+                            XByteBuffer_Clear(&buffer);
+                            XArray_Destroy(pArr);
+                            return XSTDERR;
+                        }
+
+                        while (*pLine && isspace((unsigned char)*pLine)) pLine++;
+                        xstrncpy(pEntry->sLine, sizeof(pEntry->sLine), pLine);
+                        pEntry->nLineNum = i + 1;
+
+                        if (XFile_SearchCallback(pSearch, pEntry) < 0)
                         {
-                            xfile_entry_t *pEntry = XFile_NewEntry(pName, pPath, pStat);
-                            if (pEntry == NULL)
-                            {
-                                XFile_ErrorCallback(pSearch, "Failed to alloc entry: %s", pPath);
-                                XByteBuffer_Clear(&buffer);
-                                XArray_Destroy(pArr);
-                                return XSTDERR;
-                            }
-
-                            while (*pLine && isspace((unsigned char)*pLine)) pLine++;
-                            xstrncpy(pEntry->sLine, sizeof(pEntry->sLine), pLine);
-                            pEntry->nLineNum = i + 1;
-
-                            if (XFile_SearchCallback(pSearch, pEntry) < 0)
-                            {
-                                XByteBuffer_Clear(&buffer);
-                                XArray_Destroy(pArr);
-                                return XSTDERR;
-                            }
+                            XByteBuffer_Clear(&buffer);
+                            XArray_Destroy(pArr);
+                            return XSTDERR;
                         }
                     }
                 }
-
-                XByteBuffer_Clear(&buffer);
-                XArray_Destroy(pArr);
-                return XSTDNON;
             }
-            else
-            {
-                while (nPosit && pBuffer[nPosit] != '\n') nPosit--;
-                if (pBuffer[nPosit] == '\n') nPosit++;
 
-                int nEnd = xstrsrc(&pBuffer[nPosit], "\n");
-                if (nEnd > 0)
-                {
-                    char sLine[XSTR_MAX];
-                    xstrncpys(sLine, sizeof(sLine), &pBuffer[nPosit], nEnd);
+            XByteBuffer_Clear(&buffer);
+            XArray_Destroy(pArr);
+            return XSTDNON;
+        }
 
-                    xfile_entry_t *pEntry = XFile_NewEntry(pName, pPath, pStat);
-                    if (pEntry == NULL)
-                    {
-                        XFile_ErrorCallback(pSearch, "Failed to alloc entry: %s", pPath);
-                        XByteBuffer_Clear(&buffer);
-                        return XSTDERR;
-                    }
+        while (nPosit && pBuffer[nPosit] != '\n') nPosit--;
+        if (pBuffer[nPosit] == '\n') nPosit++;
 
-                    char *pLine = sLine;
-                    while (*pLine && isspace((unsigned char)*pLine)) pLine++;
-                    xstrncpy(pEntry->sLine, sizeof(pEntry->sLine), pLine);
+        int nEnd = xstrsrc(&pBuffer[nPosit], "\n");
+        if (nEnd > 0)
+        {
+            char sLine[XSTR_MAX];
+            xstrncpys(sLine, sizeof(sLine), &pBuffer[nPosit], nEnd);
 
-                    if (XFile_SearchCallback(pSearch, pEntry) < 0)
-                    {
-                        XByteBuffer_Clear(&buffer);
-                        return XSTDERR;
-                    }
+            xfile_entry_t *pEntry = XFile_NewEntry(pName, pPath, pStat);
+            if (pEntry == NULL)
+            {
+                XFile_ErrorCallback(pSearch, "Failed to alloc entry: %s", pPath);
+                XByteBuffer_Clear(&buffer);
+                return XSTDERR;
+            }
 
-                    XByteBuffer_Clear(&buffer);
-                    return XSTDNON;
-                }
+            char *pLine = sLine;
+            while (*pLine && isspace((unsigned char)*pLine)) pLine++;
+            xstrncpy(pEntry->sLine, sizeof(pEntry->sLine), pLine);
+
+            if (XFile_SearchCallback(pSearch, pEntry) < 0)
+            {
+                XByteBuffer_Clear(&buffer);
+                return XSTDERR;
             }
+
+            XByteBuffer_Clear(&buffer);
+            return XSTDNON;
         }
 
         XByteBuffer_Clear(&buffer);
-        if (nPosit < 0) return XSTDNON;
     }
 
     return XSTDOK;

tools/xsrc.c

@@ -382,9 +382,11 @@ static void XSearch_DisplayEntry(xfile_search_t *pSearch, xfile_entry_t *pEntry)
     /* Do not display additional info if verbose is not set */
     if (!((xsearch_args_t*)pSearch->pUserCtx)->bVerbose)
     {
-        if (!pEntry->nLineNum && !xstrused(sLine)) xlog("%s%s%s", sEntry, pArrow, sLinkPath);
-        else if (xstrused(pEntry->sLine) && xstrused(sLine)) xlog("%s: %s", sEntry, sLine);
-        else xlog("%s:%s%d%s %s", sEntry, XSTR_FMT_BOLD, pEntry->nLineNum, XSTR_FMT_RESET, sLine);
+        if (pEntry->nLineNum && xstrused(sLine))
+            xlog("%s:%s%d%s %s", sEntry, XSTR_FMT_BOLD, pEntry->nLineNum, XSTR_FMT_RESET, sLine);
+        else if (xstrused(sLine)) xlog("%s: %s", sEntry, sLine);
+        else xlog("%s%s%s", sEntry, pArrow, sLinkPath);
+
         return;
     }