Changeset 2369 in MondoRescue

Timestamp:

Sep 7, 2009, 6:03:40 PM (16 years ago)

Author:

Bruno Cornec

Message:

Another compilation issue fixed.

File:

• branches/2.2.9/mondo/src/common/libmondo-filelist.c (modified) (2 diffs)

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

@@ -1269 +1269 @@
 
 /**
- * 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.
- * @param differential The differential level (currently only 0 and 1 are supported).
- * @param userdef_filelist The user-defined filelist, or NULL if you're using @p include_paths.
- * @return 0, always.
- * @bug @p logfile is unused.
- * @bug Return value is meaningless.
- */
-int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
-                       char *include_paths, char *excp, int differential,
-                       char *userdef_filelist)
-{
-    char *p, *q;
-    char *sz_datefile;
-    char *sz_filelist, *exclude_paths, *tmp;
-    int i;
-    FILE *fout;
-    char *command;
-    time_t time_of_last_full_backup = 0;
-    struct stat statbuf;
-    char *tmp1 = NULL;
-    char *tmp2 = NULL;
-
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(g_skeleton_filelist);
-    if (!(exclude_paths = malloc(8*MAX_STR_LEN))) {
-        fatal_error("Cannot malloc exclude_paths");
-    }
-    mr_asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
-    if (!include_paths && !userdef_filelist) {
-        fatal_error
-            ("Please supply either include_paths or userdef_filelist");
-    }
-// make hole for filelist
-    sprintf(command, "mkdir -p %s/archives", scratchdir);
-    paranoid_system(command);
-    mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
-    make_hole_for_file(sz_filelist);
-
-    if (differential == 0) {
-        // restore last good datefile if it exists
-        sprintf(command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
-        run_program_and_log_output(command, 3);
-        // backup last known good datefile just in case :)
-        if (does_file_exist(sz_datefile)) {
-            sprintf(command, "mv -f %s %s.aborted", sz_datefile,
-                    sz_datefile);
-            paranoid_system(command);
-        }
-        make_hole_for_file(sz_datefile);
-        write_one_liner_data_file(sz_datefile,
-                                  call_program_and_get_last_line_of_output
-                                  ("date +%s"));
-    } else if (lstat(sz_datefile, &statbuf)) {
-        log_msg(2,
-                "Warning - unable to find date of previous backup. Full backup instead.");
-        differential = 0;
-        time_of_last_full_backup = 0;
-    } else {
-        time_of_last_full_backup = statbuf.st_mtime;
-        log_msg(2, "Differential backup. Yay.");
-    }
-    paranoid_free(sz_datefile);
-
-// use user-specified filelist (if specified)
-    if (userdef_filelist) {
-        log_msg(1,
-                "Using the user-specified filelist - %s - instead of calculating one",
-                userdef_filelist);
-        sprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
-        if (run_program_and_log_output(command, 3)) {
-            fatal_error("Failed to copy user-specified filelist");
-        }
-    } else {
-        log_msg(2, "include_paths = '%s'", include_paths);
-        log_msg(1, "Calculating filelist");
-        mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
-        if (strlen(tmp2) < 1) {
-            mr_asprintf(&tmp1," ");
-        } else {
-            log_msg(2, "Found windows FS: %s",tmp2);
-            mr_asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
-            paranoid_free(tmp2);
-            mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
-            log_msg(2, "Found windows files: %s",tmp2);
-        }
-        paranoid_free(tmp1);
-
-        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s . .. \
-" MNT_CDROM " " MNT_FLOPPY " /media /tmp \
-/proc /sys " MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
-        paranoid_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);
-        make_hole_for_file(g_skeleton_filelist);
-        log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
-        log_msg(2, "Opening out filelist to %s", sz_filelist);
-        if (!(fout = fopen(sz_filelist, "w"))) {
-            fatal_error("Cannot openout to sz_filelist");
-        }
-        i = 0;
-        if (strlen(include_paths) == 0) {
-            log_msg(1, "Including only '/' in %s", sz_filelist);
-            open_and_list_dir("/", exclude_paths, fout,
-                              time_of_last_full_backup);
-        } else {
-            p = include_paths;
-            while (*p) {
-                q = next_entry(p);
-                log_msg(1, "Including %s in filelist %s", q, sz_filelist);
-                open_and_list_dir(q, exclude_paths, fout,
-                                  time_of_last_full_backup);
-                p += strlen(q);
-                paranoid_free(q);
-                while (*p == ' ') {
-                    p++;
-                }
-            }
-        }
-        paranoid_fclose(fout);
-    }
-    log_msg(2, "Copying new filelist to scratchdir");
-    sprintf(command, "mkdir -p %s/archives", scratchdir);
-    paranoid_system(command);
-    sprintf(command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
-    paranoid_system(command);
-    sprintf(command, "mv -f %s %s", sz_filelist, tmpdir);
-    paranoid_system(command);
-    paranoid_free(sz_filelist);
-    log_msg(2, "Freeing variables");
-    paranoid_free(command);
-    paranoid_free(exclude_paths);
-    paranoid_free(tmp);
-    paranoid_free(g_skeleton_filelist);
-    log_msg(2, "Exiting");
-    return (0);
-}
-
-
-
-
-
-
-
-/**
  * The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
  */
 char *g_skeleton_filelist = NULL;
 
+
+
+/**
+ * Get the next entry in the space-separated list in @p incoming.
+ * So if @p incoming was '"one and two" three four', we would
+ * return "one and two".
+ * @param incoming The list to get the next entry from.
+ * @return The first item in the list (respecting double quotes).
+ * @note The returned string points to static data that will be overwritten with each call.
+ */
+char *next_entry(char *incoming)
+{
+    char *sz_res;
+    char *p;
+    bool in_quotes = FALSE;
+
+    mr_asprintf(&sz_res, "%s", incoming);
+    p = sz_res;
+    while ((*p != ' ' || in_quotes) && *p != '\0') {
+        if (*p == '\"') {
+            in_quotes = !in_quotes;
+        }
+        p++;
+    }
+    *p = '\0';
+    return (sz_res);
+}
+
+
+
+
 /**
  * Number of entries in the skeleton filelist.
  */
 long g_skeleton_entries = 0;
-
-/**
- * Wrapper around mondo_makefilelist().
- * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->differential
- * - @c bkpinfo->exclude_paths
- * - @c bkpinfo->include_paths
- * - @c bkpinfo->make_filelist
- * - @c bkpinfo->scratchdir
- * - @c bkpinfo->tmpdir
- * @return 0 for success, nonzero for failure.
- * @see mondo_makefilelist
- */
-int prepare_filelist()
-{
-
-    /*@ int **************************************************** */
-    int res = 0;
-
-    assert(bkpinfo != NULL);
-    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir,
-           bkpinfo->scratchdir);
-    if (bkpinfo->make_filelist) {
-        mvaddstr_and_log_it(g_currentY, 0,
-                            "Making catalog of files to be backed up");
-    } else {
-        mvaddstr_and_log_it(g_currentY, 0,
-                            "Using supplied catalog of files to be backed up");
-    }
-
-    if (bkpinfo->make_filelist) {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir,
-                               bkpinfo->scratchdir, 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);
-    }
-
-    if (res) {
-        log_OS_error("Call to mondo_makefilelist failed");
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    return (res);
-}
 
 
@@ -1678 +1503 @@
 
 /**
- * Get the next entry in the space-separated list in @p incoming.
- * So if @p incoming was '"one and two" three four', we would
- * return "one and two".
- * @param incoming The list to get the next entry from.
- * @return The first item in the list (respecting double quotes).
- * @note The returned string points to static data that will be overwritten with each call.
- */
-char *next_entry(char *incoming)
-{
-    char *sz_res;
-    char *p;
-    bool in_quotes = FALSE;
-
-    mr_asprintf(&sz_res, "%s", incoming);
-    p = sz_res;
-    while ((*p != ' ' || in_quotes) && *p != '\0') {
-        if (*p == '\"') {
-            in_quotes = !in_quotes;
-        }
-        p++;
-    }
-    *p = '\0';
-    return (sz_res);
-}
-
+ * 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.
+ * @param differential The differential level (currently only 0 and 1 are supported).
+ * @param userdef_filelist The user-defined filelist, or NULL if you're using @p include_paths.
+ * @return 0, always.
+ * @bug @p logfile is unused.
+ * @bug Return value is meaningless.
+ */
+int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
+                       char *include_paths, char *excp, int differential,
+                       char *userdef_filelist)
+{
+    char *p, *q;
+    char *sz_datefile;
+    char *sz_filelist, *exclude_paths, *tmp;
+    int i;
+    FILE *fout;
+    char *command;
+    time_t time_of_last_full_backup = 0;
+    struct stat statbuf;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
+
+    malloc_string(command);
+    malloc_string(tmp);
+    malloc_string(g_skeleton_filelist);
+    if (!(exclude_paths = malloc(8*MAX_STR_LEN))) {
+        fatal_error("Cannot malloc exclude_paths");
+    }
+    mr_asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
+    if (!include_paths && !userdef_filelist) {
+        fatal_error
+            ("Please supply either include_paths or userdef_filelist");
+    }
+// make hole for filelist
+    sprintf(command, "mkdir -p %s/archives", scratchdir);
+    paranoid_system(command);
+    mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
+    make_hole_for_file(sz_filelist);
+
+    if (differential == 0) {
+        // restore last good datefile if it exists
+        sprintf(command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
+        run_program_and_log_output(command, 3);
+        // backup last known good datefile just in case :)
+        if (does_file_exist(sz_datefile)) {
+            sprintf(command, "mv -f %s %s.aborted", sz_datefile,
+                    sz_datefile);
+            paranoid_system(command);
+        }
+        make_hole_for_file(sz_datefile);
+        write_one_liner_data_file(sz_datefile,
+                                  call_program_and_get_last_line_of_output
+                                  ("date +%s"));
+    } else if (lstat(sz_datefile, &statbuf)) {
+        log_msg(2,
+                "Warning - unable to find date of previous backup. Full backup instead.");
+        differential = 0;
+        time_of_last_full_backup = 0;
+    } else {
+        time_of_last_full_backup = statbuf.st_mtime;
+        log_msg(2, "Differential backup. Yay.");
+    }
+    paranoid_free(sz_datefile);
+
+// use user-specified filelist (if specified)
+    if (userdef_filelist) {
+        log_msg(1,
+                "Using the user-specified filelist - %s - instead of calculating one",
+                userdef_filelist);
+        sprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
+        if (run_program_and_log_output(command, 3)) {
+            fatal_error("Failed to copy user-specified filelist");
+        }
+    } else {
+        log_msg(2, "include_paths = '%s'", include_paths);
+        log_msg(1, "Calculating filelist");
+        mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
+        if (strlen(tmp2) < 1) {
+            mr_asprintf(&tmp1," ");
+        } else {
+            log_msg(2, "Found windows FS: %s",tmp2);
+            mr_asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
+            paranoid_free(tmp2);
+            mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
+            log_msg(2, "Found windows files: %s",tmp2);
+        }
+        paranoid_free(tmp1);
+
+        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s . .. \
+" MNT_CDROM " " MNT_FLOPPY " /media /tmp \
+/proc /sys " MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        paranoid_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);
+        make_hole_for_file(g_skeleton_filelist);
+        log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
+        log_msg(2, "Opening out filelist to %s", sz_filelist);
+        if (!(fout = fopen(sz_filelist, "w"))) {
+            fatal_error("Cannot openout to sz_filelist");
+        }
+        i = 0;
+        if (strlen(include_paths) == 0) {
+            log_msg(1, "Including only '/' in %s", sz_filelist);
+            open_and_list_dir("/", exclude_paths, fout,
+                              time_of_last_full_backup);
+        } else {
+            p = include_paths;
+            while (*p) {
+                q = next_entry(p);
+                log_msg(1, "Including %s in filelist %s", q, sz_filelist);
+                open_and_list_dir(q, exclude_paths, fout,
+                                  time_of_last_full_backup);
+                p += strlen(q);
+                paranoid_free(q);
+                while (*p == ' ') {
+                    p++;
+                }
+            }
+        }
+        paranoid_fclose(fout);
+    }
+    log_msg(2, "Copying new filelist to scratchdir");
+    sprintf(command, "mkdir -p %s/archives", scratchdir);
+    paranoid_system(command);
+    sprintf(command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
+    paranoid_system(command);
+    sprintf(command, "mv -f %s %s", sz_filelist, tmpdir);
+    paranoid_system(command);
+    paranoid_free(sz_filelist);
+    log_msg(2, "Freeing variables");
+    paranoid_free(command);
+    paranoid_free(exclude_paths);
+    paranoid_free(tmp);
+    paranoid_free(g_skeleton_filelist);
+    log_msg(2, "Exiting");
+    return (0);
+}
+
+/**
+ * Wrapper around mondo_makefilelist().
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->differential
+ * - @c bkpinfo->exclude_paths
+ * - @c bkpinfo->include_paths
+ * - @c bkpinfo->make_filelist
+ * - @c bkpinfo->scratchdir
+ * - @c bkpinfo->tmpdir
+ * @return 0 for success, nonzero for failure.
+ * @see mondo_makefilelist
+ */
+int prepare_filelist()
+{
+
+    /*@ int **************************************************** */
+    int res = 0;
+
+    assert(bkpinfo != NULL);
+    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir,
+           bkpinfo->scratchdir);
+    if (bkpinfo->make_filelist) {
+        mvaddstr_and_log_it(g_currentY, 0,
+                            "Making catalog of files to be backed up");
+    } else {
+        mvaddstr_and_log_it(g_currentY, 0,
+                            "Using supplied catalog of files to be backed up");
+    }
+
+    if (bkpinfo->make_filelist) {
+        res =
+            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir,
+                               bkpinfo->scratchdir, 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);
+    }
+
+    if (res) {
+        log_OS_error("Call to mondo_makefilelist failed");
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    return (res);
+}