Changeset 2331 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-fork.c

Timestamp:

Aug 18, 2009, 3:25:29 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3342@localhost: bruno | 2009-08-14 00:46:51 +0200

• Another round of strcpy suppressions
• find_home_of_exe() now allocates memory which has to be freed by the caller
• Supress useless sz_last_suffix()
• mr_getline now has the same interface as the other mr_mem functions
• valgrind and compiler warnings fixes

File:

• branches/2.2.10/mondo/src/common/libmondo-fork.c (modified) (7 diffs)

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

@@ -589 +589 @@
 // BACKUP
     int res = -1;
-    char*command = NULL;
+    char *command = NULL;
 
     if (!does_file_exist(input_device)) {
         fatal_error("input device does not exist");
     }
-    if ( !find_home_of_exe("ntfsclone")) {
+    command = find_home_of_exe("ntfsclone");
+    if (!command) {
+        mr_free(command);
         fatal_error("ntfsclone not found");
     }
+    mr_free(command);
+
     mr_asprintf(command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
@@ -639 +643 @@
     /*@ buffers *********************************************************** */
     char *command = NULL;
-    char *title;
+    char *title = NULL;
     /*@ pointers ********************************************************** */
     static int chldres = 0;
@@ -650 +654 @@
     *pchild_result = 999;
 
-    malloc_string(title);
-    strcpy(title, tt);
     mr_asprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
     log_msg(3, "command = '%s'", command);
@@ -659 +661 @@
 
     log_msg(8, "Parent running");
+    mr_asprintf(title, "%s", tt);
     open_evalcall_form(title);
+    mr_free(title);
+
     for (sleep(1); command[0] != '\0'; sleep(1)) {
         pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
@@ -669 +674 @@
         if (pcno <= 5 && last_pcno >= 40) {
             close_evalcall_form();
-            strcpy(title, "Verifying...");
+            mr_asprintf(title, "Verifying...");
             open_evalcall_form(title);
+            mr_free(title);
         }
         if (counter++ >= 5) {
@@ -690 +696 @@
     }
     log_msg(3, "Parent res = %d", res);
-    paranoid_free(title);
     return (res);
 }
-
-
 
 
@@ -709 +712 @@
     char *command = NULL;
 
-    if ( !find_home_of_exe("ntfsclone")) {
+    command = find_home_of_exe("ntfsclone");
+    if (!command) {
+        mr_free(command);
         fatal_error("ntfsclone not found");
     }
+    mr_free(command);
+
     mr_asprintf(command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);