Changeset 1655 in MondoRescue for branches/2.2.5/mondo

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

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-devices.c (modified) (2 diffs)
• common/libmondo-tools.c (modified) (3 diffs)
• mondoarchive/mondo-cli.c (modified) (4 diffs)

branches/2.2.5/mondo/src/common/libmondo-devices.c

@@ -2516 +2516 @@
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x ocfs -x ocfs2 -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("LANGUAGE=C df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x ocfs -x ocfs2 -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif
 
@@ -2531 +2531 @@
         fatal_error("I couldn't figure out the tempdir!");
     }
-    sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%d", tmp,
-            (int) (random() % 32768));
+    setup_tmpdir(tmp);
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
 

branches/2.2.5/mondo/src/common/libmondo-tools.c

@@ -617 +617 @@
     }
     make_hole_for_dir(bkpinfo->scratchdir);
-    make_hole_for_dir(bkpinfo->tmpdir);
     if (bkpinfo->backup_media_type == iso)
         make_hole_for_dir(bkpinfo->isodir);
@@ -902 +901 @@
     }
     chmod(bkpinfo->scratchdir, 0700);
-    chmod(bkpinfo->tmpdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
     paranoid_free(mtpt);
@@ -963 +961 @@
 }
 
-void setup_tmpdir() {
+void setup_tmpdir(char *path) {
     
     char *tmp = NULL;
     char *p = NULL;
 
+    if (bkpinfo->tmpdir != NULL) {
+        /* purging a potential old tmpdir */
+        asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
+        run_program_and_log_output(tmp, FALSE);
+        paranoid_free(tmp);
+    }
+        
     if (getenv("TMPDIR")) {
         asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
     } else if (getenv("TMP")) {
         asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
+    } else if (path != NULL) {
+        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
     } else {
         asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");

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++;