Added executable filter in xsearch

Author: kala13x

src/sys/search.c

@@ -32,6 +32,7 @@ void XSearch_InitEntry(xsearch_entry_t *pEntry)
     pEntry->nSize = 0;
     pEntry->nGID = 0;
     pEntry->nUID = 0;
+    pEntry->nMode = 0;
 }
 
 void XSearch_CreateEntry(xsearch_entry_t *pEntry, const char *pName, const char *pPath, xstat_t *pStat)
@@ -50,6 +51,7 @@ void XSearch_CreateEntry(xsearch_entry_t *pEntry, const char *pName, const char
         pEntry->nSize = pStat->st_size;
         pEntry->nGID = pStat->st_gid;
         pEntry->nUID = pStat->st_uid;
+        pEntry->nMode = pStat->st_mode;
     }
 
 #ifndef _WIN32
@@ -362,8 +364,14 @@ static XSTATUS XSearch_CheckCriteria(xsearch_t *pSearch, const char *pPath, cons
 
     if (pSearch->nFileTypes)
     {
-        xfile_type_t eType = XFile_GetType(pStat->st_mode);
-        if (!XFILE_CHECK_FL(pSearch->nFileTypes, eType)) return XSTDNON;
+        if (XFILE_CHECK_FL(pSearch->nFileTypes, XF_EXEC) &&
+            !XFile_IsExec(pStat->st_mode)) return XSTDNON;
+
+        if (pSearch->nFileTypes & ~XF_EXEC)
+        {
+            xfile_type_t eType = XFile_GetType(pStat->st_mode);
+            if (!XFILE_CHECK_FL(pSearch->nFileTypes, eType)) return XSTDNON;
+        }
     }
 
     if (xstrused(pSearch->sName))

src/sys/search.h

@@ -28,6 +28,7 @@ typedef struct XSearchEntry {
     char sPerm[XPERM_MAX];
     char sLine[XLINE_MAX];
     xfile_type_t eType;
+    xmode_t nMode;
     size_t nLinkCount;
     uint32_t nGID;
     uint32_t nUID;

src/sys/xfs.c

@@ -460,6 +460,23 @@ xfile_type_t XFile_GetType(xmode_t nMode)
     return 0; // Unknown file format
 }
 
+xbool_t XFile_IsExec(xmode_t nMode)
+{
+#ifdef S_IXUSR
+    if (nMode & S_IXUSR) return XTRUE;
+#endif
+#ifdef S_IXGRP
+    if (nMode & S_IXGRP) return XTRUE;
+#endif
+#ifdef S_IXOTH
+    if (nMode & S_IXOTH) return XTRUE;
+#endif
+#ifdef _WIN32
+    if (nMode & _S_IEXEC) return XTRUE;
+#endif
+    return XFALSE;
+}
+
 char XFile_GetTypeChar(xfile_type_t eType)
 {
     switch (eType)

src/sys/xfs.h

@@ -38,7 +38,8 @@ typedef enum {
     XF_REGULAR = (1 << 3),
     XF_SYMLINK = (1 << 4),
     XF_SOCKET = (1 << 5),
-    XF_PIPE = (1 << 6)
+    XF_PIPE = (1 << 6),
+    XF_EXEC = (1 << 7)
 } xfile_type_t;
 
 typedef struct XFile {
@@ -99,6 +100,7 @@ int XFile_Print(xfile_t *pFile, const char *pFmt, ...);
 
 xfile_type_t XFile_GetType(xmode_t nMode);
 char XFile_GetTypeChar(xfile_type_t eType);
+xbool_t XFile_IsExec(xmode_t nMode);
 
 int XFile_GetStats(xfile_t *pFile);
 int XFile_Copy(xfile_t *pIn, xfile_t *pOut);

src/xver.h

@@ -12,7 +12,7 @@
 
 #define XUTILS_VERSION_MAX     2
 #define XUTILS_VERSION_MIN     6
-#define XUTILS_BUILD_NUMBER    46
+#define XUTILS_BUILD_NUMBER    47
 
 #ifdef __cplusplus
 extern "C" {

tools/xsrc.c

@@ -75,6 +75,7 @@ static int XSearch_GetFileTypes(const char *pTypes)
             case 'l': nTypes |= XF_SYMLINK; break;
             case 'p': nTypes |= XF_PIPE; break;
             case 's': nTypes |= XF_SOCKET; break;
+            case 'x': nTypes |= XF_EXEC; break;
             default:
             {
                 xloge("Invalid file type");
@@ -146,7 +147,8 @@ void XSearch_Usage(const char *pName)
     printf("   %sf%s: regular file\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
     printf("   %sl%s: symbolic link\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
     printf("   %sp%s: pipe\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
-    printf("   %ss%s: socket\n\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
+    printf("   %ss%s: socket\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
+    printf("   %sx%s: executable\n\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
 
     printf("Notes:\n");
     printf("   1) <file_name> option is supporting wildcard character: '%s*%s'\n", XSTR_FMT_BOLD, XSTR_FMT_RESET);
@@ -160,7 +162,7 @@ void XSearch_Usage(const char *pName)
     printf("%s[xutils@examples]$ %s -rvd / -t lf -f \"*.log\" -p rwxrwxrwx%s\n\n", XSTR_FMT_BOLD, pName, XSTR_FMT_RESET);
 
     printf("%sRecursive search of every .cpp and .java file in the \"/opt\" directory%s\n", XSTR_FMT_DIM, XSTR_FMT_RESET);
-    printf("%sthat contains the case insensitive text \"socket\" and verbose output:%s\n", XSTR_FMT_DIM, XSTR_FMT_RESET);
+    printf("%sthat contains the case insensitive text \"test\" and verbose output:%s\n", XSTR_FMT_DIM, XSTR_FMT_RESET);
     printf("%s[xutils@examples]$ %s -rvd /opt -f \"*.cpp;*.java\" -ig test%s\n\n", XSTR_FMT_BOLD, pName, XSTR_FMT_RESET);
 }
 
@@ -302,7 +304,7 @@ static int XSearch_ParseArgs(xsearch_args_t *pArgs, int argc, char *argv[])
 
 static void XSearch_ColorizeEntry(xsearch_t *pSearch, char *pOutput, size_t nSize, xsearch_entry_t *pEntry)
 {
-    xbool_t bIsExec = pEntry->sPerm[XPERM_LEN-1] == 'x' ? XTRUE : XFALSE;
+    xbool_t bIsExec = XFile_IsExec(pEntry->nMode);
     char *pColor = XSTR_EMPTY;
     char *pBack = XSTR_EMPTY;
     char *pFmt = XSTR_EMPTY;