Changeset 689 in MondoRescue for trunk/mondo/mondo/mondorestore

Timestamp:

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

Author:

bcornec

Message:

Still other memory management improvements ( I hope :-)

Location:

trunk/mondo/mondo/mondorestore

Files:

• mondo-prep.c (modified) (2 diffs)
• mondo-restore.c (modified) (3 diffs)
• mondo-rstr-compare.c (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (2 diffs)

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -203 +203 @@
     iamhere("STARTING");
     log_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes...");
-    if (find_home_of_exe("lvm"))    // found it :) cool
+    tmp = find_home_of_exe("lvm");
+    if (tmp)    // found it :) cool
     {
         asprintf(&lvscan_sz, "lvm lvscan");
@@ -219 +220 @@
         asprintf(&vgremove_sz, "vgremove");
     }
+    paranoid_free(tmp);
+
     asprintf(&command,
             "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> "

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -2049 +2049 @@
         asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
         asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
-        if (length_of_file(acl_fname) > 0 && find_home_of_exe("setfacl")) {
+        tmp = find_home_of_exe("setfacl");
+        if (length_of_file(acl_fname) > 0 && tmp) {
             set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
         }
-        if (length_of_file(xattr_fname) > 0
-            && find_home_of_exe("setfattr")) {
+        paranoid_free(tmp);
+
+        tmp = find_home_of_exe("setfattr");
+        if (length_of_file(xattr_fname) > 0 && tmp) {
             set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
         }
+        paranoid_free(tmp);
         paranoid_free(acl_fname);
         paranoid_free(xattr_fname);
@@ -2566 +2570 @@
     log_msg(1, "path is now %s", newpath);
     log_msg(1, "restoring everything");
-    if (!find_home_of_exe("petris") && !g_text_mode) {
+    tmp = find_home_of_exe("petris");
+    if (!tmp && !g_text_mode) {
         newtDrawRootText(0, g_noof_rows - 2,
                          _
@@ -2572 +2577 @@
         newtRefresh();
     }
+    paranoid_free(tmp);
+
     mvaddstr_and_log_it(g_currentY, 0,
                         _("Preparing to read your archives"));

trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

@@ -68 +68 @@
         return (1);
     }
+    paranoid_free(tmp1);
+
     fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin);
     paranoid_fclose(fin);
@@ -251 +253 @@
 
     if (compressor_exe != NULL) {
-        if (!find_home_of_exe(compressor_exe)) {
+        tmp = find_home_of_exe(compressor_exe);
+        if (!tmp) {
             fatal_error("(compare_a_tarball) Compression program missing");
         }
+        paranoid_free(tmp);
         if (use_star) {
             if (strcmp(compressor_exe, "bzip2")) {

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -659 +659 @@
         asprintf(&p1, "-o ro");
     }
-    if (find_home_of_exe("setfattr")) {
+    tmp = find_home_of_exe("setfattr");
+    if (tmp) {
         asprintf(&p2, ",user_xattr");
     } else {
         asprintf(&p2, "");
     }
-    if (find_home_of_exe("setfacl")) {
+    paranoid_free(tmp);
+
+    tmp = find_home_of_exe("setfacl");
+    if (tmp) {
         asprintf(&p3, ",acl");
     } else {
         asprintf(&p3, "");
     }
+    paranoid_free(tmp);
+
     asprintf(&additional_parameters, "%s%s%s", p1, p2, p3);
     paranoid_free(p1);
@@ -1374 +1380 @@
 {
     char *output = NULL;
+    char *tmp = NULL;
 
     /* BERLIOS: This should use $EDITOR + conf file rather first */
-    if (find_home_of_exe("pico")) {
+    tmp = find_home_of_exe("pico");
+    if (tmp) {
         asprintf(&output, "pico");
-    } else if (find_home_of_exe("nano")) {
-        asprintf(&output, "nano");
-    } else if (find_home_of_exe("e3em")) {
-        asprintf(&output, "e3em");
-    } else if (find_home_of_exe("e3vi")) {
-        asprintf(&output, "e3vi");
-    } else {
-        asprintf(&output, "vi");
-    }
-    if (!find_home_of_exe(output)) {
+    } else {
+        tmp = find_home_of_exe("nano");
+        if (tmp) {
+            asprintf(&output, "nano");
+        } else {
+            tmp = find_home_of_exe("vi");
+            if (tmp) {
+                asprintf(&output, "vi");
+            } else {
+                asprintf(&output, "emacs");
+            }
+        }
+    }
+    paranoid_free(tmp);
+
+    tmp = find_home_of_exe(output);
+    if (!tmp) {
         log_msg(2, " (find_my_editor) --- warning - %s not found", output);
     }
+    paranoid_free(tmp);
     return (output);
 }