Changeset 2322 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

Timestamp:

Aug 18, 2009, 2:37:58 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3333@localhost: bruno | 2009-08-08 01:58:31 +0200

• bkpinfo->prefix is now dynamically assigned
• Fix newt mondoarchive

File:

• branches/2.2.10/mondo/src/common/libmondo-devices.c (modified) (5 diffs)

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

@@ -19 +19 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-stream-EXT.h"
+
+extern void mr_strip_spaces(char *);
 
 #include <sys/types.h>
@@ -1803 +1805 @@
             finish(1);
         }
+        mr_free(bkpinfo->prefix);
+        bkpinfo->prefix = p;
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
-        strcpy(bkpinfo->prefix, p);
-        mr_free(p);
 
         log_msg(3, "Just set nfs_remote_dir to %s", bkpinfo->nfs_remote_dir);
@@ -1847 +1849 @@
             finish(1);
         }
-        strcpy(bkpinfo->prefix, p);
-        mr_free(p);
+        mr_free(bkpinfo->prefix);
+        bkpinfo->prefix = p;
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
         break;
+
     default:
         fatal_error
@@ -2017 +2020 @@
     log_it("media device = %s", bkpinfo->media_device);
     log_it("media size = %ld", bkpinfo->media_size[1]);
-    log_it("media type = %s",
-           bkptype_to_string(bkpinfo->backup_media_type));
+    log_it("media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
     log_it("prefix = %s", bkpinfo->prefix);
     log_it("compression = %ld", bkpinfo->compression_level);
@@ -2026 +2028 @@
     log_it("tmpdir = '%s'", bkpinfo->tmpdir);
     log_it("image_devs = '%s'", bkpinfo->image_devs);
-    log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device,
-           bkpinfo->boot_loader);
+    log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device, bkpinfo->boot_loader);
     if (bkpinfo->media_size[0] < 0) {
         if (archiving_to_media) {