Changeset 1110 in MondoRescue

Timestamp:

Feb 8, 2007, 1:37:30 AM (17 years ago)

Author:

Bruno Cornec

Message:

Improve memory management for libmondo-filelist.c (trunk merge begining)

File:

• branches/stable/mondo/src/common/libmondo-filelist.c (modified) (85 diffs)

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

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mondostructures.h"
-#include "lib-common-externs.h"
 #include "libmondo-filelist.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-tools-EXT.h"
 #include "mr_str.h"
@@ -68 +67 @@
 extern char *g_getfattr;
 
-
-
 /**
  * @addtogroup filelistGroup
@@ -89 +86 @@
     char *filelist;
     char *tempfile;
-    char *cksumlist;
-    char *tmp;
     long noof_sets;
 
@@ -100 +95 @@
     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");
-
-    log_to_screen("Dividing filelist into sets. Please wait.");
+    mvaddstr_and_log_it(g_currentY, 0, _("Dividing filelist into sets"));
+
+    log_to_screen(_("Dividing filelist into sets. Please wait."));
     i = 0;
-    sprintf(filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
-    sprintf(cksumlist, "%s/cklist.full", bkpinfo->tmpdir);
+    mr_asprintf(&filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
     if (!does_file_exist(filelist)) {
         log_it("filelist %s not found", filelist);
@@ -119 +108 @@
         chop_filelist(filelist, bkpinfo->tmpdir,
                       bkpinfo->optimal_set_size);
+    mr_free(filelist);
+
     estimate_noof_media_required(bkpinfo, noof_sets);   // for cosmetic purposes
 
-    sprintf(tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(&tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
     if (!(fout = fopen(tempfile, "a"))) {
         log_OS_error("Cannot append to biggielist");
         retval++;
-        goto end_of_func;
-    }
+    }
+    mr_free(tempfile);
     log_it(bkpinfo->image_devs);
 
@@ -132 +123 @@
 
     while (ptr && *ptr) {
-        strcpy(dev, ptr);
+        mr_asprintf(&dev, ptr);
         log_it("Examining imagedev %s", dev);
         for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
@@ -141 +132 @@
         fprintf(fout, "%s\n", dev);
         log_it("Adding '%s' to biggielist", dev);
+        mr_free(dev);
+
         if ((ptr = strchr(ptr, ' '))) {
             ptr++;
@@ -148 +141 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 
-  end_of_func:
-    mr_free(filelist);
-    mr_free(tempfile);
-    mr_free(cksumlist);
-    mr_free(dev);
-    mr_free(tmp);
     return (retval);
 }
@@ -166 +153 @@
 
     mr_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),
-            (int) (random() % 32768), (int) (random() % 32768));
+    mr_asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
+             (int) (random() % 32768), (int) (random() % 32768));
 
     if (!does_file_exist(orig_fname)) {
@@ -175 +160 @@
     }                           // no sense in trying to sort an empty file
 
-    sprintf(command, "sort %s > %s 2>> %s", orig_fname, tmp_fname,
-            MONDO_LOGFILE);
+    mr_asprintf(&command, "sort %s > %s 2>> %s", orig_fname, tmp_fname,
+             MONDO_LOGFILE);
     retval = system(command);
+    mr_free(command);
+
     if (retval) {
         mr_msg(2, "Failed to sort %s - oh dear", orig_fname);
@@ -183 +170 @@
         mr_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);
+        mr_asprintf(&command, "mv -f %s %s", tmp_fname, orig_fname);
         retval += run_program_and_log_output(command, 2);
+        mr_free(command);
+
         if (retval) {
             mr_msg(2, "Failed to copy %s back to %s - oh dear", tmp_fname,
@@ -193 +182 @@
     }
     mr_free(tmp_fname);
-    mr_free(command);
     mr_msg(1, "Finished sorting file %s", orig_fname);
     return (retval);
 }
-
 
 
@@ -223 +210 @@
     /*@ int **************************************** */
     int i;
+    size_t n = 0;
     long curr_set_no;
 
@@ -228 +216 @@
     char *outfname;
     char *biggie_fname;
-    char *incoming;
+    char *incoming = NULL;
     char *tmp;
-    char *acl_fname;
-    char *xattr_fname;
 
     /*@ pointers *********************************** */
