Changeset 457 for trunk/src/sh_hash.c

Timestamp:

Aug 3, 2014, 4:29:51 PM (10 years ago)

Author:

katerina

Message:

Fix for ticket #357 (Incorrect precedence for IgnoreAll).

File:

• trunk/src/sh_hash.c (modified) (6 diffs)

trunk/src/sh_hash.c

@@ -537 +537 @@
       SL_RET0(_("hash_unvisited"));
     }
-
+#if 0
+  if (!strcmp(p->fullpath, "/var/lib/synaptic"))
+    {
+      fprintf(stderr, "FIXME: Check for missing files %s\n", p->fullpath);
+      if (SH_FFLAG_VISITED_SET(p->fflags)) fprintf(stderr, "FIXME: visited\n");
+      if (SH_FFLAG_CHECKED_SET(p->fflags)) fprintf(stderr, "FIXME: checked\n");
+      if (SH_FFLAG_REPORTED_SET(p->fflags)) fprintf(stderr, "FIXME: reported\n");
+      if (SH_FFLAG_ALLIGNORE_SET(p->fflags)) fprintf(stderr, "FIXME: allignore\n");
+    }
+#endif
   /* visited   flag not set: not seen; 
    * checked   flag     set: not seen (i.e. missing), and already checked 
@@ -551 +560 @@
     {
       i = retry_lstat(FIL__, __LINE__, p->fullpath, &buf);
-
-      /* if file does not exist
+#if 0
+      if (!strcmp(p->fullpath, "/var/lib/synaptic"))
+        fprintf(stderr, "FIXME: Check for missing files %s (%d)\n", p->fullpath, i);
+#endif
+     /* if file does not exist
        */
       if (0 != i)
@@ -3817 +3829 @@
   int         i;
 
-  SL_ENTER(_("sh_hash_compdata"));
+  SL_ENTER(_("hash_full_tree"));
 
   if (IsInit != 1) 
-    SL_RETURN(0, _("sh_hash_compdata"));
+    SL_RETURN(0, _("hash_full_tree"));
 
   SH_MUTEX_LOCK_UNSAFE(mutex_hash);
@@ -3829 +3841 @@
     }
   SH_MUTEX_UNLOCK_UNSAFE(mutex_hash);
-  SL_RETURN (0, _("sh_hash_compdata"));
+  SL_RETURN (0, _("hash_full_tree"));
 } 
 
+#if !defined(SH_CUTEST)
+static 
+#endif
+int hash_remove_tree_test(char * s, char * fullpath, size_t len_s)
+{
+  size_t       len_p;
+  char      *  test;
+
+  len_p = strlen(fullpath);
+  
+  if (len_p >= len_s)
+    {
+      if (0 == strncmp(s, fullpath, len_s)) 
+        { 
+          if (len_p > len_s)
+            {
+              /* continue if not inside directory;
+               * len_s > 1 because everything is inside '/' 
+               */
+              if ((len_s > 1) && (fullpath[len_s] != '/'))
+                return S_FALSE;
+
+              test = sh_files_find_mostspecific_dir(fullpath);
+              
+              if (test && 0 != strcmp(test, s)) {
+                /* There is a more specific directory, continue */
+                return S_FALSE;
+              }
+              
+              if (NULL == sh_files_findfile(fullpath)) {
+                /* SET_SH_FFLAG_ALLIGNORE(p->fflags); */
+                return S_TRUE;
+              }
+            }
+          else /* len_p == len */
+            {
+              /* it is 's' itself, mark and continue 
+               * unless there is a policy for the inode itself
+               */
+              if (NULL == sh_files_findfile(fullpath)) {
+                /* SET_SH_FFLAG_ALLIGNORE(p->fflags); */
+                return S_TRUE;
+              }
+              else {
+                return S_FALSE;
+              }
+            }
+
+        } /* if path is in tree */
+    } /* if path is possibly in tree */
+  return S_FALSE;
+}
+
 
 int hash_remove_tree (char * s) 
 {
   sh_file_t *  p;
-  size_t       len;
+  size_t       len_s;
   unsigned int i;
 
@@ -3844 +3909 @@
     SL_RETURN ((-1), _("hash_remove_tree"));
 
-  len = sl_strlen(s);
+  len_s = sl_strlen(s);
 
   if (IsInit != 1) 
@@ -3854 +3919 @@
       for (p = tab[i]; p; p = p->next)
         {
-          if (p->fullpath && 0 == strncmp(s, p->fullpath, len))
-            { 
-              SET_SH_FFLAG_ALLIGNORE(p->fflags);
-            }
+          if (p->fullpath)
+            {
+              /* if (0 == strncmp(s, p->fullpath, len_s)) *//* old */
+              if (S_TRUE == hash_remove_tree_test(s, p->fullpath, len_s)) 
+                SET_SH_FFLAG_ALLIGNORE(p->fflags);
+            } /* if path is not null */
+
         }
     }