Changeset 310 for trunk/src/sh_files.c

Timestamp:

Feb 16, 2011, 9:33:00 PM (14 years ago)

Author:

katerina

Message:

Add option to skip checksum for certain files (ticket #232). Also fix for #231 (missing warning on invalid recursion depth).

File:

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

trunk/src/sh_files.c

@@ -1147 +1147 @@
   p = sh_files_C_dequote(p, &len);
   if (!p || len == 0)
-    SL_RETURN((-1), _("sh_files_pushdir"));
+    SL_RETURN((-1), _("sh_files_pushfile"));
 
   if (len >= PATH_MAX) 
@@ -1544 +1544 @@
   
 
-  if (rdepth < (-1) || tail == p || rdepth > 99)
-    rdepth = (-2);
+  if (tail == p)
+    {
+      /* Setting to an invalid number will force MaxRecursionLevel,
+       * see sh_files_setrec_int()
+       */
+      rdepth = (-2);
+    }
+  else if ( (rdepth < (-1) || rdepth > 99) || 
+            ((rdepth == (-1)) && (class != SH_LEVEL_ALLIGNORE)) )
+    {
+      SH_FREE(p);
+      SL_RETURN((-1), _("sh_files_pushdir"));
+    }
 
   len = sl_strlen(tail);