Changeset 120 in MondoRescue for trunk

Timestamp:

Nov 9, 2005, 2:44:43 AM (18 years ago)

Author:

bcornec

Message:

libmondo-filelist.c memory review (asprintf and the like) - compiles but no test made yet

Location:

trunk

Files:

• mondo/AUTHORS (modified) (1 diff)
• mondo/mondo/common/libmondo-filelist-EXT.h (modified) (1 diff)
• mondo/mondo/common/libmondo-filelist.c (modified) (94 diffs)
• mondo/mondo/common/libmondo-verify.c (modified) (1 diff)
• tools/quality (modified) (1 diff)

trunk/mondo/AUTHORS

@@ -1 @@
-Hugo Rabson <hugorabson@msn.com>
+mondorescue is copyrighted under the GPL by the following authors:
+
+Hugo Rabson <hugo.rabson@mondorescue.org>
 Jesse Keating <hosting@j2solutions.net>
 Stan Benoit <troff@nakedsoul.org>
 Mikael Hultgren <mikael.hultgren@gmx.net>
+Bruno Cornec <bcornec@users.berlios.de>
+Andree Leidenfrost <andree@users.berlios.de>

trunk/mondo/mondo/common/libmondo-filelist-EXT.h

@@ -5 +5 @@
 extern void free_filelist(struct s_node *filelist);
 extern int get_last_filelist_number(struct s_bkpinfo *bkpinfo);
+/* BERLIOS: Useless ?
 extern int add_string_at_node(struct s_node *startnode,
                               char *string_to_add);
+                              */
 extern struct s_node *load_filelist(char *filelist_fname);
 extern void reload_filelist(struct s_node *filelist);

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -2 +2 @@
 
 for subroutines which manipulate the filelist
-
 */
 
@@ -64 +63 @@
 
 
-
-
-
 /**
  * @addtogroup filelistGroup
@@ -86 +82 @@
     char *filelist;
     char *tempfile;
-    char *cksumlist;
-    char *tmp;
     long noof_sets;
 
@@ -97 +91 @@
     int i, retval = 0;
 
-    malloc_string(dev);
-    malloc_string(filelist);
-    malloc_string(tempfile);
-    malloc_string(cksumlist);
-    malloc_string(tmp);
     mvaddstr_and_log_it(g_currentY, 0, "Dividing filelist into sets");
 
@@ -114 +103 @@
     { i=0; log_to_screen ("This will take more time. Please be patient."); }
 */
