Changeset 3147 in MondoRescue for branches/3.1/mondo/src/common/libmondo-filelist.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/common/libmondo-filelist.c (modified) (13 diffs)

branches/3.1/mondo/src/common/libmondo-filelist.c

@@ -30 +30 @@
 
 extern char *MONDO_LOGFILE;
+
+extern long g_max_biggie_size;
 
 /* Reference to global bkpinfo */
@@ -195 +197 @@
 /*@ long ****************************************/
     long lino = 0;
-    long max_sane_size_for_a_file;
+    // A big file has more than 64 MB of real content
     long curr_set_size;
     long noof_lines;
@@ -221 +223 @@
     assert_string_is_neither_NULL_nor_zerolength(filelist);
     assert(maxsetsizeK > 0);
-
-    max_sane_size_for_a_file = 64L * 1024L;
-// max_sane_size_for_a_file = maxsetsizeK*2;
-//  if (max_sane_size_for_a_file > 32*1024)
-//    { max_sane_size_for_a_file = 32*1024; }
 
     log_it("filelist=%s;", filelist);
@@ -269 +266 @@
             siz = 0;
         } else {
-            siz = (long) (buf.st_size >> 10);
-        }
-        if (siz > max_sane_size_for_a_file) {
-            log_msg(10, "Adding %s to big files\n", incoming);
+            // blocks are 512 bytes long - cf man 2 stat - Pass to the previous unit (MB => kB e.g.)
+            // use blocks instead of size to allow sparse file correct handling as much as possible
+            siz = (long) ((buf.st_blocks*512) >> 10);
+        }
+        if (siz > g_max_biggie_size) {
+            log_msg(10, "Adding %s to big files (size = %ld)\n", incoming, siz);
             fprintf(fbig, "%s\n", incoming);
         } else {
             curr_set_size += siz;
-            log_msg(10, "Adding %s to filelist %d\n", incoming, curr_set_no);
+            log_msg(10, "Adding %s to filelist %d (size = %ld)\n", incoming, curr_set_no, siz);
             fprintf(fout, "%s\n", incoming);
             if (curr_set_size > maxsetsizeK) {
@@ -400 +399 @@
     char *tmp = NULL;
 
+    char *p;
+
     pattr = popen(syscall, "r");
     if (!pattr) {
@@ -431 +432 @@
     char *strtmp = NULL;
     char *tmp = NULL;
+    char *p = NULL;
     int i;
 
@@ -517 +519 @@
     int retval = 0;
     int i;
-    char *p, *q;
+    char *p, *q, *r;
     char *tmp = NULL;
     FILE *pin, *pout, *faclin;
@@ -1323 +1325 @@
     char *skip_these = NULL;
     char *new_with_pipe;
-    char *strtmp;
-    char *token;
+    char *strtmp = NULL;
+    char *token = NULL;
     char *find_excludes = NULL;
     char *name_of_evalcall_form = NULL;
@@ -1374 +1376 @@
 
         log_msg(5, "find command = %s", strtmp);
-        (void)system(strtmp);
+        paranoid_system(strtmp);
         mr_free(strtmp);
 
@@ -1510 +1512 @@
     char *sz_filelist;
     char *exclude_paths = NULL;
-    int i;
     FILE *fout;
     char *command = NULL;
@@ -1597 +1598 @@
             fatal_error("Cannot openout to sz_filelist");
         }
-        i = 0;
         if ((!include_paths) || (strlen(include_paths) == 0)) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
@@ -1697 +1697 @@
 {
     /*@ int ******************************************************** */
-    int noof_chars;
     static int depth = 0;
     static char original_string[MAX_STR_LEN];
@@ -1715 +1714 @@
     assert(startnode != NULL);
     assert(string_to_find != NULL);
-
-    noof_chars = strlen(string_to_find) + 1;    /* we include the '\0' */
 
     log_msg(7, "starting --- str=%s", string_to_find);