Show line texts when found

Author: kala13x

src/sys/xfs.c

@@ -1172,43 +1172,79 @@ 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 && pSearch->bSearchLines)
+        if (nPosit >= 0)
         {
-            xarray_t *pArr = xstrsplite(pBuffer, "\n");
-            if (pArr != NULL)
+            if (pSearch->bSearchLines)
             {
-                size_t i = 0;
-                for (i = 0; i < pArr->nUsed; i++)
+                xarray_t *pArr = xstrsplite(pBuffer, "\n");
+                if (pArr != NULL)
                 {
-                    char *pLine = (char*)XArray_GetData(pArr, i);
-                    if (xstrsrc(pLine, pSearch->sText) >= 0)
+                    size_t i = 0;
+                    for (i = 0; i < pArr->nUsed; i++)
                     {
-                        xfile_entry_t *pEntry = XFile_NewEntry(pName, pPath, pStat);
-                        if (pEntry == NULL)
+                        char *pLine = (char*)XArray_GetData(pArr, i);
+                        if (xstrsrc(pLine, pSearch->sText) >= 0)
                         {
-                            XFile_ErrorCallback(pSearch, "Failed to alloc entry: %s", pPath);
-                            XByteBuffer_Clear(&buffer);
-                            XArray_Destroy(pArr);
-                            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);
+                                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 XSTDNON;
+            }
+            else
+            {
+                while (nPosit && pBuffer[nPosit] != '\n') nPosit--;
+                if (pBuffer[nPosit] == '\n') nPosit++;
 
-                        while (*pLine && isspace((unsigned char)*pLine)) pLine++;
-                        xstrncpy(pEntry->sLine, sizeof(pEntry->sLine), pLine);
-                        pEntry->nLineNum = i + 1;
+                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);
-                            XArray_Destroy(pArr);
-                            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;
                     }
+
+                    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);
-            XArray_Destroy(pArr);
-            return XSTDNON;
         }
 
         XByteBuffer_Clear(&buffer);

tools/xsrc.c

@@ -344,7 +344,7 @@ static void XSearch_ColorizeSymlink(char *pSimlink, size_t nSize, xfile_entry_t
 
 static void XSearch_ColorizeLine(char *pDst, size_t nSize, xfile_entry_t *pEntry, const char *pText)
 {
-    if (!xstrused(pText) || !pEntry->nLineNum) return;
+    if (!xstrused(pText) || !xstrused(pEntry->sLine)) return;
     xarray_t *pArr = xstrsplit(pEntry->sLine, pText);
     if (pArr == NULL) return;
 
@@ -382,7 +382,8 @@ 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) xlog("%s%s%s", sEntry, pArrow, sLinkPath);
+        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);
         return;
     }
@@ -402,12 +403,18 @@ static void XSearch_DisplayEntry(xfile_search_t *pSearch, xfile_entry_t *pEntry)
     XBytesToUnit(sSize, sizeof(sSize), pEntry->nSize, XTRUE);
     xstrnlcpyf(sRound, sizeof(sRound), 7, XSTR_SPACE_CHAR, "%s", sSize);
 
-    if (pEntry->nLineNum)
+    if (pEntry->nLineNum && xstrused(sLine))
     {
         xlog("%c%s %lu %s %s %s [%s] %s:%s%d%s %s", XFile_GetTypeChar(pEntry->eType),
             pEntry->sPerm, pEntry->nLinkCount, pUname, pGname, sRound, sTime,
             sEntry, XSTR_FMT_BOLD, pEntry->nLineNum, XSTR_FMT_RESET, sLine);
     }
+    else if (xstrused(sLine))
+    {
+        xlog("%c%s %lu %s %s %s [%s] %s: %s", XFile_GetTypeChar(pEntry->eType),
+            pEntry->sPerm, pEntry->nLinkCount, pUname, pGname, sRound, sTime,
+            sEntry, sLine);
+    }
     else
     {
         xlog("%c%s %lu %s %s %s [%s] %s%s%s", XFile_GetTypeChar(pEntry->eType),