@@ -242 +228 @@
     int err = 0;
 
-    malloc_string(outfname);
-    malloc_string(biggie_fname);
-    incoming = mr_malloc(MAX_STR_LEN * 2);
-    malloc_string(tmp);
-    malloc_string(acl_fname);
-    malloc_string(xattr_fname);
 
     assert_string_is_neither_NULL_nor_zerolength(filelist);
@@ -267 +247 @@
     curr_set_no = 0;
     curr_set_size = 0;
-    sprintf(outfname, "%s/filelist.%ld", outdir, curr_set_no);
-    sprintf(biggie_fname, "%s/biggielist.txt", outdir);
+    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"))) {
@@ -280 +260 @@
         goto end_of_func;
     }
-    (void) fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
+    mr_getline(&incoming, &n, fin);
     while (!feof(fin)) {
         lino++;
@@ -286 +266 @@
         if (i < 0) {
             i = 0;
-        }
-        if (i > MAX_STR_LEN - 1) {
-            incoming[MAX_STR_LEN - 30] = '\0';
-            mr_msg(1, "Warning - truncating file %s's name", incoming);
-            err++;
         }
         if (incoming[i] < 32) {
@@ -312 +287 @@
                 paranoid_fclose(fout);
                 sort_file(outfname);
+                mr_free(outfname);
+
                 curr_set_no++;
                 curr_set_size = 0;
-                sprintf(outfname, "%s/filelist.%ld", outdir, curr_set_no);
+                mr_asprintf(&outfname, "%s/filelist.%ld", outdir,
+                         curr_set_no);
                 if (!(fout = fopen(outfname, "w"))) {
                     log_OS_error("Unable to openout outfname");
@@ -320 +298 @@
                     goto end_of_func;
                 }
-                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);
+        mr_getline(&incoming, &n, fin);
     }
     paranoid_fclose(fin);
@@ -338 +314 @@
     sort_file(outfname);
     sort_file(biggie_fname);
-    sprintf(outfname, "%s/LAST-FILELIST-NUMBER", outdir);
-    sprintf(tmp, "%ld", curr_set_no);
+    mr_free(biggie_fname);
+    mr_free(outfname);
+
+    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
@@ -345 +324 @@
         err = 1;
     }
+    mr_free(outfname);
+    mr_free(tmp);
+
     if (curr_set_no == 0) {
-        sprintf(tmp, "Only one fileset. Fine.");
+        mr_asprintf(&tmp, "Only one fileset. Fine.");
     } else {
-        sprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
+        mr_asprintf(&tmp, "Filelist divided into %ld sets", curr_set_no + 1);
     }
     mr_msg(1, tmp);
+    mr_free(tmp);
     close_evalcall_form();
     /* This is to work around an obscure bug in Newt; open a form, close it,
@@ -365 +348 @@
 #endif
   end_of_func:
-    mr_free(outfname);
-    mr_free(biggie_fname);
-    mr_free(incoming);
-    mr_free(tmp);
-    mr_free(acl_fname);
-    mr_free(xattr_fname);
     return (err ? 0 : curr_set_no + 1);
 }
-
-
-
 
 
@@ -397 +371 @@
     if (depth == 0) {
         open_evalcall_form("Freeing memory");
-        log_to_screen("Freeing memory formerly occupied by filelist");
+        log_to_screen(_("Freeing memory formerly occupied by filelist"));
     }
     depth++;
@@ -420 +394 @@
     }
     filelist->ch = '\0';
-    mr_free((void*) filelist);
+    mr_free((void *)filelist);
     depth--;
     if (depth == 0) {
@@ -432 +406 @@
 {
     FILE *pattr;
-    char *tmp;
+    char *tmp = NULL;
+    size_t n = 0;
+
     pattr = popen(sys_call, "r");
     if (!pattr) {
@@ -443 +419 @@
         return (2);
     }
-    malloc_string(tmp);
-    for (fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr);
-         fgets(tmp, MAX_STR_LEN, pattr)) {
+    for (mr_getline(&tmp, &n, pattr); !feof(pattr); mr_getline(&tmp, &n, pattr)) {
         fputs(tmp, pout);
     }
@@ -452 +426 @@
     return (0);
 }
-
 
 
@@ -462 +435 @@
     char *pout_command;
     char *sys_call;
-    char *file_to_analyze;
+    char *file_to_analyze = NULL;
     char *strtmp = NULL;
     int i;
+    size_t n = 0;
 
     if (!(fin = fopen(filelist, "r"))) {
@@ -470 +444 @@
         return (1);
     }
-    malloc_string(pout_command);
-    sprintf(pout_command, "gzip -c1 > %s", auxlist_fname);
+    mr_asprintf(&pout_command, "gzip -c1 > %s", auxlist_fname);
     if (!(pout = popen(pout_command, "w"))) {
         mr_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
@@ -478 +451 @@
         return (4);
     }
-    malloc_string(file_to_analyze);
-    for (fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin);
-         fgets(file_to_analyze, MAX_STR_LEN, fin)) {
+    mr_free(pout_command);
+
+    for (mr_getline(&file_to_analyze, &n, fin); !feof(fin);
+         mr_getline(&file_to_analyze, &n, fin)) {
         i = strlen(file_to_analyze);
         if (i > 0 && file_to_analyze[i - 1] < 32) {
@@ -486 +460 @@
         }
         mr_msg(8, "Analyzing %s", file_to_analyze);
-        asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
-        asprintf(&sys_call, "%s 2>> /dev/null", strtmp);    // " MONDO_LOGFILE);
+        /* BERLIOS : to be checked */
+        mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
+        mr_asprintf(&sys_call, "%s 2>> /dev/null", strtmp);
         mr_free(strtmp);
         call_exe_and_pipe_output_to_fd(sys_call, pout);
