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

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

@@ -274 +274 @@
     char *command = NULL;;
 
-    if (!kernel[0]) {
-        strcpy(kernel,
-               call_program_and_get_last_line_of_output
-               ("mindi --findkernel 2> /dev/null"));
+    if (kernel == NULL) {
+        mr_asprintf(kernel, "%s", call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null"));
     }
     // If we didn't get anything back, check whether mindi raised a fatal error
@@ -294 +292 @@
     log_it("Calling Mindi with kernel path of '%s'", kernel);
     while (!kernel[0]) {
-        if (!ask_me_yes_or_no
-            ("Kernel not found or invalid. Choose another?")) {
+        if (!ask_me_yes_or_no("Kernel not found or invalid. Choose another?")) {
             return (1);
         }
@@ -302 +299 @@
             fatal_error("Kernel not found. Please specify with the '-k' flag.");
         }
-        strcpy(kernel, tmp);
-        mr_free(tmp);
+        mr_free(kernel);
+        kernel = tmp;
 
         log_it("User says kernel is at %s", kernel);
@@ -1054 +1051 @@
     mr_free(command);
 
-    if (bkpinfo->postnuke_tarball[0]) {
+    if (bkpinfo->postnuke_tarball) {
         mr_asprintf(command, "cp -f %s %s/post-nuke.tgz", bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
         res = run_program_and_log_output(command, FALSE);