Changeset 1113 in MondoRescue

Timestamp:

Feb 8, 2007, 3:08:10 AM (17 years ago)

Author:

Bruno Cornec

Message:

Memory management improvements again for libmondo-fork.c & libmondo-files.c

Location:

branches/stable/mondo/src/common

Files:

• libmondo-files-EXT.h (modified) (2 diffs)
• libmondo-files.c (modified) (66 diffs)
• libmondo-files.h (modified) (2 diffs)
• libmondo-fork.c (modified) (34 diffs)
• libmondo.h (modified) (1 diff)
• mondostructures.h (modified) (3 diffs)

branches/stable/mondo/src/common/libmondo-files-EXT.h

@@ -7 +7 @@
 extern unsigned int updcrcr(unsigned int crc, unsigned int c);
 extern char *calc_checksum_of_file(char *filename);
-extern char *calc_file_ugly_minichecksum(char *curr_fname);
 extern long count_lines_in_file(char *filename);
 extern bool does_file_exist(char *filename);
@@ -17 +16 @@
 extern char *last_line_of_file(char *filename);
 extern off_t length_of_file(char *filename);
-extern int make_checksum_list_file(char *filelist, char *cksumlist,
-                                   char *comppath);
 extern int make_hole_for_file(char *outfile_fname);
 extern void make_list_of_files_to_ignore(char *ignorefiles_fname,

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

@@ -13 +13 @@
 #include "libmondo-files.h"
 
-#include "lib-common-externs.h"
-
 #include "libmondo-tools-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-devices-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-string-EXT.h"
+#include "mr_mem.h"
 
 #include "mr_file.h"
@@ -45 +44 @@
     /*@ buffers ***************************************************** */
     static char output[MAX_STR_LEN];
-    char command[MAX_STR_LEN * 2];
-    char tmp[MAX_STR_LEN];
+
+    char *command = NULL;
+    char *tmp = NULL;
+    size_t n = 0;
 
     /*@ pointers **************************************************** */
@@ -59 +60 @@
 
     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");
+        mr_free(command);
+
         if (fin) {
             (void) fgets(output, MAX_STR_LEN, fin);
@@ -68 +72 @@
         }
     } else {
-        sprintf(tmp, "File '%s' not found; cannot calc checksum",
+        mr_asprintf(&tmp, "File '%s' not found; cannot calc checksum",
                 filename);
         log_it(tmp);
+        mr_free(tmp);
     }
     if (p) {
@@ -124 +129 @@
 
     /*@ buffers ***************************************************** */
-    char command[MAX_STR_LEN * 2];
-    char incoming[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *command = NULL;
+    char *incoming = NULL;
+    char *tmp = NULL;
 
     /*@ long ******************************************************** */
     long noof_lines = -1L;
 
+    /*@ int ******************************************************** */
+    size_t n = 0;
+
     /*@ pointers **************************************************** */
     FILE *fin;
 
-    /*@ initialize [0] to null ******************************************** */
-    incoming[0] = '\0';
-
     assert_string_is_neither_NULL_nor_zerolength(filename);
     if (!does_file_exist(filename)) {
-        sprintf(tmp,
+        mr_asprintf(&tmp,
                 "%s does not exist, so I cannot found the number of lines in it",
                 filename);
         log_it(tmp);
+        mr_free(tmp);
         return (0);
     }
-    sprintf(command, "cat %s | wc -l", filename);
+    mr_asprintf(&command, "cat %s | wc -l", filename);
     if (!does_file_exist(filename)) {
         return (-1);
     }
     fin = popen(command, "r");
+    mr_free(command);
+
     if (fin) {
         if (feof(fin)) {
             noof_lines = 0;
         } else {
-            (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+            mr_getline(&incoming, &n, fin);
             while (strlen(incoming) > 0
                    && incoming[strlen(incoming) - 1] < 32) {
@@ -160 +168 @@
             }
             noof_lines = atol(incoming);
+            mr_free(incoming);
         }
         paranoid_pclose(fin);
@@ -181 +190 @@
 
     assert(filename != NULL);
-    //  assert_string_is_neither_NULL_nor_zerolength(filename);
+
     if (lstat(filename, &buf)) {
         mr_msg(20, "%s does not exist", filename);
@@ -192 +201 @@
 
 
-
-
-
-
 /**
  * Modify @p inout (a file containing a list of files) to only contain files
@@ -212 +217 @@
     /*@ int ********************************************************* */
     int i;
+    size_t n = 0;
 
     /*@ pointers **************************************************** */
@@ -220 +226 @@
 
     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 (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN, fin)) {
+    mr_free(outfname);
+
+    for (mr_getline(&incoming, &n, fin); !feof(fin);
+         mr_getline(&incoming, &n, fin)) {
         i = strlen(incoming) - 1;
         if (i >= 0 && incoming[i] < 32) {
@@ -241 +257 @@
             fprintf(fout, "%s\n", incoming);
         } else {
-            sprintf(tmp, "Excluding '%s'-nonexistent\n", incoming);
+            mr_asprintf(&tmp, "Excluding '%s'-nonexistent\n", incoming);
             log_it(tmp);
-        }
-    }
+            mr_free(tmp);
+        }
+    }
+    mr_free(incoming);
     paranoid_fclose(fout);
     paranoid_fclose(fin);
     unlink(infname);
-}
-
-
-
-
-
-
-
+    mr_free(infname);
+}
 
 
@@ -267 +279 @@
 int figure_out_kernel_path_interactively_if_necessary(char *kernel)
 {
-    char tmp[MAX_STR_LEN];
-    char *command;
-
+    char *tmp = NULL;
+    char *command = NULL;
+
+    malloc_string(tmp);
     if (!kernel[0]) {
         strcpy(kernel,
@@ -277 +290 @@
     // 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");
+        mr_asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
         strcpy(tmp, call_program_and_get_last_line_of_output(command));
         if (strlen(tmp) > 1) {
@@ -299 +311 @@
                 ("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);
 }
-
-
-
-
 
 
@@ -324 +331 @@
     static char output[MAX_STR_LEN];
     char *incoming;
-    char *command;
+    char *command = NULL;
 
     malloc_string(incoming);
-    malloc_string(command);
     incoming[0] = '\0';
     /*@******************************* */
 
     assert_string_is_neither_NULL_nor_zerolength(fname);
-    sprintf(command, "which %s 2> /dev/null", fname);
+
+    mr_asprintf(&command, "which %s 2> /dev/null", fname);
     strcpy(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")) {
@@ -341 +350 @@
             return (NULL);      // forget it :)
         }
-        sprintf(command,
+        mr_asprintf(&command,
                 "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null",
                 incoming);
         strcpy(incoming,
                call_program_and_get_last_line_of_output(command));
+        mr_free(command);
     }
     if (incoming[0] == '\0')    // yes, it is == '\0' twice, not once :)
     {
-        sprintf(command, "dirname %s 2> /dev/null", incoming);
+        mr_asprintf(&command, "dirname %s 2> /dev/null", incoming);
         strcpy(incoming,
                call_program_and_get_last_line_of_output(command));
+        mr_free(command);
     }
     strcpy(output, incoming);
@@ -362 +373 @@
     }
     mr_free(incoming);
-    mr_free(command);
     if (!output[0]) {
         return (NULL);
@@ -371 +381 @@
 
 
-
-
-
-
-
-
 /**
  * Get the last sequence of digits surrounded by non-digits in the first 32k of
@@ -397 +401 @@
 
     assert_string_is_neither_NULL_nor_zerolength(logfile);
+
     if (!(fin = fopen(logfile, "r"))) {
         log_OS_error("Unable to open logfile");
@@ -410 +415 @@
     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);
 }
-
-
-
-
-
 
 
@@ -432 +428 @@
 {
 
-    /*@ buffers ***************************************************** */
-    char tmp[MAX_STR_LEN];
-    char lastline[MAX_STR_LEN];
-    char command[MAX_STR_LEN];
-    /*@ pointers **************************************************** */
-    char *p;
-
-    /*@ int's ******************************************************* */
+    char *lastline = NULL;
+    char *command = NULL;
+    char *p = NULL;
     int i;
 
+    malloc_string(lastline);
     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,
+        mr_asprintf(&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_free(command);
         if (!lastline[0]) {
             return (0);
@@ -462 +455 @@
         *p = '\0';
     }
-//  mr_msg(2, "lastline='%s', ", p, lastline);
     if (!p) {
         return (0);
@@ -473 +465 @@
     i = atoi(p);
 
-    sprintf(tmp, "'%s' --> %d", p, i);
-//     log_to_screen(tmp);
-
     return (i);
 }
-
-
-
 
 
@@ -493 +479 @@
     /*@ buffers ***************************************************** */
     static char output[MAX_STR_LEN];
-    static char command[MAX_STR_LEN * 2];
-    static char tmp[MAX_STR_LEN];
+    char *command = NULL;
+    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
     FILE *fin;
+    size_t n = 0;
 
     /*@ end vars **************************************************** */
 
     if (!does_file_exist(filename)) {
-        sprintf(tmp, "Tring to get last line of nonexistent file (%s)",
+        mr_asprintf(&tmp, _("Tring to get last line of nonexistent file (%s)"),
                 filename);
         log_it(tmp);
+        mr_free(tmp);
         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);
+
     (void) fgets(output, MAX_STR_LEN, fin);
     paranoid_pclose(fin);
@@ -517 +507 @@
     return (output);
 }
+
 
 /**
@@ -544 +535 @@
 
 
-
-/**
- * ?????
- * @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)
-{
-    /*@ pointers **************************************************** */
-    FILE *fin;
-    FILE *fout;
-
-    /*@ int   ******************************************************* */
-    int percentage;
-    int i;
-    int counter = 0;
-
-    /*@ buffer ****************************************************** */
-    char stub_fname[1000];
-    char curr_fname[1000];
-    char curr_cksum[1000];
-    char tmp[1000];
-
-    /*@ long [long] ************************************************* */
-    off_t filelist_length;
-    off_t curr_pos;
-    long start_time;
-    long current_time;
-    long time_taken;
-    long time_remaining;
-
-    /*@ end vars *************************************************** */
-
-    start_time = get_time();
-    filelist_length = length_of_file(filelist);
-    sprintf(tmp, "filelist = %s; cksumlist = %s", filelist, cksumlist);
-    log_it(tmp);
-    fin = fopen(filelist, "r");
-    if (fin == NULL) {
-        log_OS_error("Unable to fopen-in filelist");
-        log_to_screen("Can't open filelist");
-        return (1);
-    }
-    fout = fopen(cksumlist, "w");
-    if (fout == NULL) {
-        log_OS_error("Unable to openout cksumlist");
-        paranoid_fclose(fin);
-        log_to_screen("Can't open checksum list");
-        return (1);
-    }
-    for (fgets(stub_fname, 999, fin); !feof(fin);
-         fgets(stub_fname, 999, 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));
-        fprintf(fout, "%s\t%s\n", curr_fname, curr_cksum);
-        if (counter++ > 12) {
-            current_time = get_time();
-            counter = 0;
-            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);
-            }
-            sync();
-        }
-    }
-    paranoid_fclose(fout);
-    paranoid_fclose(fin);
-    log_it("Done.");
-    return (0);
-}
-
-
 /**
  * Create the directory @p outdir_fname and all parent directories. Equivalent to <tt>mkdir -p</tt>.
@@ -638 +540 @@
  * @return The return value of @c mkdir.
  */
+/* BERLIOS: This function shouldn't call system at all */
 int make_hole_for_dir(char *outdir_fname)
 {
-    char tmp[MAX_STR_LEN * 2];
+    char *tmp;
     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);
 }
@@ -656 +560 @@
  * @bug Return value unnecessary.
  */
+/* BERLIOS: This function shouldn't call system at all */
 int make_hole_for_file(char *outfile_fname)
 {
     /*@ buffer ****************************************************** */
-    char command[MAX_STR_LEN * 2];
+    char *command;
 
     /*@ int  ******************************************************** */
@@ -669 +574 @@
     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);
 }
-
-
 
 
@@ -697 +606 @@
 
     /*@ buffers **************************************************** */
-    char incoming[MAX_STR_LEN];
-
+    char *incoming = NULL;
+
+    size_t n = 0;
     /*@ end vars *************************************************** */
 
@@ -708 +618 @@
         return (0);
     }
-    (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+    mr_getline(&incoming, &n, fin);
     while (!feof(fin)) {
         if (strstr(incoming, wildcard)) {
             matches++;
         }
-        (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+        mr_getline(&incoming, &n, fin);
     }
     paranoid_fclose(fin);
+    mr_free(incoming);
     return (matches);
 }
-
-
 
 
@@ -731 +640 @@
 void register_pid(pid_t pid, char *name_str)
 {
-    char tmp[MAX_STR_LEN + 1], lockfile_fname[MAX_STR_LEN + 1];
+    char *tmp = NULL;
+    char *lockfile_fname = NULL;
     int res;
+    size_t n = 0;
     FILE *fin;
 
-    sprintf(lockfile_fname, "/var/run/monitas-%s.pid", name_str);
+    mr_asprintf(&lockfile_fname, "/var/run/monitas-%s.pid", name_str);
     if (!pid) {
         log_it("Unregistering PID");
@@ -741 +652 @@
             log_it("Error unregistering PID");
         }
+        mr_free(lockfile_fname);
         return;
     }
     if (does_file_exist(lockfile_fname)) {
-        tmp[0] = '\0';
         if ((fin = fopen(lockfile_fname, "r"))) {
-            (void) fgets(tmp, MAX_STR_LEN, fin);
+            mr_getline(&tmp, &n, fin);
             paranoid_fclose(fin);
         } else {
@@ -752 +663 @@
         }
         pid = (pid_t) atol(tmp);
-        sprintf(tmp, "ps %ld > /dev/null 2> /dev/null", (long int) pid);
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, "ps %ld > /dev/null 2> /dev/null", (long int) pid);
         res = system(tmp);
+        mr_free(tmp);
         if (!res) {
             log_it
@@ -760 +674 @@
         }
     }
-    sprintf(tmp, "echo %ld > %s 2> /dev/null", (long int) getpid(),
+    mr_asprintf(&tmp, "echo %ld > %s 2> /dev/null", (long int) getpid(),
             lockfile_fname);
+    mr_free(lockfile_fname);
+
     if (system(tmp)) {
         fatal_error("Cannot register PID");
     }
-}
-
+    mr_free(tmp);
+    return;
+}
 
 
@@ -777 +694 @@
 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];
