Changeset 1591 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Aug 2, 2007, 12:26:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Improve tape support doc (Tilman Schmidt <tilman_at_imap.cc>)
• mdadm.conf files added to deplist
• Fix gentoo issues again (Francesco Talamona ti.liame_at_email.it)
• Fix bug #187 (Scott Cummings rsc_at_usfamily.net)

(merge -r1579:1590 $SVN_M/branches/2.2.5)

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (5 diffs)

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

@@ -298 +298 @@
     if (res) {
         log_OS_error(command);
+        log_msg(2, tmp);
     }
     mr_free(command);
@@ -503 +504 @@
     long q = 0L;
     char *tmp = NULL;
+    char *new = NULL;
+    char *cwd = NULL;
+
+    malloc_string(new);
+    malloc_string(cwd);
 
   /**************************************************************************
@@ -546 +552 @@
                             ("Warning - differences found during the compare phase"));
     }
-
-    retval += unmount_all_devices(mountlist);
 
     if (count_lines_in_file("/tmp/changed.txt") > 0) {
@@ -575 +579 @@
 
             mr_msg(2, "calling popup_changelist_from_file()");
+            getcwd(cwd, MAX_STR_LEN - 1);
+            chdir(bkpinfo->restore_path);
+            getcwd(new, MAX_STR_LEN - 1);
             popup_changelist_from_file("/tmp/changed.files");
             mr_msg(2, "Returning from popup_changelist_from_file()");
+            chdir(cwd);
         }
     } else {
@@ -583 +591 @@
              ("No significant differences were found. Your backup is perfect."));
     }
+    retval += unmount_all_devices(mountlist);
+
     kill_petris();
+    paranoid_free(new);
+    paranoid_free(cwd);
     return (retval);
 }