Changeset 3878 in MondoRescue for branches/3.3/mondo/src/common/libmondo-filelist.c

Timestamp:

Mar 8, 2024, 12:15:10 PM (4 months ago)

Author:

Bruno Cornec

Message:

Fix compiler errors

File:

• branches/3.3/mondo/src/common/libmondo-filelist.c (modified) (4 diffs)

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

@@ -60 +60 @@
 extern char *g_getfacl;
 extern char *g_getfattr;
+
+
+
+/**
+ * Chop the filelist into sets.
+ * Each fileset is a list of files whose total (uncompressed) size is usually
+ * about X KB. Files bigger than 8X KB are placed in a "biggielist"; they will
+ * be sliced and compressed separately from the regular files.
+ *
+ * @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)
+{
+/*@ long ****************************************/
+    long lino = 0;
+    // A big file has more than 64 MB of real content
+    long curr_set_size;
+    long noof_lines;
+    long siz;
+
+    /*@ int **************************************** */
+    int i;
+    long curr_set_no;
+
+    /*@ buffers ************************************* */
+    char *outfname = NULL;
+    char *biggie_fname = NULL;
+    char *incoming = NULL;
+    char *tmp = NULL;
+
+    /*@ pointers *********************************** */
+    FILE *fin;
+    FILE *fout;
+    FILE *fbig;
+
+    /*@ structures ********************************* */
+    struct stat buf;
+    int err = 0;
+
+    assert_string_is_neither_NULL_nor_zerolength(filelist);
+    assert_string_is_neither_NULL_nor_zerolength(outdir);
+    assert(maxsetsizeK > 0);
+
+    log_it("filelist=%s;", filelist);
+    open_evalcall_form("Dividing filelist into sets");
+    noof_lines = count_lines_in_file(filelist);
+    if (!(fin = fopen(filelist, "r"))) {
+        log_OS_error("Cannot openin filelist");
+        return (0);
+    }
+    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);
+    log_it("outfname=%s; biggie_fname=%s", outfname, biggie_fname);
+    if (!(fbig = fopen(biggie_fname, "w"))) {
+        log_OS_error("Cannot openout biggie_fname");
+        err++;
+        mr_free(outfname);
+        mr_free(biggie_fname);
+        return (curr_set_no + 1);
+    }
+    if (!(fout = fopen(outfname, "w"))) {
+        log_OS_error("Cannot openout outfname");
+        err++;
+        mr_free(outfname);
+        mr_free(biggie_fname);
+        return (curr_set_no + 1);
+    }
+
+    mr_getline(incoming, fin);
+    while (!feof(fin)) {
+        lino++;
+        i = strlen(incoming) - 1;
+        if (i < 0) {
+            i = 0;
+        }
+        if (incoming[i] < 32) {
+            incoming[i] = '\0';
+        }
+        if (!strncmp(incoming, "/dev/", 5)) {
+            siz = 1;
+        } else if (lstat(incoming, &buf) != 0) {
+            siz = 0;
+        } else {
+            // blocks are 512 bytes long - cf man 2 stat - Pass to the previous unit (MB => kB e.g.)
+            // use blocks instead of size to allow sparse file correct handling as much as possible
+            siz = (long) ((buf.st_blocks*512) >> 10);
+        }
+        if (siz > g_max_biggie_size) {
+            log_msg(10, "Adding %s to big files (size = %ld)", incoming, siz);
+            fprintf(fbig, "%s\n", incoming);
+        } else {
+            curr_set_size += siz;
+            log_msg(10, "Adding %s to filelist %d (size = %ld)", incoming, curr_set_no, siz);
+            fprintf(fout, "%s\n", incoming);
+            if (curr_set_size > maxsetsizeK) {
+                paranoid_fclose(fout);
+                sort_file(outfname);
+                mr_free(outfname);
+                curr_set_no++;
+                curr_set_size = 0;
+
+                mr_asprintf(outfname, "%s/filelist.%ld", outdir, curr_set_no);
+                if (!(fout = fopen(outfname, "w"))) {
+                    log_OS_error("Unable to openout outfname");
+                    err++;
+                    mr_free(outfname);
+                    mr_free(biggie_fname);
+                    mr_free(incoming);
+                    return (curr_set_no + 1);
+                }
+                update_evalcall_form((int) (lino * 100 / noof_lines));
+            }
+        }
+        mr_free(incoming);
+        mr_getline(incoming, fin);
+    }
+    mr_free(incoming);
+
+    paranoid_fclose(fin);
+    paranoid_fclose(fout);
+    paranoid_fclose(fbig);
+
+    if (length_of_file(outfname) <= 2) {
+        unlink(outfname);
+        g_noof_sets--;
+    }
+    g_noof_sets = curr_set_no;
+    sort_file(outfname);
+    mr_free(outfname);
+
+    sort_file(biggie_fname);
+    mr_free(biggie_fname);
+
+    mr_asprintf(outfname, "%s/LAST-FILELIST-NUMBER", outdir);
+    mr_asprintf(tmp, "%ld", curr_set_no);
+    if (write_one_liner_data_file(outfname, tmp)) {
+        log_OS_error
+            ("Unable to echo write one-liner to LAST-FILELIST-NUMBER");
+        err = 1;
+    }
+    mr_free(tmp);
+    mr_free(outfname);
+
+    if (curr_set_no == 0) {
+        log_msg(1, "Only one fileset. Fine.");
+    } else {
+        log_msg(1, "Filelist divided into %ld sets", curr_set_no + 1);
+    }
+    close_evalcall_form();
+    /* This is to work around an obscure bug in Newt; open a form, close it,
+       carry on... I don't know why it works but it works. If you don't do this
+       then update_progress_form() won't show the "time taken / time remaining"
+       line. The bug only crops up AFTER the call to chop_filelist(). Weird. */
+    if (!g_text_mode) {
+        open_progress_form("", "", "", "", 100);
+        newtPopHelpLine();
+        newtFormDestroy(g_progressForm);
+        newtPopWindow();
+    }
+    return (err ? 0 : curr_set_no + 1);
+}
+
 
 
@@ -184 +352 @@
 
 
-/**
- * Chop the filelist into sets.
- * Each fileset is a list of files whose total (uncompressed) size is usually
- * about X KB. Files bigger than 8X KB are placed in a "biggielist"; they will
- * be sliced and compressed separately from the regular files.
- *
- * @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)
-{
-/*@ long ****************************************/
-    long lino = 0;
-    // A big file has more than 64 MB of real content
-    long curr_set_size;
-    long noof_lines;
-    long siz;
-
-    /*@ int **************************************** */
-    int i;
-    long curr_set_no;
-
-    /*@ buffers ************************************* */
-    char *outfname = NULL;
-    char *biggie_fname = NULL;
-    char *incoming = NULL;
-    char *tmp = NULL;
-
-    /*@ pointers *********************************** */
-    FILE *fin;
-    FILE *fout;
-    FILE *fbig;
-
-    /*@ structures ********************************* */
-    struct stat buf;
-    int err = 0;
-
-    assert_string_is_neither_NULL_nor_zerolength(filelist);
-    assert_string_is_neither_NULL_nor_zerolength(outdir);
-    assert(maxsetsizeK > 0);
-
-    log_it("filelist=%s;", filelist);
-    open_evalcall_form("Dividing filelist into sets");
-    noof_lines = count_lines_in_file(filelist);
-    if (!(fin = fopen(filelist, "r"))) {
-        log_OS_error("Cannot openin filelist");
-        return (0);
-    }
-    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);
-    log_it("outfname=%s; biggie_fname=%s", outfname, biggie_fname);
-    if (!(fbig = fopen(biggie_fname, "w"))) {
-        log_OS_error("Cannot openout biggie_fname");
-        err++;
-        mr_free(outfname);
-        mr_free(biggie_fname);
-        return (curr_set_no + 1);
-    }
-    if (!(fout = fopen(outfname, "w"))) {
-        log_OS_error("Cannot openout outfname");
-        err++;
-        mr_free(outfname);
-        mr_free(biggie_fname);
-        return (curr_set_no + 1);
-    }
-
-    mr_getline(incoming, fin);
-    while (!feof(fin)) {
-        lino++;
-        i = strlen(incoming) - 1;
-        if (i < 0) {
-            i = 0;
-        }
-        if (incoming[i] < 32) {
-            incoming[i] = '\0';
-        }
-        if (!strncmp(incoming, "/dev/", 5)) {
-            siz = 1;
-        } else if (lstat(incoming, &buf) != 0) {
-            siz = 0;
-        } else {
-            // blocks are 512 bytes long - cf man 2 stat - Pass to the previous unit (MB => kB e.g.)
-            // use blocks instead of size to allow sparse file correct handling as much as possible
-            siz = (long) ((buf.st_blocks*512) >> 10);
-        }
-        if (siz > g_max_biggie_size) {
-            log_msg(10, "Adding %s to big files (size = %ld)", incoming, siz);
-            fprintf(fbig, "%s\n", incoming);
-        } else {
-            curr_set_size += siz;
-            log_msg(10, "Adding %s to filelist %d (size = %ld)", incoming, curr_set_no, siz);
-            fprintf(fout, "%s\n", incoming);
-            if (curr_set_size > maxsetsizeK) {
-                paranoid_fclose(fout);
-                sort_file(outfname);
-                mr_free(outfname);
-                curr_set_no++;
-                curr_set_size = 0;
-
-                mr_asprintf(outfname, "%s/filelist.%ld", outdir, curr_set_no);
-                if (!(fout = fopen(outfname, "w"))) {
-                    log_OS_error("Unable to openout outfname");
-                    err++;
-                    mr_free(outfname);
-                    mr_free(biggie_fname);
-                    mr_free(incoming);
-                    return (curr_set_no + 1);
-                }
-                update_evalcall_form((int) (lino * 100 / noof_lines));
-            }
-        }
-        mr_free(incoming);
-        mr_getline(incoming, fin);
-    }
-    mr_free(incoming);
-
-    paranoid_fclose(fin);
-    paranoid_fclose(fout);
-    paranoid_fclose(fbig);
-
-    if (length_of_file(outfname) <= 2) {
-        unlink(outfname);
-        g_noof_sets--;
-    }
-    g_noof_sets = curr_set_no;
-    sort_file(outfname);
-    mr_free(outfname);
-
-    sort_file(biggie_fname);
-    mr_free(biggie_fname);
-
-    mr_asprintf(outfname, "%s/LAST-FILELIST-NUMBER", outdir);
-    mr_asprintf(tmp, "%ld", curr_set_no);
-    if (write_one_liner_data_file(outfname, tmp)) {
-        log_OS_error
-            ("Unable to echo write one-liner to LAST-FILELIST-NUMBER");
-        err = 1;
-    }
-    mr_free(tmp);
-    mr_free(outfname);
-
-    if (curr_set_no == 0) {
-        log_msg(1, "Only one fileset. Fine.");
-    } else {
-        log_msg(1, "Filelist divided into %ld sets", curr_set_no + 1);
-    }
-    close_evalcall_form();
-    /* This is to work around an obscure bug in Newt; open a form, close it,
-       carry on... I don't know why it works but it works. If you don't do this
-       then update_progress_form() won't show the "time taken / time remaining"
-       line. The bug only crops up AFTER the call to chop_filelist(). Weird. */
-    if (!g_text_mode) {
-        open_progress_form("", "", "", "", 100);
-        newtPopHelpLine();
-        newtFormDestroy(g_progressForm);
-        newtPopWindow();
-    }
-    return (err ? 0 : curr_set_no + 1);
-}
-
-
-
-
 
 /**
@@ -967 +967 @@
     }
     return;
-}
-
-
-
-
-/**
- * Reset the filelist to the state it was when it was loaded. This does not
- * touch the file on disk.
- * @param filelist The filelist tree structure.
- */
-void reload_filelist(struct s_node *filelist)
-{
-    assert(filelist != NULL);
-    toggle_node_selection(filelist, FALSE);
-    toggle_path_expandability(filelist, "/", FALSE);
-    toggle_all_root_dirs_on(filelist);
-}
-
-
-
-/**
- * Save a filelist tree structure to disk.
- * @param filelist The filelist tree structure to save.
- * @param outfname Where to save it.
- */
-void save_filelist(struct s_node *filelist, char *outfname)
-{
-    /*@ int ********************************************************* */
-    static int percentage;
-    static int depth = 0;
-
-    /*@ buffers ***************************************************** */
-    static char str[MAX_STR_LEN];
-
-    /*@ structures ************************************************** */
-    struct s_node *node;
-
-    /*@ pointers **************************************************** */
-    static FILE *fout = NULL;
-
-    /*@ long ******************************************************** */
-    static long lines_in_filelist = 0;
-    static long lino = 0;
-
-    /*@ end vars *************************************************** */
-
-    assert(filelist != NULL);
-    assert(outfname != NULL);   // will be zerolength if save_filelist() is called by itself
-    if (depth == 0) {
-        log_to_screen("Saving filelist");
-        if (!(fout = fopen(outfname, "w"))) {
-            fatal_error("Cannot openout/save filelist");
-        }
-        lines_in_filelist = g_original_noof_lines_in_filelist;  /* set by load_filelist() */
-        open_evalcall_form("Saving selection to disk");
-    }
-    for (node = filelist; node != NULL; node = node->right) {
-        str[depth] = node->ch;
-        log_msg(5, "depth=%d ch=%c", depth, node->ch);
-        if (!node->ch) {
-//    if (node->selected)
-//      {
-            fprintf(fout, "%s\n", str);
-//      }
-            if (!(++lino % 1111)) {
-                percentage = (int) (lino * 100 / lines_in_filelist);
-                update_evalcall_form(percentage);
-            }
-        }
-        if (node->down) {
-            depth++;
-            save_filelist(node->down, "");
-            depth--;
-        }
-    }
-    if (depth == 0) {
-        paranoid_fclose(fout);
-        close_evalcall_form();
-        log_it("Finished saving filelist");
-    }
 }
 
