Changeset 1663 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-compare.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/mondorestore/mondo-rstr-compare.c (modified) (23 diffs)

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -19 +19 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 //static char cvsid[] = "$Id$";
 
@@ -34 +37 @@
  * @note This function uses an MD5 checksum.
  */
-int compare_a_biggiefile(struct s_bkpinfo *bkpinfo, long bigfileno)
+int compare_a_biggiefile(long bigfileno)
 {
 
@@ -58 +61 @@
     if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
         if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
-            insist_on_this_cd_number(bkpinfo, (++g_current_media_number));
+            insist_on_this_cd_number((++g_current_media_number));
         } else {
             mr_msg(2, "No CD's left. No biggiefiles left. No problem.");
@@ -133 +136 @@
 
     if (retval) {
-        if (!(fout = fopen("/tmp/changed.txt", "a"))) {
+        if (!(fout = fopen(MINDI_CACHE"/changed.txt", "a"))) {
             fatal_error("Cannot openout changed.txt");
         }
@@ -151 +154 @@
 /**
  * Compare all biggiefiles in the backup.
- * @param bkpinfo The backup information structure. Used only in compare_a_biggiefile().
  * @return 0 for success, nonzero for failure.
  */
-int compare_all_biggiefiles(struct s_bkpinfo *bkpinfo)
+int compare_all_biggiefiles()
 {
     int retval = 0;
@@ -161 +163 @@
     char *tmp = NULL;
 
-    assert(bkpinfo != NULL);
     mr_msg(1, "Comparing biggiefiles");
 
@@ -187 +188 @@
         mr_free(tmp);
 
-        res = compare_a_biggiefile(bkpinfo, bigfileno);
+        res = compare_a_biggiefile(bigfileno);
         retval += res;
         g_current_progress++;
@@ -303 +304 @@
     if (length_of_file(logfile) > 5) {
         mr_asprintf(&command,
-                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> /tmp/changed.txt",
+                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MINDI_CACHE"/changed.txt",
                 logfile);
         system(command);
@@ -330 +331 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_all_tarballs(struct s_bkpinfo *bkpinfo)
+int compare_all_tarballs()
 {
     int retval = 0;
@@ -361 +362 @@
 
     for (;;) {
-        insist_on_this_cd_number(bkpinfo, g_current_media_number);
+        insist_on_this_cd_number(g_current_media_number);
         update_progress_form(progress_str);
         mr_asprintf(&tarball_fname,
@@ -441 +442 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_to_CD(struct s_bkpinfo *bkpinfo)
+int compare_to_CD()
 {
   /** needs malloc *********/
@@ -460 +461 @@
     chdir(bkpinfo->restore_path);
     getcwd(new, MAX_STR_LEN - 1);
-    insist_on_this_cd_number(bkpinfo, g_current_media_number);
-    unlink("/tmp/changed.txt");
-
-    resA = compare_all_tarballs(bkpinfo);
-    resB = compare_all_biggiefiles(bkpinfo);
+    insist_on_this_cd_number(g_current_media_number);
+    unlink(MINDI_CACHE"/changed.txt");
+
+    resA = compare_all_tarballs();
+    resB = compare_all_biggiefiles();
     chdir(cwd);
-    noof_changed_files = count_lines_in_file("/tmp/changed.txt");
+    noof_changed_files = count_lines_in_file(MINDI_CACHE"/changed.txt");
     if (noof_changed_files) {
         log_to_screen(_("%ld files do not match the backup            "),
                 noof_changed_files);
-        mr_asprintf(&command, "cat /tmp/changed.txt >> %s", MONDO_LOGFILE);
+        mr_asprintf(&command, "cat "MINDI_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
         paranoid_system(command);
         mr_free(command);
@@ -501 +502 @@
  */
 int
-compare_mode(struct s_bkpinfo *bkpinfo,
-             struct mountlist_itself *mountlist,
+compare_mode(struct mountlist_itself *mountlist,
              struct raidlist_itself *raidlist)
 {
@@ -522 +522 @@
     assert(raidlist != NULL);
 
-    while (get_cfg_file_from_archive(bkpinfo)) {
+    while (get_cfg_file_from_archive()) {
         if (!ask_me_yes_or_no
             (_
@@ -529 +529 @@
             fatal_error("Unable to find config file/archives. Aborting.");
         }
-        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    }
-
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+        interactively_obtain_media_parameters_from_user(FALSE);
+    }
+
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     g_current_media_number = 1;
     mvaddstr_and_log_it(1, 30, _("Comparing Automatically"));
@@ -544 +544 @@
     if (bkpinfo->backup_media_type == tape
         || bkpinfo->backup_media_type == udev) {
-        retval += compare_to_tape(bkpinfo);
+        retval += compare_to_tape();
     } else if (bkpinfo->backup_media_type == cdstream) {
-        retval += compare_to_cdstream(bkpinfo);
-    } else {
-        retval += compare_to_CD(bkpinfo);
+        retval += compare_to_cdstream();
+    } else {
+        retval += compare_to_CD();
     }
     if (retval) {
@@ -557 +557 @@
     }
 
-    if (count_lines_in_file("/tmp/changed.txt") > 0) {
+    if (count_lines_in_file(MINDI_CACHE"/changed.txt") > 0) {
         mvaddstr_and_log_it(g_currentY++, 0,
                             _
                             ("Differences found while files were being compared."));
-        streamline_changes_file("/tmp/changed.files", "/tmp/changed.txt");
-        if (count_lines_in_file("/tmp/changed.files") <= 0) {
+        streamline_changes_file(MINDI_CACHE"/changed.files", MINDI_CACHE"/changed.txt");
+        if (count_lines_in_file(MINDI_CACHE"/changed.files") <= 0) {
             mvaddstr_and_log_it(g_currentY++, 0,
                                 _
@@ -569 +569 @@
                           ("The differences were logfiles and temporary files. Your archives are fine."));
         } else {
-            q = count_lines_in_file("/tmp/changed.files");
+            q = count_lines_in_file(MINDI_CACHE"/changed.files");
             mr_asprintf(&tmp, _("%ld significant difference%s found."), q,
                     (q != 1) ? "s" : "");
@@ -586 +586 @@
             chdir(bkpinfo->restore_path);
             getcwd(new, MAX_STR_LEN - 1);
-            popup_changelist_from_file("/tmp/changed.files");
+            popup_changelist_from_file(MINDI_CACHE"/changed.files");
             mr_msg(2, "Returning from popup_changelist_from_file()");
             chdir(cwd);
@@ -616 +616 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_to_cdstream(struct s_bkpinfo *bkpinfo)
+int compare_to_cdstream()
 {
     int res;
@@ -642 +642 @@
                last_line_of_file("/tmp/CDROM-LIVES-HERE"));
     }
-    res = verify_tape_backups(bkpinfo);
+    res = verify_tape_backups();
     chdir(dir);
-    if (length_of_file("/tmp/changed.txt") > 2
-        && length_of_file("/tmp/changed.files") > 2) {
+    if (length_of_file(MINDI_CACHE"/changed.txt") > 2
+        && length_of_file(MINDI_CACHE"/changed.files") > 2) {
         mr_msg(0,
-                "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()");
     }
@@ -674 +674 @@
  * returns: int                                                           *
  **************************************************************************/
-int compare_to_tape(struct s_bkpinfo *bkpinfo)
+int compare_to_tape()
 {
     int res = 0;
@@ -692 +692 @@
     mvaddstr_and_log_it(g_currentY,
                         0, _("Verifying archives against filesystem"));
-    res = verify_tape_backups(bkpinfo);
+    res = verify_tape_backups();
     chdir(dir);
     if (res) {