-    long file_len_K;
-
-    sprintf(mountlist, "%s/mountlist.txt", tmpdir);
-    sprintf(command,
-            "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'",
+    char *command = NULL;
+    char *sz_res = NULL;
+    long file_len_K = 0L;
+
+    malloc_string(sz_res);
+    mr_asprintf(&command,
+            "grep '%s ' %s/mountlist.txt | head -n1 | awk '{print $4;}'",
             dev, tmpdir);
     log_it(command);
@@ -790 +706 @@
     file_len_K = atol(sz_res);
     mr_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
+    mr_free(command);
+    mr_free(sz_res);
     return (file_len_K);
 }
+
 
 /**
@@ -800 +719 @@
 long size_of_all_biggiefiles_K(struct s_bkpinfo *bkpinfo)
 {
-    /*@ buffers ***************************************************** */
-    char *fname;
-    char *biggielist;
-    char *comment;
-    char *tmp;
-    char *command;
+    char *fname = NULL;
+    char *biggielist = NULL;
+    char *comment = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
 
     /*@ long ******************************************************** */
-    long scratchL = 0;
-    long file_len_K;
+    long scratchL = 0L;
+    long file_len_K = 0L;
 
     /*@ pointers *************************************************** */
     FILE *fin = NULL;
+    size_t n = 0;
 
     /*@ 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"))) {
@@ -829 +744 @@
     } else {
         mr_msg(4, "Reading it...");
-        for (fgets(fname, MAX_STR_LEN, fin); !feof(fin);
-             fgets(fname, MAX_STR_LEN, fin)) {
+        for (mr_getline(&fname, &n, fin); !feof(fin);
+             mr_getline(&fname, &n, fin)) {
             if (fname[strlen(fname) - 1] <= 32) {
                 fname[strlen(fname) - 1] = '\0';
@@ -839 +754 @@
                         fatal_error("ntfsresize not found");
                     }
-                    sprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
+                    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_free(command);
+
                     log_it("res of it = %s", tmp);
                     file_len_K = atoll(tmp) / 1024L;
@@ -855 +772 @@
                 mr_msg(4, "%s --> %ld K", fname, file_len_K);
             }
-            sprintf(comment,
+            mr_asprintf(&comment,
                     "After adding %s, scratchL+%ld now equals %ld", fname,
                     file_len_K, scratchL);
             mr_msg(4, comment);
+            mr_free(comment);
+
             if (feof(fin)) {
                 break;
             }
         }
-    }
+        mr_free(fname);
+    }
+    mr_free(biggielist);
+
     log_it("Closing...");
     paranoid_fclose(fin);
     log_it("Finished calculating total size of all biggiefiles");
-    mr_free(fname);
-    mr_free(biggielist);
-    mr_free(comment);
     mr_free(tmp);
-    mr_free(command);
     return (scratchL);
 }
@@ -884 +802 @@
 {
     /*@ buffer ****************************************************** */
