Changeset 1669 in MondoRescue for branches/stable/mondo/src/common/libmondo-files.c

Timestamp:

Sep 30, 2007, 8:16:06 PM (17 years ago)

Author:

Bruno Cornec

Message:

use conf file for kernel_path

File:

• branches/stable/mondo/src/common/libmondo-files.c (modified) (2 diffs)

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

@@ -250 +250 @@
     char *command = NULL;
 
-    malloc_string(tmp);
-    if (!kernel[0]) {
-        strcpy(kernel,
+    if (kernel == NULL) {
+        mr_allocstr(kernel,
                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
-    if (!kernel[0]) {
+    if (kernel == NULL) {
         mr_asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
-        strcpy(tmp, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
         if (strlen(tmp) > 1) {
             popup_and_OK(tmp);
@@ -265 +264 @@
         }
         mr_free(command);
+        mr_free(tmp);
     }
     log_it("Calling Mindi with kernel path of '%s'", kernel);
-    while (!kernel[0]) {
+    while (kernel == NULL) {
         if (!ask_me_yes_or_no
             ("Kernel not found or invalid. Choose another?")) {