-    sprintf(filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
-    sprintf(cksumlist, "%s/cklist.full", bkpinfo->tmpdir);
+    asprintf(&filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
     if (!does_file_exist(filelist)) {
         log_it("filelist %s not found", filelist);
@@ -124 +112 @@
         chop_filelist(filelist, bkpinfo->tmpdir,
                       bkpinfo->optimal_set_size);
+    paranoid_free(filelist);
+
     estimate_noof_media_required(bkpinfo, noof_sets);   // for cosmetic purposes
 
-    sprintf(tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
+    asprintf(&tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
     if (!(fout = fopen(tempfile, "a"))) {
         log_OS_error("Cannot append to biggielist");
         retval++;
-        goto end_of_func;
-    }
+    }
+    paranoid_free(tempfile);
     log_it(bkpinfo->image_devs);
 
@@ -137 +127 @@
 
     while (ptr && *ptr) {
-        strcpy(dev, ptr);
+        asprintf(&dev, ptr);
         log_it("Examining imagedev %s", dev);
         for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
@@ -146 +136 @@
         fprintf(fout, "%s\n", dev);
         log_it("Adding '%s' to biggielist", dev);
+        paranoid_free(dev);
+
         if ((ptr = strchr(ptr, ' '))) {
             ptr++;
@@ -153 +145 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 
-  end_of_func:
-    paranoid_free(filelist);
-    paranoid_free(tempfile);
-    paranoid_free(cksumlist);
-    paranoid_free(dev);
-    paranoid_free(tmp);
     return (retval);
 }
@@ -171 +157 @@
 
     log_msg(1, "Sorting file %s", orig_fname);
-    malloc_string(tmp_fname);
-    malloc_string(command);
-    sprintf(tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
+    asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
             (int) (random() % 32768), (int) (random() % 32768));
 
@@ -180 +164 @@
     }                           // no sense in trying to sort an empty file
 
-    sprintf(command, "sort %s > %s 2>> %s", orig_fname, tmp_fname,
+    asprintf(&command, "sort %s > %s 2>> %s", orig_fname, tmp_fname,
             MONDO_LOGFILE);
     retval = system(command);
+    paranoid_free(command);
+
     if (retval) {
         log_msg(2, "Failed to sort %s - oh dear", orig_fname);
@@ -188 +174 @@
         log_msg(2, "Sorted %s --> %s OK. Copying it back to %s now",
                 orig_fname, tmp_fname, orig_fname);
-        sprintf(command, "mv -f %s %s", tmp_fname, orig_fname);
+        asprintf(&command, "mv -f %s %s", tmp_fname, orig_fname);
         retval += run_program_and_log_output(command, 2);
+        paranoid_free(command);
+
         if (retval) {
             log_msg(2, "Failed to copy %s back to %s - oh dear", tmp_fname,
@@ -198 +186 @@
     }
     paranoid_free(tmp_fname);
-    paranoid_free(command);
     log_msg(1, "Finished sorting file %s", orig_fname);
     return (retval);
 }
-
 
 
@@ -228 +214 @@
     /*@ int **************************************** */
     int i;
+    int n = 0;
     long curr_set_no;
 
@@ -233 +220 @@
     char *outfname;
     char *biggie_fname;
-    char *incoming;
+    char *incoming = NULL;
     char *tmp;
-    char *acl_fname;
-    char *xattr_fname;
 
     /*@ pointers *********************************** */
@@ -245 +230 @@
     /*@ structures ********************************* */
     struct stat buf;
-    int err = 0;
-
-    malloc_string(outfname);
-    malloc_string(biggie_fname);
-    incoming = malloc(MAX_STR_LEN * 2);
-    malloc_string(tmp);
-    malloc_string(acl_fname);
-    malloc_string(xattr_fname);
 
     assert_string_is_neither_NULL_nor_zerolength(filelist);
@@ -272 +249 @@
     curr_set_no = 0;
     curr_set_size = 0;
-    sprintf(outfname, "%s/filelist.%ld", outdir, curr_set_no);
-    sprintf(biggie_fname, "%s/biggielist.txt", outdir);
+    asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
+    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++;
-        goto end_of_func;
+        return(0);
     }
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Cannot openout outfname");
-        err++;
-        goto end_of_func;
-    }
-    (void) fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
+        return(0);
+    }
+    (void) fgets(&incoming, &n, fin);
     while (!feof(fin)) {
         lino++;
@@ -292 +267 @@
             i = 0;
         }
+        /* BERLIOS: Useless with getline
         if (i > MAX_STR_LEN - 1) {
             incoming[MAX_STR_LEN - 30] = '\0';
@@ -297 +273 @@
             err++;
         }
+        */
         if (incoming[i] < 32) {
             incoming[i] = '\0';
@@ -317 +294 @@
                 paranoid_fclose(fout);
                 sort_file(outfname);
+                paranoid_free(outfname);
+
                 curr_set_no++;
                 curr_set_size = 0;
-                sprintf(outfname, "%s/filelist.%ld", outdir, curr_set_no);
+                asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
                 if (!(fout = fopen(outfname, "w"))) {
                     log_OS_error("Unable to openout outfname");
-                    err++;
-                    goto end_of_func;
+                    return(0);
                 }
-                sprintf(tmp, "Fileset #%ld chopped ", curr_set_no - 1);
                 update_evalcall_form((int) (lino * 100 / noof_lines));
-                /*              if (!g_text_mode) {newtDrawRootText(0,22,tmp);newtRefresh();} else {log_it(tmp);} */
             }
         }
-        (void) fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
+        (void) getline(&incoming, &n, fin);
     }
     paranoid_fclose(fin);
@@ -343 +319 @@
     sort_file(outfname);
     sort_file(biggie_fname);
-    sprintf(outfname, "%s/LAST-FILELIST-NUMBER", outdir);
-    sprintf(tmp, "%ld", curr_set_no);
+    paranoid_free(biggie_fname);
+    paranoid_free(outfname);
+
+    asprintf(&outfname, "%s/LAST-FILELIST-NUMBER", outdir);
+    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;
-    }
+        return(0);
+    }
+    paranoid_free(outfname);
+    paranoid_free(tmp);
+
     if (curr_set_no == 0) {
-        sprintf(tmp, "Only one fileset. Fine.");
+        asprintf(&tmp, "Only one fileset. Fine.");
     } else {
-        sprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
+        asprintf(&tmp, "Filelist divided into %ld sets", curr_set_no + 1);
     }
     log_msg(1, tmp);
