Changeset 2321 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.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-tools.c (modified) (11 diffs)

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

@@ -429 +429 @@
 
     assert(bkpinfo != NULL);
+
+    if (!bkpinfo->tmpdir) {
+        fatal_error("Tmpdir set to NULL !");
+    }
+
     malloc_string(mtpt);
     malloc_string(hostname);
@@ -435 +440 @@
         (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
         1024;
+
+    if (strlen(bkpinfo->tmpdir) < 2) {
+        log_it("tmpdir is blank/missing");
+        retval++;
+    }
 
     log_msg(1, "Foo");
@@ -685 +695 @@
         fprintf(stderr, "Type 'man mondoarchive' for help.\n");
     }
-    if (strlen(bkpinfo->tmpdir) < 2) {
-        log_it("tmpdir is blank/missing");
-        retval++;
-    }
     if (bkpinfo->include_paths == NULL) {
         mr_asprintf(&p, "/");
@@ -751 +757 @@
     if ((bkpinfo->tmpdir != NULL) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
         /* purging a potential old tmpdir */
+        log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
         mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
-        system(tmp);
-        paranoid_free(tmp);
+        mr_free(bkpinfo->tmpdir);
+        (void)system(tmp);
+        mr_free(tmp);
     }
 
@@ -768 +776 @@
     if (p == NULL) {
         log_it("Failed to create global tmp directory %s for Mondo.",tmp);
+        mr_free(tmp);
         finish(-1);
     }
-    strcpy(bkpinfo->tmpdir,p);
-    paranoid_free(tmp);
-}
-
+
+    bkpinfo->tmpdir = p;
+    log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
+}
+
+/* Free all memory allocated into bkpinfo */
+void mr_free_bkpinfo() {
+
+    mr_free(bkpinfo->scratchdir);
+    mr_free(bkpinfo->tmpdir);
+    mr_free(bkpinfo->include_paths);
+    mr_free(bkpinfo->exclude_paths);
+    mr_free(bkpinfo->nfs_user);
+
+    /* Then free the structure */
+    mr_free(bkpinfo);
+}
 
 /**
@@ -779 +801 @@
  * @param bkpinfo The @c bkpinfo to reset.
  */
-void reset_bkpinfo()
+void init_bkpinfo()
 {
     int i;
 
     log_msg(1, "Hi");
-    assert(bkpinfo != NULL);
-    memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
-
+
+    /* Initialized in same order as in the structure declaration to detect errors more easily */
     bkpinfo->media_device[0] = '\0';
     for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
@@ -805 +826 @@
     bkpinfo->use_star = FALSE;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-    bkpinfo->disaster_recovery =
-        (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
+    bkpinfo->disaster_recovery = (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
     if (bkpinfo->disaster_recovery) {
         strcpy(bkpinfo->isodir, "/");
@@ -813 +833 @@
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
-    sensibly_set_tmpdir_and_scratchdir();
-
+    bkpinfo->scratchdir = NULL;
+    bkpinfo->tmpdir = NULL;
     bkpinfo->optimal_set_size = 0;
+    bkpinfo->backup_media_type = none;
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
+    bkpinfo->include_paths = NULL;
+    bkpinfo->exclude_paths = NULL;
     bkpinfo->restore_path[0] = '\0';
     bkpinfo->call_before_iso[0] = '\0';
@@ -824 +847 @@
     bkpinfo->kernel_path[0] = '\0';
     bkpinfo->nfs_mount[0] = '\0';
+    bkpinfo->nfs_remote_dir[0] = '\0';
     bkpinfo->nfs_user = NULL;
-    bkpinfo->exclude_paths = NULL;
-    bkpinfo->include_paths = NULL;
-    bkpinfo->nfs_remote_dir[0] = '\0';
     bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->wipe_media_first = FALSE;
@@ -838 +859 @@
     bkpinfo->use_obdr = FALSE;
     bkpinfo->restore_mode = interactive;
+
+    setup_tmpdir(NULL);
+    sensibly_set_scratchdir();
 }
 
@@ -1339 +1363 @@
         if (!(fout = fopen(MONDO_LOGFILE, "a"))) {
             return;
-        }       // fatal_error("Failed to openout to logfile - sheesh..."); }
+        }
 
         // add tabs to distinguish log levels