Changeset 689 in MondoRescue for trunk/mondo/mondo/common/libmondo-fork.c

Timestamp:

Jul 17, 2006, 7:43:58 PM (18 years ago)

Author:

bcornec

Message:

Still other memory management improvements ( I hope :-)

File:

• trunk/mondo/mondo/common/libmondo-fork.c (modified) (2 diffs)

trunk/mondo/mondo/common/libmondo-fork.c

@@ -510 +510 @@
 // BACKUP
     int res = -1;
-    char*command;
+    char *command = NULL;
+    char *tmp = NULL;
 
     if (!does_file_exist(input_device)) {
         fatal_error("input device does not exist");
     }
-    if ( !find_home_of_exe("ntfsclone")) {
+    tmp = find_home_of_exe("ntfsclone");
+    if (!tmp) {
         fatal_error("ntfsclone not found");
     }
-    malloc_string(command);
-    sprintf(command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
+    paranoid_free(tmp);
+
+    asprintf(&command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
     paranoid_free(command);
+
     unlink(output_fname);
     return (res);
@@ -678 +682 @@
 // RESTORE
     int res = -1;
-    char *command;
-
-    if ( !find_home_of_exe("ntfsclone")) {
+    char *command = NULL;
+    char *tmp = NULL;
+
+    tmp = find_home_of_exe("ntfsclone");
+    if (!tmp) {
         fatal_error("ntfsclone not found");
     }
+    paranoid_free(tmp);
+
     asprintf(&command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);