Changeset 3834 in MondoRescue for branches

Timestamp:

Mar 5, 2024, 1:57:03 AM (14 months ago)

Author:

Bruno Cornec

Message:

manages scratchdir dynamically

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-devices.c (modified) (2 diffs)
• libmondo-tools.c (modified) (4 diffs)
• mondostructures.h (modified) (1 diff)
• newt-specific.c (modified) (2 diffs)

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

@@ -2751 +2751 @@
 
         if (bkpinfo->exclude_paths != NULL ) {
-            strncpy(p,bkpinfo->exclude_paths,(16*MAX_STR_LEN)-1);
+            mr_asprintf(p, "%s", bkpinfo->exclude_paths);
         } else {
-            p[0] = '\0';
-        }
-        popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with '|'. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.", p, (16*MAX_STR_LEN)-1);
-        if (p == NULL) {
+            mr_asprintf(p, "%s", "");
+        }
+        tmp = mr_popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with '|'. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.", p);
+        mr_free(p);
+        if (tmp == NULL) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
         }
         mr_free(bkpinfo->exclude_paths);
-        mr_asprintf(tmp, "%s", p);
         bkpinfo->exclude_paths = tmp;
 
         mr_asprintf(oldtmp, "%s", bkpinfo->tmpdir);
         if (bkpinfo->tmpdir != NULL ) {
-            strncpy(p,bkpinfo->tmpdir,(MAX_STR_LEN / 4)-1);
+            mr_asprintf(p, "%s", bkpinfo->tmpdir);
         } else {
-            p[0] = '\0';
-        }
-        if (!popup_and_get_string("Temporary directory", "Please enter your temporary directory.", p, (4*MAX_STR_LEN)-1)) {
+            mr_asprintf(p, "%s", "");
+        }
+        tmp = mr_popup_and_get_string("Temporary directory", "Please enter your temporary directory.", p);
+        mr_free(p);
+        if (tmp == NULL) {
+            mr_free(oldtmp);
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
         }
         /*  if modified to another path */
-        if (strcmp(p,oldtmp) != 0) {
-            setup_tmpdir(p);
+        if (strcmp(tmp,oldtmp) != 0) {
+            setup_tmpdir(tmp);
         }
         mr_free(oldtmp);
@@ -2782 +2785 @@
         mr_asprintf(oldtmp, "%s", bkpinfo->scratchdir);
         if (bkpinfo->scratchdir != NULL ) {
-            strncpy(p,bkpinfo->scratchdir,(MAX_STR_LEN / 4)-1);
+            mr_asprintf(p, "%s", bkpinfo->scratchdir);
         } else {
-            p[0] = '\0';
-        }
-        if (!popup_and_get_string("Scratch directory", "Please enter your scratch directory.", p, (4*MAX_STR_LEN)-1)) {
+            mr_asprintf(p, "%s", "");
+        }
+        tmp = mr_popup_and_get_string("Scratch directory", "Please enter your scratch directory.", p);
+        mr_free(p);
+        if (tmp == NULL) {
+            mr_free(oldtmp);
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
         }
         /*  if modified to another path */
-        if (strcmp(p,oldtmp) != 0) {
-            setup_scratchdir(p);
+        if (strcmp(tmp,oldtmp) != 0) {
+            setup_scratchdir(tmp);
         }
         mr_free(oldtmp);

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

@@ -743 +743 @@
         mr_asprintf(tmp, "/tmp/mondo.tmp.XXXXXX");
     }
+    mr_free(bkpinfo->tmpdir);
     bkpinfo->tmpdir = mkdtemp(tmp);
     if (bkpinfo->tmpdir == NULL) {
@@ -756 +757 @@
 
     char *tmp = NULL;
-    char *p = NULL;
 
     if (bkpinfo->scratchdir != NULL) {
@@ -786 +786 @@
         mr_asprintf(tmp, "/tmp/mondo.scratch.XXXXXX");
     }
-    p = mkdtemp(tmp);
-    if (p == NULL) {
+    mr_free(bkpinfo->scratchdir);
+    bkpinfo->scratchdir = mkdtemp(tmp);
+    if (bkpinfo->scratchdir == NULL) {
         log_it("Failed to create global scratch directory %s for Mondo.",tmp);
+        mr_free(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);
+    mr_system("mkdir -p %s", bkpinfo->scratchdir);
 }
 
@@ -828 +825 @@
     
     /*  We need tmpdir as early as possible for further function calls */
-    bkpinfo->tmpdir = NULL;         // Really setup after
-    bkpinfo->scratchdir[0] = '\0';          // Really setup after
+    bkpinfo->tmpdir = NULL;             // Really setup just after
+    bkpinfo->scratchdir = NULL;         // Really setup just after
     setup_tmpdir(NULL);
     setup_scratchdir(NULL);

branches/3.3/mondo/src/common/mondostructures.h

@@ -481 +481 @@
    * As such, it needs to be at least as large as the largest CD/DVD/ISO.
    */
-    char scratchdir[MAX_STR_LEN / 4];
+    char *scratchdir;
 
   /**

branches/3.3/mondo/src/common/newt-specific.c

@@ -411 +411 @@
             }
         }
-        if (bkpinfo->scratchdir) {
+        if (bkpinfo->scratchdir != NULL) {
             log_msg(8,"scratchdir is %s", bkpinfo->scratchdir);
             if (strstr(bkpinfo->scratchdir ,"mondo.scratch.") != NULL) {
@@ -440 +440 @@
         mr_free(bkpinfo->zip_suffix);
         mr_free(bkpinfo->tmpdir);
+        mr_free(bkpinfo->scratchdir);
         /* Then free the structure */
         paranoid_free(bkpinfo);