Changeset 2328 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c

Timestamp:

Aug 18, 2009, 3:20:42 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3339@localhost: bruno | 2009-08-11 23:56:01 +0200
bkpinfo->kernel_path, bkpinfo->call_before_iso, bkpinfo->call_make_iso, bkpinfo->call_burn_iso, bkpinfo->call_after_iso and bkpinfo->postnuke_tarball are now dynamically allocated

File:

• branches/2.2.10/mondo/src/common/libmondo-cli.c (modified) (4 diffs)

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

@@ -1181 +1181 @@
 
     if ((flag_set['k']) && (! bkpinfo->restore_data)) {
-        strncpy(bkpinfo->kernel_path, flag_val['k'], MAX_STR_LEN);
+        mr_asprintf(bkpinfo->kernel_path, "%s", flag_val['k']);
         if (!strcmp(bkpinfo->kernel_path, "failsafe")) {
-            strcpy(bkpinfo->kernel_path, "FAILSAFE");
-        }
-        if (strcmp(bkpinfo->kernel_path, "FAILSAFE")
-            && !does_file_exist(bkpinfo->kernel_path)) {
+            mr_free(bkpinfo->kernel_path);
+            mr_asprintf(bkpinfo->kernel_path, "FAILSAFE");
+        }
+        if (strcmp(bkpinfo->kernel_path, "FAILSAFE") && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
             log_to_screen("You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
@@ -1293 +1293 @@
 
     if ((flag_set['A']) && (! bkpinfo->restore_data)) {
-        strncpy(bkpinfo->call_after_iso, flag_val['A'], MAX_STR_LEN);
+        mr_asprintf(bkpinfo->call_after_iso, "%s", flag_val['A']);
     }
 
     if ((flag_set['B']) && (! bkpinfo->restore_data)) {
-        strncpy(bkpinfo->call_before_iso, flag_val['B'], MAX_STR_LEN);
+        mr_asprintf(bkpinfo->call_before_iso, "%s", flag_val['B']);
     }
 
@@ -1314 +1314 @@
 #  endif
 #endif
-        if (!strchr
-            (BOOT_LOADER_CHARS,
-             (bkpinfo->boot_loader = flag_val['l'][0]))) {
-            log_msg(1, "%c? WTF is %c? I need G, L, E or R.",
-                    bkpinfo->boot_loader, bkpinfo->boot_loader);
-            fatal_error
-                ("Please specify GRUB, LILO, ELILO  or RAW with the -l switch");
+        if (!strchr(BOOT_LOADER_CHARS, (bkpinfo->boot_loader = flag_val['l'][0]))) {
+            log_msg(1, "%c? What is %c? I need G, L, E or R.", bkpinfo->boot_loader, bkpinfo->boot_loader);
+            fatal_error("Please specify GRUB, LILO, ELILO  or RAW with the -l switch");
         }
 #undef BOOT_LOADER_CHARS
@@ -1331 +1327 @@
 
     if ((flag_set['P']) && (! bkpinfo->restore_data)) {
-        strncpy(bkpinfo->postnuke_tarball, flag_val['P'], MAX_STR_LEN);
+        mr_free(bkpinfo->postnuke_tarball);
+        mr_asprintf(bkpinfo->postnuke_tarball, "%s", flag_val['P']);
     }