Changeset 2272 in MondoRescue

Timestamp:

Jul 12, 2009, 2:05:33 AM (15 years ago)

Author:

Bruno Cornec

Message:

r3224@localhost: bruno | 2009-07-11 15:05:24 +0200
Replace sprintf by mr_asprintf in libmondo-files.c

File:

• branches/2.2.10/mondo/src/common/libmondo-files.c (modified) (57 diffs)

branches/2.2.10/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;
+    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
@@ -62 +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) {
@@ -69 +69 @@
             paranoid_pclose(fin);
         }
+        mr_free(command);
     } 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) {
@@ -126 +128 @@
 
     /*@ buffers ***************************************************** */
-    char command[MAX_STR_LEN * 2];
+    char *command = NULL;
     char incoming[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     /*@ long ******************************************************** */
@@ -141 +143 @@
     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)) {
+        mr_free(command);
         return (-1);
     }
     fin = popen(command, "r");
+    mr_free(command);
     if (fin) {
         if (feof(fin)) {
@@ -207 +212 @@
 void exclude_nonexistent_files(char *inout)
 {
-    char infname[MAX_STR_LEN];
-    char outfname[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *infname = NULL;
+    char *outfname = NULL;
+    char *tmp  NULL;
     char incoming[MAX_STR_LEN];
 
@@ -222 +227 @@
 
     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(&outfname, "%s", 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;
     }
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Unable to openout outfname");
+        mr_free(outfname);
         return;
     }
+    mr_free(outfname);
+
     for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
          fgets(incoming, MAX_STR_LEN, fin)) {
@@ -243 +254 @@
             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);
         }
     }
@@ -250 +262 @@
     paranoid_fclose(fin);
     unlink(infname);
+    mr_free(infname);
 }
 
@@ -269 +282 @@
 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]) {
@@ -279 +292 @@
     // 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);
@@ -301 +316 @@
                 ("Kernel not found. Please specify with the '-k' flag.");
         }
-        sprintf(tmp, "User says kernel is at %s", kernel);
+        mr_asprintf(&tmp, "User says kernel is at %s", kernel);
         log_it(tmp);
+        mr_free(tmp);
     }
     return (0);
@@ -326 +342 @@
     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")) {
             paranoid_free(incoming);
-            paranoid_free(command);
             output[0] = '\0';
             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);
@@ -364 +381 @@
     }
     paranoid_free(incoming);
-    paranoid_free(command);
     if (!output[0]) {
         return (NULL);
@@ -412 +428 @@
     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);
 }
@@ -435 +447 @@
 
     /*@ buffers ***************************************************** */
-    char tmp[MAX_STR_LEN];
     char lastline[MAX_STR_LEN];
-    char command[MAX_STR_LEN];
+    char *command = NULL;
     /*@ pointers **************************************************** */
     char *p;
@@ -448 +459 @@
          && !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);
@@ -464 +476 @@
         *p = '\0';
     }
-//  log_msg(2, "lastline='%s', ", p, lastline);
     if (!p) {
         return (0);
@@ -475 +486 @@
     i = atoi(p);
 
-    sprintf(tmp, "'%s' --> %d", p, i);
-//     log_to_screen(tmp);
-
     return (i);
 }
@@ -495 +503 @@
     /*@ 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 **************************************************** */
@@ -504 +512 @@
 
     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);
@@ -567 +578 @@
     char curr_fname[1000];
     char curr_cksum[1000];
-    char tmp[1000];
+    char *tmp = NULL;
 
     /*@ long [long] ************************************************* */
@@ -581 +592 @@
     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) {
@@ -601 +612 @@
             stub_fname[i] = '\0';
         }
-        sprintf(tmp, "%s%s", comppath, stub_fname);
+        mr_asprintf(&tmp, "%s%s", comppath, stub_fname);
         strcpy(curr_fname, tmp + 1);
+        mr_free(tmp);
+
         strcpy(curr_cksum, calc_file_ugly_minichecksum(curr_fname));
         fprintf(fout, "%s\t%s\n", curr_fname, curr_cksum);
@@ -617 +630 @@
                 time_remaining =
                     time_taken * 100 / (long) (percentage) - time_taken;
