Changeset 1703 in MondoRescue for branches/2.2.5/mondo/src/mondoarchive/main.c

Timestamp:

Oct 24, 2007, 1:59:37 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Add USB Key button to Menu UI (CD streamer removed)
• Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.

File:

• branches/2.2.5/mondo/src/mondoarchive/main.c (modified) (4 diffs)

branches/2.2.5/mondo/src/mondoarchive/main.c

@@ -529 +529 @@
         run_program_and_log_output(tmp, TRUE);
     }
-    run_program_and_log_output(g_erase_tmpdir_and_scratchdir, TRUE);
 
     run_program_and_log_output("mount", 2);
@@ -542 +541 @@
     register_pid(0, "mondo");
     set_signals(FALSE);
-    chdir("/tmp");              // just in case there's something wrong with g_erase_tmpdir_and_scratchdir
-    system(g_erase_tmpdir_and_scratchdir);
-
-    /* assemble command string for deletion of Mondo's tmp directory */
-    sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
-    
+
     free_libmondo_global_strings();
     paranoid_free(say_at_end);
-    paranoid_free(bkpinfo);
+    
 
     if (!g_cdrom_drive_is_here) {
@@ -562 +556 @@
     log_msg(0, "Time finished: %s", mr_date());
 
-    /* remove Mondo's tmp directory */
-    system(tmp); 
-    paranoid_free(tmp);
+    chdir("/tmp");              // just in case there's something wrong with g_erase_tmpdir_and_scratchdir
 
     if (!g_text_mode) {
@@ -570 +562 @@
             ("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
         log_to_screen("See %s for details of backup run.", MONDO_LOGFILE);
-        finish(retval);
     } else {
         printf("See %s for details of backup run.\n", MONDO_LOGFILE);
-        exit(retval);
-    }
+    }
+    finish(retval);
 
     return EXIT_SUCCESS;