-    char tmp[MAX_STR_LEN];
-    char command[MAX_STR_LEN * 2];
+    char *tmp = NULL;
+    char *command = NULL;
     long long llres;
+    size_t n = 0;
     /*@ pointers **************************************************** */
-    char *p;
-    FILE *fin;
+    char *p = NULL;
+    FILE *fin = NULL;
 
     /*@ end vars *************************************************** */
 
-    sprintf(command, "du -sk %s", mountpt);
+    mr_asprintf(&command, "du -sk %s", mountpt);
     errno = 0;
     fin = popen(command, "r");
@@ -900 +819 @@
       llres = 0;
     } else {
-      (void) fgets(tmp, MAX_STR_LEN, fin);
-      paranoid_pclose(fin);
-      p = strchr(tmp, '\t');
-      if (p) {
-        *p = '\0';
-      }
-      for (p = tmp, llres = 0; *p != '\0'; p++) {
-        llres *= 10;
-        llres += (int) (*p - '0');
-      }
-    }
-
+        mr_getline(&tmp, &n, fin);
+        paranoid_pclose(fin);
+        p = strchr(tmp, '\t');
+        if (p) {
+            *p = '\0';
+        }
+        for (p = tmp, llres = 0; *p != '\0'; p++) {
+            llres *= 10;
+            llres += (int) (*p - '0');
+        }
+    }
+
+    mr_free(command);
+    mr_free(tmp);
     return (llres);
 }
