Changeset 3196 in MondoRescue for branches/3.2/mondo/src/common/libmondo-archive.c

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)

File:

• branches/3.2/mondo/src/common/libmondo-archive.c (modified) (1 diff)

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) {