Changeset 1652 in MondoRescue for branches/2.2.5/mondo

Timestamp:

Sep 24, 2007, 1:07:01 PM (17 years ago)

Author:

Bruno Cornec

Message:

Always wrokign on fixing tmpdir problems

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-tools.c (modified) (3 diffs)
• mondoarchive/main.c (modified) (1 diff)

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

@@ -930 +930 @@
 {
     int res = 0;
+    char *tmp = NULL;
 
     make_hole_for_dir(MNT_CDROM);
@@ -935 +936 @@
     srandom((unsigned long) (time(NULL)));
     insmod_crucial_modules();
-    reset_bkpinfo();        // also sets defaults ('/'=backup path, 3=compression level)
     if (bkpinfo->disaster_recovery) {
         if (!does_nonMS_partition_exist()) {
@@ -944 +944 @@
 
     unlink(MONDO_TRACEFILE);
-    run_program_and_log_output("rm -Rf /tmp/changed.files*", FALSE);
+    asprintf(&tmp,"rm -Rf %s/changed.files*",bkpinfo->tmpdir);
+    run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
     if (find_and_store_mondoarchives_home(g_mondo_home)) {
         fprintf(stderr,

branches/2.2.5/mondo/src/mondoarchive/main.c

@@ -284 +284 @@
 /* Initialize variables */
 
-    malloc_libmondo_global_strings();
-    malloc_string(tmp);
-    malloc_string(say_at_end);
+    printf("Initializing...\n");
+    if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
+        fatal_error("Cannot malloc bkpinfo");
+    }
+    reset_bkpinfo();
 
     res = 0;
     retval = 0;
     diffs = 0;
+    malloc_string(tmp);
+    malloc_string(say_at_end);
     say_at_end[0] = '\0';
-    printf("Initializing...\n");
-    if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
+    malloc_libmondo_global_strings();
 
     /* initialize log file with time stamp */