Changeset 2320 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.c

Timestamp:

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

Author:

Bruno Cornec

Message:

r3331@localhost: bruno | 2009-08-06 01:34:32 +0200

• bkpinfo->scratchdir is now dynamically allocated
• mondoarchive tests made in text+newt env. Seems OK. Valgrind errors to be fixed

File:

• branches/2.2.10/mondo/src/common/libmondo-tools.c (modified) (3 diffs)

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

@@ -448 +448 @@
         mr_free(tmp);
     }
-    make_hole_for_dir(bkpinfo->scratchdir);
+    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)
         make_hole_for_dir(bkpinfo->isodir);
@@ -680 +685 @@
         fprintf(stderr, "Type 'man mondoarchive' for help.\n");
     }
-    if (strlen(bkpinfo->tmpdir) < 2 || strlen(bkpinfo->scratchdir) < 2) {
-        log_it("tmpdir or scratchdir are blank/missing");
+    if (strlen(bkpinfo->tmpdir) < 2) {
+        log_it("tmpdir is blank/missing");
         retval++;
     }
@@ -688 +693 @@
         bkpinfo->include_paths = p;
     }
-    chmod(bkpinfo->scratchdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
     paranoid_free(mtpt);