@@ -495 +470 @@
     paranoid_pclose(pout);
     mr_free(file_to_analyze);
-    mr_free(pout_command);
     return (0);
 }
@@ -502 +476 @@
 int get_acl_list(char *filelist, char *facl_fname)
 {
-    char *command;
+    char *command = NULL;
     int retval = 0;
 
     if (g_getfacl != NULL) {
-        malloc_string(command);
-        sprintf(command, "touch %s", facl_fname);
+        mr_asprintf(&command, "touch %s", facl_fname);
         run_program_and_log_output(command, 8);
-//      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
-        sprintf(command,
-                "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s",
-                filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
+        mr_free(command);
+
+        mr_asprintf(&command,
+                 "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s",
+                 filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
         iamhere(command);
         retval = system(command);
@@ -523 +497 @@
 int get_fattr_list(char *filelist, char *fattr_fname)
 {
-    char *command;
+    char *command = NULL;
     int retval = 0;
 
     if (g_getfattr != NULL) {
-        malloc_string(command);
-        sprintf(command, "touch %s", fattr_fname);
+        mr_asprintf(&command, "touch %s", fattr_fname);
         run_program_and_log_output(command, 8);
         mr_free(command);
-//      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
+
         retval =
             gen_aux_list(filelist, "getfattr --en=hex -P -d \"%s\"",
@@ -544 +517 @@
 {
     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;
+    size_t n = 0;
     char *p, *q;
     FILE *pin, *pout, *faclin;
 
-    malloc_string(command);
     mr_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist,
             original_exat_fname, executable);
@@ -558 +533 @@
         mr_msg(1,
                 "No masklist provided. I shall therefore set ALL attributes.");
-        sprintf(command, "gzip -dc %s | %s --restore - 2>> %s",
-                original_exat_fname, executable, MONDO_LOGFILE);
+        mr_asprintf(&command, "gzip -dc %s | %s --restore - 2>> %s",
+                 original_exat_fname, executable, MONDO_LOGFILE);
         mr_msg(1, "command = %s", command);
         retval = system(command);
@@ -570 +545 @@
                 "original_exat_fname %s is empty or missing, so no need to set EXAT list",
                 original_exat_fname);
-        mr_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),
-            (int) (random() % 32768));
-    sprintf(command, "cp -f %s %s", orig_msklist, masklist);
+    mr_asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
+             (int) (random() % 32768));
+
+    mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
+    mr_free(command);
+
     sort_file(masklist);
-    current_subset_file[0] = current_master_file[0] = '\0';
-    sprintf(syscall_pin, "gzip -dc %s", original_exat_fname);
-    sprintf(syscall_pout, "%s --restore - 2>> %s", executable,
-            MONDO_LOGFILE);
+    mr_asprintf(&syscall_pin, "gzip -dc %s", original_exat_fname);
+    mr_asprintf(&syscall_pout, "%s --restore - 2>> %s", executable,
+             MONDO_LOGFILE);
 
     mr_msg(1, "syscall_pin = %s", syscall_pin);
@@ -596 +566 @@
         return (1);
     }
+    mr_free(syscall_pout);
+
     pin = popen(syscall_pin, "r");
     if (!pin) {
@@ -602 +574 @@
         return (1);
     }
+    mr_free(syscall_pin);
+
     faclin = fopen(masklist, "r");
     if (!faclin) {
@@ -611 +585 @@
 //  printf("Hi there. Starting the loop\n");
 
-    fgets(current_subset_file, MAX_STR_LEN, faclin);
-    fgets(incoming, MAX_STR_LEN, pin);
+    mr_getline(&current_subset_file, &n, faclin);
+    mr_getline(&incoming, &n, pin);
     while (!feof(pin) && !feof(faclin)) {
 //      printf("incoming = %s", incoming);
 
-        strcpy(current_master_file, incoming + 8);
+        mr_asprintf(&current_master_file, incoming + 8);
 
         p = current_subset_file;
@@ -644 +618 @@
         if (i < 0) {            // read another subset file in.
             mr_msg(my_depth, "Reading next subset line in\n\n");
-            fgets(current_subset_file, MAX_STR_LEN, faclin);
+            mr_getline(&current_subset_file, &n, faclin);
             continue;
         }
@@ -651 +625 @@
             fputs(incoming, pout);
         }
-        fgets(incoming, MAX_STR_LEN, pin);
+        mr_getline(&incoming, &n, pin);
         if (!i) {
             mr_msg(my_depth, "Copying master %s", q);
@@ -664 +638 @@
                 fputs(incoming, pout);
             }
-            fgets(incoming, MAX_STR_LEN, pin);
+            mr_getline(&incoming, &n, pin);
         }
         if (!i) {
-            fgets(current_subset_file, MAX_STR_LEN, faclin);
-        }
-    }
+            mr_getline(&current_subset_file, &n, faclin);
+        }
+        mr_free(current_master_file);
+    }
+    mr_free(current_subset_file);
+
     while (!feof(pin)) {
-        fgets(incoming, MAX_STR_LEN, pin);
-    }
+        mr_getline(&incoming, &n, pin);
+    }
+    mr_free(incoming);
     fclose(faclin);
     pclose(pin);
