Changeset 355 for trunk

Timestamp:

Sep 5, 2011, 6:21:54 PM (13 years ago)

Author:

katerina

Message:

Patch for ticket #260 (update from file list).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• include/sh_utils.h (modified) (1 diff)
• src/sh_getopt.c (modified) (1 diff)
• src/sh_utils.c (modified) (3 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 2.8.6:
+        * Option to use a textfile with a list of files for update
         * Fix --enable-db-reload option (reported by David L.)
         * Fix samhain_kmem compilation, need to compile under chosen

trunk/include/sh_utils.h

@@ -96 +96 @@
 int sh_util_ask_update(const char * path);
 int sh_util_set_interactive(const char * str);
+int sh_util_update_file (const char * str);
 
 /* don't log output files

trunk/src/sh_getopt.c

@@ -80 +80 @@
     HAS_ARG_NO, 
     sh_util_set_interactive },
+  { N_("listfile"),  
+    '-', 
+    N_("Run update with listfile"),  
+    HAS_ARG_YES, 
+    sh_util_update_file },
 #endif
 #if defined(SH_WITH_SERVER) || defined(SH_WITH_CLIENT)

trunk/src/sh_utils.c

@@ -107 +107 @@
 
   sh_ask_update = S_TRUE;
-
   sh_unix_setnodeamon(NULL);
 
   return 0;
 }
+
+static char * sh_update_file = NULL;
+
+int sh_util_update_file (const char * str)
+{
+  if (str)
+    {
+      if (0 == access(str, R_OK)) /* flawfinder: ignore */
+        {
+          if (NULL != sh_update_file)
+            SH_FREE(sh_update_file);
+          sh_update_file = sh_util_strdup(str);
+          sh_ask_update = S_TRUE;
+          sh_unix_setnodeamon(NULL);
+          return 0;
+        }
+      else
+        {
+          char ebuf[SH_ERRBUF_SIZE];
+          int  errnum = errno;
+
+          sh_error_message(errnum, ebuf, sizeof(ebuf));
+          sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, errnum, MSG_E_SUBGEN,
+                           ebuf, _("sh_util_update_file") );
+          
+          return -1;
+        }
+    }
+
+  return -1;
+}
+
 
 #if !defined(STDIN_FILENO)
@@ -120 +151 @@
 #endif
 
+/* Returns S_FALSE if no update desired 
+ */
+int sh_util_update_checkfile(const char * path)
+{
+  FILE * fd = fopen(sh_update_file, "r");
+  char * line;
+
+  if (!fd)
+    {
+      uid_t  euid;
+      int errnum = errno;
+      sl_get_euid(&euid);
+      sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, errnum, MSG_NOACCESS,
+                       (long) euid, sh_update_file);
+      aud_exit (FIL__, __LINE__, EXIT_FAILURE);
+      return S_FALSE;
+    }
+
+  line = SH_ALLOC(8192);
+
+  while (NULL != fgets(line, 8192, fd))
+    {
+      char * nl = strrchr(line, '\n');
+
+      if (nl)
+        {
+          *nl = '\0';
+
+          /* Check for MS Windows line terminator 
+           */
+          if (nl > line) --nl;
+          if (*nl == '\r')
+            *nl = '\0';
+        }
+
+      if (0 == sl_strcmp(line, path))
+        {
+          SH_FREE(line);
+          fclose(fd);
+          return S_TRUE;
+        }
+    }
+  SH_FREE(line);
+  fclose(fd);
+  return S_FALSE;
+}
+
+/* Returns S_FALSE if no update desired 
+ */
 int sh_util_ask_update(const char * path)
 {
@@ -130 +210 @@
   if (sh_ask_update != S_TRUE)
     {
+      SL_RETURN(i, _("sh_util_ask_update"));
+    }
+
+  if (sh_update_file)
+    {
+      i = sh_util_update_checkfile(path);
       SL_RETURN(i, _("sh_util_ask_update"));
     }