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

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -772 +772 @@
         }
     }
+    mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-            strcpy(bkpinfo->prefix,value);
+        mr_asprintf(&tmp1, "%s", value);
     } else {
-            strcpy(bkpinfo->prefix,STD_PREFIX);
-    }
+        mr_asprintf(&tmp1, "%s", STD_PREFIX);
+    }
+    bkpinfo->prefix = tmp1;
 } else if (!strcmp(value, "nfs")) {
     bkpinfo->backup_media_type = nfs;
     bkpinfo->please_dont_eject = TRUE;
+    mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-            strcpy(bkpinfo->prefix,value);
+        mr_asprintf(&tmp1, "%s", value);
     } else {
-            strcpy(bkpinfo->prefix,STD_PREFIX);
-    }
-    if (strstr(call_program_and_get_last_line_of_output
-       ("cat /proc/cmdline"), "pxe")) {
+        mr_asprintf(&tmp1, "%s", STD_PREFIX);
+    }
+    bkpinfo->prefix = tmp1;
+
+    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
         /* We need to override prefix value in PXE mode as it's 
         * already done in start-nfs */
@@ -793 +797 @@
             fatal_error("no imgname variable in environment");
         }
-        strcpy(bkpinfo->prefix,envtmp1);
+        mr_free(bkpinfo->prefix);
+        mr_asprintf(&tmp1, "%s", envtmp1);
+        bkpinfo->prefix = tmp1;
     }