Changeset 2325 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Aug 18, 2009, 3:19:15 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3336@localhost: bruno | 2009-08-11 16:32:36 +0200

• bkpinfo->media_device, bkpinfo->nfs_remote_dir, and bkpinfo->nfs_mount are now dynamically allocated
• new interfaces for find_cdrom_device(), find_tape_device_and_size(), find_dvd_device(), find_cdrw_device(), set_dev_to_this_if_rx_OK() and read_cfg_var() which allocate the string now returned
• Better differentiation between ISO and NFS iso file names construction

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (3 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -360 +360 @@
   /**  needs malloc **********/
 
-    char *tarball_fname = NULL; 
-    char *progress_str = NULL;
-    char *tmp = NULL;
+    char *tarball_fname, *progress_str; 
+    char *tmp = NULL;
     char *mds = NULL;
     long max_val;
 
+    malloc_string(tarball_fname);
+    malloc_string(progress_str);
 
     assert(bkpinfo != NULL);
     mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
-
-    malloc_string(tmp);
-    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
+    tmp = read_cfg_var(g_mondo_cfg_file, "last-filelist-number");
     max_val = atol(tmp);
+    mr_free(tmp);
+
     paranoid_free(tmp);
 
@@ -442 +443 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
+    paranoid_free(tarball_fname);
+    paranoid_free(progress_str);
     return (retval);
 }
@@ -671 +674 @@
                         0, "Verifying archives against filesystem");
 
+    mr_free(bkpinfo->media_device);
     if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        strcpy(bkpinfo->media_device,
-               last_line_of_file("/tmp/CDROM-LIVES-HERE"));
-    } else {
-        find_cdrom_device(bkpinfo->media_device, FALSE);
+        mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+    } else {
+        bkpinfo->media_device = find_cdrom_device(FALSE);
     }
     res = verify_tape_backups();