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

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -240 +240 @@
     log_it("STARTING");
     log_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes...");
-    if (find_home_of_exe("lvm"))    // found it :) cool
+    tmp1 = find_home_of_exe("lvm");
+    if (tmp1)   // found it :) cool
     {
         strcpy(lvscan_sz, "lvm lvscan");
@@ -258 +259 @@
         strcpy(vgremove_sz, "vgremove");
     }
+    mr_free(tmp1);
+
     mr_asprintf(tmp1, "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
     run_program_and_log_output(tmp1, 5);