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

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

@@ -23 +23 @@
 extern bool g_text_mode;
 extern char *MONDO_LOGFILE;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 pid_t g_buffer_pid = 0;
 extern struct mr_ar_conf *mr_conf;
@@ -91 +94 @@
  */
 int
-eval_call_to_make_ISO(struct s_bkpinfo *bkpinfo,
-                      char *basic_call, char *isofile,
+eval_call_to_make_ISO(char *basic_call, char *isofile,
                       int cd_no, char *logstub, char *what_i_am_doing)
 {
@@ -211 +213 @@
     }
     mr_asprintf(&callstr,
-            "%s > /tmp/mondo-run-prog-thing.tmp 2> /tmp/mondo-run-prog-thing.err",
-            program);
+            "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err",
+             program, bkpinfo->tmpdir, bkpinfo->tmpdir);
     while ((p = strchr(callstr, '\r'))) {
         *p = ' ';
@@ -228 +230 @@
     mr_free(callstr);
 
-    if (log_if_failure
-        &&
-        system
-        ("cat /tmp/mondo-run-prog-thing.err >> /tmp/mondo-run-prog-thing.tmp 2> /dev/null"))
-    {
+    mr_asprintf(&callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+    if (log_if_failure && system(callstr)) {
         log_OS_error("Command failed");
     }
-    unlink("/tmp/mondo-run-prog-thing.err");
-    fin = fopen("/tmp/mondo-run-prog-thing.tmp", "r");
+    mr_asprintf(&tmp, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
+    unlink(tmp);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
+    fin = fopen(tmp, "r");
     if (fin) {
         for (mr_getline(&incoming, &n, fin); !feof(fin); mr_getline(&incoming, &n, fin)) {
@@ -252 +255 @@
         paranoid_fclose(fin);
     }
-    unlink("/tmp/mondo-run-prog-thing.tmp");
+    unlink(tmp);
+    mr_free(tmp);
+
     if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
         mr_msg(0,
@@ -293 +298 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    mr_asprintf(&lockfile, "/tmp/mojo-jojo.blah.XXXXXX");
-    mkstemp(lockfile);
+    sprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
+
     mr_asprintf(&command,
             "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res",
@@ -363 +368 @@
     char *tmp1 = NULL;
     char *buf = NULL;
+    char filestr[MAX_STR_LEN];
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
         0, bufcap, subsliceno = 0;
@@ -469 +475 @@
             mr_msg(5, "tmpB is %s", tmp);
             if (!strstr(tmp, PIMP_END_SZ)) {
-                ftmp = fopen("/tmp/out.leftover", "w");
+                sprintf(filestr, "%s/out.leftover", bkpinfo->tmpdir);
+                ftmp = fopen(filestr, "w");
                 bytes_read_in = fread(tmp, 1, 64L, fin);
                 mr_msg(1, "bytes_read_in = %ld", bytes_read_in);
@@ -539 +546 @@
 
     strcpy(title, tt);
-    strcpy(tempfile,
-           call_program_and_get_last_line_of_output
-           ("mktemp -q /tmp/mondo.XXXXXXXX"));
+    sprintf(tempfile, "%s/mondo.binperc", bkpinfo->tmpdir);
     mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
             tempfile);