+    paranoid_free(tmp);
     close_evalcall_form();
     /* This is to work around an obscure bug in Newt; open a form, close it,
@@ -369 +352 @@
     }
 #endif
-  end_of_func:
-    paranoid_free(outfname);
-    paranoid_free(biggie_fname);
-    paranoid_free(incoming);
-    paranoid_free(tmp);
-    paranoid_free(acl_fname);
-    paranoid_free(xattr_fname);
-    return (err ? 0 : curr_set_no + 1);
-}
-
-
-
+    return (curr_set_no + 1);
+}
 
 
@@ -437 +410 @@
 {
     FILE *pattr;
-    char *tmp;
+    char *tmp = NULL;
+    int n = 0;
+
     pattr = popen(syscall, "r");
     if (!pattr) {
@@ -448 +423 @@
         return (2);
     }
-    malloc_string(tmp);
-    for (fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr);
-         fgets(tmp, MAX_STR_LEN, pattr)) {
+    for (getline(&tmp, &n, pattr); !feof(pattr);
+         getline(&tmp, &n, pattr)) {
         fputs(tmp, pout);
     }
@@ -457 +431 @@
     return (0);
 }
-
 
 
@@ -467 +440 @@
     char *pout_command;
     char *syscall;
-    char *file_to_analyze;
+    char *tmp;
+    char *file_to_analyze = NULL;
     int i;
+    int n = 0;
 
     if (!(fin = fopen(filelist, "r"))) {
@@ -474 +449 @@
         return (1);
     }
-    malloc_string(pout_command);
-    sprintf(pout_command, "gzip -c1 > %s", auxlist_fname);
+    asprintf(&pout_command, "gzip -c1 > %s", auxlist_fname);
     if (!(pout = popen(pout_command, "w"))) {
         log_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
@@ -482 +456 @@
         return (4);
     }
-    malloc_string(syscall);
-    malloc_string(file_to_analyze);
-    for (fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin);
-         fgets(file_to_analyze, MAX_STR_LEN, fin)) {
+    paranoid_free(pout_command);
+
+    for (getline(&file_to_analyze, &n, fin); !feof(fin);
+         getline(&file_to_analyze, &n, fin)) {
         i = strlen(file_to_analyze);
         if (i > 0 && file_to_analyze[i - 1] < 32) {
@@ -491 +465 @@
         }
         log_msg(8, "Analyzing %s", file_to_analyze);
-        sprintf(syscall, syscall_sprintf, file_to_analyze);
-        strcat(syscall, " 2>> /dev/null");  // " MONDO_LOGFILE);
+        asprintf(&tmp, "%s 2>> /dev/null", syscall_sprintf);
+        asprintf(&syscall, tmp, file_to_analyze);
+        paranoid_free(tmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
+        paranoid_free(syscall);
     }
     paranoid_fclose(fin);
     paranoid_pclose(pout);
     paranoid_free(file_to_analyze);
-    paranoid_free(syscall);
-    paranoid_free(pout_command);
     return (0);
 }
@@ -509 +483 @@
     int retval = 0;
 
-    malloc_string(command);
-    sprintf(command, "touch %s", facl_fname);
+    asprintf(&command, "touch %s", facl_fname);
     run_program_and_log_output(command, 8);
+    paranoid_free(command);
+
     if (find_home_of_exe("getfacl")) {
 //      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
-        sprintf(command,
+        asprintf(&command,
                 "cat %s | getfacl --all-effective -P - 2>> %s | gzip -c1 > %s 2>> %s",
                 filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
         iamhere(command);
         retval = system(command);
-    }
-    paranoid_free(command);
+        paranoid_free(command);
+    }
     return (retval);
 }
@@ -530 +505 @@
     int retval = 0;
 
-    malloc_string(command);
-    sprintf(command, "touch %s", fattr_fname);
+    asprintf(&command, "touch %s", fattr_fname);
     run_program_and_log_output(command, 8);
+    paranoid_free(command);
+
     if (find_home_of_exe("getfattr")) {
 //      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
@@ -539 +515 @@
                          fattr_fname);
     }
-    paranoid_free(command);
     return (retval);
 }
@@ -565 +540 @@
 
 
-
 int set_EXAT_list(char *orig_msklist, char *original_exat_fname,
                   char *executable)
 {
     const int my_depth = 8;
-    char *command, *syscall_pin, *syscall_pout, *incoming;
-    char *current_subset_file, *current_master_file, *masklist;
+    char *command, *syscall_pin, *syscall_pout; 
+    char *incoming = NULL;
+    char *current_subset_file = NULL; 
+    char *current_master_file, *masklist;
     int retval = 0;
     int i;
+    int n = 0;
     char *p, *q;
     FILE *pin, *pout, *faclin;
 
-    malloc_string(command);
     log_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist,
             original_exat_fname, executable);
@@ -584 +560 @@
         log_msg(1,
                 "No masklist provided. I shall therefore set ALL attributes.");
-        sprintf(command, "cat %s | gzip -dc | %s --restore - 2>> %s",
+        asprintf(&command, "cat %s | gzip -dc | %s --restore - 2>> %s",
                 original_exat_fname, executable, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
@@ -596 +572 @@
                 "original_exat_fname %s is empty or missing, so no need to set EXAT list",
                 original_exat_fname);
-        paranoid_free(command);
         return (0);
     }
-    malloc_string(incoming);
-    malloc_string(masklist);
-    malloc_string(current_subset_file);
-    malloc_string(current_master_file);
-    malloc_string(syscall_pin);
-    malloc_string(syscall_pout);
-    sprintf(masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
+    asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
             (int) (random() % 32768));
-    sprintf(command, "cp -f %s %s", orig_msklist, masklist);
+    asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
     sort_file(masklist);
-    current_subset_file[0] = current_master_file[0] = '\0';
-    sprintf(syscall_pin, "cat %s | gzip -dc", original_exat_fname);
-    sprintf(syscall_pout, "%s --restore - 2>> %s", executable,
+    asprintf(&syscall_pin, "cat %s | gzip -dc", original_exat_fname);
+    asprintf(&syscall_pout, "%s --restore - 2>> %s", executable,
             MONDO_LOGFILE);
 
@@ -622 +592 @@
         return (1);
     }
+    paranoid_free(syscall_pout);
+
     pin = popen(syscall_pin, "r");
     if (!pin) {
@@ -628 +600 @@
         return (1);
     }
+    paranoid_free(syscall_pin);
+
     faclin = fopen(masklist, "r");
     if (!faclin) {
@@ -637 +611 @@
 //  printf("Hi there. Starting the loop\n");
 
-    fgets(current_subset_file, MAX_STR_LEN, faclin);
-    fgets(incoming, MAX_STR_LEN, pin);
+    getline(&current_subset_file, &n, faclin);
+    getline(&incoming, &n, pin);
     while (!feof(pin) && !feof(faclin)) {
 //      printf("incoming = %s", incoming);
 
-        strcpy(current_master_file, incoming + 8);
+        asprintf(&current_master_file, incoming + 8);
 
         p = current_subset_file;
@@ -670 +644 @@
         if (i < 0) {            // read another subset file in.
             log_msg(my_depth, "Reading next subset line in\n\n");
-            fgets(current_subset_file, MAX_STR_LEN, faclin);
+            getline(&current_subset_file, &n, faclin);
             continue;
         }
@@ -677 +651 @@
             fputs(incoming, pout);
         }
-        fgets(incoming, MAX_STR_LEN, pin);
+        getline(&incoming, &n, pin);
         if (!i) {
             log_msg(my_depth, "Copying master %s", q);
@@ -690 +664 @@
                 fputs(incoming, pout);
             }
-            fgets(incoming, MAX_STR_LEN, pin);
+            getline(&incoming, &n, pin);
         }
         if (!i) {
-            fgets(current_subset_file, MAX_STR_LEN, faclin);
-        }
-    }
+            getline(&current_subset_file, &n, faclin);
+        }
+        paranoid_free(current_master_file);
+    }
+    paranoid_free(current_subset_file);
+
     while (!feof(pin)) {
-        fgets(incoming, MAX_STR_LEN, pin);
-    }
+        getline(&incoming, &n, pin);
+    }
+    paranoid_free(incoming);
     fclose(faclin);
     pclose(pin);
@@ -706 +684 @@
 
     unlink(masklist);
-    paranoid_free(current_subset_file);
-    paranoid_free(current_master_file);
-    paranoid_free(syscall_pout);
-    paranoid_free(syscall_pin);
     paranoid_free(masklist);
-    paranoid_free(incoming);
-    paranoid_free(command);
+
     return (retval);
 }
@@ -728 +701 @@
     return (set_EXAT_list(masklist, acl_fname, "setfacl"));
 }
-
-/*
-  if (find_home_of_exe("setfattr"))
-    {
-      sprintf(command, "cat %s | gzip -dc | setfattr --restore - 2>> %s", acl_fname, MONDO_LOGFILE);
-      log_msg(1, "command = %s", command);
-      retval = system(command);
-    }
-  paranoid_free(acl_subset_fname);
-  paranoid_free(syscall_pin);
-  paranoid_free(command);
-  return(retval);
-*/
-
-
-
-
 
 
@@ -757 +713 @@
     /*@ buffers ***************************************************** */
     char val_sz[MAX_STR_LEN];
