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

branches/stable/mondo/src/common/libmondo-filelist.c

@@ -40 +40 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
                        char *include_paths, char *excp, bool differential,
@@ -82 +85 @@
  * @see chop_filelist
  */
-int call_filelist_chopper(struct s_bkpinfo *bkpinfo)
+int call_filelist_chopper()
 {
     /*@ buffers *********************** */
@@ -112 +115 @@
     mr_free(filelist);
 
-    estimate_noof_media_required(bkpinfo, noof_sets);   // for cosmetic purposes
+    estimate_noof_media_required(noof_sets);    // for cosmetic purposes
 
     mr_asprintf(&tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
@@ -155 +158 @@
 
     mr_msg(5, "Sorting file %s", orig_fname);
-    mr_asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
-             (int) (random() % 32768), (int) (random() % 32768));
+    mr_asprintf(&tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
 
     if (!does_file_exist(orig_fname)) {
@@ -547 +549 @@
         return (0);
     }
-    mr_asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
-             (int) (random() % 32768));
-
+    mr_asprintf(&masklist, "%s/masklist", bkpinfo->tmpdir);
     mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
@@ -693 +693 @@
  * @note This function should only be called at restore-time.
  */
-int get_last_filelist_number(struct s_bkpinfo *bkpinfo)
+int get_last_filelist_number()
 {
     /*@ buffers ***************************************************** */
@@ -1239 +1239 @@
  * @see mondo_makefilelist
  */
-int prepare_filelist(struct s_bkpinfo *bkpinfo)
+int prepare_filelist()
 {