Changeset 1999 in MondoRescue for branches/2.2.7/mondo/src/mondorestore/mondorestore.c

Timestamp:

Jul 10, 2008, 6:37:04 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Protect recursive remove of tempdir with test on the look and feel of that dir to avoid removing blindly useful dir :-(

File:

• branches/2.2.7/mondo/src/mondorestore/mondorestore.c (modified) (2 diffs)

branches/2.2.7/mondo/src/mondorestore/mondorestore.c

@@ -3189 +3189 @@
         }
         log_msg(2, "Still here. Yay.");
-        if (strlen(bkpinfo->tmpdir) > 0) {
+        if ((strlen(bkpinfo->tmpdir) > 0) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
             sprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
             run_program_and_log_output(tmp, FALSE);
@@ -3353 +3353 @@
         run_program_and_log_output("mount / -o remount,rw", 2);
     }                           // for b0rken distros
-    sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
-    system(tmp);
+    if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
+        sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
+        system(tmp);
+    }
     paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
     free_libmondo_global_strings(); // it's fine to have this here :) really :)