-    char cfg_fname[MAX_STR_LEN];
-/*  char tmp[MAX_STR_LEN]; remove stan benoit apr 2002 */
+    char *cfg_fname;
 
     /*@ long ******************************************************** */
@@ -767 +722 @@
     assert(bkpinfo != NULL);
 
-    sprintf(cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
+    asprintf(&cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
     read_cfg_var(cfg_fname, "last-filelist-number", val_sz);
     val_i = atoi(val_sz);
@@ -773 +728 @@
         val_i = 500;
     }
+    paranoid_free(cfg_fname);
     return (val_i);
 }
@@ -784 +740 @@
  * @bug I don't understand this function. Would someone care to explain it?
  */
+
 int add_string_at_node(struct s_node *startnode, char *string_to_add)
 {
 
-
-    /*@ int ******************************************************** */
     int noof_chars;
     int i;
     int res;
 
-    /*@ sturctures ************************************************* */
     struct s_node *node, *newnode;
 
-    /*@ char  ****************************************************** */
     char char_to_add;
-
-    /*@ bools ****************************************************** */
 
     const bool sosodef = FALSE;
@@ -813 +764 @@
     }
 
-    noof_chars = strlen(string_to_add) + 1; /* we include the '\0' */
-
-/* walk across tree if necessary */
+    noof_chars = strlen(string_to_add) + 1; // we include the '\0'
+
+    // walk across tree if necessary
     node = startnode;
     char_to_add = string_to_add[0];