@@ -680 +658 @@
 
     unlink(masklist);
-    mr_free(current_subset_file);
-    mr_free(current_master_file);
-    mr_free(syscall_pout);
-    mr_free(syscall_pin);
     mr_free(masklist);
-    mr_free(incoming);
-    mr_free(command);
+
     return (retval);
 }
@@ -724 +697 @@
     /*@ 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 = NULL;
 
     /*@ long ******************************************************** */
-    int val_i;
+    int val_i = 0;
 
     /*@ end vars **************************************************** */
@@ -734 +706 @@
     assert(bkpinfo != NULL);
 
-    sprintf(cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
+    mr_asprintf(&cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
     read_cfg_var(cfg_fname, "last-filelist-number", val_sz);
     val_i = atoi(val_sz);
@@ -740 +712 @@
         val_i = 500;
     }
+    mr_free(cfg_fname);
     return (val_i);
 }
@@ -751 +724 @@
  * @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;
@@ -780 +748 @@
     }
 
-    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];
@@ -791 +759 @@
     }
 
-/* walk down tree if appropriate */
+    // walk down tree if appropriate
     if (node->down != NULL && node->ch == char_to_add) {
         mr_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_add);
@@ -805 +773 @@
     }
 
-/* add here */
+    // add here
     newnode = (struct s_node *) mr_malloc(sizeof(struct s_node));
     if (char_to_add < node->ch) // add to the left of node
@@ -829 +797 @@
         return (0);
     }
