Changeset 3866 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondorestore.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/mondorestore/mondorestore.c (modified) (6 diffs)

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -207 +207 @@
     mr_asprintf(tmp1,"%s/var/lib/multipath/bindings",bkpinfo->restore_path);
     (void)unlink(tmp1);
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     /* Edit multipath.conf if needed to adapt wwid */
@@ -214 +214 @@
         log_msg(2, "We may need to clean /etc/multipath.conf");
     } else {
-        paranoid_free(tmp1);
+        mr_free(tmp1);
         return;
     }
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     if (bkpinfo->restore_mode != nuke) {
-        mr_asprintf(editor, "%s", find_my_editor());
+        editor = find_my_editor();
         mr_asprintf(tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
         popup_and_OK("You will now edit multipath.conf");
@@ -230 +230 @@
             newtResume();
         }
-        paranoid_free(tmp1);
-        paranoid_free(editor);
+        mr_free(tmp1);
+        mr_free(editor);
     } else {
         log_to_screen("Non-interactive mode: no way to give you the keyboard so that you edit your multipath.conf. Hope it's OK");
@@ -1767 +1767 @@
 
     log_msg(1, "restoring everything");
-    if (!find_home_of_exe("petris") && !g_text_mode) {
+    if (((tmp = find_home_of_exe("petris")) != NULL) && !g_text_mode) {
         newtDrawRootText(0, g_noof_rows - 2,
                          "Press ALT-<left cursor> twice to play Petris :-) ");
         newtRefresh();
     }
+    mr_free(tmp);
     mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
     mount_media();
@@ -1842 +1843 @@
 
   /** needs malloc **********/
+    char *tmp = NULL;
     char *tmp1 = NULL;
     char *fstab_fname = NULL;
@@ -1881 +1883 @@
         if (g_text_mode) {
             save_mountlist_to_disk(mountlist, g_mountlist_fname);
-            mr_asprintf(tmp1, "%s %s", find_my_editor(), g_mountlist_fname);
+            tmp = find_my_editor();
+            mr_asprintf(tmp1, "%s %s", tmp, g_mountlist_fname);
+            mr_free(tmp);
             res = system(tmp1);
             mr_free(tmp1);