Changeset 3373 in MondoRescue for branches/3.2/mondo/src/common

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

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-cli.c (modified) (1 diff)
• libmondo-devices.c (modified) (2 diffs)
• libmondo-tools.c (modified) (1 diff)
• mondostructures.h (modified) (1 diff)

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

@@ -596 +596 @@
 
     update_evalcall_form(2);
-    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__
@@ -638 +638 @@
             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);
         }
     }

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

@@ -811 +811 @@
 
     if (flag_set['f']) {
-        strncpy(bkpinfo->boot_device, resolve_softlinks_to_get_to_actual_device_file(flag_val['f']),MAX_STR_LEN / 4);
+        mr_free(bkpinfo->boot_device);
+        mr_asprintf(bkpinfo->boot_device, "%s", resolve_softlinks_to_get_to_actual_device_file(flag_val['f']));
     }
 

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")) {

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

@@ -776 +776 @@
     bkpinfo->media_size = -1;
     bkpinfo->boot_loader = '\0';
-    bkpinfo->boot_device[0] = '\0';
+    bkpinfo->boot_device = NULL;
     bkpinfo->zip_exe[0] = '\0';
     bkpinfo->zip_suffix[0] = '\0';

branches/3.2/mondo/src/common/mondostructures.h

@@ -361 +361 @@
    * to take truncate_to_drive_name() of where_is_root_mounted().
    */
-    char boot_device[MAX_STR_LEN / 4];
+    char *boot_device;
 
   /**