Changeset 2334 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-files.c

Timestamp:

Aug 18, 2009, 5:28:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3369@localhost: bruno | 2009-08-18 16:57:27 +0200

• Transform bout 100 strcpy in dyn. allocation. Quality is improving
• function figure_out_kernel_path_interactively_if_necessary now return a dynamically allocated string
• mondoarchive checked with valgrind in text an newt modes

File:

• branches/2.2.10/mondo/src/common/libmondo-files.c (modified) (6 diffs)

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

@@ -269 +269 @@
  * @return 0 for success, 1 for failure.
  */
-int figure_out_kernel_path_interactively_if_necessary(char *kernel)
-{
+char *figure_out_kernel_path_interactively_if_necessary(void) {
+
     char *tmp = NULL;
     char *command = NULL;;
-
-    if (kernel == NULL) {
-        mr_asprintf(kernel, "%s", call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null"));
-    }
+    char *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
     if (!kernel[0]) {
@@ -285 +285 @@
             mr_free(tmp);
             mr_free(command);
+            mr_free(kernel);
             fatal_error("Mindi gave a fatal error. Please check '/var/log/mindi.log'.");
         }
@@ -293 +294 @@
     while (!kernel[0]) {
         if (!ask_me_yes_or_no("Kernel not found or invalid. Choose another?")) {
-            return (1);
+            return (NULL);
         }
         tmp = popup_and_get_string("Kernel path", "What is the full path and filename of your kernel, please?", kernel);
@@ -304 +305 @@
         log_it("User says kernel is at %s", kernel);
     }
-    return (0);
+    return (kernel);
 }
 
@@ -1103 +1104 @@
     }
     *(p++) = '\0';
-    mr_asprintf(nfs_server_ipaddr, tmp);
-    mr_asprintf(nfs_mount, p);
+    mr_asprintf(nfs_server_ipaddr, "%s", tmp);
+    mr_asprintf(nfs_mount, "%s", p);
     mr_free(tmp);
 
@@ -1151 +1152 @@
         mr_free(nfs_dev);
 
-        mr_asprintf(nfs_dev, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(nfs_dev, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);