Changeset 3191 in MondoRescue for branches/3.2/mondo/src/common/libmondo-files.c

Timestamp:

Sep 25, 2013, 8:55:45 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Lots of memory management backports from 3.1 to 3.2 - still not finished, nor working ATM. the common subdir was done during travel, so this is essentially a backup !

File:

• branches/3.2/mondo/src/common/libmondo-files.c (modified) (48 diffs)

branches/3.2/mondo/src/common/libmondo-files.c

@@ -47 +47 @@
     /*@ buffers ***************************************************** */
     static char output[MAX_STR_LEN];
-    char command[MAX_STR_LEN * 2];
-    char tmp[MAX_STR_LEN];
+    char *command = NULL;
 
     /*@ pointers **************************************************** */
-    char *p;
+    char *p = NULL;
     char *q;
     FILE *fin;
@@ -63 +62 @@
     assert_string_is_neither_NULL_nor_zerolength(filename);
     if (does_file_exist(filename)) {
-        sprintf(command, "md5sum \"%s\"", filename);
+        mr_asprintf(command, "md5sum \"%s\"", filename);
         fin = popen(command, "r");
         if (fin) {
@@ -73 +72 @@
             paranoid_pclose(fin);
         }
+        mr_free(command);
     } else {
-        sprintf(tmp, "File '%s' not found; cannot calc checksum",
-                filename);
-        log_it(tmp);
+        log_it("File '%s' not found; cannot calc checksum", filename);
     }
     if (p) {
@@ -130 +128 @@
 
     /*@ buffers ***************************************************** */
-    char command[MAX_STR_LEN * 2];
-    char incoming[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    char *q;
+    char *command = NULL;
+    char *incoming = NULL;
 
     /*@ long ******************************************************** */
@@ -141 +137 @@
     FILE *fin;
 
-    /*@ initialize [0] to null ******************************************** */
-    incoming[0] = '\0';
-
     assert_string_is_neither_NULL_nor_zerolength(filename);
     if (!does_file_exist(filename)) {
-        sprintf(tmp,
-                "%s does not exist, so I cannot found the number of lines in it",
-                filename);
-        log_it(tmp);
+        log_it("%s does not exist, so I cannot found the number of lines in it", filename);
         return (0);
     }
-    sprintf(command, "cat %s | wc -l", filename);
+    mr_asprintf(command, "cat %s | wc -l", filename);
     if (!does_file_exist(filename)) {
+        mr_free(command);
         return (-1);
     }
     fin = popen(command, "r");
+    mr_free(command);
+
     if (fin) {
         if (feof(fin)) {
             noof_lines = 0;
         } else {
-            q = fgets(incoming, MAX_STR_LEN - 1, fin);
-            if (!q) {
-                // FIXME
-            }
-            while (strlen(incoming) > 0 && (q != NULL)
-                   && incoming[strlen(incoming) - 1] < 32) {
+            mr_getline(incoming, fin);
+            while (strlen(incoming) > 0 && incoming[strlen(incoming) - 1] < 32) {
                 incoming[strlen(incoming) - 1] = '\0';
             }
             noof_lines = atol(incoming);
+            mr_free(incoming);
         }
         paranoid_pclose(fin);
@@ -215 +205 @@
 void exclude_nonexistent_files(char *inout)
 {
-    char infname[MAX_STR_LEN];
-    char outfname[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    char incoming[MAX_STR_LEN];
-    char *q;
+    char *infname = NULL;
+    char *outfname = NULL;
+    char *tmp = NULL;
+    char *incoming = NULL;
 
     /*@ int ********************************************************* */
@@ -231 +220 @@
 
     assert_string_is_neither_NULL_nor_zerolength(inout);
-    sprintf(infname, "%s.in", inout);
-    sprintf(outfname, "%s", inout);
-    sprintf(tmp, "cp -f %s %s", inout, infname);
+    mr_asprintf(infname, "%s.in", inout);
+    mr_asprintf(tmp, "cp -f %s %s", inout, infname);
     run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+
     if (!(fin = fopen(infname, "r"))) {
         log_OS_error("Unable to openin infname");
+        mr_free(infname);
         return;
     }
+
+    mr_asprintf(outfname, "%s", inout);
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Unable to openout outfname");
+        mr_free(infname);
+        mr_free(outfname);
         return;
     }
-    for (q = fgets(incoming, MAX_STR_LEN, fin); !feof(fin) && (q != NULL);
-         q = fgets(incoming, MAX_STR_LEN, fin)) {
+    mr_free(outfname);
+
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
         i = strlen(incoming) - 1;
         if (i >= 0 && incoming[i] < 32) {
@@ -252 +248 @@
             fprintf(fout, "%s\n", incoming);
         } else {
-            sprintf(tmp, "Excluding '%s'-nonexistent\n", incoming);
-            log_it(tmp);
-        }
-    }
+            log_it("Excluding '%s'-nonexistent\n", incoming);
+        }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
+
     paranoid_fclose(fout);
     paranoid_fclose(fin);
     unlink(infname);
-}
-
-
-
-
-
-
-
+    mr_free(infname);
+}
 
 
@@ -278 +270 @@
 int figure_out_kernel_path_interactively_if_necessary(char *kernel)
 {
-    char tmp[MAX_STR_LEN];
-    char *command;
+    char *tmp = NULL;
+    char *command = NULL;
 
     if (!kernel[0]) {
-        strcpy(kernel,
-               call_program_and_get_last_line_of_output
-               ("mindi --findkernel 2> /dev/null"));
+        strcpy(kernel, call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null"));
     }
     // If we didn't get anything back, check whether mindi raised a fatal error
     if (!kernel[0]) {
-        malloc_string(command);
-        strcpy(command, "grep 'Fatal error' /var/log/mindi.log");
-        strcpy(tmp, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(command, "%s", "grep 'Fatal error' /var/log/mindi.log");
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
         if (strlen(tmp) > 1) {
             popup_and_OK(tmp);
+            mr_free(tmp);
+            mr_free(command);
             fatal_error("Mindi gave a fatal error. Please check '/var/log/mindi.log'.");
         }
-        paranoid_free(command);
+        mr_free(tmp);
+        mr_free(command);
     }
     log_it("Calling Mindi with kernel path of '%s'", kernel);
@@ -310 +302 @@
                 ("Kernel not found. Please specify with the '-k' flag.");
         }
-        sprintf(tmp, "User says kernel is at %s", kernel);
-        log_it(tmp);
+        log_it("User says kernel is at %s", kernel);
     }
     return (0);
 }
-
-
-
-
 
 
@@ -334 +321 @@
     /*@ buffers ********************* */
     static char output[MAX_STR_LEN];
-    char *incoming;
-    char *command;
-
-    malloc_string(incoming);
-    malloc_string(command);
-    incoming[0] = '\0';
+    char *incoming = NULL;
+    char *command = NULL;
+
     /*@******************************* */
 
     assert_string_is_neither_NULL_nor_zerolength(fname);
-    sprintf(command, "which %s 2> /dev/null", fname);
-    strcpy(incoming, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(command, "which %s 2> /dev/null", fname);
+    mr_asprintf(incoming, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     if (incoming[0] == '\0') {
         if (system("which file > /dev/null 2> /dev/null")) {
-            paranoid_free(incoming);
-            paranoid_free(command);
+            mr_free(incoming);
             output[0] = '\0';
             return (NULL);      // forget it :)
         }
-        sprintf(command,
-                "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null",
-                incoming);
-        strcpy(incoming,
-               call_program_and_get_last_line_of_output(command));
-    }
-    if (incoming[0] == '\0')    // yes, it is == '\0' twice, not once :)
-    {
-        sprintf(command, "dirname %s 2> /dev/null", incoming);
-        strcpy(incoming,
-               call_program_and_get_last_line_of_output(command));
+        mr_asprintf(command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", incoming);
+        mr_free(incomig);
+
+        mr_asprintf(incoming, "%s", call_program_and_get_last_line_of_output(command));
+        mr_free(command);
+    }
+    if (incoming[0] == '\0') {
+        mr_asprintf(command, "dirname %s 2> /dev/null", incoming);
+        mr_free(incoming);
+
+        mr_asprintf(incoming, "%s", call_program_and_get_last_line_of_output(command));
+        mr_free(command);
     }
     strcpy(output, incoming);
     if (output[0] != '\0' && does_file_exist(output)) {
-        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname,
-                incoming);
+        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname, incoming);
     } else {
         output[0] = '\0';
         log_msg(4, "find_home_of_exe() --- Could not find %s", fname);
     }
-    paranoid_free(incoming);
-    paranoid_free(command);
+    mr_free(incoming);
     if (!output[0]) {
         return (NULL);
@@ -382 +366 @@
 
 
-
-
-
-
-
-
 /**
  * Get the last sequence of digits surrounded by non-digits in the first 32k of
@@ -421 +399 @@
     for (; len > 0 && isdigit(datablock[len - 1]); len--);
     trackno = atoi(datablock + len);
-    /*
-       sprintf(tmp,"datablock=%s; trackno=%d",datablock+len, trackno);
-       log_it(tmp);
-     */
     return (trackno);
 }
@@ -444 +418 @@
 
     /*@ buffers ***************************************************** */
-    char tmp[MAX_STR_LEN];
-    char lastline[MAX_STR_LEN];
-    char command[MAX_STR_LEN];
+    char *lastline = NULL;
+    char *command = NULL;
     /*@ pointers **************************************************** */
-    char *p;
+    char *p = NULL;
 
     /*@ int's ******************************************************* */
-    int i;
-
-    for (i = NOOF_ERR_LINES - 1;
-         i >= 0 && !strstr(err_log_lines[i], "% Done")
-         && !strstr(err_log_lines[i], "% done"); i--);
+    int i = 0;
+
+    for (i = NOOF_ERR_LINES - 1; i >= 0 && !strstr(err_log_lines[i], "% Done") && !strstr(err_log_lines[i], "% done"); i--);
     if (i < 0) {
-        sprintf(command,
-                "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'",
-                filename, '%');
-        strcpy(lastline,
-               call_program_and_get_last_line_of_output(command));
+        mr_asprintf(command, "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'", filename, '%');
+        mr_asprintf(lastline, "%s", call_program_and_get_last_line_of_output(command));
+        mr_free(command);
         if (!lastline[0]) {
+            mr_free(lastline);
             return (0);
         }
     } else {
-        strcpy(lastline, err_log_lines[i]);
+        mr_asprintf(lastline, "%s", err_log_lines[i]);
     }
 
@@ -472 +442 @@
     if (p) {
         *p = '\0';
-    }
-//  log_msg(2, "lastline='%s', ", p, lastline);
-    if (!p) {
+    } else {
+        mr_free(lastline);
         return (0);
     }
-    *p = '\0';
-    for (p--; *p != ' ' && p != lastline; p--);
+
+    for (p--; isdigit(*p) && p != lastline; p--);
     if (p != lastline) {
         p++;
     }
     i = atoi(p);
-
-    sprintf(tmp, "'%s' --> %d", p, i);
-//     log_to_screen(tmp);
-
+    mr_free(lastline);
     return (i);
 }
@@ -504 +470 @@
     /*@ buffers ***************************************************** */
     static char output[MAX_STR_LEN];
-    static char command[MAX_STR_LEN * 2];
-    static char tmp[MAX_STR_LEN];
-    char *p = NULL;
+    char *command = NULL;
 
     /*@ pointers **************************************************** */
@@ -514 +478 @@
 
     if (!does_file_exist(filename)) {
-        sprintf(tmp, "Tring to get last line of nonexistent file (%s)",
-                filename);
-        log_it(tmp);
+        log_it("Tring to get last line of nonexistent file (%s)", filename);
         output[0] = '\0';
         return (output);
     }
-    sprintf(command, "tail -n1 %s", filename);
+    mr_asprintf(command, "tail -n1 %s", filename);
     fin = popen(command, "r");
+    mr_free(command);
     p = fgets(output, MAX_STR_LEN, fin);
     if (p == NULL) {
@@ -564 +527 @@
  * @bug I don't know what this function does. However, it seems orphaned, so it should probably be removed.
  */
-int
-make_checksum_list_file(char *filelist, char *cksumlist, char *comppath)
-{
+int make_checksum_list_file(char *filelist, char *cksumlist, char *comppath) {
     /*@ pointers **************************************************** */
     FILE *fin;
@@ -577 +538 @@
 
     /*@ buffer ****************************************************** */
-    char stub_fname[1000];
-    char curr_fname[1000];
-    char curr_cksum[1000];
-    char tmp[1000];
-    char *q;
+    char *stub_fname = NULL;
+    char *curr_fname = NULL;
+    char *curr_cksum = NULL;
+    char *tmp = NULL;
 
     /*@ long [long] ************************************************* */
@@ -595 +555 @@
     start_time = get_time();
     filelist_length = length_of_file(filelist);
-    sprintf(tmp, "filelist = %s; cksumlist = %s", filelist, cksumlist);
-    log_it(tmp);
+    log_it("filelist = %s; cksumlist = %s", filelist, cksumlist);
+
     fin = fopen(filelist, "r");
     if (fin == NULL) {
@@ -610 +570 @@
         return (1);
     }
-    for (q = fgets(stub_fname, 999, fin); !feof(fin) && (q != NULL);
-         q = fgets(stub_fname, 999, fin)) {
+    for (mr_getline(stub_fname, fin); !feof(fin); mr_getline(stub_fname, fin)) {
         if (stub_fname[(i = strlen(stub_fname) - 1)] < 32) {
             stub_fname[i] = '\0';
         }
-        sprintf(tmp, "%s%s", comppath, stub_fname);
-        strcpy(curr_fname, tmp + 1);
-        strcpy(curr_cksum, calc_file_ugly_minichecksum(curr_fname));
+        mr_asprintf(tmp, "%s%s", comppath, stub_fname);
+        mr_free(stub_fname);
+
+        mr_asprintf(curr_fname, "%s", tmp + 1);
+        mr_free(tmp);
+
+        mr_asprintf(curr_cksum, "%s", calc_file_ugly_minichecksum(curr_fname));
         fprintf(fout, "%s\t%s\n", curr_fname, curr_cksum);
+        mr_free(curr_cksum);
+
         if (counter++ > 12) {
             current_time = get_time();
             counter = 0;
+            /* BERLIOS: 37 really ? */
             curr_fname[37] = '\0';
             curr_pos = ftello(fin) / 1024;
             percentage = (int) (curr_pos * 100 / filelist_length);
             time_taken = current_time - start_time;
-            if (percentage == 0) {
-                /*              printf("%0d%% done      \r",percentage); */
-            } else {
-                time_remaining =
-                    time_taken * 100 / (long) (percentage) - time_taken;
-                sprintf(tmp,
-                        "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r",
-                        percentage, (int) (time_taken / 60),
-                        (int) (time_taken % 60),
-                        (int) (time_remaining / 60),
-                        (int) (time_remaining % 60), curr_fname);
-                log_to_screen(tmp);
+            if (percentage != 0) {
+                time_remaining = time_taken * 100 / (long) (percentage) - time_taken;
+                log_to_screen("%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r", percentage, (int) (time_taken / 60), (int) (time_taken % 60), (int) (time_remaining / 60), (int) (time_remaining % 60), curr_fname);
             }
             sync();
         }
-    }
+        mr_free(curr_fname);
+    }
+    mr_free(stub_fname);
+
     paranoid_fclose(fout);
     paranoid_fclose(fin);
@@ -654 +614 @@
  * @return The return value of @c mkdir.
  */
-int make_hole_for_dir(char *outdir_fname)
-{
-    char tmp[MAX_STR_LEN * 2];
+int make_hole_for_dir(const char *outdir_fname)
+{
+    char *tmp = NULL;
     int res = 0;
 
     assert_string_is_neither_NULL_nor_zerolength(outdir_fname);
-    sprintf(tmp, "mkdir -p %s", outdir_fname);
+    mr_asprintf(tmp, "mkdir -p %s", outdir_fname);
     res = system(tmp);
+    mr_free(tmp);
     return (res);
 }
@@ -675 +636 @@
 {
     /*@ buffer ****************************************************** */
-    char command[MAX_STR_LEN * 2];
+    char *command = NULL;
 
     /*@ int  ******************************************************** */
@@ -685 +646 @@
     assert(!strstr(outfile_fname, MNT_CDROM));
     assert(!strstr(outfile_fname, "/dev/cdrom"));
-    sprintf(command, "mkdir -p \"%s\" 2> /dev/null", outfile_fname);
+    mr_asprintf(command, "mkdir -p \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
-    sprintf(command, "rmdir \"%s\" 2> /dev/null", outfile_fname);
+    mr_free(command);
+
+    mr_asprintf(command, "rmdir \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
-    sprintf(command, "rm -f \"%s\" 2> /dev/null", outfile_fname);
+    mr_free(command);
+
+    mr_asprintf(command, "rm -f \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
+    mr_free(command);
+
     unlink(outfile_fname);
     return (0);
 }
-
-
 
 
@@ -713 +678 @@
 
     /*@ buffers **************************************************** */
-    char incoming[MAX_STR_LEN];
-    char *p = NULL;
+    char *incoming = NULL;
 
     /*@ end vars *************************************************** */
@@ -725 +689 @@
         return (0);
     }
-    p = fgets(incoming, MAX_STR_LEN - 1, fin);
-    while (!feof(fin) && (p != NULL)) {
+    mr_getline(incoming, fin);
+    while (!feof(fin)) {
         if (strstr(incoming, wildcard)) {
             matches++;
         }
-        p = fgets(incoming, MAX_STR_LEN - 1, fin);
-    }
+        mr_free(incoming);
+        mr_getline(incoming, fin);
+    }
+    mr_free(incoming);
     paranoid_fclose(fin);
     return (matches);
@@ -746 +712 @@
 long size_of_partition_in_mountlist_K(char *tmpdir, char *dev)
 {
-    char command[MAX_STR_LEN];
-    char mountlist[MAX_STR_LEN];
-    char sz_res[MAX_STR_LEN];
+    char *command = NULL;
+    char *mountlist = NULL;
+    char *sz_res = NULL;
     long file_len_K;
 
-    sprintf(mountlist, "%s/mountlist.txt", tmpdir);
-    sprintf(command,
-            "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'",
-            dev, tmpdir);
+    mr_asprintf(mountlist, "%s/mountlist.txt", tmpdir);
+    mr_asprintf(command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, tmpdir);
+    mr_free(mountlist);
+
     log_it(command);
-    strcpy(sz_res, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(sz_res, "%s", call_program_and_get_last_line_of_output(command));
     file_len_K = atol(sz_res);
     log_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
+    mr_free(sz_res);
+    mr_free(command);
+
     return (file_len_K);
 }
@@ -770 +739 @@
 {
     /*@ buffers ***************************************************** */
-    char *fname;
-    char *biggielist;
-    char *comment;
-    char *tmp;
-    char *q;
-    char *command;
+    char *fname = NULL;
+    char *biggielist = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
 
     /*@ long ******************************************************** */
@@ -786 +753 @@
     /*@ end vars *************************************************** */
 
-    malloc_string(fname);
-    malloc_string(biggielist);
-    malloc_string(comment);
-    malloc_string(tmp);
-    malloc_string(command);
     log_it("Calculating size of all biggiefiles (in total)");
-    sprintf(biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
     log_it("biggielist = %s", biggielist);
-    if (!(fin = fopen(biggielist, "r"))) {
-        log_OS_error
-            ("Cannot open biggielist. OK, so estimate is based on filesets only.");
+    fin = fopen(biggielist, "r");
+    mr_free(biggielist);
+
+    if (!(fin)) {
+        log_OS_error("Cannot open biggielist. OK, so estimate is based on filesets only.");
     } else {
         log_msg(4, "Reading it...");
-        for (q = fgets(fname, MAX_STR_LEN, fin); !feof(fin) && (q != NULL);
-             q = fgets(fname, MAX_STR_LEN, fin)) {
+        for (mr_getline(fname, fin); !feof(fin); mr_getline(fname, fin)) {
             if (fname[strlen(fname) - 1] <= 32) {
                 fname[strlen(fname) - 1] = '\0';
@@ -807 +770 @@
                 if (is_dev_an_NTFS_dev(fname)) {
                     if ( !find_home_of_exe("ntfsresize")) {
+                        mr_free(tmp);
+                        mr_free(fname);
                         fatal_error("ntfsresize not found");
                     }
-                    sprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
+                    mr_free(tmp);
+
+                    mr_asprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
                     log_it("command = %s", command);
-                    strcpy (tmp, call_program_and_get_last_line_of_output(command));
+                    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+                    mr_free(command);
+
                     log_it("res of it = %s", tmp);
                     file_len_K = atoll(tmp) / 1024L;
+                    mr_free(tmp);
                 } else {
                     file_len_K = get_phys_size_of_drive(fname) * 1024L;
@@ -825 +795 @@
                 log_msg(4, "%s --> %ld K", fname, file_len_K);
             }
-            sprintf(comment,
-                    "After adding %s, scratchL+%ld now equals %ld", fname,
-                    file_len_K, scratchL);
-            log_msg(4, comment);
+            log_msg(4, "After adding %s, scratchL+%ld now equals %ld", fname, file_len_K, scratchL);
             if (feof(fin)) {
                 break;
             }
-        }
+            mr_free(fname);
+        }
+        mr_free(fname);
     }
     log_it("Closing...");
     paranoid_fclose(fin);
     log_it("Finished calculating total size of all biggiefiles");
-    paranoid_free(fname);
-    paranoid_free(biggielist);
-    paranoid_free(comment);
-    paranoid_free(tmp);
-    paranoid_free(command);
     return (scratchL);
 }
@@ -854 +818 @@
 {
     /*@ buffer ****************************************************** */
-    char tmp[MAX_STR_LEN];
-    char command[MAX_STR_LEN * 2];
+    char *tmp = NULL;
+    char *command = NULL;
     long long llres;
     /*@ pointers **************************************************** */
@@ -863 +827 @@
     /*@ end vars *************************************************** */
 
-    sprintf(command, "du -sk %s", mountpt);
+    mr_asprintf(command, "du -sk %s", mountpt);
     errno = 0;
     fin = popen(command, "r");
@@ -870 +834 @@
       llres = 0;
     } else {
-      p = fgets(tmp, MAX_STR_LEN, fin);
+      mr_getline(tmp, fin);
       paranoid_pclose(fin);
       p = strchr(tmp, '\t');
@@ -880 +844 @@
         llres += (int) (*p - '0');
       }
-    }
+      mr_free(tmp);
+    }
+    mr_free(command);
 
     return (llres);
@@ -928 +894 @@
 {
     /*@ buffers *** */
-    char command[MAX_STR_LEN * 2];
-    char errorstr[MAX_STR_LEN];
-
-
-    sprintf(command, "which %s > /dev/null 2> /dev/null", fname);
-    sprintf(errorstr,
-            "Please install '%s'. I cannot find it on your system.",
-            fname);
-    if (system(command)) {
-        log_to_screen(errorstr);
-        log_to_screen
-            ("There may be hyperlink at http://www.mondorescue.org/downloads.shtml which");
+    char *command = NULL;
+    int res = 0;
+
+    mr_asprintf(command, "which %s > /dev/null 2> /dev/null", fname);
+    res = system(command);
+    mr_free(command);
+
+    if (res) {
+        log_to_screen("Please install '%s'. I cannot find it on your system.", fname);
+        log_to_screen("There may be hyperlink at http://www.mondorescue.org which");
         log_to_screen("will take you to the relevant (missing) package.");
         return (1);
@@ -1038 +1002 @@
 {
     /*@ Char buffers ** */
-    char command[MAX_STR_LEN * 2];
-    char tmp[MAX_STR_LEN];
+    char *command = NULL;
+    char *tmp = NULL;
     char old_pwd[MAX_STR_LEN];
-
-    mvaddstr_and_log_it(g_currentY, 0,
-                        "Copying Mondo's core files to the scratch directory");
+    int res = 0;
+
+    mvaddstr_and_log_it(g_currentY, 0, "Copying Mondo's core files to the scratch directory");
 
     log_msg(4, "g_mondo_home='%s'", g_mondo_home);
@@ -1049 +1013 @@
         find_and_store_mondoarchives_home(g_mondo_home);
     }
-    sprintf(command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
-            bkpinfo->scratchdir);
+    mr_asprintf(command, CP_BIN " --parents -pRdf %s %s", g_mondo_home, bkpinfo->scratchdir);
 
     log_msg(4, "command = %s", command);
-    if (run_program_and_log_output(command, 1)) {
+    res = run_program_and_log_output(command, 1);
+    mr_free(command);
+
+    if (res) {
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
     }
 
-    sprintf(tmp, "%s/payload.tgz", g_mondo_home);
+    mr_asprintf(tmp, "%s/payload.tgz", g_mondo_home);
     if (does_file_exist(tmp)) {
-        log_it("Untarring payload %s to scratchdir %s", tmp,
-               bkpinfo->scratchdir);
+        log_it("Untarring payload %s to scratchdir %s", tmp, bkpinfo->scratchdir);
         if (getcwd(old_pwd, MAX_STR_LEN - 1)) {
             // FIXME
@@ -1067 +1032 @@
             // FIXME
         }
-        sprintf(command, "tar -zxvf %s", tmp);
-        if (run_program_and_log_output(command, FALSE)) {
+        mr_asprintf(command, "tar -zxvf %s", tmp);
+        res = run_program_and_log_output(command, FALSE);
+        if (res) {
+            mr_free(command);
+            mr_free(tmp);
             fatal_error("Failed to untar payload");
         }
+        mr_free(command);
         if (chdir(old_pwd)) {
             // FIXME
         }
     }
-
-    sprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir,
-            bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
 
     if (run_program_and_log_output(command, FALSE)) {
         fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }
-
-    strcpy(tmp,
-           call_program_and_get_last_line_of_output("which mondorestore"));
+    mr_free(command);
+
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("which mondorestore"));
     if (!tmp[0]) {
-        fatal_error
-            ("'which mondorestore' returned null. Where's your mondorestore? `which` can't find it. That's odd. Did you install mondorestore?");
-    }
-    sprintf(command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
-    if (run_program_and_log_output(command, FALSE)) {
+        mr_free(tmp);
+        fatal_error("'which mondorestore' returned null. Where's your mondorestore? `which` can't find it. That's odd. Did you install mondorestore?");
+    }
+
+    mr_asprintf(command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
+    mr_free(tmp);
+    res = run_program_and_log_output(command, FALSE);
+    if (res) {
+        mr_free(command);
         fatal_error("Failed to copy mondorestore to tmpdir");
     }
-
-    sprintf(command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
+    mr_free(command);
+
+    mr_asprintf(command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
     paranoid_system(command);
+    mr_free(command);
 
     if (bkpinfo->postnuke_tarball[0]) {
-        sprintf(command, "cp -f %s %s/post-nuke.tgz",
-                bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
-        if (run_program_and_log_output(command, FALSE)) {
+        mr_asprintf(command, "cp -f %s %s/post-nuke.tgz", bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
+        res = run_program_and_log_output(command, FALSE);
+        mr_free(command);
+
+        if (res) {
             fatal_error("Unable to copy post-nuke tarball to tmpdir");
         }
     }
-
 
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -1125 +1101 @@
 
     /*@ buffers ******** */
-    char netfs_dev[MAX_STR_LEN];
-    char netfs_mount[MAX_STR_LEN];
-    char netfs_client_hwaddr[MAX_STR_LEN];
-    char netfs_client_ipaddr[MAX_STR_LEN];
-    char netfs_client_netmask[MAX_STR_LEN];
-    char netfs_client_broadcast[MAX_STR_LEN];
-    char netfs_client_defgw[MAX_STR_LEN];
-    char netfs_server_ipaddr[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    char command[MAX_STR_LEN * 2];
+    char *netfs_dev = NULL;
+    char *netfs_client_hwaddr = NULL;
+    char *netfs_mount = NULL;
+    char *netfs_client_ipaddr = NULL;
+    char *netfs_client_netmask = NULL;
+    char *netfs_client_broadcast = NULL;
+    char *netfs_client_defgw = NULL;
+    char *netfs_server_ipaddr = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
 
     /*@ pointers ***** */
     char *p;
 
+    if (! bkpinfo->netfs_mount) {
+        fatal_error("No netfs_mount found !");
+    }
+
     log_it("Storing Network configuration");
-    strcpy(tmp, bkpinfo->netfs_mount);
+    mr_asprintf(tmp, "%s", bkpinfo->netfs_mount);
     p = strchr(tmp, ':');
     if (!p) {
-        fatal_error
-            ("Network mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
+        fatal_error("Network mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
     }
     *(p++) = '\0';
-    strcpy(netfs_server_ipaddr, tmp);
-    strcpy(netfs_mount, p);
+    mr_asprintf(netfs_server_ipaddr, "%s", tmp);
+    mr_asprintf(netfs_mount, "%s", p);
+    mr_free(tmp);
 
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
-    sprintf(command,
-            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
-    strcpy(netfs_dev, call_program_and_get_last_line_of_output(command));
-    sprintf(command,
-            "ifconfig %s | head -1 | awk '{print $5}'", netfs_dev);
-    strcpy(netfs_client_hwaddr, call_program_and_get_last_line_of_output(command));
-    sprintf(command,
-            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
-    strcpy(netfs_client_ipaddr,
-           call_program_and_get_last_line_of_output(command));
-    sprintf(command,
-            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
-    strcpy(netfs_client_netmask,
-           call_program_and_get_last_line_of_output(command));
-    sprintf(command,
-            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
-    strcpy(netfs_client_broadcast,
-           call_program_and_get_last_line_of_output(command));
-    sprintf(command,
-            "route -n | grep '^0.0.0.0' | awk '{print $2}'");
-    strcpy(netfs_client_defgw,
-           call_program_and_get_last_line_of_output(command));
-    sprintf(tmp,
-            "netfs_client_hwaddr=%s; netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s",
-            netfs_client_hwaddr, netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
+    mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
+    mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
+    mr_asprintf(netfs_client_ipaddr, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
+    mr_asprintf(netfs_client_netmask, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
+    mr_asprintf(netfs_client_broadcast, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    mr_asprintf(command, "%s", "route -n | grep '^0.0.0.0' | awk '{print $2}'");
+    mr_asprintf(netfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    mr_asprintf(command, "ifconfig %s | head -1 | awk '{print $5}'", netfs_dev);
+    mr_asprintf(netfs_client_hwaddr, "%s" call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    log_it("netfs_client_hwaddr=%s; netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s", netfs_client_hwaddr, netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
     if (strlen(netfs_dev) < 2) {
-        fatal_error
-            ("Unable to find ethN (eth0, eth1, ...) adapter via Network mount you specified.");
-    }
+        fatal_error("Unable to find ethN (eth0, eth1, ...) adapter via Network mount you specified.");
+    }
+
     /********
-    * If the Network device that found above is a bonded device, 
+    * If the Network device found above is a bonded device, 
     * we need to replace it with an ethN device or the
     * networking will not start during an Network restore.
@@ -1191 +1171 @@
     if (!strncmp(netfs_dev, "bond", 4) || !strncmp(netfs_dev, "alb", 3) || !strncmp(netfs_dev, "aft", 3)) {
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", netfs_dev);
-        sprintf(command,
-                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1",netfs_client_hwaddr,netfs_dev);
-        strcpy(netfs_dev, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1",netfs_client_hwaddr,netfs_dev);
+        mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
+        mr_free(command);
         log_to_screen("Replacing it with %s\n", netfs_dev);
     }
 
-    sprintf(tmp, "%s/NETFS-DEV", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NETFS-DEV", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_dev);
+    mr_free(netfs_dev);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_hwaddr);
+    mr_free(netfs_client_hwaddr);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_ipaddr);
+    mr_free(netfs_client_ipaddr);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_netmask);
+    mr_free(netfs_client_netmask);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_broadcast);
+    mr_free(netfs_client_broadcast);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_defgw);
+    mr_free(netfs_client_defgw);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_server_ipaddr);
+    mr_free(netfs_server_ipaddr);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
+    mr_free(tmp);
+
+    if (bkpinfo->netfs_user) {
+        mr_asprintf(tmp, "%s/NETFS-SERVER-USER", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, bkpinfo->netfs_user);
+        mr_free(tmp);
+    }
+    mr_asprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->prefix);
+    mr_free(tmp);
 
     sprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
-
-    sprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_hwaddr);
-    sprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_ipaddr);
-    sprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_netmask);
-    sprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_broadcast);
-    sprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_defgw);
-    sprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_server_ipaddr);
-    sprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
-    if (bkpinfo->netfs_user) {
-        sprintf(tmp, "%s/NETFS-SERVER-USER", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, bkpinfo->netfs_user);
-    }
-    sprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
-    sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->prefix);
+    mr_free(tmp);
+
+
     log_it("Finished storing Network configuration");
 }
-
-
-
-
 
 
@@ -1253 +1258 @@
 {
     /*@ buffers *************** */
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char *mds = NULL;
 
@@ -1265 +1270 @@
 
     log_it("Estimating number of media required...");
-    scratchLL =
-        (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size)
-        + (long long) (size_of_all_biggiefiles_K());
+    scratchLL = (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size) + (long long) (size_of_all_biggiefiles_K());
     scratchLL = (scratchLL / 1024) / bkpinfo->media_size;
     scratchLL++;
@@ -1274 +1277 @@
     } else if (bkpinfo->use_gzip) {
         scratchLL = (scratchLL * 2) / 3;
+    } else if (bkpinfo->use_lzma) {
+        scratchLL = (scratchLL * 2) / 3;
     } else {
         scratchLL = scratchLL / 2;
@@ -1282 +1287 @@
     if (scratchLL <= 1) {
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        sprintf(tmp,
-                "Your backup will probably occupy a single %s. Maybe two.", mds);
+        mr_asprintf(tmp, "Your backup will probably occupy a single %s. Maybe two.", mds);
         mr_free(mds);
     } else if (scratchLL > 4) {
-        sprintf(tmp,
-                "Your backup will occupy one meeeeellion media! (maybe %s)",
-                number_to_text((int) (scratchLL + 1)));
+        mr_asprintf(tmp, "Your backup will occupy one meeeeellion media! (maybe %s)", number_to_text((int) (scratchLL + 1)));
     } else {
-        sprintf(tmp, "Your backup will occupy approximately %s media.",
-                number_to_text((int) (scratchLL + 1)));
-    }
-    if (!bkpinfo->image_devs[0] && (scratchLL < 50)) {
+        mr_asprintf(tmp, "Your backup will occupy approximately %s media.", number_to_text((int) (scratchLL + 1)));
+    }
+    if (scratchLL < 50) {
         log_to_screen(tmp);
     }
-}
-
-
-/**
- * Get the last suffix of @p instr.
- * If @p instr was "httpd.log.gz", we would return "gz".
- * @param instr The filename to get the suffix of.
- * @return The suffix (without a dot), or "" if none.
- * @note The returned string points to static storage that will be overwritten with each call.
- */
-char *sz_last_suffix(char *instr)
-{
-    static char outstr[MAX_STR_LEN];
-    char *p;
-
-    p = strrchr(instr, '.');
-    if (!p) {
-        outstr[0] = '\0';
-    } else {
-        strcpy(outstr, p);
-    }
-    return (outstr);
+    mr_free(tmp);
 }
 
@@ -1329 +1309 @@
 bool is_this_file_compressed(char *filename)
 {
-    char do_not_compress_these[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *do_not_compress_these = NULL;
+    char *tmp = NULL;
     char *p;
     char *q = NULL;
@@ -1339 +1319 @@
     }
 
-    sprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
+    mr_asprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
     if (!does_file_exist(tmp)) {
+        mr_free(tmp);
         return (FALSE);
     }
     /* BERLIOS: This is just plain WRONG !! */
-    strcpy(do_not_compress_these,last_line_of_file(tmp));
+    mr_asprintf(do_not_compress_these,"%s", last_line_of_file(tmp));
+    mr_free(tmp);
 
     for (p = do_not_compress_these; p != NULL; p++) {
-        strcpy(tmp, p);
+        mr_asprintf(tmp, "%s", p);
         if (strchr(tmp, ' ')) {
             *(strchr(tmp, ' ')) = '\0';
         }
         if (!strcmp(q, tmp)) {
+            mr_free(tmp);
+            mr_free(do_not_compress_these);
             return (TRUE);
         }
@@ -1357 +1341 @@
             break;
         }
-    }
+        mr_free(tmp);
+    }
+    mr_free(do_not_compress_these);
     return (FALSE);
 }