Changeset 2326 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Aug 18, 2009, 3:19:54 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3337@localhost: bruno | 2009-08-11 20:02:18 +0200
bkpinfo->boot_device and bkpinfo->zip_exe are now dynamically allocated

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (2 diffs)

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

@@ -616 +616 @@
     }
 
-    if (!bkpinfo->nonbootable_backup
-        && (bkpinfo->boot_loader == '\0'
-            || bkpinfo->boot_device[0] == '\0')) {
+    if (!bkpinfo->nonbootable_backup && (bkpinfo->boot_loader == '\0' || bkpinfo->boot_device == NULL)) {
 
 #ifdef __FreeBSD__
@@ -660 +658 @@
             bkpinfo->boot_loader = ch;
         }
-        if (bkpinfo->boot_device[0] != '\0') {
+        if (bkpinfo->boot_device != NULL) {
             log_msg(2, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
         } else {
-            strcpy(bkpinfo->boot_device, bootdev);
+            mr_asprintf(bkpinfo->boot_device, "%s", bootdev);
         }
     }