@@ -931 +852 @@
 }
 
+
 /**
  * Update a reverse CRC checksum to include another character.
@@ -947 +869 @@
 
 
-
-
 /**
  * Check for an executable on the user's system; write a message to the
@@ -958 +878 @@
 {
     /*@ 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.",
+    char *command;
+    char *errorstr;
+    int res = 0;
+
+
+    mr_asprintf(&command, "which %s > /dev/null 2> /dev/null", fname);
+    res = system(command);
+    mr_free(command);
+
+    if (res) {
+        mr_asprintf(&errorstr,
+            _("Please install '%s'. I cannot find it on your system."),
             fname);
-    if (system(command)) {
         log_to_screen(errorstr);
+        mr_free(errorstr);
         log_to_screen
-            ("There may be hyperlink at http://www.mondorescue.com which");
-        log_to_screen("will take you to the relevant (missing) package.");
+            (_("There may be an hyperlink at http://www.mondorescue.org which"));
+        log_to_screen(_("will take you to the relevant (missing) package."));
         return (1);
     } else {
@@ -976 +901 @@
     }
 }
-
-
-
-
 
 
@@ -1012 +933 @@
 
 
-
 /**
  * Read @p fname into @p contents.
@@ -1045 +965 @@
     return (res);
 }
-
-
-
-
-
-
-
 
 
@@ -1067 +980 @@
 {
     /*@ Char buffers ** */
-    char command[MAX_STR_LEN * 2];
+    char *command = NULL;
     char tmp[MAX_STR_LEN];
     char old_pwd[MAX_STR_LEN];
@@ -1074 +987 @@
                         "Copying Mondo's core files to the scratch directory");
 
+    /* BERLIOS: Why do we need to do it here as well ? */
     mr_msg(4, "g_mondo_home='%s'", g_mondo_home);
     if (strlen(g_mondo_home) < 2) {
         find_and_store_mondoarchives_home(g_mondo_home);
     }
-    sprintf(command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
+    mr_asprintf(&command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
             bkpinfo->scratchdir);
 
@@ -1085 +999 @@
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
     }
