Changeset 3190 in MondoRescue for branches/3.1/mondo/src/common/libmondo-tools.c

Timestamp:

Sep 25, 2013, 8:55:43 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Modification to 3.1 branch to make it extremely similar to 3.0. What remains are function rewrite with allocation in the function and desallocation outside of the function. Will be next step

File:

• branches/3.1/mondo/src/common/libmondo-tools.c (modified) (19 diffs)

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

@@ -57 +57 @@
  */
 char *g_mondo_home = NULL;
+
+/**
+ * The serial string (used to differentiate between backups) of the current backup.
+ */
+char *g_serial_string = NULL;
 
 /**
@@ -363 +368 @@
     assert(bkpinfo != NULL);
 
-    if (!bkpinfo->tmpdir) {
-        fatal_error("Tmpdir set to NULL !");
-    }
-
     bkpinfo->optimal_set_size =
         (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, "Post-param");
@@ -393 +389 @@
         }
         mr_free(tmp);
-    }
-    if (bkpinfo->scratchdir) {
-        make_hole_for_dir(bkpinfo->scratchdir);
-        chmod(bkpinfo->scratchdir, 0700);
-    } else {
-        fatal_error("Scratchdir set to NULL !");
     }
     if (bkpinfo->backup_media_type == iso)
@@ -461 +451 @@
     }
 #endif
-        else
-        {
+        else {
             mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
-            paranoid_free(mondo_mkisofs_sz);
             fatal_error("Manual CD tray + DVD not supported yet.");
             // -m isn't supported by growisofs, BTW...
-        } else {
-            if (bkpinfo->media_device == NULL) {
-                return(1);
-            }
+        } else {}
             mr_free(bkpinfo->call_make_iso);
             mr_asprintf(bkpinfo->call_make_iso, "%s %s -Z %s . 2>> _ERR_", mondo_mkisofs_sz, "", bkpinfo->media_device);
-            paranoid_free(mondo_mkisofs_sz);
-        }
+        }
+        mr_free(mondo_mkisofs_sz);
         if (getenv ("SUDO_COMMAND")) {
             mr_asprintf(command, "strings `which growisofs` | grep -c SUDO_COMMAND");
@@ -506 +491 @@
         }
         if (find_home_of_exe("cdrecord")) {
-            strcpy(cdr_exe, "cdrecord");
+            mr_asprintf(cdr_exe, "cdrecord");
         } else if (find_home_of_exe("dvdrecord")) {
-            strcpy(cdr_exe, "dvdrecord");
+            mr_asprintf(cdr_exe, "dvdrecord");
         } else {
             mr_free(tmp);
@@ -569 +554 @@
         }
         mr_free(cdr_exe);
-        paranoid_free(mondo_mkisofs_sz);
-        paranoid_free(extra_cdrom_params);
+        mr_free(mondo_mkisofs_sz);
+        mr_free(extra_cdrom_params);
     }                           // end of CD code
 
@@ -587 +572 @@
         iso_dev = call_program_and_get_last_line_of_output(command,TRUE);
         log_it("res of it = %s", iso_dev);
+        mr_asprintf(tmp, "%s/ISO-DEV", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, iso_dev);
+        mr_free(tmp);
         mr_free(command);
 
@@ -595 +583 @@
         iso_mnt = call_program_and_get_last_line_of_output(command,TRUE);
         log_it("res of it = %s", iso_mnt);
+        mr_asprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, iso_mnt);
+        mr_free(tmp);
         mr_free(command);
 
@@ -602 +593 @@
             mr_asprintf(iso_path, "%s", "");
         } else {
-            // If iso_mnt is only / then iso_path is the full dir 
+            // If iso_mnt is only / then iso_path is the full dir
             // (the formula bellow doesn't work in this case)
             if (strcmp(iso_mnt, "/") == 0) {
@@ -614 +605 @@
         mr_free(iso_tmp);
 
+        mr_asprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, iso_path);
+        mr_free(tmp);
+
         log_it("isodir: %s", iso_path);
         mr_free(iso_path);
+
+        mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, bkpinfo->prefix);
+        mr_free(tmp);
 
         log_it("iso-prefix: %s",  bkpinfo->prefix);
@@ -666 +665 @@
     }
     if (bkpinfo->include_paths == NULL) {
-        mr_asprintf(p, "/");
-        bkpinfo->include_paths = p;
+        mr_asprintf(bkpinfo->include_paths, "/");
     }
     g_backup_media_type = bkpinfo->backup_media_type;
@@ -731 +729 @@
     if ((bkpinfo->tmpdir != NULL) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
         /* purging a potential old tmpdir */
-        log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
         if (chdir("/tmp")) {
             // FIXME
@@ -757 +754 @@
         finish(-1);
     }