@@ -824 +775 @@
     }
 
-/* walk down tree if appropriate */
+    // walk down tree if appropriate
     if (node->down != NULL && node->ch == char_to_add) {
         log_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_add);
@@ -838 +789 @@
     }
 
-/* add here */
+    // add here
     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
         log_to_screen("failed to malloc");
@@ -866 +817 @@
         return (0);
     }
-// add the rest
+    // add the rest
     log_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
     for (i = 1; i < noof_chars; i++) {
@@ -890 +841 @@
 
 
-
-
 /**
  * Load a filelist into a <tt>struct s_node</tt>.
@@ -908 +857 @@
 
     /*@ buffers **************************************************** */
-    char command_to_open_fname[MAX_STR_LEN];
-    char fname[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *command_to_open_fname;
+    char *fname = NULL;
+    char *tmp;
     int pos_in_fname;
+    int n = 0;
     /*@ int ******************************************************** */
     int percentage;
@@ -926 +876 @@
     }
     log_to_screen("Loading filelist");
-    sprintf(command_to_open_fname, "gzip -dc %s", filelist_fname);
-    sprintf(tmp, "zcat %s | wc -l", filelist_fname);
+    asprintf(&command_to_open_fname, "gzip -dc %s", filelist_fname);
+    asprintf(&tmp, "zcat %s | wc -l", filelist_fname);
     log_msg(6, "tmp = %s", tmp);
     lines_in_filelist =
         atol(call_program_and_get_last_line_of_output(tmp));
+    paranoid_free(tmp);
+
     if (lines_in_filelist < 3) {
         log_to_screen("Warning - surprisingly short filelist.");
@@ -949 +901 @@
         return (NULL);
     }
+    paranoid_free(command_to_open_fname);
+
     open_evalcall_form("Loading filelist from disk");
-    for (fgets(fname, MAX_STR_LEN, pin); !feof(pin);
-         fgets(fname, MAX_STR_LEN, pin)) {
+    for (getline(&fname, &n, pin); !feof(pin);
+         getline(&fname, &n, pin)) {
         if ((fname[strlen(fname) - 1] == 13
              || fname[strlen(fname) - 1] == 10) && strlen(fname) > 0) {
             fname[strlen(fname) - 1] = '\0';
         }
-//      strip_spaces (fname);
         if (!strlen(fname)) {
             continue;
@@ -964 +917 @@
                 continue;
             }
-            strcpy(tmp, fname);
+            asprintf(&tmp, fname);
             tmp[pos_in_fname] = '\0';
             if (strlen(tmp)) {
                 add_string_at_node(filelist, tmp);
             }
+            paranoid_free(tmp);
         }
         add_string_at_node(filelist, fname);
@@ -976 +930 @@
         }
     }
