Changeset 3154 in MondoRescue for branches/3.0/mondo/src/common/libmondo-devices.c

Timestamp:

Jun 23, 2013, 12:34:33 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Remove the introduction of LogProgress in ListKernelModulePaths which should stay quiet
• Remove a remaining support of max-noof-media in confidure.in now gone.
• Fix #640 by cleaning up fully the managemnt of tmpdir and scratchdir (one function for the creation, one point of removal at end, intermediate removal if needed, clean naming conventions, unify mkdtemp usage, remove sensibly_set_tmpdir_and_scratchdir function). Consequence is that default dir for scratchdir if nothing else specified is /tmp using CLI and the largest partition using the GUI.
• Fix a bug introduced in process_the_s_switch with intermediate variables which weren't initialized correctly.

File:

• branches/3.0/mondo/src/common/libmondo-devices.c (modified) (6 diffs)

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

@@ -50 +50 @@
 
 extern void setup_tmpdir(char *path);
+extern void setup_scratchdir(char *path);
 
 static char g_cdrw_drive_is_here[MAX_STR_LEN / 4] = "";
@@ -2174 +2175 @@
 {
     char *tmp = NULL;
+    char *sz = NULL;
     char *tmpro = NULL;
     char *tmp1 = NULL;
@@ -2210 +2212 @@
     }
     */
+    if (archiving_to_media) {
+        setup_tmpdir(NULL);
+        /*
+         * Set the scratchdir to reside on the partition with the most free space.
+         * Automatically excludes DOS, NTFS, SMB, and NFS filesystems.
+         */
+#ifdef __FreeBSD__
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,vmhgfs,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
+#else
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x fuse.sshfs -x fuse -x vfat -x ntfs -x ntfs-3g -x vmhgfs -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
+#endif
+
+        if (tmp[0] != '/') {
+            mr_asprintf(&sz, "%s", tmp);
+            mr_free(tmp);
+            mr_asprintf(&tmp, "/%s", sz);
+            mr_free(sz);
+        }
+        setup_scratchdir(tmp);
+    }
     log_msg(3, "media type = %s",
             bkptype_to_string(bkpinfo->backup_media_type));
-    if (archiving_to_media) {
-        sensibly_set_tmpdir_and_scratchdir();
-    }
     bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
     bkpinfo->compression_level =
@@ -2774 +2793 @@
             finish(1);
         }
+        /*  if modified to another path */
+        if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
+            setup_tmpdir(bkpinfo->tmpdir);
+        }
         if (!popup_and_get_string
             ("Scratch directory",
@@ -2780 +2803 @@
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
+        }
+        /*  if modified to another path */
+        if (strstr(bkpinfo->scratchdir,"mondo.scratch.") != NULL) {
+            setup_scratchdir(bkpinfo->scratchdir);
         }
         if (ask_me_yes_or_no("Do you want to backup extended attributes?")) {
@@ -2934 +2961 @@
     paranoid_free(tmp);
 }
-
-
-
-
-
-
-/**
- * Set the tmpdir and scratchdir to reside on the partition with the most free space.
- * Automatically excludes DOS, NTFS, SMB, and NFS filesystems.
- * @param bkpinfo The backup information structure. @c bkpinfo->tmpdir and @c bkpinfo->scratchdir will be set.
- * @ingroup utilityGroup
- */
-void sensibly_set_tmpdir_and_scratchdir()
-{
-    char *tmp = NULL; 
-    char *tmp1 = NULL; 
-    char *command = NULL;
-    char *sz = NULL;
-
-    assert(bkpinfo != NULL);
-
-#ifdef __FreeBSD__
-    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,vmhgfs,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
-#else
-    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x fuse.sshfs -x fuse -x vfat -x ntfs -x ntfs-3g -x vmhgfs -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
-#endif
-
-    if (tmp[0] != '/') {
-        mr_asprintf(&sz, "%s", tmp);
-        paranoid_free(tmp);
-        mr_asprintf(&tmp, "/%s", sz);
-        mr_free(sz);
-    }
-    if (!tmp[0]) {
-        fatal_error("I couldn't figure out the tempdir!");
-    }
-    setup_tmpdir(tmp);
-    log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
-
-    /* Before changing remove old ones if any */
-    if (bkpinfo->scratchdir) {
-        if (chdir("/tmp")) {
-            // FIXME
-        }
-        mr_asprintf(&tmp1, "rm -Rf %s", bkpinfo->scratchdir);
-        paranoid_system(tmp1);
-        mr_free(tmp1);
-    }
-    sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%d", tmp,
-            (int) (random() % 32768));
-    log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
-
-    mr_asprintf(&command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
-    paranoid_free(tmp);
-
-    paranoid_system(command);
-    mr_free(command);
-}
-
-
-