-// add the rest
+    // add the rest
     mr_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
     for (i = 1; i < noof_chars; i++) {
@@ -848 +816 @@
 
 
-
-
 /**
  * Load a filelist into a <tt>struct s_node</tt>.
@@ -859 +825 @@
 {
 
-    /*@ structures ************************************************* */
-    struct s_node *filelist;
-
-    /*@ pointers *************************************************** */
-    FILE *pin;
-
-    /*@ buffers **************************************************** */
-    char command_to_open_fname[MAX_STR_LEN];
-    char fname[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    int pos_in_fname;
-    /*@ int ******************************************************** */
-    int percentage;
-
-    /*@ long ******************************************************* */
-    long lines_in_filelist;
-    long lino = 0;
-    /*@ end vars *************************************************** */
+    struct s_node *filelist = NULL;
+    FILE *pin = NULL;
+    char *command_to_open_fname = NULL;
+    char *fname = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    int pos_in_fname = 0;
+    size_t n = 0;
+    int percentage = 0;
+
+    long lines_in_filelist = 0L;
+    long lino = 0L;
 
     assert_string_is_neither_NULL_nor_zerolength(filelist_fname);
@@ -883 +843 @@
         fatal_error("filelist does not exist -- cannot load it");
     }
-    log_to_screen("Loading filelist");
-    sprintf(command_to_open_fname, "gzip -dc %s", filelist_fname);
-    sprintf(tmp, "zcat %s | wc -l", filelist_fname);
+    log_to_screen(_("Loading filelist"));
+    mr_asprintf(&command_to_open_fname, "gzip -dc %s", filelist_fname);
+    mr_asprintf(&tmp, "zcat %s | wc -l", filelist_fname);
     mr_msg(6, "tmp = %s", tmp);
     lines_in_filelist =
         atol(call_program_and_get_last_line_of_output(tmp));
     if (lines_in_filelist < 3) {
-        log_to_screen("Warning - surprisingly short filelist.");
+        log_to_screen(_("Warning - surprisingly short filelist."));
     }
     g_original_noof_lines_in_filelist = lines_in_filelist;
@@ -905 +865 @@
         return (NULL);
     }
-    open_evalcall_form("Loading filelist from disk");
-    for (fgets(fname, MAX_STR_LEN, pin); !feof(pin);
-         fgets(fname, MAX_STR_LEN, pin)) {
+    mr_free(command_to_open_fname);
+
+    open_evalcall_form(_("Loading filelist from disk"));
+    for (mr_getline(&fname, &n, pin); !feof(pin); mr_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;
@@ -920 +880 @@
                 continue;
             }
-            strcpy(tmp, fname);
+            mr_asprintf(&tmp, fname);
             tmp[pos_in_fname] = '\0';
             if (strlen(tmp)) {
                 add_string_at_node(filelist, tmp);
             }
+            mr_free(tmp);
         }
         add_string_at_node(filelist, fname);
@@ -932 +893 @@
         }
     }
+    mr_free(fname);
     paranoid_pclose(pin);
     close_evalcall_form();
@@ -976 +938 @@
 
 
-
-
 /**
  * Reset the filelist to the state it was when it was loaded. This does not
@@ -992 +952 @@
 
 
-
 /**
  * Save a filelist tree structure to disk.
@@ -1022 +981 @@
     assert(outfname != NULL);   // will be zerolength if save_filelist() is called by itself
     if (depth == 0) {
-        log_to_screen("Saving filelist");
+        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");
+        open_evalcall_form(_("Saving selection to disk"));
     }
     for (node = filelist; node != NULL; node = node->right) {
@@ -1056 +1015 @@
 
 
-
 /**
  * Toggle all root dirs on.
@@ -1124 +1082 @@
     /*@ buffers **************************************************** */
     static char current_filename[MAX_STR_LEN];
-
-/*  char tmp[MAX_STR_LEN+2]; */
 
     /*@ end vars *************************************************** */
@@ -1179 +1135 @@
 }
 
+
 /**
  * Toggle whether a path is selected.
@@ -1199 +1156 @@
     /*@ buffers ***************************************************** */
     static char current_filename[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN + 2];
 
     /*@ end vars *************************************************** */
@@ -1222 +1178 @@
                     || current_filename[j] == '\0') {
                     node->selected = on_or_off;
-                    sprintf(tmp, "%s is now %s\n", current_filename,
-                            (on_or_off ? "ON" : "OFF"));
                 }
             }
@@ -1259 +1213 @@
     }
 }
