Changeset 2351 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Aug 28, 2009, 2:41:30 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Replacement of some fgets by mr_getline to allow for dyn. memory management.
• Backport of SElinux fix from 2.2.9

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (10 diffs)

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -1927 +1927 @@
 
     /*@ pointers ******************************************* */
-    FILE *fin;
-    char *p;
+    FILE *fin = NULL;
 
     /*@ buffers ******************************************** */
     char *tmp = NULL;
-    char *bigfile_fname;
+    char *bigfile_fname = NULL;
     char *sz_devfile = NULL;
     char *ntfsprog_fifo = NULL;
@@ -1976 +1975 @@
     }
 
-    malloc_string(bigfile_fname);
-    for (fgets(bigfile_fname, MAX_STR_LEN, fin); !feof(fin);
-         fgets(bigfile_fname, MAX_STR_LEN, fin), biggie_file_number++) {
+    for (mr_getline(bigfile_fname, fin); !feof(fin); mr_getline(bigfile_fname, fin), biggie_file_number++) {
         use_ntfsprog = FALSE;
         if (bigfile_fname[strlen(bigfile_fname) - 1] < 32) {
@@ -1991 +1988 @@
                 log_msg(3, "Unable to write to %s", bigfile_fname);
                 // So skip it as it doesn't exist
+                mr_free(bigfile_fname);
                 continue;
             } else {
@@ -2001 +1999 @@
             log_msg(2, "bigfile_fname = %s", bigfile_fname);
             use_ntfsprog = FALSE;
-            if (!strncmp(bigfile_fname, "/dev/", 5)
-                && is_dev_an_NTFS_dev(bigfile_fname)) {
+            if (!strncmp(bigfile_fname, "/dev/", 5) && is_dev_an_NTFS_dev(bigfile_fname)) {
                 use_ntfsprog = TRUE;
                 log_msg(2, "Calling ntfsclone in background because %s is an NTFS partition", bigfile_fname);
@@ -2010 +2007 @@
                 switch (pid = fork()) {
                 case -1:
+                    mr_free(bigfile_fname);
                     mr_free(sz_devfile);
                     fatal_error("Fork failure");
@@ -2032 +2030 @@
             // Whether partition or biggiefile, just do your thang :-)
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                write_header_block_to_stream(biggie_fsize, bigfile_fname,
-                                             use_ntfsprog ?
-                                             BLK_START_A_PIHBIGGIE :
-                                             BLK_START_A_NORMBIGGIE);
+                write_header_block_to_stream(biggie_fsize, bigfile_fname, use_ntfsprog ?  BLK_START_A_PIHBIGGIE : BLK_START_A_NORMBIGGIE);
             }
             res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, noof_biggie_files, use_ntfsprog);
@@ -2042 +2037 @@
             }
             retval += res;
-            p = strrchr(bigfile_fname, '/');
-            if (p) {
-                p++;
-            } else {
-                p = bigfile_fname;
-            }
             mr_asprintf(tmp, "Archiving %s ... ", bigfile_fname);
             if (res) {
@@ -2059 +2048 @@
             }
         }
+        mr_free(bigfile_fname);
 #ifndef _XWIN
         if (!g_text_mode) {
@@ -2067 +2057 @@
         mr_free(tmp);
     }
+    mr_free(bigfile_fname);
+
     log_msg(1, "Finished backing up bigfiles");
     log_msg(1, "estimated slices = %ld; actual slices = %ld",
@@ -2072 +2064 @@
     close_progress_form();
     paranoid_fclose(fin);
-    paranoid_free(bigfile_fname);
     return (retval);
 }