Changeset 1663 in MondoRescue for branches/stable/mondo/src/mondoarchive/mondoarchive.c

Timestamp:

Sep 27, 2007, 12:21:18 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix bug #197 (based on an initial patch of Scott Cummings)
• Fix a bug where df was using locale to print messages and wasn't filtered correctly
• mkdtemp checked in configure
• reset_bkpinfo called as early as possible by both main program.
• It creates a tmpdir cleanly with mkdtemp in setup_tmpdir subfunction, which takes in account TMPIR and TMP env var. Remains to see what tmpfs does and tests
• configure.in should also be filtered.
• Remove g_bkpinfo_DONTUSETHIS
• remove bkpinfo also from header files
• Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
• Apply patch from Andree Leidenfrost, modified a bit to use bkpinfo->tmpdir instead of /tmp or MINDI_CACHE when appropriate. Fix security issues in mondo. Thanks al ot Andree for catching all those issues.
• /tmp => /var/log for mondorestore.log in mindi
• Update linux terminfo to fix a color issue (Andree Leidenfrost)
• Removes useless log file (Andree Leidenfrost)
• replace vi with find_my_editor during restore (Andree Leidenfrost)
• sync in bg in mindi (VMWare issue to look at)
• mindi/mindi-busybox have a different version than mondo for pb
• PB-SUF also added to spec file
• Fix a bug for pb build (omission of PB-SUF declaration)

(merge -r1631:1662 $SVN_M/branches/2.2.5)

File:

• branches/stable/mondo/src/mondoarchive/mondoarchive.c (modified) (14 diffs)

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -62 +62 @@
 /****************** subroutines used only here ******************/
 
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
+
+/****************** subroutines used only by main.c ******************/
 
 /**
@@ -386 +390 @@
 int main(int argc, char *argv[])
 {
-    struct s_bkpinfo *bkpinfo = NULL;
     struct stat stbuf;
     char *tmp = NULL;
@@ -399 +402 @@
 #endif
     printf(_("Initializing...\n"));
+
+    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
+    reset_bkpinfo();
 
     /* Reference a dummy cleanup function for mr_exit temporarily */
@@ -463 +469 @@
     malloc_libmondo_global_strings();
     diffs = 0;
-    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
     if (stat(MONDO_CACHE, &stbuf) != 0) {
         mr_mkdir(MONDO_CACHE,0x755);
@@ -580 +585 @@
     }
 
-    if (pre_param_configuration(bkpinfo)) {
+    if (pre_param_configuration()) {
         fatal_error
             ("Pre-param initialization phase failed. Please review the error messages above, make the specified changes, then try again. Exiting...");
@@ -591 +596 @@
         g_text_mode = FALSE;
         setup_newt_stuff();
-        res = interactively_obtain_media_parameters_from_user(bkpinfo, TRUE);   /* yes, archiving */
+        res = interactively_obtain_media_parameters_from_user(TRUE);    /* yes, archiving */
         if (res) {
             fatal_error
@@ -597 +602 @@
         }
     } else {
-        res = handle_incoming_parameters(argc, argv, bkpinfo);
+        res = handle_incoming_parameters(argc, argv);
         if (res) {
             mr_msg(1,
@@ -609 +614 @@
 
 /* Finish configuring global structures */
-    if (post_param_configuration(bkpinfo)) {
+    if (post_param_configuration()) {
         fatal_error
             ("Post-param initialization phase failed. Perhaps bad parameters were supplied to mondoarchive? Please review the documentation, error messages and logs. Exiting...");
@@ -622 +627 @@
     /* If we're meant to backup then backup */
     if (bkpinfo->backup_data) {
-        res = backup_data(bkpinfo);
+        res = backup_data();
         retval += res;
         if (res) {
@@ -634 +639 @@
     /* If we're meant to verify then verify */
     if (bkpinfo->verify_data) {
-        res = verify_data(bkpinfo);
+        res = verify_data();
         if (res < 0) {
             mr_asprintf(&say_at_end2, _("%d difference%c found."), -res,
@@ -657 +662 @@
     }
 
-
-    if (length_of_file("/tmp/changed.files") > 2) {
+    if (length_of_file(MINDI_CACHE"/changed.files") > 2) {
         if (g_text_mode) {
             log_to_screen
-                (_("Type 'less /tmp/changed.files' to see which files don't match the archives"));
+                (_("Type 'less "MINDI_CACHE"/changed.files' to see which files don't match the archives"));
         } else {
             mr_msg(1,
-                    _("Type 'less /tmp/changed.files' to see which files don't match the archives"));
+                    _("Type 'less "MINDI_CACHE"/changed.files' to see which files don't match the archives"));
             mr_msg(2, "Calling popup_changelist_from_file()");
-            popup_changelist_from_file("/tmp/changed.files");
+            popup_changelist_from_file(MINDI_CACHE"/changed.files");
             mr_msg(2, "Returned from popup_changelist_from_file()");
         }
     } else {
-        unlink("/tmp/changed.files");
+        unlink(MINDI_CACHE"/changed.files");
     }
     log_to_screen(say_at_end);
@@ -687 +691 @@
 
     system("rm -f /var/cache/mondo-archive/last-backup.aborted");
-    system("rm -Rf /tmp.mondo.* /mondo.scratch.*");
     if (!retval) {
         printf(_("Mondoarchive ran OK.\n"));
@@ -698 +701 @@
     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();
     mr_free(bkpinfo);
-
-    unlink("/tmp/filelist.full");
-    unlink("/tmp/filelist.full.gz");
 
     if (!g_cdrom_drive_is_here) {
@@ -714 +718 @@
     mr_msg(1, "Time finished: %s", mr_date());
     mr_msg_close();
+
+    /* remove Mondo's tmp directory */
+    system(tmp); 
+    paranoid_free(tmp);
 
     if (!g_text_mode) {