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

Timestamp:

Sep 23, 2007, 2:41:29 AM (17 years ago)

Author:

Bruno Cornec

Message:

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.
Will not compile needs more work as bkpinfo->tmpdir isn't available everywhere
Should become a global in 3.x when only containing pointers.

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

@@ -202 +202 @@
     log_msg(1, tmp_ptr);
     if (retval) {
-        if (!(fout = fopen("/tmp/changed.txt", "a"))) {
+        if (!(fout = fopen(MINDI_CACHE"/changed.txt", "a"))) {
             fatal_error("Cannot openout changed.txt");
         }
@@ -381 +381 @@
     if (length_of_file(logfile) > 5) {
         sprintf(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);
@@ -542 +542 @@
     getcwd(new, MAX_STR_LEN - 1);
     insist_on_this_cd_number(bkpinfo, g_current_media_number);
-    unlink("/tmp/changed.txt");
+    unlink(MINDI_CACHE"/changed.txt");
 
     resA = compare_all_tarballs(bkpinfo);
     resB = compare_all_biggiefiles(bkpinfo);
     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) {
         sprintf(tmp, "%ld files do not match the backup            ",
@@ -553 +553 @@
         //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
         log_to_screen(tmp);
-        sprintf(command, "cat /tmp/changed.txt >> %s", MONDO_LOGFILE);
+        sprintf(command, "cat "MINDI_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
         paranoid_system(command);
     } else {
@@ -641 +641 @@
     }
 
-    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,
                                 "...but they were logfiles and temporary files. Your archives are fine.");
@@ -651 +651 @@
                 ("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");
             sprintf(tmp, "%ld significant difference%s found.", q,
                     (q != 1) ? "s" : "");
@@ -666 +666 @@
             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");
             chdir(cwd);
             log_msg(2, "Returning from popup_changelist_from_file()");
@@ -723 +723 @@
     res = verify_tape_backups(bkpinfo);
     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) {
         log_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");
         log_msg(2, "Calling popup_changelist_from_file()");
-        popup_changelist_from_file("/tmp/changed.files");
+        popup_changelist_from_file(MINDI_CACHE"/changed.files");
         log_msg(2, "Returned from popup_changelist_from_file()");
     }