Changeset 2325 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondorestore.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/mondorestore.c (modified) (15 diffs)

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -969 +969 @@
         interactively_obtain_media_parameters_from_user(FALSE);
     }
-    log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
-    if (!bkpinfo->media_device[0]) {
-        log_msg(2, "Warning - failed to find media dev");
+    if (!bkpinfo->media_device) {
+        log_msg(2, "WARNING: failed to find media dev");
+    } else {
+        log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
     }
 
@@ -1999 +2000 @@
     long noof_biggiefiles, bigfileno = 0, total_slices;
   /** malloc **/
-    char *tmp;
     char *tmp1 = NULL;
     char *mds = NULL;
@@ -2009 +2009 @@
     FILE *fbw = NULL;
 
-    malloc_string(tmp);
     malloc_string(pathname_of_last_biggie_restored);
     assert(bkpinfo != NULL);
@@ -2018 +2017 @@
     }
 
-    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
-    total_slices = atol(tmp);
+    tmp1 = read_cfg_var(g_mondo_cfg_file, "total-slices");
+    total_slices = atol(tmp1);
+    mr_free(tmp1);
+
     mr_asprintf(tmp1, "Reassembling large files      ");
     mvaddstr_and_log_it(g_currentY, 0, tmp1);
@@ -2108 +2109 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tmp);
     paranoid_free(pathname_of_last_biggie_restored);
     return (retval);
@@ -2138 +2138 @@
     long max_val;
   /**malloc ***/
-    char *tmp = NULL;
     char *mds = NULL;
     char *tmp1 = NULL;
@@ -2145 +2144 @@
     char *comment;
 
-    malloc_string(tmp);
     malloc_string(comment);
 
@@ -2157 +2155 @@
     }
     insist_on_this_cd_number(g_current_media_number);
-    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
-    max_val = atol(tmp) + 1;
-    paranoid_free(tmp);
+    tmp1 = read_cfg_var(g_mondo_cfg_file, "last-filelist-number");
+    max_val = atol(tmp1) + 1;
+    mr_free(tmp1);
 
     mds = media_descriptor_string(bkpinfo->backup_media_type);
@@ -2278 +2276 @@
 
   /** malloc add ****/
-    char *tmp;
-    char *tmp1;
+    char *tmp1 = NULL;
     char *biggie_fname;
     char *biggie_cksum;
@@ -2290 +2287 @@
     FILE *fbw = NULL;
 
-    malloc_string(tmp);
     malloc_string(biggie_fname);
     malloc_string(biggie_cksum);
@@ -2296 +2292 @@
     assert(bkpinfo != NULL);
 
-    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
-
-    total_slices = atol(tmp);
+    tmp1 = read_cfg_var(g_mondo_cfg_file, "total-slices");
+    total_slices = atol(tmp1);
+    mr_free(tmp1);
+
     if (g_getfattr) {
         mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
@@ -2408 +2405 @@
     paranoid_free(biggie_fname);
     paranoid_free(biggie_cksum);
-    paranoid_free(tmp);
     return (retval);
 }
@@ -2453 +2449 @@
     assert(bkpinfo != NULL);
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    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) + 1;
+    mr_free(tmp);
 
     chdir(bkpinfo->restore_path);   /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
@@ -2595 +2592 @@
             openin_cdstream();
         } else {
-            assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
             openin_tape();
         }
@@ -2933 +2929 @@
         // BCO:To be reviewed
         if ((bkpinfo->restore_mode == compare) || (bkpinfo->restore_mode == nuke)) {
-            if (bkpinfo->backup_media_type == nfs
-                && !is_this_device_mounted(bkpinfo->nfs_mount)) {
+            if (bkpinfo->backup_media_type == nfs && bkpinfo->nfs_mount && !is_this_device_mounted(bkpinfo->nfs_mount)) {
                 log_msg(1, "Mounting nfs dir");
                 mr_free(bkpinfo->isodir);