Changeset 1585 in MondoRescue

Timestamp:

Jul 29, 2007, 8:53:23 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fix bug #187 (Scott Cummings rsc_at_usfamily.net)

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-string.c (modified) (1 diff)
• mondorestore/mondo-rstr-compare.c (modified) (6 diffs)

branches/2.2.5/mondo/src/common/libmondo-string.c

@@ -944 +944 @@
         sev = 2;
         sprintf(reason,
-                "It's in your /home partiton. Therefore, it is important.");
+                "It's in your /home directory. Therefore, it is important.");
     }
     if (!strncmp(filename, "/usr/", 5)) {

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

@@ -377 +377 @@
         log_OS_error(command);
         sprintf(tmp, "Warning - afio returned error = %d", res);
+        log_msg(2, tmp);
     }
     if (length_of_file(logfile) > 5) {
@@ -536 +537 @@
     chdir(bkpinfo->restore_path);
     getcwd(new, MAX_STR_LEN - 1);
-    sprintf(tmp, "new path is %s", new);
     insist_on_this_cd_number(bkpinfo, g_current_media_number);
     unlink("/tmp/changed.txt");
@@ -589 +589 @@
     long q;
     char *tmp;
+    char *new;
+    char *cwd;
 
     malloc_string(tmp);
+    malloc_string(new);
+    malloc_string(cwd);
 
   /**************************************************************************
@@ -632 +636 @@
                             "Warning - differences found during the compare phase");
     }
-
-    retval += unmount_all_devices(mountlist);
 
     if (count_lines_in_file("/tmp/changed.txt") > 0) {
@@ -657 +659 @@
 
             log_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");
+            chdir(cwd);
             log_msg(2, "Returning from popup_changelist_from_file()");
         }
@@ -664 +670 @@
             ("No significant differences were found. Your backup is perfect.");
     }
+    retval += unmount_all_devices(mountlist);
+
     kill_petris();
     paranoid_free(tmp);
+    paranoid_free(new);
+    paranoid_free(cwd);
     return (retval);
 }