Changeset 3120 in MondoRescue

Timestamp:

May 15, 2013, 2:52:16 AM (11 years ago)

Author:

Bruno Cornec

Message:

• chop_filelist doesn't truncate files in the file list anymore. Fix a bug for ecryptfs support and is a 3.1 branch patch.

File:

• branches/3.0/mondo/src/common/libmondo-filelist.c (modified) (4 diffs)

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

@@ -210 +210 @@
     char *outfname = NULL;
     char *biggie_fname = NULL;
-    char *incoming;
+    char *incoming = NULL;
     char *tmp = NULL;
     char *p = NULL;
@@ -258 +258 @@
         return (curr_set_no + 1);
     }
-    incoming = malloc(MAX_STR_LEN * 2);
-
-    p = fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
-    while (!feof(fin) && (p != NULL)) {
+
+    mr_getline(incoming, fin);
+    while (!feof(fin)) {
         lino++;
         i = strlen(incoming) - 1;
         if (i < 0) {
             i = 0;
-        }
-        if (i > MAX_STR_LEN - 1) {
-            incoming[MAX_STR_LEN - 30] = '\0';
-            log_msg(1, "Warning - truncating file %s's name", incoming);
-            err++;
         }
         if (incoming[i] < 32) {
@@ -302 +296 @@
                     mr_free(outfname);
                     mr_free(biggie_fname);
-                    paranoid_free(incoming);
+                    mr_free(incoming);
                     return (curr_set_no + 1);
                 }
@@ -308 +302 @@
             }
         }
-        p = fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
-    }
-    paranoid_free(incoming);
+        mr_free(incoming);
+        mr_getline(incoming, fin);
+    }
+    mr_free(incoming);
+
     paranoid_fclose(fin);
     paranoid_fclose(fout);