-                sprintf(tmp,
+                mr_asprintf(&tmp,
                         "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r",
                         percentage, (int) (time_taken / 60),
@@ -624 +637 @@
                         (int) (time_remaining % 60), curr_fname);
                 log_to_screen(tmp);
+                mr_free(tmp);
             }
             sync();
@@ -642 +656 @@
 int make_hole_for_dir(char *outdir_fname)
 {
-    char tmp[MAX_STR_LEN * 2];
+    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);
 }
@@ -661 +676 @@
 {
     /*@ buffer ****************************************************** */
-    char command[MAX_STR_LEN * 2];
+    char *command = NULL;
 
     /*@ int  ******************************************************** */
@@ -671 +686 @@
     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);
@@ -731 +752 @@
 long size_of_partition_in_mountlist_K(char *tmpdir, char *dev)
 {
-    char command[MAX_STR_LEN];
-    char mountlist[MAX_STR_LEN];
+    char *command = NULL;
+    char *mountlist = NULL;
     char sz_res[MAX_STR_LEN];
     long file_len_K;
 
-    sprintf(mountlist, "%s/mountlist.txt", tmpdir);
-    sprintf(command,
+    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));
     file_len_K = atol(sz_res);
     log_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
+    mr_free(command);
+
     return (file_len_K);
 }
@@ -756 +781 @@
     /*@ buffers ***************************************************** */
     char *fname;
-    char *biggielist;
-    char *comment;
-    char *tmp;
-    char *command;
+    char *biggielist = NULL;
+    char *comment = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
 
     /*@ long ******************************************************** */
@@ -765 +790 @@
     long file_len_K;
 
+    int res = 0;
+
     /*@ pointers *************************************************** */
     FILE *fin = NULL;
@@ -771 +798 @@
 
     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...");
@@ -793 +818 @@
                         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_asorintf(&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;
@@ -809 +837 @@
                 log_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);
             log_msg(4, comment);
+            mr_free(comment);
             if (feof(fin)) {
                 break;
@@ -822 +851 @@
     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);
 }
@@ -839 +864 @@
     /*@ buffer ****************************************************** */
     char tmp[MAX_STR_LEN];
-    char command[MAX_STR_LEN * 2];
+    char *command = NULL;
     long long llres;
     /*@ pointers **************************************************** */
@@ -847 +872 @@
     /*@ end vars *************************************************** */
 
-    sprintf(command, "du -sk %s", mountpt);
+    mr_asprintf(&command, "du -sk %s", mountpt);
     errno = 0;
     fin = popen(command, "r");
@@ -865 +890 @@
       }
     }
+    mr_free(command);
 
     return (llres);
@@ -912 +938 @@
 {
     /*@ 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)) {
+    char *command = NULL;
+    char *errorstr = NULL;
+    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);
         log_to_screen(errorstr);
-        log_to_screen
-            ("There may be hyperlink at http://www.mondorescue.com which");
+        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.");
         return (1);
@@ -1021 +1048 @@
 {
     /*@ Char buffers ** */
-    char command[MAX_STR_LEN * 2];
+    char *command = NULL;
     char tmp[MAX_STR_LEN];
     char old_pwd[MAX_STR_LEN];
+    int res = 0;
 
     mvaddstr_and_log_it(g_currentY, 0,
@@ -1032 +1060 @@
         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);
 
     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");
     }
@@ -1046 +1077 @@
         (void) getcwd(old_pwd, MAX_STR_LEN - 1);
         chdir(bkpinfo->scratchdir);
-        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);
+        mr_free(command);
+
+        if (res) {
             fatal_error("Failed to untar payload");
         }
@@ -1053 +1087 @@
     }
 
