Changeset 19 for trunk/src/sh_files.c

Timestamp:

Feb 12, 2006, 10:49:56 PM (19 years ago)

Author:

rainer

Message:

Rewrite of test suite, checksum for growing logs, fix for minor bug with dead client detection.

File:

• trunk/src/sh_files.c (modified) (8 diffs)

trunk/src/sh_files.c

@@ -590 +590 @@
         if (0 == strncmp(myword, _("HLN"), 3))
           sh_files_set_mask (mask, MODI_HLN, act);
+/* size may grow */
+        if (0 == strncmp(myword, _("GROW"), 3))
+          sh_files_set_mask (mask, MODI_SGROW, act);
+/* use prelink */
+        if (0 == strncmp(myword, _("PRE"), 3))
+          sh_files_set_mask (mask, MODI_PREL, act);
         
       }
@@ -1010 +1016 @@
               ++dcount;
             }
-          ptr->checked = S_TRUE;
+          ptr->checked        = S_TRUE;
+          ptr->childs_checked = S_TRUE;
         }
 
@@ -1425 +1432 @@
 
   dirstack_t *    dst_ptr;
+  dirstack_t *    tmp_ptr;
 
   int             hardlink_num = 0;
@@ -1645 +1653 @@
         file_class_next    = dst_ptr->class;
         checked_flag       = dst_ptr->checked;
-        cchecked_flag      = dst_ptr->childs_checked;
+        /* not set, hence always FALSE                   */
+        /* cchecked_flag      = dst_ptr->childs_checked; */
       }
     
@@ -1708 +1717 @@
             cchecked_flag = -1;
             
-            dst_ptr     = (dirstack_t *) zAVLSearch(zdirListOne, tmpcat);
-
-            if (dst_ptr) 
+            tmp_ptr     = (dirstack_t *) zAVLSearch(zdirListOne, tmpcat);
+
+            if (tmp_ptr) 
               {
                 TPT((0, FIL__, __LINE__, 
                      _("msg=<%s -> recursion depth %d\n>"),
-                     dst_ptr->name, dst_ptr->rdepth));
-                rdepth_next   = dst_ptr->rdepth;
-                class_next    = dst_ptr->class;
+                     tmp_ptr->name, tmp_ptr->rdepth));
+                rdepth_next   = tmp_ptr->rdepth;
+                class_next    = tmp_ptr->class;
                 /* 28. Aug 2001 reversed
                  */
-                cchecked_flag = dst_ptr->childs_checked;
-                checked_flag  = dst_ptr->checked;
+                cchecked_flag = tmp_ptr->childs_checked;
+                checked_flag  = tmp_ptr->checked;
               }
             
             if (checked_flag == -1)
               {
-                dst_ptr     = (dirstack_t *) zAVLSearch(zdirListTwo, tmpcat);
-
-                if (dst_ptr) 
+                tmp_ptr     = (dirstack_t *) zAVLSearch(zdirListTwo, tmpcat);
+
+                if (tmp_ptr) 
                   {
                     TPT((0, FIL__, __LINE__, 
                          _("msg=<%s -> recursion depth %d\n>"),
-                         dst_ptr->name, dst_ptr->rdepth));
-                    rdepth_next   = dst_ptr->rdepth;
-                    class_next    = dst_ptr->class;
+                         tmp_ptr->name, tmp_ptr->rdepth));
+                    rdepth_next   = tmp_ptr->rdepth;
+                    class_next    = tmp_ptr->class;
                     /* 28. Aug 2001 reversed
                      */
-                    cchecked_flag = dst_ptr->childs_checked;
-                    checked_flag  = dst_ptr->checked;
+                    cchecked_flag = tmp_ptr->childs_checked;
+                    checked_flag  = tmp_ptr->checked;
                   }
               }
@@ -1745 +1754 @@
                 sh_files_checkdir (class_next, rdepth_next, tmpcat, 
                                    dirlist->sh_d_name);
-                dst_ptr->childs_checked = S_TRUE;
+                tmp_ptr->childs_checked = S_TRUE;
+                /*
+                 * 04. Feb 2006 avoid double checking
+                 */
+                tmp_ptr->checked        = S_TRUE;
               }
             else if (checked_flag == -1)
@@ -1768 +1781 @@
     
     dirlist = dirlist->next;
+
+    if (dst_ptr)
+      dst_ptr->childs_checked = S_TRUE;
     
   } while (dirlist != NULL);
@@ -1820 +1836 @@
    */
   char            fullpath[PATH_MAX];
-  char            fileHash[KEY_LEN + 1];
+  char            fileHash[2*(KEY_LEN + 1)];
   int             status;
   file_type       theFile;