+    paranoid_free(fname);
     paranoid_pclose(pin);
     close_evalcall_form();
@@ -1020 +975 @@
 
 
-
-
 /**
  * Reset the filelist to the state it was when it was loaded. This does not
@@ -1034 +987 @@
     toggle_all_root_dirs_on(filelist);
 }
-
 
 
@@ -1100 +1052 @@
 
 
-
 /**
  * Toggle all root dirs on.
@@ -1168 +1119 @@
     /*@ buffers **************************************************** */
     static char current_filename[MAX_STR_LEN];
-
-/*  char tmp[MAX_STR_LEN+2]; */
 
     /*@ end vars *************************************************** */
@@ -1223 +1172 @@
 }
 
+
 /**
  * Toggle whether a path is selected.
@@ -1243 +1193 @@
     /*@ buffers ***************************************************** */
     static char current_filename[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN + 2];
 
     /*@ end vars *************************************************** */
@@ -1266 +1215 @@
                     || current_filename[j] == '\0') {
                     node->selected = on_or_off;
-                    sprintf(tmp, "%s is now %s\n", current_filename,
-                            (on_or_off ? "ON" : "OFF"));
                 }
             }
@@ -1305 +1252 @@
 
 
-
-
-
-
-
-/**
- * The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
- */
-char *g_skeleton_filelist = NULL;
-
 /**
  * Number of entries in the skeleton filelist.
  */
 long g_skeleton_entries = 0;
+
 
 /**
@@ -1388 +1326 @@
  */
 int open_and_list_dir(char *dir, char *sth, FILE * fout,
-                      time_t time_of_last_full_backup)
+                      time_t time_of_last_full_backup, char *skeleton_filelist) 
 {
     DIR *dip;
     struct dirent *dit;
     struct stat statbuf;
-    char new[MAX_STR_LEN];
+    char *new;
     char *tmp;
-    char *sth_B;
     static int percentage = 0;
-    char *ith_B;
     char *skip_these;
     char *new_with_spaces;
@@ -1411 +1347 @@
     time_t this_time;
 
-    malloc_string(tmp);
-    malloc_string(sth_B);
-    malloc_string(ith_B);
-    malloc_string(new_with_spaces);
     p = strrchr(dir, '/');
     if (p) {
@@ -1423 +1355 @@
 
     if (!depth) {
-        malloc_string(name_of_evalcall_form);
         malloc_string(find_skeleton_marker);
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        sprintf(tmp,
+        asprintf(&tmp,
                 "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
-                dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
+                dir, MAX_SKEL_DEPTH, skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        sprintf(tmp,
+        asprintf(&tmp,
                 "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -type d -a -print > %s 2> /dev/null",
-                dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
+                dir, MAX_SKEL_DEPTH, skeleton_filelist);
 #endif
         system(tmp);
-        sprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
+        paranoid_free(tmp);
+
+        asprintf(&tmp, "wc -l %s | awk '{print $1;}'", skeleton_filelist);
         g_skeleton_entries =
             1 + atol(call_program_and_get_last_line_of_output(tmp));
-        sprintf(name_of_evalcall_form, "Making catalog of %s", dir);
+        paranoid_free(tmp);
+
+        asprintf(&name_of_evalcall_form, "Making catalog of %s", dir);
         open_evalcall_form(name_of_evalcall_form);
         find_skeleton_marker[0] = '\0';
@@ -1450 +1385 @@
         sprintf(find_skeleton_marker,
                 "fgrep -v \"%s\" %s > %s.new 2> /dev/null", dir,
-                g_skeleton_filelist, g_skeleton_filelist);
+                skeleton_filelist, skeleton_filelist);
 //    log_msg(0, "fsm = %s", find_skeleton_marker);
         if (!system(find_skeleton_marker)) {
@@ -1458 +1393 @@
 //        log_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
             sprintf(find_skeleton_marker, "mv -f %s.new %s",
-                    g_skeleton_filelist, g_skeleton_filelist);
+                    skeleton_filelist, skeleton_filelist);
 //        log_msg(6, "fsm = %s", find_skeleton_marker);
             run_program_and_log_output(find_skeleton_marker, 8);
@@ -1466 +1401 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    sprintf(tmp, "Reading %-68s", dir);
+                    asprintf(&tmp, "Reading %-68s", dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
+                    paranoid_free(tmp);
                 }
 #endif
@@ -1479 +1415 @@
 //  log_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
-        skip_these = sth;
+        asprintf(&skip_these, "%s", sth);
     } else {
-        skip_these = sth_B;
-        sprintf(skip_these, " %s ", sth);
-    }
-    sprintf(new_with_spaces, " %s ", dir);
+        asprintf(&skip_these, " %s ", sth);
+    }
+    asprintf(&new_with_spaces, " %s ", dir);
     if ((dip = opendir(dir)) == NULL) {
         log_OS_error("opendir");
@@ -1493 +1428 @@
         while ((dit = readdir(dip)) != NULL) {
             i++;
-            strcpy(new, dir);
             if (strcmp(dir, "/")) {
-                strcat(new, "/");
+                asprintf(&new, "%s/%s", dir, dit->d_name);
+            } else {
+                asprintf(&new, "%s%s", dir, dit->d_name);
             }
-            strcat(new, dit->d_name);
+            paranoid_free(new_with_spaces);
+            asprintf(&new_with_spaces, " %s ", new);
+            /* BERLIOS: Old code
             new_with_spaces[0] = ' ';
             strcpy(new_with_spaces + 1, new);
             strcat(new_with_spaces, " ");
+            */
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
@@ -1508 +1447 @@
                         && S_ISDIR(statbuf.st_mode)) {
                         open_and_list_dir(new, skip_these, fout,
-                                          time_of_last_full_backup);
+                                          time_of_last_full_backup, skeleton_filelist);
                     } else {
                         if (time_of_last_full_backup == 0
@@ -1517 +1456 @@
                                 counter = 0;
                                 uberctr++;
-                                sprintf(tmp, " %c ",
+                                asprintf(&tmp, " %c ",
                                         special_dot_char(uberctr));
 #ifndef _XWIN
@@ -1525 +1464 @@
                                     newtRefresh();
                                 }
+                                paranoid_free(tmp);
 #endif
                             }
@@ -1531 +1471 @@
                 }
             }
-        }
-    }
+            paranoid_free(new);
+        }
+    }
+    paranoid_free(new_with_spaces);
+    paranoid_free(skip_these);
+
     if (dip) {
         if (closedir(dip) == -1) {
@@ -1543 +1487 @@
         paranoid_free(name_of_evalcall_form);
         paranoid_free(find_skeleton_marker);
-        unlink(g_skeleton_filelist);
+        unlink(skeleton_filelist);
         log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
     }
-    paranoid_free(tmp);
-    paranoid_free(sth_B);
-    paranoid_free(ith_B);
-    paranoid_free(new_with_spaces);
     return (0);
 }