@@ -1251 +1171 @@
 }
 
+
+
+
+/**
+ * Reset the filelist to the state it was when it was loaded. This does not
+ * touch the file on disk.
+ * @param filelist The filelist tree structure.
+ */
+void reload_filelist(struct s_node *filelist)
+{
+    assert(filelist != NULL);
+    toggle_node_selection(filelist, FALSE);
+    toggle_path_expandability(filelist, "/", FALSE);
+    toggle_all_root_dirs_on(filelist);
+}
+
+
+
+/**
+ * Save a filelist tree structure to disk.
+ * @param filelist The filelist tree structure to save.
+ * @param outfname Where to save it.
+ */
+void save_filelist(struct s_node *filelist, char *outfname)
+{
+    /*@ int ********************************************************* */
+    static int percentage;
+    static int depth = 0;
+
+    /*@ buffers ***************************************************** */
+    static char str[MAX_STR_LEN];
+
+    /*@ structures ************************************************** */
+    struct s_node *node;
+
+    /*@ pointers **************************************************** */
+    static FILE *fout = NULL;
+
+    /*@ long ******************************************************** */
+    static long lines_in_filelist = 0;
+    static long lino = 0;
+
+    /*@ end vars *************************************************** */
+
+    assert(filelist != NULL);
+    assert(outfname != NULL);   // will be zerolength if save_filelist() is called by itself
+    if (depth == 0) {
+        log_to_screen("Saving filelist");
+        if (!(fout = fopen(outfname, "w"))) {
+            fatal_error("Cannot openout/save filelist");
+        }
+        lines_in_filelist = g_original_noof_lines_in_filelist;  /* set by load_filelist() */
+        open_evalcall_form("Saving selection to disk");
+    }
+    for (node = filelist; node != NULL; node = node->right) {
+        str[depth] = node->ch;
+        log_msg(5, "depth=%d ch=%c", depth, node->ch);
+        if (!node->ch) {
+//    if (node->selected)
+//      {
+            fprintf(fout, "%s\n", str);
+//      }
+            if (!(++lino % 1111)) {
+                percentage = (int) (lino * 100 / lines_in_filelist);
+                update_evalcall_form(percentage);
+            }
+        }
+        if (node->down) {
+            depth++;
+            save_filelist(node->down, "");
+            depth--;
+        }
+    }
+    if (depth == 0) {
+        paranoid_fclose(fout);
+        close_evalcall_form();
+        log_it("Finished saving filelist");
+    }
+}