Changeset 1747 in MondoRescue for branches/2.2.5/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Oct 30, 2007, 1:18:55 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
• Create MONDO_CACHE and use it everywhere + creation at start

File:

• branches/2.2.5/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (8 diffs)

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

@@ -207 +207 @@
     log_msg(1, tmp_ptr);
     if (retval) {
-        if (!(fout = fopen(MINDI_CACHE"/changed.txt", "a"))) {
+        if (!(fout = fopen(MONDO_CACHE"/changed.txt", "a"))) {
             fatal_error("Cannot openout changed.txt");
         }
@@ -384 +384 @@
     if (length_of_file(logfile) > 5) {
         sprintf(command,
-                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MINDI_CACHE"/changed.txt",
+                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt",
                 logfile);
         system(command);
@@ -545 +545 @@
     getcwd(new, MAX_STR_LEN - 1);
     insist_on_this_cd_number(g_current_media_number);
-    unlink(MINDI_CACHE"/changed.txt");
+    unlink(MONDO_CACHE"/changed.txt");
 
     resA = compare_all_tarballs();
     resB = compare_all_biggiefiles();
     chdir(cwd);
-    noof_changed_files = count_lines_in_file(MINDI_CACHE"/changed.txt");
+    noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
     if (noof_changed_files) {
         sprintf(tmp, "%ld files do not match the backup            ",
@@ -556 +556 @@
         //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
         log_to_screen(tmp);
-        sprintf(command, "cat "MINDI_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
+        sprintf(command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
         paranoid_system(command);
     } else {
@@ -662 +662 @@
     }
 
-    if (count_lines_in_file(MINDI_CACHE"/changed.txt") > 0) {
+    if (count_lines_in_file(MONDO_CACHE"/changed.txt") > 0) {
         mvaddstr_and_log_it(g_currentY++, 0,
                             "Differences found while files were being compared.");
-        streamline_changes_file(MINDI_CACHE"/changed.files", MINDI_CACHE"/changed.txt");
-        if (count_lines_in_file(MINDI_CACHE"/changed.files") <= 0) {
+        streamline_changes_file(MONDO_CACHE"/changed.files", MONDO_CACHE"/changed.txt");
+        if (count_lines_in_file(MONDO_CACHE"/changed.files") <= 0) {
             mvaddstr_and_log_it(g_currentY++, 0,
                                 "...but they were logfiles and temporary files. Your archives are fine.");
@@ -672 +672 @@
                 ("The differences were logfiles and temporary files. Your archives are fine.");
         } else {
-            q = count_lines_in_file(MINDI_CACHE"/changed.files");
+            q = count_lines_in_file(MONDO_CACHE"/changed.files");
             sprintf(tmp, "%ld significant difference%s found.", q,
                     (q != 1) ? "s" : "");
@@ -687 +687 @@
             chdir(bkpinfo->restore_path);
             getcwd(new, MAX_STR_LEN - 1);
-            popup_changelist_from_file(MINDI_CACHE"/changed.files");
+            popup_changelist_from_file(MONDO_CACHE"/changed.files");
             chdir(cwd);
             log_msg(2, "Returning from popup_changelist_from_file()");
@@ -744 +744 @@
     res = verify_tape_backups();
     chdir(dir);
-    if (length_of_file(MINDI_CACHE"/changed.txt") > 2
-        && length_of_file(MINDI_CACHE"/changed.files") > 2) {
+    if (length_of_file(MONDO_CACHE"/changed.txt") > 2
+        && length_of_file(MONDO_CACHE"/changed.files") > 2) {
         log_msg(0,
-                "Type 'less "MINDI_CACHE"/changed.files' to see which files don't match the archives");
+                "Type 'less "MONDO_CACHE"/changed.files' to see which files don't match the archives");
         log_msg(2, "Calling popup_changelist_from_file()");
-        popup_changelist_from_file(MINDI_CACHE"/changed.files");
+        popup_changelist_from_file(MONDO_CACHE"/changed.files");
         log_msg(2, "Returned from popup_changelist_from_file()");
     }