-
 
 
@@ -1580 +1519 @@
     return (sz_res);
 }
-
 
 
@@ -1602 +1540 @@
     char sz_datefile_wildcard[] = "/var/cache/mondo-archive/difflevel.%d";
     char *p, *q;
-    char sz_datefile[80];
-    char *sz_filelist, *exclude_paths, *tmp;
+    char *sz_datefile;
+    char *sz_filelist, *exclude_paths;
     int i;
     FILE *fout;
@@ -1609 +1547 @@
     time_t time_of_last_full_backup = 0;
     struct stat statbuf;
-
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(sz_filelist);
-    malloc_string(g_skeleton_filelist);
-    if (!(exclude_paths = malloc(1000))) {
-        fatal_error("Cannot malloc exclude_paths");
-    }
-    log_msg(3, "Trying to write test string to exclude_paths");
-    strcpy(exclude_paths, "/blah /froo");
-    log_msg(3, "...Success!");
-    sprintf(sz_datefile, sz_datefile_wildcard, 0);
+    char *skeleton_filelist; 
+    // The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
+
+    asprintf(&sz_datefile, sz_datefile_wildcard, 0);
     if (!include_paths && !userdef_filelist) {
         fatal_error
@@ -1626 +1556 @@
     }
 // make hole for filelist
-    sprintf(command, "mkdir -p %s/archives", scratchdir);
+    asprintf(&command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    sprintf(sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
+    paranoid_free(command);
+
+    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);
+        asprintf(&command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
         run_program_and_log_output(command, 3);
+        paranoid_free(command);
+
         // backup last known good datefile just in case :)
         if (does_file_exist(sz_datefile)) {
-            sprintf(command, "mv -f %s %s.aborted", sz_datefile,
+            asprintf(&command, "mv -f %s %s.aborted", sz_datefile,
                     sz_datefile);
             paranoid_system(command);
+            paranoid_free(command);
         }
         make_hole_for_file(sz_datefile);
@@ -1654 +1589 @@
         log_msg(2, "Differential backup. Yay.");
     }
+    paranoid_free(sz_datefile);
 
 // use user-specified filelist (if specified)
@@ -1660 +1596 @@
                 "Using the user-specified filelist - %s - instead of calculating one",
                 userdef_filelist);
-        sprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
+        asprintf(&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");
         }
+        paranoid_free(command);
     } else {
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
-        sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
+        asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
 /proc /sys /tmp /root/images/mondo /root/images/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
@@ -1674 +1611 @@
         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);
