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

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

@@ -436 +436 @@
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir,
-            bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
     if (run_program_and_log_output(tmp, 2)) {
         mr_free(tmp);
@@ -1431 +1430 @@
                     register_in_tape_catalog(fileset, storing_set_no, -1,
                                          storing_afioball_fname);
-                    maintain_collection_of_recent_archives(bkpinfo->tmpdir,
-                                                       storing_afioball_fname);
+                    maintain_collection_of_recent_archives(storing_afioball_fname);
                     log_it("Writing EXAT files");
                     res +=
@@ -2204 +2202 @@
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
             register_in_tape_catalog(fileset, curr_set_no, -1, curr_afioball_fname);
-            maintain_collection_of_recent_archives(bkpinfo->tmpdir, curr_afioball_fname);
+            maintain_collection_of_recent_archives(curr_afioball_fname);
             log_it("Writing EXAT files");
             res +=
@@ -3107 +3105 @@
             register_in_tape_catalog(biggieslice, biggie_file_number,
                                      slice_num, file_to_archive);
-            maintain_collection_of_recent_archives(bkpinfo->tmpdir,
-                                                   file_to_archive);
+            maintain_collection_of_recent_archives(file_to_archive);
             res = move_files_to_stream(file_to_archive, NULL);
         } else {