-
-
-
-
-
 
 
@@ -1299 +1248 @@
     if (bkpinfo->make_filelist) {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Making catalog of files to be backed up");
+                            _("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");
+                            _("Using supplied catalog of files to be backed up"));
     }
 
@@ -1322 +1271 @@
     if (res) {
         log_OS_error("Call to mondo_makefilelist failed");
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     return (res);
@@ -1343 +1292 @@
 {
     const char delims[] = " ";
-
-    DIR *dip;
-    struct dirent *dit;
+    DIR *dip = NULL;
+    struct dirent *dit = NULL;
+
     struct stat statbuf;
     char new[MAX_STR_LEN];
-    char *tmp;
-    char *sth_B;
+    char *tmp = NULL;
+    char *sth_B = NULL;
     static int percentage = 0;
-    char *ith_B;
-    char *skip_these;
-    char *new_with_spaces;
-    char *strtmp;
-    char *token;
-    char *find_excludes;
-    static char *name_of_evalcall_form;
-    int i;
+    char *ith_B = NULL;
+    char *skip_these = NULL;
+    char *new_with_spaces = NULL;
+    static char *name_of_evalcall_form = NULL;
+    int i = 0;
+    char *strtmp = NULL;
+    char *token = NULL;
+    char *find_excludes = NULL;
     int lastpos = 0;
     static int depth = 0;
-    char *p;
+    char *p = NULL;
     static int counter = 0;
     static int uberctr = 0;
-    static char *find_skeleton_marker;
+    static char *find_skeleton_marker = NULL;
     static long skeleton_lino = 0;
     static time_t last_time = 0;
@@ -1523 +1472 @@
 
 
-
 /**
  * Get the next entry in the space-separated list in @p incoming.
@@ -1535 +1483 @@
 {
     static char sz_res[MAX_STR_LEN];
-    char *p;
+    char *p = NULL;
     bool in_quotes = FALSE;
 
@@ -1549 +1497 @@
     return (sz_res);
 }
-
 
 
@@ -1570 +1517 @@
 {
     char sz_datefile_wildcard[] = "/var/cache/mondo-archive/difflevel.%d";
-    char *p, *q;
-    char sz_datefile[80];
-    char *sz_filelist, *exclude_paths, *tmp;
-    int i;
-    FILE *fout;
-    char *command;
+    char *p = NULL;
+    char *q = NULL;
+
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
+    char *sz_datefile = NULL;
+    char *sz_filelist = NULL;
+    char *exclude_paths = NULL;
+    int i = 0;
+    FILE *fout = NULL;
+    char *command = NULL;
     time_t time_of_last_full_backup = 0;
     struct stat statbuf;
 
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(sz_filelist);
+    malloc_string(sz_datefile);
+    malloc_string(exclude_paths);
     malloc_string(g_skeleton_filelist);
-    exclude_paths = mr_malloc(1000);
-    mr_msg(3, "Trying to write test string to exclude_paths");
-    strcpy(exclude_paths, "/blah /froo");
-    mr_msg(3, "...Success!");
-    sprintf(sz_datefile, sz_datefile_wildcard, 0);
+    // The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
+    mr_asprintf(&sz_datefile, sz_datefile_wildcard, 0);
     if (!include_paths && !userdef_filelist) {
         fatal_error
@@ -1593 +1541 @@
     }
 // make hole for filelist
-    sprintf(command, "mkdir -p %s/archives", scratchdir);
+    mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    sprintf(sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
+    mr_free(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);
+        mr_asprintf(&command, "cp -f %s.aborted %s", sz_datefile,
+                 sz_datefile);
         run_program_and_log_output(command, 3);
+        mr_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,
-                    sz_datefile);
+            mr_asprintf(&command, "mv -f %s %s.aborted", sz_datefile,
+                     sz_datefile);
             paranoid_system(command);
+            mr_free(command);
         }
         make_hole_for_file(sz_datefile);
@@ -1621 +1575 @@
         mr_msg(2, "Differential backup. Yay.");
     }
+    mr_free(sz_datefile);
 
 // use user-specified filelist (if specified)
@@ -1627 +1582 @@
                 "Using the user-specified filelist - %s - instead of calculating one",
                 userdef_filelist);
-        sprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
+        mr_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");
         }
+        mr_free(command);
     } else {
         mr_msg(2, "include_paths = '%s'", include_paths);
@@ -1667 +1623 @@
         }
         paranoid_fclose(fout);
+        mr_free(exclude_paths);
     }
     mr_msg(2, "Copying new filelist to scratchdir");
-    sprintf(command, "mkdir -p %s/archives", scratchdir);
+    mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    sprintf(command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
     paranoid_system(command);
-    sprintf(command, "mv -f %s %s", sz_filelist, tmpdir);
+    mr_free(command);
+
+    mr_asprintf(&command, "mv -f %s %s", sz_filelist, tmpdir);
     paranoid_system(command);
-    mr_msg(2, "Freeing variables");
+    mr_free(command);
     mr_free(sz_filelist);
-    mr_free(command);
-    mr_free(exclude_paths);
-    mr_free(tmp);
     mr_free(g_skeleton_filelist);
     mr_msg(2, "Exiting");
     return (0);
 }
-
-
 
 
@@ -1750 +1706 @@
 
 
-
 /**
  * Write all entries in @p needles_list_fname which are also in
@@ -1768 +1723 @@
     FILE *fin;
     FILE *fout;
-    char *fname;
+    char *fname = NULL;
     char *tmp;
     size_t len = 0;             // Scrub's patch doesn't work without that
 
-//  mr_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
-    malloc_string(fname);
-    malloc_string(tmp);
     mr_msg(5, "starting");
     mr_msg(5, "needles_list_fname = %s", needles_list_fname);
@@ -1785 +1737 @@
     }
     while (!feof(fin)) {
-//      fscanf(fin, "%s\n", fname);
-        len = MAX_STR_LEN - 1;
-        getline(&fname, &len, fin); // patch by Scrub
+        mr_getline(&fname, &len, fin);
         if (!use_star) {
             if (fname[0] == '/') {
-                strcpy(tmp, fname);
+                mr_asprintf(&tmp, fname);
             } else {
-                tmp[0] = '/';
-                strcpy(tmp + 1, fname);
+                mr_asprintf(&tmp, "/%s", fname);
             }
-            strcpy(fname, tmp);
+            mr_free(fname);
+            fname = tmp;
         }
         while (strlen(fname) > 0 && fname[strlen(fname) - 1] < 32) {
             fname[strlen(fname) - 1] = '\0';
         }
-
-/*
-      if (strlen(fname)>3 && fname[strlen(fname)-1]=='/') { fname[strlen(fname)-1] = '\0'; }
-      if (strlen(fname)==0) { continue; }
-      sprintf(temporary_string, "echo \"Looking for '%s'\" >> /tmp/looking.txt", fname);
-      system(temporary_string);
-*/
 
         mr_msg(5, "Looking for '%s'", fname);
@@ -1812 +1755 @@
         if (found_node) {
             if (found_node->selected) {
-//              if (use_star)
                 if (fname[0] == '/') {
-                    strcpy(tmp, fname + 1);
-                    strcpy(fname, tmp);
+                    mr_asprintf(&tmp, fname + 1);
+                    mr_free(fname);
+                    fname = tmp;
                 }
                 mr_msg(5, "Found '%s'", fname);
                 turn_wildcard_chars_into_literal_chars(tmp, fname);
                 fprintf(fout, "%s\n", tmp);
+                mr_free(tmp);
                 retval++;
             }
         }
+        mr_free(fname);
     }
     paranoid_fclose(fout);
     paranoid_fclose(fin);
-    mr_free(fname);
-    mr_free(tmp);
     return (retval);
 }
-
-
-
-
 
 
@@ -1848 +1787 @@
 {
     FILE *fin;
-    char *tmp;
+    char *tmp = NULL;
+    size_t n = 0;
     struct s_node *nod;
 
-    malloc_string(tmp);
     mr_msg(3, "Adding %s to filelist", list_of_files_fname);
     if (!(fin = fopen(list_of_files_fname, "r"))) {
@@ -1857 +1796 @@
         return (1);
     }
-    for (fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-         fgets(tmp, MAX_STR_LEN, fin)) {
+    for (mr_getline(&tmp, &n, fin); !feof(fin); mr_getline(&tmp, &n, fin)) {
         if (!tmp[0]) {
             continue;