+    mr_free(command);
+
+    /* i18n */
+    mr_asprintf(&command, CP_BIN " --parents /usr/share/locale/*/LC_MESSAGES/mondo.mo %s",bkpinfo->scratchdir);
+    mr_msg(4, "command = %s", command);
+    run_program_and_log_output(command, 1);
+    mr_free(command);
 
     sprintf(tmp, "%s/payload.tgz", g_mondo_home);
@@ -1092 +1013 @@
         (void) getcwd(old_pwd, MAX_STR_LEN - 1);
         chdir(bkpinfo->scratchdir);
-        sprintf(command, "tar -zxvf %s", tmp);
+        mr_asprintf(&command, "tar -zxvf %s", tmp);
         if (run_program_and_log_output(command, FALSE)) {
             fatal_error("Failed to untar payload");
         }
+        mr_free(command);
         chdir(old_pwd);
     }
 
-    sprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir,
+    mr_asprintf(&command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir,
             bkpinfo->scratchdir);
 
@@ -1105 +1027 @@
         fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }
-
-    strcpy(tmp,
-           call_program_and_get_last_line_of_output("which mondorestore"));
-    if (!tmp[0]) {
+    mr_free(command);
+
+    tmp = call_program_and_get_last_line_of_output("which mondorestore");
+    if (!tmp) {
         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);
+    mr_asprintf(&command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
     if (run_program_and_log_output(command, FALSE)) {
         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",
+        mr_asprintf(&command, "cp -f %s %s/post-nuke.tgz",
                 bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
         if (run_program_and_log_output(command, FALSE)) {
             fatal_error("Unable to copy post-nuke tarball to tmpdir");
         }
-    }
-
+        mr_free(command);
+    }
 
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 }
-
-
-
 
 
@@ -1156 +1077 @@
     char nfs_client_defgw[MAX_STR_LEN];
     char nfs_server_ipaddr[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    char command[MAX_STR_LEN * 2];
+    char *tmp = NULL;
+    char *command = NULL;
 
     FILE *fd1 = NULL;
@@ -1165 +1086 @@
 
     log_it("Storing NFS configuration");
-    strcpy(tmp, bkpinfo->nfs_mount);
+    mr_asprintf(&tmp, bkpinfo->nfs_mount);
     p = strchr(tmp, ':');
     if (!p) {
@@ -1173 +1094 @@
     *(p++) = '\0';
     strcpy(nfs_server_ipaddr, tmp);
+    mr_free(tmp);
+
     strcpy(nfs_mount, p);
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
-    sprintf(command,
+    mr_asprintf(&command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
     strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
-    sprintf(command,
+    mr_free(command);
+
+    mr_asprintf(&command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
     strcpy(nfs_client_ipaddr,
            call_program_and_get_last_line_of_output(command));
-    sprintf(command,
+    mr_free(command);
+
+    mr_asprintf(&command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
     strcpy(nfs_client_netmask,
            call_program_and_get_last_line_of_output(command));
-    sprintf(command,
+    mr_free(command);
+
+    mr_asprintf(&command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
     strcpy(nfs_client_broadcast,
            call_program_and_get_last_line_of_output(command));
-    sprintf(command,
+    mr_free(command);
+
+    mr_asprintf(&command,
             "route -n | grep '^0.0.0.0' | awk '{print $2}'");
     strcpy(nfs_client_defgw,
            call_program_and_get_last_line_of_output(command));
-    sprintf(tmp,
-            "nfs_client_ipaddr=%s; nfs_server_ipaddr=%s; nfs_mount=%s",
-            nfs_client_ipaddr, nfs_server_ipaddr, nfs_mount);
+    mr_free(command);
+
+    mr_asprintf(&tmp,
+            "nfs_client_ipaddr=%s; nfs_client_netmask=%s; nfs_server_ipaddr=%s; nfs_mount=%s; nfs_client_defgw=%s;  ",
+            nfs_client_ipaddr, nfs_client_netmask, nfs_server_ipaddr, nfs_mount, nfs_client_defgw);
+    log_it(tmp);
+    mr_free(tmp);
+
     if (strlen(nfs_dev) < 2) {
         fatal_error
@@ -1212 +1148 @@
     if (!strncmp(nfs_dev, "bond", 4)) {
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
-        sprintf(command,
+        mr_asprintf(&command,
                 "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
         strcpy(mac_addr, call_program_and_get_last_line_of_output(command));
-        sprintf(command,
+        mr_free(command);
+
+        mr_asprintf(&command,
                 "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
         strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
+        mr_free(command);
+
         log_to_screen("Replacing it with %s\n", nfs_dev);
     }
 
     fd1 = mr_fopen(MONDORESTORECFG, "a");
-
     mr_fprintf(fd1, "nfs-dev %s\n", nfs_dev);
     mr_fprintf(fd1, "nfs-client-ipaddr %s\n", nfs_client_ipaddr);
@@ -1236 +1175 @@
     log_it("Finished storing NFS configuration");
 }
-
-
-
-
 
 
@@ -1262 +1197 @@
 {
     /*@ buffers *************** */
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     /*@ long long ************* */
@@ -1289 +1224 @@
     }
     if (scratchLL <= 1) {
-        sprintf(tmp,
-                "Your backup will probably occupy a single %s. Maybe two.",
-                media_descriptor_string(bkpinfo->backup_media_type));
-    } 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 probably occupy a single %s. Maybe two."),
+                bkpinfo->backup_media_string);
     } else {
-        sprintf(tmp, "Your backup will occupy approximately %s media.",
+        mr_asprintf(&tmp, _("Your backup will occupy approximately %s media."),
                 number_to_text((int) (scratchLL + 1)));
     }
@@ -1303 +1234 @@
         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);
+    return;
 }
 
@@ -1336 +1247 @@
 bool is_this_file_compressed(char *filename)
 {
-    char do_not_compress_these[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    char *p;
-
-    sprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
+    char *do_not_compress_these = NULL;
+    char *tmp = NULL;
+    char *p = NULL;
+
+    malloc_string(do_not_compress_these);
+    mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
     if (!does_file_exist(tmp)) {
+        mr_free(tmp);
         return (FALSE);
     }
-    strcpy(do_not_compress_these, last_line_of_file(tmp));
+    mr_free(tmp);
+
+    strcpy(do_not_compress_these,last_line_of_file(tmp));
     for (p = do_not_compress_these; p != NULL; p++) {
-        strcpy(tmp, p);
+        mr_asprintf(&tmp, p);
         if (strchr(tmp, ' ')) {
             *(strchr(tmp, ' ')) = '\0';
         }
-        if (!strcmp(sz_last_suffix(filename), tmp)) {   /*printf("MATCH\n"); */
+        if (!strcmp(sz_last_suffix(filename), tmp)) {
+            mr_free(do_not_compress_these);
+            mr_free(tmp);
             return (TRUE);
         }
+        mr_free(tmp);
+
         if (!(p = strchr(p, ' '))) {
             break;
         }
     }
+    mr_free(do_not_compress_these);
     return (FALSE);
 }
-
 
 
@@ -1375 +1294 @@
 
 
-
-
 /**
  * Create a small script that mounts /boot, calls @c grub-install, and syncs the disks.
@@ -1384 +1301 @@
 int make_grub_install_scriptlet(char *outfile)
 {
-    FILE *fout;
-    char *tmp;
+    FILE *fout = NULL;
+    char *tmp = NULL;
     int retval = 0;
 
-    malloc_string(tmp);
     if ((fout = fopen(outfile, "w"))) {
         fprintf(fout,
@@ -1394 +1310 @@
         paranoid_fclose(fout);
         mr_msg(2, "Created %s", outfile);
-        sprintf(tmp, "chmod +x %s", outfile);
+        mr_asprintf(&tmp, "chmod +x %s", outfile);
         paranoid_system(tmp);
+        mr_free(tmp);
+
         retval = 0;
     } else {
         retval = 1;
     }
-    mr_free(tmp);
     return (retval);
 }

branches/stable/mondo/src/common/libmondo-files.h

@@ -9 +9 @@
 unsigned int updcrcr(unsigned int crc, unsigned int c);
 char *calc_checksum_of_file(char *filename);
-char *calc_file_ugly_minichecksum(char *curr_fname);
-char *calc_file_ugly_minichecksum(char *curr_fname);
 long count_lines_in_file(char *filename);
 bool does_file_exist(char *filename);
@@ -20 +18 @@
 char *last_line_of_file(char *filename);
 off_t length_of_file(char *filename);
-int make_checksum_list_file(char *filelist, char *cksumlist,
-                            char *comppath);
 int make_hole_for_file(char *outfile_fname);
 void make_list_of_files_to_ignore(char *ignorefiles_fname,

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

@@ -1 @@
-/* libmondo-fork.c
-   $Id$
-*/
-
-
+/* libmondo-fork.c - subroutines for handling forking/pthreads/etc.
+ * $Id$
+ */
 #include "my-stuff.h"
 #include "mr_mem.h"
@@ -9 +7 @@
 #include "libmondo-fork.h"
 #include "libmondo-string-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "lib-common-externs.h"
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -96 +94 @@
 
     /*@ buffers      *** */
-    char *midway_call, *ultimate_call, *tmp, *command, *incoming,
-        *old_stderr, *cd_number_str;
-    char *p;
+    char *midway_call, *ultimate_call, *tmp;
+    char *p = NULL; 
+    char *cd_number_str = NULL;
+    char *command = NULL;
+    
 
 /*@***********   End Variables ***************************************/
@@ -107 +107 @@
     assert_string_is_neither_NULL_nor_zerolength(isofile);
     assert_string_is_neither_NULL_nor_zerolength(logstub);
+
     midway_call = mr_malloc(1200);
     ultimate_call = mr_malloc(1200);
     tmp = mr_malloc(1200);
-    command = mr_malloc(1200);
-    malloc_string(incoming);
-    malloc_string(old_stderr);
-    malloc_string(cd_number_str);
-
-    incoming[0] = '\0';
-    old_stderr[0] = '\0';
-
-    sprintf(cd_number_str, "%d", cd_no);
+
+    mr_asprintf(&cd_number_str, "%d", cd_no);
     resolve_naff_tokens(midway_call, basic_call, isofile, "_ISO_");
     resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
+    mr_free(cd_number_str);
+
     resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
     mr_msg(4, "basic call = '%s'", basic_call);
@@ -126 +122 @@
     mr_msg(4, "tmp = '%s'", tmp);
     mr_msg(4, "ultimate call = '%s'", ultimate_call);
-    sprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
+    mr_asprintf(&command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
 
     log_to_screen
-        ("Please be patient. Do not be alarmed by on-screen inactivity.");
+        (_("Please be patient. Do not be alarmed by on-screen inactivity."));
     mr_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
             what_i_am_doing);
-    strcpy(tmp, command);
     if (bkpinfo->manual_cd_tray) {
-        p = strstr(tmp, "2>>");
+        /* Find everything after a 2>> and remove it */
+        p = strstr(command, "2>>");
         if (p) {
-            sprintf(p, "   ");
-            while (*p == ' ') {
-                p++;
-            }
-            for (; *p != ' '; p++) {
+            for (; *p != ' ' && *p != '\0'; p++) {
                 *p = ' ';
             }
         }
-        strcpy(command, tmp);
 #ifndef _XWIN
         if (!g_text_mode) {
@@ -157 +148 @@
         if (retval) {
             mr_msg(2, "Basic call '%s' returned an error.", basic_call);
-            popup_and_OK("Press ENTER to continue.");
+            popup_and_OK(_("Press ENTER to continue."));
             popup_and_OK
-                ("mkisofs and/or cdrecord returned an error. CD was not created");
+                (_("mkisofs and/or cdrecord returned an error. CD was not created"));
         }
     }
@@ -170 +161 @@
             (what_i_am_doing, command);
     }
+    mr_free(command);
 
     mr_free(midway_call);
     mr_free(ultimate_call);
     mr_free(tmp);
-    mr_free(command);
-    mr_free(incoming);
-    mr_free(old_stderr);
-    mr_free(cd_number_str);
-/*
-  if (bkpinfo->backup_media_type == dvd && !bkpinfo->please_dont_eject_when_restoring)
-    {
-      mr_msg(3, "Ejecting DVD device");
-      eject_device(bkpinfo->media_device);
-    }
-*/
     return (retval);
 }
-
-
 
 
@@ -200 +179 @@
 {
     /*@ buffer ****************************************************** */
-    char callstr[MAX_STR_LEN * 2];
-    char incoming[MAX_STR_LEN * 2];
-    char tmp[MAX_STR_LEN * 2];
-    char initial_label[MAX_STR_LEN * 2];
+    char *callstr = NULL;
+    char *incoming = NULL;
 
     /*@ int ********************************************************* */
-    int res;
+    int res = 0;
+    size_t n = 0;
     int i;
     int len;
@@ -223 +201 @@
         return (1);
     }
-//  if (debug_level == TRUE) { debug_level=5; }
-
-    //  assert_string_is_neither_NULL_nor_zerolength(program);
 
     if (debug_level <= g_loglevel) {
@@ -231 +206 @@
         log_if_failure = TRUE;
     }
-    sprintf(callstr,
+    mr_asprintf(&callstr,
             "%s > /tmp/mondo-run-prog-thing.tmp 2> /tmp/mondo-run-prog-thing.err",
             program);
@@ -260 +235 @@
                 "--------------------------------start of output-----------------------------");
     }
+    mr_free(callstr);
+
     if (log_if_failure
         &&
@@ -270 +247 @@
     fin = fopen("/tmp/mondo-run-prog-thing.tmp", "r");
     if (fin) {
-        for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
-             fgets(incoming, MAX_STR_LEN, fin)) {
+        for (mr_getline(&incoming, &n, fin); !feof(fin);
+             mr_getline(&incoming, &n, fin)) {
             /* patch by Heiko Schlittermann */
             p = incoming;
@@ -287 +264 @@
             }
         }
+        mr_free(incoming);
         paranoid_fclose(fin);
     }
@@ -303 +281 @@
     return (res);
 }
-
 
 
@@ -325 +302 @@
 
     /*@ buffers **************************************************** */
-    char tmp[MAX_STR_LEN * 2];
-    char command[MAX_STR_LEN * 2];
-    char lockfile[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *command = NULL;
+    char *lockfile = NULL;
 
     /*@ end vars *************************************************** */
@@ -333 +310 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    sprintf(lockfile, "/tmp/mojo-jojo.blah.XXXXXX");
+    mr_asprintf(&lockfile, "/tmp/mojo-jojo.blah.XXXXXX");
     mkstemp(lockfile);
-    sprintf(command,
+    mr_asprintf(&command,
             "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res",
             lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
     open_evalcall_form(what_i_am_doing);
-    sprintf(tmp, "Executing %s", basic_call);
+    mr_asprintf(&tmp, "Executing %s", basic_call);
     mr_msg(2, tmp);
+    mr_free(tmp);
+
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        sprintf(tmp, "Failed utterly to call '%s'", command);
+        mr_asprintf(&tmp, _("Failed utterly to call '%s'"), command);
         log_to_screen(tmp);
+        mr_free(tmp);
+        mr_free(lockfile);
+        mr_free(command);
         return (1);
     }
+    mr_free(command);
+
     if (!does_file_exist(lockfile)) {
-        log_to_screen("Waiting for external binary to start");
+        log_to_screen(_("Waiting for external binary to start"));
         for (i = 0; i < 60 && !does_file_exist(lockfile); sleep(1), i++) {
             mr_msg(3, "Waiting for lockfile %s to exist", lockfile);
@@ -375 +359 @@
     res = pclose(fin);
     /* Log actual pclose errors. */
-    if (errno) mr_msg(5, "pclose err: %d", errno);
+    if (errno) {
+        mr_msg(5, "pclose err: %d", errno);
+    }
     /* Check if we have a valid status. If we do, extract the called program's exit code. */
     /* If we don't, highlight this fact by returning -1. */
@@ -385 +371 @@
     close_evalcall_form();
     unlink(lockfile);
+    mr_free(lockfile);
+
     return (retval);
 }
 
 
-
-
 /**
- * Apparently unused. @bug This has a purpose, but what?
+ * Apparently used. @bug This has a purpose, but what?
  */
 #define PIMP_START_SZ "STARTSTARTSTART9ff3kff9a82gv34r7fghbkaBBC2T231hc81h42vws8"
@@ -404 +390 @@
 // if dir=='w' then copy from orig to archived
 // if dir=='r' then copy from archived to orig
-    char *tmp;
-    char *buf;
+    char *tmp = NULL;
+    char *buf = NULL;
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
         0, bufcap, subsliceno = 0;
     int retval = 0;
-    FILE *fin;
-    FILE *fout;
-    FILE *ftmp;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
+    FILE *ftmp = NULL;
 
     mr_msg(5, "Opening.");
@@ -526 +512 @@
 }
 
-
-
-
 /**
  * Feed @p input_device through ntfsclone to @p output_fname.
@@ -539 +522 @@
 // BACKUP
     int res = -1;
-    char*command;
+    char *command = NULL;
 
     if (!does_file_exist(input_device)) {
@@ -547 +530 @@
         fatal_error("ntfsclone not found");
     }
-    malloc_string(command);
-    sprintf(command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
+    mr_asprintf(&command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
     mr_free(command);
+
     unlink(output_fname);
     return (res);
@@ -556 +539 @@
 
 
-
-
-
 int run_external_binary_with_percentage_indicator_OLD(char *tt, char *cmd)
 {
 
-    /*@ int *************************************************************** */
     int res = 0;
     int percentage = 0;
@@ -569 +548 @@
     int last_pcno = 0;
 
-    /*@ buffers *********************************************************** */
-    char *command;
+    char *command = NULL;
     char *tempfile;
     char *title;
@@ -577 +555 @@
 
     malloc_string(title);
-    malloc_string(command);
     malloc_string(tempfile);
     assert_string_is_neither_NULL_nor_zerolength(cmd);
@@ -586 +563 @@
            call_program_and_get_last_line_of_output
            ("mktemp -q /tmp/mondo.XXXXXXXX"));
-    sprintf(command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
+    mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
             tempfile);
     mr_msg(3, command);
@@ -592 +569 @@
     if (!(pin = popen(command, "r"))) {
         log_OS_error("fmt err");
+        mr_free(command);
         return (1);
     }
+    mr_free(command);
+
     maxpc = 100;
 // OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD
@@ -618 +598 @@
     }
     unlink(tempfile);
-    mr_free(command);
     mr_free(tempfile);
     mr_free(title);
     return (res);
 }
-
-
 
 
@@ -643 +620 @@
     pthread_exit((void *) (&res));
 }
-
-
 
 
@@ -659 +634 @@
 
     /*@ buffers *********************************************************** */
-    char *command;
+    char *command = NULL;
     char *title;
     /*@ pointers ********************************************************** */
@@ -672 +647 @@
 
     malloc_string(title);
-    malloc_string(command);
     strcpy(title, tt);
-    sprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
+    mr_asprintf(&command, "%s 2>> %s", cmd, MONDO_LOGFILE);
     mr_msg(3, "command = '%s'", command);
     if ((res =
@@ -703 +677 @@
         update_evalcall_form(percentage);
     }
+    mr_free(command);
+
     log_file_end_to_screen(MONDO_LOGFILE, "");
     close_evalcall_form();
@@ -712 +688 @@
     }
     mr_msg(3, "Parent res = %d", res);
-    mr_free(command);
     mr_free(title);
     return (res);
 }
-
-
 
 
@@ -730 +703 @@
 // RESTORE
     int res = -1;
-    char *command;
+    char *command = NULL;
 
     if ( !find_home_of_exe("ntfsclone")) {
         fatal_error("ntfsclone not found");
     }
-    malloc_string(command);
-    sprintf(command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
+    mr_asprintf(&command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);
     mr_free(command);

branches/stable/mondo/src/common/libmondo.h

@@ -9 +9 @@
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-mountlist-EXT.h"
 #include "libmondo-raid-EXT.h"

branches/stable/mondo/src/common/mondostructures.h

@@ -1 +1 @@
 /***************************************************************************
-                          mondostructures.h  -  description
-                             -------------------
-    begin                : Fri Apr 19 2002
-    copyright            : (C) 2002 by Stan Benoit
-    email                : troff@nakedsoul.org
-    cvsid                : $Id$
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
-/**
+ * $Id$
+ *
  * @file
  * The header file defining all of Mondo's structures.
@@ -24 +7 @@
 
 
-/** @def MAX_NOOF_MEDIA The maximum number of media that can be used in any one backup. */
-
-///* So we can override it in config.h: */
+/* @def MAX_NOOF_MEDIA The maximum number of media that can be used in any one backup. */
+
+/* So we can override it in config.h: */
 //#ifndef MAX_NOOF_MEDIA
 #define MAX_NOOF_MEDIA 50
@@ -489 +472 @@
     t_bkptype backup_media_type;
 //  bool blank_dvd_first;
+
+  /**
+   * The string corresponding to the media type
+   */
+    char backup_media_string[64];
 
   /**