Changeset 1663 in MondoRescue for branches/stable/mondo/src/common/newt-specific.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/common/newt-specific.c (modified) (4 diffs)

branches/stable/mondo/src/common/newt-specific.c

@@ -1282 +1282 @@
                                  char *source_file) {
     int i;
+    int j = 0;
     bool done;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     size_t n = 0;
     FILE *fin = NULL;
@@ -1298 +1300 @@
         return (1);
     }
+
+    asprintf(&tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
+    if (!(fout = fopen(tmp1, "a"))) {
+        mr_msg(2, "Can't write to %s", tmp1);
+        return(1);
+    }
+
     mr_msg(2, "Loading %s", source_file);
     for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
@@ -1316 +1325 @@
             goto god_i_hate_gotos;
         }
-        if (!does_file_exist(tmp)) {
+        if (!does_file_exist(tmp) && !feof(fin)) {
+            fprintf(fout, "%s\n", tmp);
+            j++;
             goto god_i_hate_gotos;
         }
@@ -1329 +1340 @@
 
     paranoid_fclose(fin);
+    paranoid_fclose(fout);
+
+    if (j > 0) {
+        log_to_screen("%d files listed in %s/changed.files have been deleted since backup was made\nand are referenced in %s", j, bkpinfo->tmpdir,tmp1);
+    }
+    mr_free(tmp1);
+
     if (filelist->entries >= ARBITRARY_MAXIMUM) {
         log_to_screen(_("Arbitrary limits suck, man!"));