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

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

@@ -30 +30 @@
 
 extern int g_currentY;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -680 +683 @@
  * @return The total size of all biggiefiles in KB.
  */
-long size_of_all_biggiefiles_K(struct s_bkpinfo *bkpinfo)
+long size_of_all_biggiefiles_K()
 {
     char *fname = NULL;
@@ -940 +943 @@
  * - @c bkpinfo->tmpdir
  */
-void copy_mondo_and_mindi_stuff_to_scratchdir(struct s_bkpinfo *bkpinfo)
+void copy_mondo_and_mindi_stuff_to_scratchdir()
 {
     /*@ Char buffers ** */
@@ -1026 +1029 @@
  * - @c tmpdir
  */
-void store_nfs_config(struct s_bkpinfo *bkpinfo)
+void store_nfs_config()
 {
 
@@ -1156 +1159 @@
  */
 void
-estimate_noof_media_required(struct s_bkpinfo *bkpinfo, long noof_sets)
+estimate_noof_media_required(long noof_sets)
 {
     /*@ buffers *************** */
@@ -1172 +1175 @@
     scratchLL =
         (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size)
-        + (long long) (size_of_all_biggiefiles_K(bkpinfo));
+        + (long long) (size_of_all_biggiefiles_K());
     scratchLL = (scratchLL / 1024) / bkpinfo->media_size;
     scratchLL++;