Changeset 3866 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Mar 7, 2024, 1:55:18 PM (4 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/mondorestore/mondo-rstr-compare.c (modified) (4 diffs)

branches/3.3/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -259 +259 @@
 
     if (compressor_exe) {
-        mr_asprintf(tmp, "%s", compressor_exe);
-        if (!find_home_of_exe(tmp)) {
+        if ((tmp = find_home_of_exe(compressor_exe)) == NULL) {
             mr_free(tmp);
             mr_free(compressor_exe);
@@ -266 +265 @@
             fatal_error("(compare_a_tarball) Compression program missing");
         }
-        mr_free(tmp);
 
         if (use_star) {
@@ -278 +276 @@
         } else {
             // afio
-            mr_asprintf(tmp, "%s", compressor_exe);
-            mr_free(compressor_exe);
             mr_asprintf(compressor_exe, "-P %s -Z", tmp);
-            mr_free(tmp);
-        }
+        }
+        mr_free(tmp);
     }
 
@@ -541 +537 @@
     if (g_text_mode) {
         save_mountlist_to_disk(mountlist, g_mountlist_fname);
-        sprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
-        res = system(tmp);
+        tmp = find_my_editor();
+        res = mr_system("%s %s", tmp, g_mountlist_fname);
+        mr_free(tmp);
         load_mountlist(mountlist, g_mountlist_fname);
     } else {