Changeset 2325 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-verify.c

Timestamp:

Aug 18, 2009, 3:19:15 PM (16 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/common/libmondo-verify.c (modified) (3 diffs)

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

@@ -924 +924 @@
     assert(bkpinfo != NULL);
 
+    if (bkpinfo->media_device == NULL) {
+        return(1);
+    }
+
     mr_asprintf(fname, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(fname)) {
@@ -1022 +1026 @@
     assert(bkpinfo != NULL);
 
+    if (bkpinfo->media_device == NULL) {
+        return(1);
+    }
+
     mr_asprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+    if (((bkpinfo->isodir == NULL) && (bkpinfo->nfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
+        fatal_error("No iso filename preparation possible");
+    }
+    if (bkpinfo->nfs_remote_dir) {
+        // NFS
+        mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+    } else {
+        // ISO
+        mr_asprintf(fname, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
+    }
 
     mkdir(mountpoint, 1777);
@@ -1106 +1123 @@
         mr_free(command);
 
-        if (!bkpinfo->please_dont_eject
-            && eject_device(bkpinfo->media_device)) {
+        if (!bkpinfo->please_dont_eject && eject_device(bkpinfo->media_device)) {
             log_msg(2, "Failed to eject CD-ROM drive");
         }