+        asprintf(&skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
+        make_hole_for_file(skeleton_filelist);
+
         log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
         log_msg(2, "Opening out filelist to %s", sz_filelist);
@@ -1685 +1623 @@
             log_msg(1, "Including only '/' in %s", sz_filelist);
             open_and_list_dir("/", exclude_paths, fout,
-                              time_of_last_full_backup);
+                              time_of_last_full_backup, skeleton_filelist);
         } else {
             p = include_paths;
@@ -1692 +1630 @@
                 log_msg(1, "Including %s in filelist %s", q, sz_filelist);
                 open_and_list_dir(q, exclude_paths, fout,
-                                  time_of_last_full_backup);
+                                  time_of_last_full_backup, skeleton_filelist);
                 p += strlen(q);
                 while (*p == ' ') {
@@ -1700 +1638 @@
         }
         paranoid_fclose(fout);
+        paranoid_free(skeleton_filelist);
+        paranoid_free(exclude_paths);
     }
     log_msg(2, "Copying new filelist to scratchdir");
-    sprintf(command, "mkdir -p %s/archives", scratchdir);
+    asprintf(&command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    sprintf(command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
+    paranoid_free(command);
+
+    asprintf(&command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
     paranoid_system(command);
-    sprintf(command, "mv -f %s %s", sz_filelist, tmpdir);
+    paranoid_free(command);
+
+    asprintf(&command, "mv -f %s %s", sz_filelist, tmpdir);
     paranoid_system(command);
-    log_msg(2, "Freeing variables");
+    paranoid_free(command);
     paranoid_free(sz_filelist);
-    paranoid_free(command);
-    paranoid_free(exclude_paths);
-    paranoid_free(tmp);
-    paranoid_free(g_skeleton_filelist);
+
     log_msg(2, "Exiting");
     return (0);
 }
-
-
 
 
@@ -1781 +1720 @@
     }
 }
-
 
 
@@ -1824 +1762 @@
             }
             paranoid_free(fname);
-            asprintf(&fname, tmp);
-            paranoid_free(tmp);
+            fname = tmp;
         }
         while (strlen(fname) > 0 && fname[strlen(fname) - 1] < 32) {
@@ -1845 +1782 @@
                     asprintf(&tmp, fname + 1);
                     paranoid_free(fname);
-                    asprintf(&fname, tmp);
-                    paranoid_free(tmp);
+                    fname = tmp;
                 }
                 log_msg(5, "Found '%s'", fname);
@@ -1862 +1798 @@
 
 
-
-
-
-
 /**
  * Add all files listed in @p list_of_files_fname to the directory structure rooted at
@@ -1878 +1810 @@
 {
     FILE *fin;
-    char *tmp;
+    char *tmp = NULL;
+    int n = 0;
     struct s_node *nod;
 
-    malloc_string(tmp);
     log_msg(3, "Adding %s to filelist", list_of_files_fname);
     if (!(fin = fopen(list_of_files_fname, "r"))) {
@@ -1887 +1819 @@
         return (1);
     }
-    for (fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-         fgets(tmp, MAX_STR_LEN, fin)) {
+    for (getline(&tmp, &n, fin); !feof(fin);
+         getline(&tmp, &n, fin)) {
         if (!tmp[0]) {
             continue;

trunk/mondo/mondo/common/libmondo-verify.c

@@ -1 +1 @@
 /* $Id$ */
-/*
-copyright : (C) 2002 Mondo  Hugo Rabson <hugorabson@msn.com>
-edited by : by Stan Benoit 4/2002 troff@nakedsoul.org
-*/
-
 
 /**

trunk/tools/quality

@@ -32 +32 @@
 echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r strcat | wc -l` strcat"
 echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r strcpy | wc -l` strcpy"
+echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r fgets | wc -l` fgets"
 echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r malloc_string | wc -l` malloc_string"
 echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r MAX_STR_LEN | wc -l` MAX_STR_LEN"
+echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r goto | wc -l` goto"
 
 echo " "