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

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -25 +25 @@
 extern bool g_text_mode;
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
-extern char g_erase_tmpdir_and_scratchdir[MAX_STR_LEN];
 extern char g_tmpfs_mountpt[MAX_STR_LEN];
 extern bool g_sigpipe;
@@ -44 +43 @@
 bool g_running_live = FALSE;    ///< ????? @bug ????? @ingroup globalGroup
 extern bool g_cd_recovery;
+
+extern void setup_tmpdir(char *path);
 
 /**
@@ -63 +64 @@
 char *g_getfacl = NULL;
 char *g_getfattr = NULL;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -76 +80 @@
  */
 int
-handle_incoming_parameters(int argc, char *argv[],
-                           struct s_bkpinfo *bkpinfo)
+handle_incoming_parameters(int argc, char *argv[])
 {
     /*@ int *** */
@@ -89 +92 @@
     bool flag_set[128];
 
-    sensibly_set_tmpdir_and_scratchdir(bkpinfo);
+    sensibly_set_tmpdir_and_scratchdir();
 
     for (i = 0; i < 128; i++) {
@@ -99 +102 @@
     retval += res;
     if (!retval) {
-        res = process_switches(bkpinfo, flag_val, flag_set);
+        res = process_switches(flag_val, flag_set);
         retval += res;
     }
@@ -121 +124 @@
     mr_free(tmp);
 
-    sprintf(bkpinfo->tmpdir + strlen(bkpinfo->tmpdir), "/tmp.mondo.%ld",
-            random() % 32767);
     sprintf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
             "/mondo.scratch.%ld", random() % 32767);
@@ -144 +145 @@
  * @bug Return code not needed.
  */
-int process_the_s_switch(struct s_bkpinfo *bkpinfo, char *value)
+int process_the_s_switch(char *value)
 {
     char *tmp = NULL;
@@ -180 +181 @@
  */
 int
-process_switches(struct s_bkpinfo *bkpinfo,
-                 char flag_val[128][MAX_STR_LEN], bool flag_set[128])
+process_switches(char flag_val[128][MAX_STR_LEN], bool flag_set[128])
 {
 
@@ -425 +425 @@
                         ("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
                 }
-                if (process_the_s_switch(bkpinfo, flag_val['s'])) {
+                if (process_the_s_switch(flag_val['s'])) {
                     fatal_error("Bad -s switch");
                 }
@@ -438 +438 @@
     } else {                    /* CD|USB size */
         if (flag_set['s']) {
-            if (process_the_s_switch(bkpinfo, flag_val['s'])) {
+            if (process_the_s_switch(flag_val['s'])) {
                 fatal_error("Bad -s switch");
             }
@@ -672 +672 @@
     }
     if (flag_set['T']) {
-        sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%ld", flag_val['T'],
-                random() % 32768);
+        setup_tmpdir(flag_val['T']);
         mr_asprintf(&tmp2, "touch %s/.foo.dat", flag_val['T']);
         if (run_program_and_log_output(tmp2, 1)) {
@@ -683 +682 @@
         mr_free(tmp2);
 
-        mr_asprintf(&tmp2, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
-                flag_val['T']);
+        mr_asprintf(&tmp2, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
         if (run_program_and_log_output(tmp2, 1)) {
             retval++;