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

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

@@ -404 +404 @@
     if (bkpinfo->backup_media_type == dvd) {
 #ifdef DVDRWFORMAT
-        if (!find_home_of_exe("dvd+rw-format")) {
-            fatal_error
-                ("Cannot find dvd+rw-format. Please install it or fix your PATH.");
-        }
+        tmp = find_home_of_exe("dvd+rw-format");
+        if (!tmp) {
+            mr_free(tmp);
+            fatal_error("Cannot find dvd+rw-format. Please install it or fix your PATH.");
+        }
+        mr_free(tmp);
 #endif
-        if (!find_home_of_exe("growisofs")) {
-            fatal_error
-                ("Cannot find growisofs. Please install it or fix your PATH.");
-        }
+        tmp = find_home_of_exe("growisofs");
+        if (!tmp) {
+            mr_free(tmp);
+            fatal_error("Cannot find growisofs. Please install it or fix your PATH.");
+        }
+        mr_free(tmp);
     }
 
@@ -2877 +2881 @@
         mr_asprintf(checksum_line, "IGNORE");
         log_msg(2, "Not calculating checksum for %s: it would take too long", biggie_filename);
-        if ( !find_home_of_exe("ntfsresize")) {
+        tmp = find_home_of_exe("ntfsresize");
+        if (!tmp) {
+            mr_free(tmp);
             fatal_error("ntfsresize not found");
         }
+        mr_free(tmp);
+
         mr_asprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
         log_it("command = %s", command);