-
     bkpinfo->tmpdir = p;
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
+
+    mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    paranoid_system(tmp);
+    mr_free(tmp);
+}
+
+
+void setup_scratchdir(char *path) {
+
+    char *tmp = NULL;
+    char *p = NULL;
+
+    if (bkpinfo->scratchdir != NULL) {
+        /* purging a potential old scratchdir */
+        if (chdir("/tmp")) {
+            // FIXME
+        }
+        if (strstr(bkpinfo->scratchdir,"mondo.scratch.") != NULL) {
+            log_it("Purging old scratchdir %s", bkpinfo->scratchdir);
+            mr_asprintf(tmp,"rm -Rf %s",bkpinfo->scratchdir);
+        } else {
+            log_it("Purging old scratchdir %s/mondo.scratch.*", bkpinfo->scratchdir);
+            mr_asprintf(tmp,"rm -Rf %s/mondo.scratch.*",bkpinfo->scratchdir);
+        }
+        paranoid_system(tmp);
+        mr_free(tmp);
+    }
+
+    /* Always take in account arg first, then env, then default */
+    if (path != NULL) {
+        mr_asprintf(tmp, "%s/mondo.scratch.XXXXXX", path);
+    } else if (getenv("MRSCRATCH")) {
+        mr_asprintf(tmp, "%s/mondo.scratch.XXXXXX", getenv("MRSCRATCH"));
+    } else {
+        mr_asprintf(tmp, "/tmp/mondo.scratch.XXXXXX");
+    }
+    p = mkdtemp(tmp);
+    if (p == NULL) {
+        log_it("Failed to create global scratch directory %s for Mondo.",tmp);
+        finish(-1);
+    }
+    strcpy(bkpinfo->scratchdir,p);
+    log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
+    paranoid_free(tmp);
+
+    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    paranoid_system(tmp);
+    mr_free(tmp);
 }
 
@@ -805 +849 @@
     bkpinfo = (struct s_bkpinfo *)mr_malloc(sizeof(struct s_bkpinfo));
 
-    /*  We need tmpdir as early as possible for further function calls */
-    bkpinfo->tmpdir = NULL;         // Really setup after
-    setup_tmpdir(NULL);
-
     /* Initialized in same order as in the structure declaration to detect errors more easily */
     bkpinfo->media_device = NULL;
-    for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-        bkpinfo->media_size[i] = -1;
-    }
+    bkpinfo->media_size = -1;
     bkpinfo->boot_loader = '\0';
     bkpinfo->boot_device = NULL;
@@ -828 +866 @@
     bkpinfo->use_star = FALSE;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
+    
+/*  We need tmpdir as early as possible for further function calls */
+    bkpinfo->tmpdir = NULL;         // Really setup after
+    setup_tmpdir(NULL);
+    setup_scratchdir(NULL);
+
     bkpinfo->disaster_recovery = am_I_in_disaster_recovery_mode();
     if (bkpinfo->disaster_recovery) {
@@ -835 +879 @@
     }
     mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
-    /*   bkpinfo->tmpdir is here in the struct */
-    bkpinfo->scratchdir = NULL;     // Really setup after
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
+    bkpinfo->exclude_paths = NULL;
     bkpinfo->include_paths = NULL;
-    bkpinfo->exclude_paths = NULL;
     bkpinfo->exclude_devs = NULL;
     bkpinfo->restore_path = NULL;
@@ -850 +892 @@
     bkpinfo->kernel_path = NULL;
     bkpinfo->netfs_mount = NULL;
+    bkpinfo->netfs_proto = NULL;
+    bkpinfo->netfs_user = NULL;
     bkpinfo->netfs_remote_dir = NULL;
-    bkpinfo->netfs_user = NULL;
-    bkpinfo->netfs_proto = NULL;
     bkpinfo->postnuke_tarball = NULL;
     bkpinfo->subdir = NULL;
@@ -864 +906 @@
     bkpinfo->use_obdr = FALSE;
     bkpinfo->restore_mode = interactive;
-
-    sensibly_set_scratchdir();
-}
-
-
+}
 
 
@@ -1218 +1256 @@
     mr_asprintf(command, "mount | grep -Ew '/boot'");
     mr_free(tmp);
+
     tmp = call_program_and_get_last_line_of_output(command,TRUE);
     mr_free(command);
 
     if (!strcmp(tmp,"")) {
-        if ((strstr(tmp, "LABEL=") != NULL) || (strstr(tmp,"UUID=")!= NULL)) {
+        if ((strstr(tmp, "LABEL=") != NULL) || (strstr(tmp,"UUID=") != NULL)) {
             if (!run_program_and_log_output("mount /boot", 5)) {
                 strcpy(g_boot_mountpt, "/boot");