Changeset 689 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-rstr-tools.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/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

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);
 }