Changeset 2321 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

Timestamp:

Aug 18, 2009, 2:37:55 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3332@localhost: bruno | 2009-08-07 23:59:34 +0200

• bkpinfo->tmpchdir is now dynamically allocated
• reorganize how tmpdir and scratchdir are initialized and the startup of the main sections
• change of interface for maintain_collection_of_recent_archives, mondo_makefilelist, chop_filelist
• sensibly_set_tmpdir_and_scratchdir => sensibly_set_scratchdir
• reset_bkpinfo => init_bkpinfo
• add function mr_free_bkpinfo
• Fix a bug in mr_strtok
• mondoarchive seems to globally work. Newt stuff needs more testing

File:

• branches/2.2.10/mondo/src/common/libmondo-devices.c (modified) (10 diffs)

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

@@ -42 +42 @@
 extern char *MONDO_LOGFILE;
 
-extern void setup_tmpdir(char *path);
-
 static char g_cdrw_drive_is_here[MAX_STR_LEN / 4] = "";
 static char g_cdrom_drive_is_here[MAX_STR_LEN / 4] = "";
@@ -111 +109 @@
     bool is_this_a_ramdisk = FALSE;
 
-    malloc_string(comment);
     mr_asprintf(&tmp, "%s", where_is_root_mounted());
-    mr_asprintf(&comment, "root is mounted at %s\n", tmp);
+    mr_asprintf(&comment, "root is currently mounted at %s\n", tmp);
     log_msg(0, comment);
     mr_free(comment);
-    log_msg(0,
-            "No, Schlomo, that doesn't mean %s is the root partition. It's just a debugging message. Relax. It's part of am_I_in_disaster_recovery_mode().",
-            tmp);
 
 #ifdef __FreeBSD__
@@ -138 +132 @@
     if (is_this_a_ramdisk) {
         if (!does_file_exist("/THIS-IS-A-RAMDISK")) {
-            log_to_screen
-                ("Using /dev/root is stupid of you but I'll forgive you.");
+            log_to_screen("Using /dev/root is stupid of you but I'll forgive you.");
             is_this_a_ramdisk = FALSE;
         }
@@ -146 +139 @@
         is_this_a_ramdisk = TRUE;
     }
-    log_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
+    log_msg(1, "Is this a ramdisk? result = %s", (is_this_a_ramdisk) ? "TRUE" : "FALSE");
     return (is_this_a_ramdisk);
 }
@@ -1374 +1367 @@
             mr_asprintf(&tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
             if (does_file_exist(tmp)) {
-                log_msg(1,
-                        "FIXME - hacking bkpinfo->isodir from '%s' to %s/isodir",
-                        bkpinfo->isodir, bkpinfo->tmpdir);
+                log_msg(1, "FIXME - hacking bkpinfo->isodir from '%s' to %s/isodir", bkpinfo->isodir, bkpinfo->tmpdir);
                 sprintf(bkpinfo->isodir, "%s/isodir", bkpinfo->tmpdir);
             }
@@ -1474 +1465 @@
     }
     */
-    log_msg(3, "media type = %s",
-            bkptype_to_string(bkpinfo->backup_media_type));
-    if (archiving_to_media) {
-        sensibly_set_tmpdir_and_scratchdir();
-    }
+    log_msg(3, "media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
     bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
     bkpinfo->compression_level =
@@ -1971 +1958 @@
             finish(1);
         }
-        strcpy(bkpinfo->tmpdir, p);
-        mr_free(p);
+        mr_free(bkpinfo->tmpdir);
+        bkpinfo->tmpdir = p;
 
         p = popup_and_get_string("Scratch directory", "Please enter your scratch directory.", bkpinfo->scratchdir);
@@ -2140 +2127 @@
  * @ingroup utilityGroup
  */
-void sensibly_set_tmpdir_and_scratchdir()
+void sensibly_set_scratchdir()
 {
     char *tmp = NULL; 
     char *command = NULL;
     char *sz = NULL;
-
-    assert(bkpinfo != NULL);
 
 #ifdef __FreeBSD__
@@ -2161 +2146 @@
     }
     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);
-
+        fatal_error("I couldn't figure out the scratchdir!");
+    }
     mr_asprintf(&sz, "%s/mondo.scratch.%d", tmp, (int) (random() % 32768));
     mr_free(bkpinfo->scratchdir);
@@ -2171 +2153 @@
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
 
-    mr_asprintf(&command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
+    mr_asprintf(&command, "rm -Rf %s/mondo.scratch.*", tmp);
     mr_free(tmp);