Changeset 2331 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Aug 18, 2009, 3:25:29 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3342@localhost: bruno | 2009-08-14 00:46:51 +0200

• Another round of strcpy suppressions
• find_home_of_exe() now allocates memory which has to be freed by the caller
• Supress useless sz_last_suffix()
• mr_getline now has the same interface as the other mr_mem functions
• valgrind and compiler warnings fixes

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (4 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -390 +390 @@
             mr_strcat(additional_parameters, "-o ro");
         }
-        if (find_home_of_exe("setfattr")) {
+        tmp = find_home_of_exe("setfattr");
+        if (tmp) {
             mr_strcat(additional_parameters, ",user_xattr");
         }
-        if (find_home_of_exe("setfacl")) {
+        mr_free(tmp);
+
+        tmp = find_home_of_exe("setfacl");
+        if (tmp) {
             mr_strcat(additional_parameters, ",acl");
         }
+        mr_free(tmp);
     }
 
@@ -870 +875 @@
     mr_asprintf(g_getfacl,"setfacl");
     log_msg(1, "We will restore ACLs");
-    if (! find_home_of_exe("setfacl")) {
+    tmp = find_home_of_exe("setfacl");
+    if (!tmp) {
         log_msg(1, "Unable to restore ACLs as no setfacl found");
     }
+    mr_free(tmp);
 }
 mr_free(value);
@@ -880 +887 @@
     mr_asprintf(g_getfattr,"setfattr");
     log_msg(1, "We will restore XATTRs");
-    if (! find_home_of_exe("setfattr")) {
+    tmp = find_home_of_exe("setfattr");
+    if (!tmp) {
         log_msg(1, "Unable to restore XATTRs as no setfattr found");
     }
+    mr_free(tmp);
 }
 mr_free(value);
@@ -1437 +1446 @@
  * @note The returned string points to static storage that will be overwritten with each call.
  */
-char *find_my_editor(void)
-{
+char *find_my_editor(void) {
+    
+    char *tmp = NULL;
     static char output[MAX_STR_LEN];
-    if (find_home_of_exe("pico")) {
+
+    tmp = find_home_of_exe("pico");
+    if (tmp) {
         strcpy(output, "pico");
-    } else if (find_home_of_exe("nano")) {
-        strcpy(output, "nano");
-    } else if (find_home_of_exe("e3em")) {
-        strcpy(output, "e3em");
-    } else if (find_home_of_exe("e3vi")) {
-        strcpy(output, "e3vi");
-    } else {
-        strcpy(output, "vi");
-    }
-    if (!find_home_of_exe(output)) {
+    } else { 
+        mr_free(tmp);
+        tmp = find_home_of_exe("nano");
+        if (tmp) {
+            strcpy(output, "nano");
+        } else {
+            mr_free(tmp);
+            tmp = find_home_of_exe("joe");
+            if (tmp) {
+                strcpy(output, "joe");
+            } else {
+                strcpy(output, "vi");
+            }
+        }
+    }
+    mr_free(tmp);
+
+    tmp = find_home_of_exe(output);
+    if (!tmp) {
         log_msg(2, " (find_my_editor) --- warning - %s not found", output);
     }
+    mr_free(tmp);
     return (output);
 }