Changeset 3829 in MondoRescue for branches/3.3/mondo/src

Timestamp:

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

Author:

Bruno Cornec

Message:

manages kernel_path dynamically

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-cli.c (modified) (1 diff)
• libmondo-files.c (modified) (4 diffs)
• libmondo-fork.c (modified) (1 diff)
• libmondo-tools.c (modified) (1 diff)
• mondostructures.h (modified) (1 diff)
• newt-specific.c (modified) (1 diff)

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

@@ -672 +672 @@
 
     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 (!does_file_exist(bkpinfo->kernel_path)) {
             retval++;

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);
 }
 

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

@@ -34 +34 @@
  * Call a program and retrieve its last line of output.
  * @param call The program to run.
- * @return The last line of its output.
+ * @return The last line of its output or the empty string.
  * @note The returned value points to storage that needs to be freed by the
  * caller

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

@@ -855 +855 @@
     bkpinfo->call_burn_iso = NULL;
     bkpinfo->call_after_iso = NULL;
-    bkpinfo->kernel_path[0] = '\0';
+    bkpinfo->kernel_path = NULL;
     bkpinfo->netfs_mount = NULL;
     bkpinfo->netfs_proto = NULL;

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

@@ -560 +560 @@
    * Path to the user's kernel
    */
-    char kernel_path[MAX_STR_LEN];
+    char *kernel_path;
 
   /**

branches/3.3/mondo/src/common/newt-specific.c

@@ -436 +436 @@
         mr_free(bkpinfo->call_before_iso);
         mr_free(bkpinfo->restore_path);
+        mr_free(bkpinfo->kernel_path);
         /* Then free the structure */
         paranoid_free(bkpinfo);