Changeset 2331 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.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/common/libmondo-cli.c (modified) (5 diffs)

branches/2.2.10/mondo/src/common/libmondo-cli.c

@@ -709 +709 @@
     }
 
-    if (!find_home_of_exe("afio")) {
-        if (find_home_of_exe("star")) {
+    tmp1 = find_home_of_exe("afio");
+    if (!tmp1) {
+        mr_free(tmp1);
+        tmp1 = find_home_of_exe("star");
+        if (tmp1) {
+            mr_free(tmp1);
             flag_set['R'] = TRUE;
             log_msg(1, "Using star instead of afio");
         } else {
-            fatal_error
-                ("Neither afio nor star is installed. Please install at least one.");
-        }
-    }
+            mr_free(tmp1);
+            fatal_error("Neither afio nor star is installed. Please install at least one.");
+        }
+    }
+    mr_free(tmp1);
 
     if (flag_set['R']) {
@@ -724 +729 @@
             fatal_error("You may not use star and lzop at the same time.");
         }
-        if (!find_home_of_exe("star")) {
-            fatal_error
-                ("Please install 'star' RPM or tarball if you are going to use -R. Thanks.");
-        }
+        tmp1 = find_home_of_exe("star");
+        if (!tmp1) {
+            mr_free(tmp1);
+            fatal_error("Please install 'star' RPM or tarball if you are going to use -R. Thanks.");
+        }
+        mr_free(tmp1);
     }
 
@@ -919 +926 @@
         }
         if (! bkpinfo->restore_data) {
-            if (!find_home_of_exe("growisofs")) {
+            tmp1 = find_home_of_exe("growisofs");
+            if (!tmp1) {
+                mr_free(tmp1);
                 fatal_error("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
-            if (!find_home_of_exe("dvd+rw-format")) {
+            mr_free(tmp1);
+
+            tmp1 = find_home_of_exe("dvd+rw-format");
+            if (!tmp1) {
+                mr_free(tmp1);
                 fatal_error("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
+            mr_free(tmp1);
+
             if (!flag_set['s']) {
                 sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
@@ -1046 +1061 @@
     }
     if (flag_set['z']) {
-        if (find_home_of_exe("getfattr")) {
+        tmp1 = find_home_of_exe("getfattr");
+        if (tmp1) {
             mr_asprintf(g_getfattr,"getfattr");
         }
-        if (find_home_of_exe("getfacl")) {
+        mr_free(tmp1);
+
+        tmp1 = find_home_of_exe("getfacl");
+        if (tmp1) {
             mr_asprintf(g_getfacl,"getfacl");
         }
+        mr_free(tmp1);
     }
 
@@ -1332 +1352 @@
 
     if (flag_set['Q']) {
-        i = which_boot_loader(tmp1);
-        log_msg(3, "boot loader is %c, residing at %s", i, tmp1);
-        printf("boot loader is %c, residing at %s\n", i, tmp1);
-        mr_free(tmp1);
+        i = which_boot_loader(NULL);
+        log_msg(3, "boot loader is %c", i);
+        printf("boot loader is %c\n", i);
         finish(0);
     }