-    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);
-
-    if (run_program_and_log_output(command, FALSE)) {
+    res = run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
+    if (res) {
         fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }
@@ -1066 +1102 @@
             ("'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_asprintf(&command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
+    res = run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
+    if (res) {
         fatal_error("Failed to copy mondorestore to tmpdir");
     }
 
-    sprintf(command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
+    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)) {
+        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.");
@@ -1102 +1144 @@
 
     /*@ buffers ******** */
-    char nfs_dev[MAX_STR_LEN];
-    char mac_addr[MAX_STR_LEN];
-    char nfs_mount[MAX_STR_LEN];
-    char nfs_client_ipaddr[MAX_STR_LEN];
-    char nfs_client_netmask[MAX_STR_LEN];
-    char nfs_client_broadcast[MAX_STR_LEN];
-    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 *nfs_dev = NULL;
+    char *mac_addr = NULL;
+    char *nfs_mount = NULL;
+    char *nfs_client_ipaddr = NULL;
+    char *nfs_client_netmask = NULL;
+    char *nfs_client_broadcast = NULL;
+    char *nfs_client_defgw = NULL;
+    char *nfs_server_ipaddr = NULL;
+    char *tmp = NULL;
+    char *command = NULL
 
     /*@ pointers ***** */
@@ -1117 +1159 @@
 
     log_it("Storing NFS configuration");
-    strcpy(tmp, bkpinfo->nfs_mount);
+    mr_asprintf(&tmp, "%s", bkpinfo->nfs_mount);
     p = strchr(tmp, ':');
     if (!p) {
@@ -1124 +1166 @@
     }
     *(p++) = '\0';
-    strcpy(nfs_server_ipaddr, tmp);
-    strcpy(nfs_mount, p);
+    mr_asprintf(&nfs_server_ipaddr, tmp);
+    mr_asprintf(&nfs_mount, p);
+    mr_free(tmp);
 
     /* 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,
-            "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,
-            "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,
-            "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,
-            "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_asprintf(&nfs_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(&nfs_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(&nfs_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(&nfs_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(&nfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
+    mr-free(command);
+
     if (strlen(nfs_dev) < 2) {
         fatal_error
@@ -1165 +1211 @@
     if (!strncmp(nfs_dev, "bond", 4) || !strncmp(nfs_dev, "alb", 3) || !strncmp(nfs_dev, "aft", 3)) {
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
-        sprintf(command,
-                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
-        strcpy(mac_addr, call_program_and_get_last_line_of_output(command));
-        sprintf(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_asprintf(&command,
+                "%s", "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
+        mr_asprintf(&mac_addr, "%s", call_program_and_get_last_line_of_output(command));
+        mr-free(command);
+
+        mr_asprintf(&command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
+        mr_free(mac_addr);
+        mr_free(nfs_dev);
+
+        mr_asprintf(&nfs_dev, call_program_and_get_last_line_of_output(command));
+        mr-free(command);
+
         log_to_screen("Replacing it with %s\n", nfs_dev);
     }
 
-    sprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_dev);
-
-    sprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    mr_free(nfs_dev);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_ipaddr);
-    sprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    mr_free(nfs_client_ipaddr);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_netmask);
-    sprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    mr_free(nfs_client_netmask);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_broadcast);
-    sprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    mr_free(nfs_client_broadcast);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_defgw);
-    sprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    mr_free(nfs_client_defgw);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_server_ipaddr);
-    sprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    mr_free(tmp);
+    mr_free(nfs_server_ipaddr);
+
+    mr_asprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
-    sprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
+    mr_free(tmp);
+    mr_free(nfs_mount);
+
+    mr_asprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
-    sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->prefix);
+    mr_free(tmp);
+
     log_it("Finished storing NFS configuration");
 }
@@ -1221 +1297 @@
 {
     /*@ buffers *************** */
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char *mds = NULL;
 
@@ -1250 +1326 @@
     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,
+        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.",
+        mr_asprintf(&tmp, "Your backup will occupy approximately %s media.",
                 number_to_text((int) (scratchLL + 1)));
     }
@@ -1264 +1339 @@
         log_to_screen(tmp);
     }
+    mr_free(tmp);
 }
 
@@ -1298 +1374 @@
 {
     char do_not_compress_these[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char *p;
     char *q = NULL;
@@ -1307 +1383 @@
     }
 
-    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_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);
             return (TRUE);
         }
@@ -1325 +1404 @@
             break;
         }
+        mr_free(tmp);
     }
     return (FALSE);
 }
-
 
 
@@ -1354 +1433 @@
 {
     FILE *fout;
-    char *tmp;
+    char *tmp = NULL;
     int retval = 0;
 
-    malloc_string(tmp);
     if ((fout = fopen(outfile, "w"))) {
         fprintf(fout,
@@ -1363 +1441 @@
         paranoid_fclose(fout);
         log_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;
     }
-    paranoid_free(tmp);
     return (retval);
 }