Changeset 1655 in MondoRescue for branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c

Timestamp:

Sep 25, 2007, 12:54:32 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix a bug where df was using locale to print messages and wasn't filtered correctly
Improve setup of tmpdir again

File:

• branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c (modified) (4 diffs)

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

@@ -244 +244 @@
         flag_set[i] = FALSE;
     }
-    //  strcpy (bkpinfo->tmpdir, "/root/images/mondo");
     //  strcpy (bkpinfo->scratchdir, "/home");
     for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
@@ -273 +272 @@
     sprintf(tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
     paranoid_system(tmp);
-    sprintf(bkpinfo->tmpdir + strlen(bkpinfo->tmpdir), "/tmp.mondo.%ld",
-            random() % 32767);
     sprintf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
             "/mondo.scratch.%ld", random() % 32767);
@@ -853 +850 @@
     }
     if (flag_set['T']) {
-        sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%ld", flag_val['T'],
-                random() % 32768);
-        sprintf(tmp, "touch %s/.foo.dat", flag_val['T']);
+        setup_tmpdir(flag_val['T']);
+        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->tmpdir);
         if (run_program_and_log_output(tmp, 1)) {
             retval++;
@@ -862 +858 @@
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
-                flag_val['T']);
+        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
         if (run_program_and_log_output(tmp, 1)) {
             retval++;