Changeset 425 for trunk/src/sh_ignore.c

Timestamp:

Feb 20, 2013, 7:30:02 PM (12 years ago)

Author:

katerina

Message:

Fix for tickets #329, #330, #331, #332

File:

• trunk/src/sh_ignore.c (modified) (7 diffs)

trunk/src/sh_ignore.c

@@ -53 +53 @@
 static struct sh_ignore_list * sh_del_ign = NULL;
 static struct sh_ignore_list * sh_new_ign = NULL;
+static struct sh_ignore_list * sh_mod_ign = NULL;
 
 static struct sh_ignore_list * sh_ignore_add_int(struct sh_ignore_list * list, 
@@ -118 +119 @@
 }
 
+int sh_ignore_add_mod (const char * addpath)
+{
+  if ((addpath == NULL) || (addpath[0] != '/'))
+    {
+      return -1;
+    }
+  sh_mod_ign = sh_ignore_add_int (sh_mod_ign, addpath);
+  return 0;
+}
+
 static int sh_ignore_chk_int (struct sh_ignore_list * list, 
                               const char * chkpath)
@@ -159 +170 @@
 }
 
+int sh_ignore_chk_mod (const char * chkpath)
+{
+  return (sh_ignore_chk_int(sh_mod_ign, chkpath));
+}
+
 int sh_ignore_clean (void)
 {
@@ -191 +207 @@
     }
 
+  new = sh_mod_ign;
+
+  while (new)
+    {
+      sh_mod_ign = new->next;
+#ifdef HAVE_REGEX_H
+      regfree (&(new->preg));
+#else
+      SH_FREE(new->path);
+#endif
+      SH_FREE(new);
+      new        = sh_mod_ign;
+    }
+
   return 0;
 }
@@ -205 +235 @@
   CuAssertTrue(tc, NULL == sh_del_ign);
   CuAssertTrue(tc, NULL == sh_new_ign);
+  CuAssertTrue(tc, NULL == sh_mod_ign);
  
   ret = sh_ignore_add_del ("/var/log/foo/.*");
   CuAssertTrue(tc, 0 == ret);
+
   CuAssertPtrNotNull(tc, sh_del_ign);
+  CuAssertTrue(tc, NULL == sh_new_ign);
+  CuAssertTrue(tc, NULL == sh_mod_ign);
 
   ret = sh_ignore_chk_del ("/var/log/foo/test");
   CuAssertTrue(tc, S_TRUE == ret);
-  CuAssertTrue(tc, NULL == sh_new_ign);
   
   ret = sh_ignore_chk_del ("/var/log/footest");
@@ -223 +256 @@
   CuAssertTrue(tc, NULL == sh_del_ign);
   CuAssertTrue(tc, NULL == sh_new_ign);
+  CuAssertTrue(tc, NULL == sh_mod_ign);
  
   ret = sh_ignore_add_new ("/var/log/foo/.*");
   CuAssertTrue(tc, 0 == ret);
+
   CuAssertPtrNotNull(tc, sh_new_ign);
   CuAssertTrue(tc, NULL == sh_del_ign);
+  CuAssertTrue(tc, NULL == sh_mod_ign);
 
   ret = sh_ignore_chk_new ("/var/log/foo/test");
@@ -241 +277 @@
   CuAssertTrue(tc, NULL == sh_new_ign);
   CuAssertTrue(tc, NULL == sh_del_ign);
+  CuAssertTrue(tc, NULL == sh_mod_ign);
+
+  ret = sh_ignore_add_mod ("/var/log/foo/.*");
+  CuAssertTrue(tc, 0 == ret);
+
+  CuAssertPtrNotNull(tc, sh_mod_ign);
+  CuAssertTrue(tc, NULL == sh_del_ign);
+  CuAssertTrue(tc, NULL == sh_new_ign);
+
+  ret = sh_ignore_chk_mod ("/var/log/foo/test");
+  CuAssertTrue(tc, S_TRUE == ret);
+  
+  ret = sh_ignore_chk_mod ("/var/log/footest");
+  CuAssertTrue(tc, S_FALSE == ret);
+
+  ret = sh_ignore_chk_mod ("/my/var/log/footest");
+  CuAssertTrue(tc, S_FALSE == ret);
+
+  sh_ignore_clean();
+  CuAssertTrue(tc, NULL == sh_new_ign);
+  CuAssertTrue(tc, NULL == sh_del_ign);
+  CuAssertTrue(tc, NULL == sh_mod_ign);
 
 #else