Changeset 3829 in MondoRescue for branches/3.3/mondo/src/common/libmondo-files.c

Timestamp:

Mar 4, 2024, 5:11:25 PM (4 months ago)

Author:

Bruno Cornec

Message:

manages kernel_path dynamically

File:

• branches/3.3/mondo/src/common/libmondo-files.c (modified) (4 diffs)

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

@@ -269 +269 @@
  * don't do anything.
  * @param kernel Where to put the found kernel.
- * @return 0 for success, 1 for failure.
+ * @return 0 for success aborts otherwise
  */
 int figure_out_kernel_path_interactively_if_necessary(char *kernel)
@@ -276 +276 @@
     char *command = NULL;
 
-    if (!kernel[0]) {
-        tmp = call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null");
-        strcpy(kernel, tmp);
-        mr_free(tmp);
+    if (kernel == NULL) {
+        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 (strcmp(kernel,"") == 0) {
         mr_asprintf(command, "grep 'Fatal error' %s", MINDI_LOGFILE);
         tmp = call_program_and_get_last_line_of_output(command);
@@ -295 +293 @@
     } else {
         // If we've found the kernel, allow sysadmin to modify it if he wants
-        if (!g_text_mode) {
-            if (!popup_and_get_string("Kernel path", "We found this full path name for your kernel. You should just use it in most cases", kernel, MAX_STR_LEN / 4)) {
-                fatal_error("Kernel not found. Please specify with the '-k' flag.");
+        while ((kernel == NULL) || (strcmp(kernel,"") == 0)) {
+            if (!g_text_mode) {
+                tmp = mr_popup_and_get_string("Kernel path", "We found this full path name for your kernel. You should just use it in most cases", kernel);
+                if (tmp == NULL) {
+                    fatal_error("Kernel not found. Please specify with the '-k' flag.");
+                } else {
+                    mr_free(kernel);
+                    kernel = tmp;
+                }
             }
         }
@@ -304 +308 @@
 
     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?")) {
-            return (1);
-        }
-        if (!popup_and_get_string("Kernel path", "What is the full path and filename of your kernel, please?", kernel, MAX_STR_LEN / 4)) {
-            fatal_error("Kernel not found. Please specify with the '-k' flag.");
-        }
-        log_it("User says kernel is at %s", kernel);
-    }
-    return (0);
+    return(0);
 }