Changeset 215 for trunk/src/sh_extern.c

Timestamp:

Feb 18, 2009, 7:11:26 PM (16 years ago)

Author:

katerina

Message:

Consolidate filtering code (ticket #142) and match on regular expressions (ticket #143).

File:

• trunk/src/sh_extern.c (modified) (10 diffs)

trunk/src/sh_extern.c

@@ -92 +92 @@
 #include "sh_extern.h"
 #include "sh_calls.h"
+#include "sh_filter.h"
 #define SH_NEED_PWD_GRP 1
 #include "sh_static.h"
@@ -867 +868 @@
   char     type[4];
 
-  int      for_c;
-  char   * for_v[32];
-  int      fand_c;
-  char   * fand_v[32];
-  int      fnot_c;
-  char   * fnot_v[32];
+  sh_filter_type * filter;
+
   time_t   deadtime;
   time_t   last_run;
@@ -900 +897 @@
 sh_com_t * command_init(void)
 {
-  int         i;
   uid_t       ff_euid;
   sh_com_t  * ext_com = NULL;
@@ -924 +920 @@
 
   set3(ext_com->type, 'l', 'o', 'g');
-  ext_com->for_c        = 0;
-  ext_com->fand_c       = 0;
-  ext_com->fnot_c       = 0;
+  ext_com->filter       = NULL;
   ext_com->deadtime     = 0;
   ext_com->last_run     = 0;
 
-  for (i = 0; i < 32; ++i)
-    {
-      ext_com->for_v[i]         = NULL;
-      ext_com->fand_v[i]        = NULL;
-      ext_com->fnot_v[i]        = NULL;
-    }
   ext_com->next             = NULL;
 
@@ -1128 +1116 @@
 int sh_ext_cleanup(void)
 {
-  int i;
   sh_com_t * retval;
 
@@ -1140 +1127 @@
       sh_ext_tas_free (&(retval->tas));
 
-      for (i = 0; i < 32; ++i)
-        {
-          if (NULL != retval->for_v[i])  SH_FREE(retval->for_v[i]);
-          if (NULL != retval->fand_v[i]) SH_FREE(retval->fand_v[i]);
-          if (NULL != retval->fnot_v[i]) SH_FREE(retval->fnot_v[i]);
-        }
+      if (retval->filter)
+        sh_filter_free (retval->filter);
 
       SH_FREE(retval);
@@ -1173 +1156 @@
   if (ext_coms == NULL || ext_failed == (-1))
     return (-1);
-  return (sh_ext_add (str, &(ext_coms->for_c), ext_coms->for_v));
+  if (ext_coms->filter == NULL)
+    ext_coms->filter = sh_filter_alloc();
+  return (sh_filter_add(str, ext_coms->filter, SH_FILT_OR));
 }
 
@@ -1183 +1168 @@
   if (ext_coms == NULL || ext_failed == (-1))
     return (-1);
-  return (sh_ext_add (str, &(ext_coms->fand_c), ext_coms->fand_v));
+  if (ext_coms->filter == NULL)
+    ext_coms->filter = sh_filter_alloc();
+  return (sh_filter_add(str, ext_coms->filter, SH_FILT_AND));
 }
 
@@ -1193 +1180 @@
   if (ext_coms == NULL || ext_failed == (-1))
     return (-1);
-  return (sh_ext_add (str, &(ext_coms->fnot_c), ext_coms->fnot_v));
+  if (ext_coms->filter == NULL)
+    ext_coms->filter = sh_filter_alloc();
+  return (sh_filter_add(str, ext_coms->filter, SH_FILT_NOT));
 }
 
@@ -1354 +1343 @@
 static int sh_ext_filter (char * message, sh_com_t * task)
 {
-  int i;
-  int j = 0;
   time_t now_time;
 
   SL_ENTER(_("sh_ext_filter"));
 
-  /* Presence of any of these keywords prevents execution.
-   */
-  if (task->fnot_c > 0)
-    {
-      for (i = 0; i < task->fnot_c; ++i)
+  if (task->filter)
+    {
+      if (0 != sh_filter_filter (message, task->filter))
         {
-          if (NULL != sl_strstr(message, task->fnot_v[i]))
-            {
-              SL_RETURN ((-1), _("sh_ext_filter"));
-            }
+          SL_RETURN ((-1), _("sh_ext_filter"));
         }
     }
 
-  /* Presence of all of these keywords is required for execution.
-   */
-  if (task->fand_c > 0)
-    {
-      j = 0;
-
-      for (i = 0; i < task->fand_c; ++i)
-        {
-          if (NULL == sl_strstr(message, task->fand_v[i]))
-            {
-              SL_RETURN ((-1), _("sh_ext_filter"));
-            }
-        }
-
-    }
-
-  /* Presence of at least one of these keywords is required for execution.
-   */
-  if (task->for_c > 0)
-    {
-      for (i = 0; i < task->for_c; ++i)
-        {
-          if (NULL != sl_strstr(message, task->for_v[i]))
-            {
-              goto checkdeadtime;
-            }
-        }
-      SL_RETURN ((-1), _("sh_ext_filter"));
-    }
-
- checkdeadtime:
-  if (task->deadtime != (time_t) 0)   /* deadtime */
+  /* Filter passed, check deadtime */
+
+  if (task->deadtime != (time_t) 0)
     {
       now_time = time (NULL);