Changeset 3866 in MondoRescue for branches/3.3/mondo/src/common/libmondo-fork.c

Timestamp:

Mar 7, 2024, 1:55:18 PM (2 months ago)

Author:

Bruno Cornec

Message:

Change find_my_editor and find_home_of_exe to return dynamically assigned stringsi - adapt whine_if_not_found

File:

• branches/3.3/mondo/src/common/libmondo-fork.c (modified) (2 diffs)

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

@@ -608 +608 @@
     int res = -1;
     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")) {
+    if ((tmp = find_home_of_exe("ntfsclone")) == NULL) {
         fatal_error("ntfsclone not found");
     }
-    mr_asprintf(command, "ntfsclone --rescue --force --save-image --overwrite %s %s", output_fname, input_device);
+    mr_asprintf(command, "%s --rescue --force --save-image --overwrite %s %s", tmp, output_fname, input_device);
+    mr_free(tmp);
     res = run_program_and_log_output(command, 5);
     mr_free(command);
@@ -717 +719 @@
     int res = -1;
     char *command = NULL;
-
-    if ( !find_home_of_exe("ntfsclone")) {
+    char *tmp = NULL;
+
+    if ((tmp = find_home_of_exe("ntfsclone")) == NULL) {
         fatal_error("ntfsclone not found");
     }
-    mr_asprintf(command, "ntfsclone --rescue --force --restore-image --overwrite %s %s", output_device, input_fifo);
+    mr_asprintf(command, "%s --rescue --force --restore-image --overwrite %s %s", tmp, output_device, input_fifo);
+    mr_free(tmp);
     res = run_program_and_log_output(command, 5);
     mr_free(command);