Changeset 1999 in MondoRescue

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 :-(

Location:

branches/2.2.7/mondo/src

Files:

• common/libmondo-fork-EXT.h (modified) (1 diff)
• common/libmondo-fork.c (modified) (1 diff)
• common/libmondo-fork.h (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• common/newt-specific.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (2 diffs)
• restore-scripts/mondo/grub-install.patched (modified) (1 diff)
• restore-scripts/mondo/mount-subroutine-me (modified) (1 diff)

branches/2.2.7/mondo/src/common/libmondo-fork-EXT.h

@@ -10 +10 @@
                                  int cd_no, char *logstub,
                                  char *what_i_am_doing);
-extern int run_external_binary_with_percentage_indicator_OLD(char *tt,
-                                                             char *cmd);
 extern int run_external_binary_with_percentage_indicator_NEW(char *tt,
                                                              char *cmd);

branches/2.2.7/mondo/src/common/libmondo-fork.c

@@ -701 +701 @@
 
 
-
-
-
-int run_external_binary_with_percentage_indicator_OLD(char *tt, char *cmd)
-{
-
-    /*@ int *************************************************************** */
-    int res = 0;
-    int percentage = 0;
-    int maxpc = 0;
-    int pcno = 0;
-    int last_pcno = 0;
-
-    /*@ buffers *********************************************************** */
-    char *command;
-    char *tempfile;
-    char *title;
-    /*@ pointers ********************************************************** */
-    FILE *pin;
-
-    malloc_string(title);
-    malloc_string(command);
-    malloc_string(tempfile);
-    assert_string_is_neither_NULL_nor_zerolength(cmd);
-    assert_string_is_neither_NULL_nor_zerolength(title);
-
-    strcpy(title, tt);
-    sprintf(tempfile, "%s/mondo.binperc", bkpinfo->tmpdir);
-    sprintf(command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
-            tempfile);
-    log_msg(3, command);
-    open_evalcall_form(title);
-    if (!(pin = popen(command, "r"))) {
-        log_OS_error("fmt err");
-        return (1);
-    }
-    maxpc = 100;
-// OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD
-    for (sleep(1); does_file_exist(tempfile); sleep(1)) {
-        pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
-        if (pcno < 0 || pcno > 100) {
-            log_msg(5, "Weird pc#");
-            continue;
-        }
-        percentage = pcno * 100 / maxpc;
-        if (pcno <= 5 && last_pcno > 40) {
-            close_evalcall_form();
-            strcpy(title, "Verifying...");
-            open_evalcall_form(title);
-        }
-        last_pcno = pcno;
-        update_evalcall_form(percentage);
-    }
-// OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD
-    close_evalcall_form();
-    if (pclose(pin)) {
-        res++;
-        log_OS_error("Unable to pclose");
-    }
-    unlink(tempfile);
-    paranoid_free(command);
-    paranoid_free(tempfile);
-    paranoid_free(title);
-    return (res);
-}
-
-
-
-
 void *run_prog_in_bkgd_then_exit(void *info)
 {

branches/2.2.7/mondo/src/common/libmondo-fork.h

@@ -12 +12 @@
                           int cd_no, char *logstub, char *what_i_am_doing);
 
-int run_external_binary_with_percentage_indicator_OLD(char *tt, char *cmd);
 int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd);
 int copy_from_src_to_dest(FILE *, FILE *, char);

branches/2.2.7/mondo/src/common/libmondo-tools.c

@@ -810 +810 @@
     char *p = NULL;
 
-    if (bkpinfo->tmpdir != NULL) {
+    if ((bkpinfo->tmpdir != NULL) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
         /* purging a potential old tmpdir */
         asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);

branches/2.2.7/mondo/src/common/newt-specific.c

@@ -406 +406 @@
         printf("Execution run ended; result=%d\n", signal);
         printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
-        asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
-        system(command);
-        paranoid_free(command);
+        if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
+            asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+            system(command);
+            paranoid_free(command);
+        }
         paranoid_free(bkpinfo);
         free_libmondo_global_strings();

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 :)

branches/2.2.7/mondo/src/restore-scripts/mondo/grub-install.patched

@@ -282 +282 @@
 
 copy_images() {
-    # Copy the GRUB images to the GRUB directory.
-#    for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
-#   rm -f $file || exit 1
-#    done
-    for file in \
-    ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
-    cp -f $file ${grubdir} || exit 1
+    for file in ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
+        cp -f $file ${grubdir} || exit 1
     done
 }

branches/2.2.7/mondo/src/restore-scripts/mondo/mount-subroutine-me

@@ -24 +24 @@
         if [ -e "$mountdir" ] && [ ! -d "$mountdir" ] ; then
             LogIt "$mountdir exists (but not a dir). Deleting..." 2
-            rm "$mountdir" -f
+            rm -f "$mountdir"
             mkdir -p "$mountdir"
         else