Changeset 3196 in MondoRescue for branches

Timestamp:

Oct 1, 2013, 8:20:32 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix ISO mode when netfs_remote_dir is NULL (wasn't differentiated correctly with dynamic meory allocation)

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-devices.c (modified) (5 diffs)

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

@@ -3210 +3210 @@
         log_to_screen("Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.",(long) space_occupied_by_cd(bkpinfo->scratchdir),(long) bkpinfo->media_size);
     }
-    mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->netfs_remote_dir, bkpinfo->prefix,
-            g_current_media_number);
+
+    if (bkpinfo->netfs_remote_dir) {
+        // NETFS
+        mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_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);
+    }
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
         if (bkpinfo->backup_media_type != usb) {

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -1340 +1340 @@
         }
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+        if (bkpinfo->netfs_remote_dir) {
+            // NETFS
+            mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+        } else {
+            // ISO
+            mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
+        }
         mddev = make_vn(mount_cmd);
         mr_free(mount_cmd);
@@ -1347 +1352 @@
         mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        if (bkpinfo->netfs_remote_dir) {
+            // NETFS
+            mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        } else {
+            // ISO
+            mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        }
 #endif
 
@@ -2549 +2560 @@
             finish(1);
         }
+        if (bkpinfo->netfs_remote_dir == NULL) {
+            fatal_error("bkpinfo->netfs_remote_dir shold not be NULL");
+        }
         strcpy(tmp1, bkpinfo->netfs_remote_dir);
         if (!popup_and_get_string
@@ -2556 +2570 @@
             finish(1);
         }
+        mr_free(bkpinfo->netfs_remote_dir);
         mr_asprintf(bkpinfo->netfs_remote_dir, "%s", tmp1);
 
@@ -2615 +2630 @@
         break;
     default:
-        fatal_error
-            ("I, Mojo Jojo, shall defeat those pesky Powerpuff Girls!");
+        fatal_error("I, Mojo Jojo, shall defeat those pesky Powerpuff Girls!");
     }