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

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

@@ -36 +36 @@
 
 
-int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
-                       char *include_paths, char *excp, int differential,
-                       char *userdef_filelist);
+int mondo_makefilelist(char *logfile, char *include_paths, char *excp, int differential, char *userdef_filelist);
 
 
@@ -106 +104 @@
     }
 
-    noof_sets = chop_filelist(filelist, bkpinfo->tmpdir, bkpinfo->optimal_set_size);
+    noof_sets = chop_filelist(filelist, bkpinfo->optimal_set_size);
     mr_free(filelist);
     estimate_noof_media_required(noof_sets);    // for cosmetic purposes
@@ -194 +192 @@
  *
  * @param filelist The big filelist (filelist.full) to chop up.
- * @param outdir The directory to place the files (filelist.N where N is
- * an integer, biggielist.txt, and LAST-FILELIST-NUMBER) created
  * @param maxsetsizeK Optimal size of a fileset (X above).
  * @return number of errors encountered (0 for success).
  */
-int chop_filelist(char *filelist, char *outdir, long maxsetsizeK)
+int chop_filelist(char *filelist, long maxsetsizeK)
 {
 /*@ long ****************************************/
@@ -228 +224 @@
 
     assert_string_is_neither_NULL_nor_zerolength(filelist);
-    assert_string_is_neither_NULL_nor_zerolength(outdir);
     assert(maxsetsizeK > 0);
 
@@ -245 +240 @@
     curr_set_no = 0;
     curr_set_size = 0;
-    mr_asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
-    mr_asprintf(&biggie_fname, "%s/biggielist.txt", outdir);
+    mr_asprintf(&outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
+    mr_asprintf(&biggie_fname, "%s/biggielist.txt", bkpinfo->tmpdir);
     log_it("outfname=%s; biggie_fname=%s", outfname, biggie_fname);
     if (!(fbig = fopen(biggie_fname, "w"))) {
@@ -298 +293 @@
                 curr_set_size = 0;
 
-                mr_asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
+                mr_asprintf(&outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
                 if (!(fout = fopen(outfname, "w"))) {
                     log_OS_error("Unable to openout outfname");
@@ -328 +323 @@
     mr_free(biggie_fname);
 
-    mr_asprintf(&outfname, "%s/LAST-FILELIST-NUMBER", outdir);
+    mr_asprintf(&outfname, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
     mr_asprintf(&tmp, "%ld", curr_set_no);
     if (write_one_liner_data_file(outfname, tmp)) {
@@ -1307 +1302 @@
     if (bkpinfo->make_filelist) {
         res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
+            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
     } else {
         res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
+            mondo_makefilelist(MONDO_LOGFILE, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
     }
 
@@ -1377 +1372 @@
             while((token = mr_strtok(sth, delims, &lastpos))) {
                 mr_strcat(find_excludes," -path %s -prune -o", token);
+                mr_free(token);
             }
         }
@@ -1542 +1538 @@
  * Create the filelist for the backup. It will be stored in [scratchdir]/archives/filelist.full.
  * @param logfile Unused.
- * @param tmpdir The tmpdir of the backup.
- * @param scratchdir The scratchdir of the backup.
  * @param include_paths The paths to back up, or NULL if you're using a user-defined filelist.
  * @param excp The paths to NOT back up.
@@ -1552 +1546 @@
  * @bug Return value is meaningless.
  */
-int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
-                       char *include_paths, char *excp, int differential,
-                       char *userdef_filelist)
+int mondo_makefilelist(char *logfile, char *include_paths, char *excp, int differential, char *userdef_filelist)
 {
     char *p, *q;
@@ -1577 +1569 @@
     }
     // make hole for filelist
-    mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
+    mr_asprintf(&command, "mkdir -p %s/archives", bkpinfo->scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
+    mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
     make_hole_for_file(sz_filelist);
 
@@ -1640 +1632 @@
         mr_free(tmp1);
 
-        mr_asprintf(&exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        mr_asprintf(&exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
         mr_free(tmp2);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);
         log_msg(2, "Generating skeleton filelist so that we can track our progress");
-        sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
+        sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", bkpinfo->tmpdir);
         make_hole_for_file(g_skeleton_filelist);
         log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
@@ -1675 +1667 @@
     }
     log_msg(2, "Copying new filelist to scratchdir");
-    mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
+    mr_asprintf(&command, "mkdir -p %s/archives", bkpinfo->scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
+    mr_asprintf(&command, "cp -f %s %s/archives/", sz_filelist, bkpinfo->scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "mv -f %s %s", sz_filelist, tmpdir);
+    mr_asprintf(&command, "mv -f %s %s", sz_filelist, bkpinfo->tmpdir);
     paranoid_system(command);
     mr_free(command);