Changeset 2326 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.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-devices.c (modified) (3 diffs)

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

@@ -1823 +1823 @@
     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/'"));
+#define EXAMPLEBD   "/dev/ad0"
+        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].*//'"));
+#define EXAMPLEBD   "/dev/hda"
+        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);
@@ -1836 +1835 @@
         {
 
-#ifdef __FreeBSD__
-            p = popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/ad0)", bkpinfo->boot_device);
-            if (!p == NULL) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            strcpy(bkpinfo->boot_device, p);
-            mr_free(p);
-            i = which_boot_loader(bkpinfo->boot_device);
-#else
-            p = popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/hda)", bkpinfo->boot_device);
+            p = popup_and_get_string("Boot device", "What is your boot device? (e.g. "EXAMPLEBD")", bkpinfo->boot_device);
+#undef EXAMPLEBD
             if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            strcpy(bkpinfo->boot_device, p);
-            mr_free(p);
-
+            mr_free(bkpinfo->boot_device);
+            bkpinfo->boot_device = p;
+#ifdef __FreeBSD__
+            i = which_boot_loader(bkpinfo->boot_device);
+#else
             if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
                 i = 'L';
@@ -1867 +1859 @@
 #endif
             if (i == 'U') {
-                if (ask_me_yes_or_no
-                    ("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?"))
-                {
+                if (ask_me_yes_or_no("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?")) {
                     i = 'R';    // raw
                 } else {
-                    log_to_screen
-                        ("I cannot find your boot loader. Please run mondoarchive with parameters.");
+                    log_to_screen("I cannot find your boot loader. Please run mondoarchive with parameters.");
                     finish(1);
                 }