Changeset 3373 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c

Timestamp:

Apr 27, 2015, 4:25:28 PM (9 years ago)

Author:

Bruno Cornec

Message:

Change the bkpinfo->boot_device from statically allocated to dynamically allocated

File:

• branches/3.2/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

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

@@ -2595 +2595 @@
 
     if (archiving_to_media) {
-
+        mr_free(bkpinfo->boot_device);
 #ifdef __FreeBSD__
-        strcpy(bkpinfo->boot_device,
-               call_program_and_get_last_line_of_output
-               ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
+        mr_asprintf(bkpinfo->boot_device, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
 #else
-        strcpy(bkpinfo->boot_device,
-               call_program_and_get_last_line_of_output
-               ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+        mr_asprintf(bkpinfo->boot_device, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
 #endif
         i = which_boot_loader(bkpinfo->boot_device);
@@ -2616 +2612 @@
             i = which_boot_loader(bkpinfo->boot_device);
 #else
-            if (!popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/hda)", bkpinfo->boot_device, MAX_STR_LEN / 4)) {
+            strcpy(tmp1, bkpinfo->boot_device);
+            if (!popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/hda)", tmp1, MAX_STR_LEN / 4)) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
+            mr_free(bkpinfo->boot_device);
+            mr_asprintf(bkpinfo->boot_device, "%s", tmp1);
+
+            if (does_string_exist_in_boot_block(bkpinfo->boot_device, "ELILO")) {
+                i = 'E';
+            } else
+                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
                 i = 'L';
-            } else
-                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "ELILO")) {
-                i = 'E';
             } else
                 if (does_string_exist_in_boot_block(bkpinfo->boot_device, "GRUB")) {