Changeset 1178 in MondoRescue

Timestamp:

Feb 17, 2007, 2:27:26 AM (17 years ago)

Author:

Bruno Cornec

Message:

Continue to merge trunk memory management enhancements for libmondo-tools.c & libmondo-string.c
Introduction + test of a new function mr_strcat

Location:

branches/stable/mondo/src

Files:

• common/libmondo-string-EXT.h (modified) (1 diff)
• common/libmondo-string.c (modified) (36 diffs)
• common/libmondo-tools.c (modified) (60 diffs)
• include/mr_mem.h (modified) (2 diffs)
• include/mr_str.h (modified) (1 diff)
• lib/mr_mem.c (modified) (1 diff)
• lib/mr_str.c (modified) (1 diff)
• test/test-mem.c (modified) (2 diffs)
• test/test-mem.res (modified) (1 diff)

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

@@ -10 +10 @@
                                       int lino);
 extern long friendly_sizestr_to_sizelong(char *incoming);
-extern char *leftpad_string(char *incoming, int width);
 extern char *marker_to_string(int marker);
 extern char *mountlist_entry_to_string(struct mountlist_itself *mountlist,

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

@@ -1 @@
-/* $Id$ */
-
+/* 
+   $Id$
+*/
 
 /**
@@ -14 +15 @@
 #include "libmondo-string.h"
 #include "libmondo-files-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-tools-EXT.h"
+#include <math.h>
 
 /*@unused@*/
@@ -22 +24 @@
 extern int g_current_media_number;
 extern long long g_tape_posK;
-
 
 /**
@@ -38 +39 @@
 char *build_partition_name(char *partition, const char *drive, int partno)
 {
-    char *p, *c;
+    char *p = NULL;
+    char *c = NULL;
 
     assert(partition != NULL);
@@ -49 +51 @@
     if (c && strncmp(c, "/disc", 5) == 0) {
         /* yup it's devfs, return the "part" path */
+        /* format /dev/.../disc */
         strcpy(c + 1, "part");
         p = c + 5;
@@ -67 +70 @@
 
 
-
-
-
-
-
-
-
-
-
-
-
 /**
  * Pad a string on both sides so it appears centered.
@@ -85 +77 @@
 void center_string(char *in_out, int width)
 {
-    char scratch[MAX_STR_LEN];
-    char *p;
-    int i;                      /* purpose */
-    int len;                    /* purpose */
-    int mid;                    /* purpose */
-    int x;                      /* purpose */
+    char *scratch = NULL;
+    char *out = NULL;
+    char *p = NULL;
+    int i = 0;                      /* purpose */
+    int len = 0;                    /* purpose */
+    int mid = 0;                    /* purpose */
+    int x = 0;                      /* purpose */
 
     assert(in_out != NULL);
@@ -98 +91 @@
         return;
     }
-    for (p = in_out; *p == ' '; p++);
-    strcpy(scratch, p);
-    mr_strip_spaces (scratch);
+    mr_asprintf(&scratch, in_out);
+    mr_strip_spaces(scratch);
     len = (int) strlen(scratch);
     mid = width / 2;
@@ -129 +121 @@
     *q = *p;                    // for the final '\0'
 }
-
-
-
-/**
- * Add commas every third place in @p input.
- * @param input The string to commarize.
- * @return The string with commas.
- * @note The returned string points to static storage that will be overwritten with each call.
- */
-char *commarize(char *input)
-{
-    char pos_w_commas[MAX_STR_LEN];
-    static char output[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    int j;
-
-    assert(input != NULL);
-
-    strcpy(tmp, input);
-    if (strlen(tmp) > 6) {
-        strcpy(pos_w_commas, tmp);
-        j = (int) strlen(pos_w_commas);
-        tmp[j - 6] = ',';
-        strcpy(tmp + j - 5, pos_w_commas + j - 6);
-//      tmp[j-2] = ',';
-//      strcpy(tmp+j-1, pos_w_commas+j-3);
-        strcpy(pos_w_commas, tmp);
-    }
-    if (strlen(tmp) > 3) {
-        j = (int) strlen(tmp);
-        strcpy(pos_w_commas, tmp);
-        pos_w_commas[j - 3] = ',';
-        strcpy(pos_w_commas + j - 2, tmp + j - 3);
-    } else {
-        strcpy(pos_w_commas, tmp);
-    }
-    strcpy(output, pos_w_commas);
-    return (output);
-}
-
-
-
-
-
-
-
 
 
@@ -201 +147 @@
 
 
-
-
-
 /**
  * Turn a "friendly" sizestring into a number of megabytes.
@@ -213 +156 @@
 long friendly_sizestr_to_sizelong(char *incoming)
 {
-    long outval;
-    int i;
-    char *tmp;
-    char ch;
+    long outval = 0L;
+    int i = 0;
+    char *tmp = NULL;
+    char ch = ' ';
 
     assert_string_is_neither_NULL_nor_zerolength(incoming);
 
-    malloc_string(tmp);
     if (!incoming[0]) {
-        mr_free(tmp);
-        return (0);
+        return(0L);
     }
     if (strchr(incoming, '.')) {
         fatal_error("Please use integers only. No decimal points.");
     }
-    strcpy(tmp, incoming);
+    mr_asprintf(&tmp, "%s", incoming);
     i = (int) strlen(tmp);
     if (tmp[i - 1] == 'B' || tmp[i - 1] == 'b') {
@@ -237 +178 @@
     tmp[i] = '\0';
     outval = atol(tmp);
+    mr_free(tmp);
+
     if (ch == 'g' || ch == 'G') {
         outval = outval * 1024;
@@ -249 +192 @@
             ("Oh my gosh. You actually think a YOTTABYTE will get you anywhere? What're you going to do with 1,208,925,819,614,629,174,706,176 bytes of data?!?!");
         popup_and_OK
-            ("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)");
+            (_("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)"));
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
-        sprintf(tmp, "Re: parameter '%s' - bad multiplier ('%c')",
-                incoming, ch);
+        mr_asprintf(&tmp, "Re: parameter '%s' - bad multiplier ('%c')",
+                 incoming, ch);
         fatal_error(tmp);
     }
-    mr_free(tmp);
     return (outval);
 }
-
-
-
-/**
- * Add spaces to the right of @p incoming to make it @p width characters wide.
- * @param incoming The string to left-pad.
- * @param width The width to pad it to.
- * @return The left-padded string.
- * @note The returned string points to static storage that will be overwritten with each call.
- * @bug Why does center_string() modify its argument but leftpad_string() returns a modified copy?
- */
-char *leftpad_string(char *incoming, int width)
-{
-    /*@ buffers ***************************************************** */
-    static char output[MAX_STR_LEN];
-
-    /*@ ints ******************************************************** */
-    int i;
-
-    /*@ end vars **************************************************** */
-    assert(incoming != NULL);
-    assert(width > 2);
-
-    strcpy(output, incoming);
-    for (i = (int) strlen(output); i < width; i++) {
-        output[i] = ' ';
-    }
-    output[i] = '\0';
-    return (output);
-}
-
 
 
@@ -374 +285 @@
     return (outstr);
 }
-
-
 
 
@@ -405 +314 @@
 
 
-
-
-
-
 /**
  * Generate a friendly string containing "X blah blah disk(s)"
@@ -424 +329 @@
 
     /*@ char     ******************************************************** */
-    char p;
+    char p = NULL;
 
     assert(label != NULL);
@@ -495 +400 @@
     return (output);
 }
-
-
 
 
@@ -530 +433 @@
     mr_free(input);
 }
-
-
-
 
 
@@ -555 +455 @@
     /*@ buffers **************************************************** */
     static char output[MAX_STR_LEN];
-    static char suffix[MAX_STR_LEN];
+    char *suffix = NULL;
 
     /*@ end vars *************************************************** */
@@ -561 +461 @@
     assert_string_is_neither_NULL_nor_zerolength(path);
     if (s[0] != '\0') {
-        sprintf(suffix, ".%s", s);
+        mr_asprintf(&suffix, ".%s", s);
     } else {
-        suffix[0] = '\0';
+        mr_asprintf(&suffix, "");
     }
     sprintf(output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno, sliceno,
             suffix);
+    mr_free(suffix);
     return (output);
 }
@@ -597 +498 @@
 
 
-
-
 /**
  * Wrap @p flaws_str across three lines. The first two are no more than 74 characters wide.
@@ -650 +549 @@
 
 
-
 /**
  * Compare @p stringA and @p stringB. This uses an ASCII sort for everything
@@ -698 +596 @@
     numA = atol(stringA + start_of_numbers_in_A);
     numB = atol(stringB + start_of_numbers_in_B);
-    /*
-       sprintf(tmp,"Comparing %s and %s --> %ld,%ld\n",stringA,stringB,numA,numB);
-       log_to_screen(tmp);
-     */
     return ((int) (numA - numB));
 }
@@ -773 +667 @@
 {
     int i = strlen(partition) - 1;
-    char *c;
+    char *c = NULL;
 
 #ifdef __FreeBSD__
@@ -793 +687 @@
     if (c && strncmp(c, "/part", 5) == 0) {
         /* yup it's devfs, return the "disc" path */
-        strcpy(c + 1, "disc");
+        strncpy(c + 1, "disc", (size_t)5);
         return partition;
     }
@@ -808 +702 @@
     return partition;
 }
-
-
-
 
 
@@ -838 +729 @@
 
 
-
-
-
-
-
-
-
 /**
  * Determine the severity (1-3, 1 being low) of the fact that
@@ -854 +738 @@
 int severity_of_difference(char *fn, char *out_reason)
 {
-    int sev;
-    char *reason;
-    char *filename;
-
-    malloc_string(reason);
-    malloc_string(filename);
-// out_reason might be null on purpose, so don't bomb if it is :) OK?
+    int sev = 0;
+    char *reason = NULL;
+    char *filename = NULL;
+
+    // out_reason might be null on purpose, so don't bomb if it is :) OK?
     assert_string_is_neither_NULL_nor_zerolength(fn);
     if (!strncmp(fn, MNT_RESTORING, strlen(MNT_RESTORING))) {
-        strcpy(filename, fn + strlen(MNT_RESTORING));
+        mr_asprintf(&filename, fn + strlen(MNT_RESTORING));
     } else if (fn[0] != '/') {
-        sprintf(filename, "/%s", fn);
+        mr_asprintf(&filename, "/%s", fn);
     } else {
-        strcpy(filename, fn);
-    }
-
-    sev = 3;
-    sprintf(reason,
-            "Changed since backup. Consider running a differential backup in a day or two.");
+        mr_asprintf(&filename, fn);
+    }
+
     if (!strncmp(filename, "/var/", 5)) {
         sev = 2;
-        sprintf(reason,
-                "/var's contents will change regularly, inevitably.");
+        mr_asprintf(&reason,
+                 _("/var's contents will change regularly, inevitably."));
     }
     if (!strncmp(filename, "/home", 5)) {
         sev = 2;
-        sprintf(reason,
-                "It's in your /home partiton. Therefore, it is important.");
+        mr_asprintf(&reason,
+                 _("It's in your /home partiton. Therefore, it is important."));
     }
     if (!strncmp(filename, "/usr/", 5)) {
         sev = 3;
-        sprintf(reason,
-                "You may have installed/removed software during the backup.");
+        mr_asprintf(&reason,
+                 _("You may have installed/removed software during the backup."));
     }
     if (!strncmp(filename, "/etc/", 5)) {
         sev = 3;
-        sprintf(reason,
-                "Do not edit config files while backing up your PC.");
+        mr_asprintf(&reason,
+                 _("Do not edit config files while backing up your PC."));
     }
     if (!strcmp(filename, "/etc/adjtime")
         || !strcmp(filename, "/etc/mtab")) {
         sev = 1;
-        sprintf(reason, "This file changes all the time. It's OK.");
+        mr_asprintf(&reason, _("This file changes all the time. It's OK."));
     }
     if (!strncmp(filename, "/root/", 6)) {
         sev = 3;
-        sprintf(reason, "Were you compiling/editing something in /root?");
+        mr_asprintf(&reason,
+                 _("Were you compiling/editing something in /root?"));
     }
     if (!strncmp(filename, "/root/.", 7)) {
         sev = 2;
-        sprintf(reason, "Temp or 'dot' files changed in /root.");
+        mr_asprintf(&reason, _("Temp or 'dot' files changed in /root."));
     }
     if (!strncmp(filename, "/var/lib/", 9)) {
         sev = 2;
-        sprintf(reason, "Did you add/remove software during backing?");
+        mr_asprintf(&reason, _("Did you add/remove software during backing?"));
     }
     if (!strncmp(filename, "/var/lib/rpm", 12)) {
         sev = 3;
-        sprintf(reason, "Did you add/remove software during backing?");
+        mr_asprintf(&reason, _("Did you add/remove software during backing?"));
     }
     if (!strncmp(filename, "/var/lib/slocate", 16)) {
         sev = 1;
-        sprintf(reason,
-                "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
+        mr_asprintf(&reason,
+                 _("The 'update' daemon ran during backup. This does not affect the integrity of your backup."));
     }
     if (!strncmp(filename, "/var/log/", 9)
@@ -923 +803 @@
         || !strcmp(filename + strlen(filename) - 4, ".log")) {
         sev = 1;
-        sprintf(reason,
-                "Log files change frequently as the computer runs. Fret not.");
+        mr_asprintf(&reason,
+                 _("Log files change frequently as the computer runs. Fret not."));
     }
     if (!strncmp(filename, "/var/spool", 10)) {
         sev = 1;
-        sprintf(reason,
-                "Background processes or printers were active. This does not affect the integrity of your backup.");
+        mr_asprintf(&reason,
+                 _("Background processes or printers were active. This does not affect the integrity of your backup."));
     }
     if (!strncmp(filename, "/var/spool/mail", 10)) {
         sev = 2;
-        sprintf(reason, "Mail was sent/received during backup.");
+        mr_asprintf(&reason, _("Mail was sent/received during backup."));
     }
     if (filename[strlen(filename) - 1] == '~') {
         sev = 1;
-        sprintf(reason,
-                "Backup copy of another file which was modified recently.");
+        mr_asprintf(&reason,
+                 _("Backup copy of another file which was modified recently."));
     }
     if (strstr(filename, "cache")) {
         sev = 1;
-        sprintf(reason,
-                "Part of a cache of data. Caches change from time to time. Don't worry.");
+        mr_asprintf(&reason,
+                 _("Part of a cache of data. Caches change from time to time. Don't worry."));
     }
     if (!strncmp(filename, "/var/run/", 9)
@@ -950 +830 @@
         || strstr(filename, "/.Xauthority")) {
         sev = 1;
-        sprintf(reason,
-                "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
+        mr_asprintf(&reason,
+                _("Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence."));
+    }
+    mr_free(filename);
+
+    if (sev == 0) {
+        sev = 3;
+        mr_asprintf(&reason,
+                 _("Changed since backup. Consider running a differential backup in a day or two."));
     }
     if (out_reason) {
         strcpy(out_reason, reason);
     }
-    mr_free(filename);
+
     mr_free(reason);
     return (sev);
 }
-
 
 
@@ -982 +868 @@
     return (res);
 }
-
-
-
-
-
 
 
@@ -1002 +883 @@
 {
     /*@ int *********************************************** */
-    int percentage;
-    int j;
+    int percentage = 0;
+    int i = 0;
+    int j = 0;
 
     /*@ buffers ******************************************* */
     static char outstr[MAX_STR_LEN];
-    char *pos_w_commas, *tmp;
 
     assert(bkpinfo != NULL);
-    malloc_string(pos_w_commas);
-    malloc_string(tmp);
-    sprintf(tmp, "%lld", g_tape_posK);
-    strcpy(pos_w_commas, commarize(tmp));
-
-
-
-    if (bkpinfo->media_size[g_current_media_number] <= 0)
-//    { fatal_error( "percentage_media_full_comment() - unknown media size"); }
-    {
-        sprintf(outstr, "Volume %d: %s kilobytes archived so far",
-                g_current_media_number, pos_w_commas);
+
+    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+        sprintf(outstr, _("Volume %d: %'lld kilobytes archived so far"),
+                g_current_media_number, g_tape_posK);
         return (outstr);
     }
 
-/* update screen */
+    /* update screen */
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         percentage =
@@ -1033 +906 @@
             percentage = 100;
         }
-        sprintf(outstr, "Volume %d: [", g_current_media_number);
+        sprintf(outstr, _("Volume %d: ["), g_current_media_number);
     } else {
         percentage =
@@ -1039 +912 @@
                    bkpinfo->media_size[g_current_media_number]);
         sprintf(outstr, "%s %d: [",
-                media_descriptor_string(bkpinfo->backup_media_type),
+                bkpinfo->backup_media_string,
                 g_current_media_number);
     }
@@ -1050 +923 @@
     j = (int) strlen(outstr);
     sprintf(outstr + j, "] %d%% used", percentage);
-    mr_free(pos_w_commas);
-    mr_free(tmp);
     return (outstr);
 }
+
+
 
 /**
@@ -1063 +936 @@
 char *media_descriptor_string(t_bkptype type_of_bkp)
 {
-    static char *type_of_backup = NULL;
-
-    if (!type_of_backup) {
-        malloc_string(type_of_backup);
-    }
-
-    switch (type_of_bkp) {
-    case dvd:
-        strcpy(type_of_backup, "DVD");
-        break;
-    case cdr:
-        strcpy(type_of_backup, "CDR");
-        break;
-    case cdrw:
-        strcpy(type_of_backup, "CDRW");
-        break;
-    case tape:
-        strcpy(type_of_backup, "tape");
-        break;
-    case cdstream:
-        strcpy(type_of_backup, "CDR");
-        break;
-    case udev:
-        strcpy(type_of_backup, "udev");
-        break;
-    case iso:
-        strcpy(type_of_backup, "ISO");
-        break;
-    case nfs:
-        strcpy(type_of_backup, "nfs");
-        break;
-    case usb:
-        strcpy(type_of_backup, "USB");
-        break;
-    default:
-        strcpy(type_of_backup, "ISO");
-    }
-    return (type_of_backup);
-}
+       static char *type_of_backup = NULL;
+
+       if (!type_of_backup) {
+               malloc_string(type_of_backup);
+       }
+
+       switch (type_of_bkp) {
+       case dvd:
+               strcpy(type_of_backup, "DVD");
+               break;
+       case cdr:
+               strcpy(type_of_backup, "CDR");
+               break;
+       case cdrw:
+               strcpy(type_of_backup, "CDRW");
+               break;
+       case tape:
+               strcpy(type_of_backup, "tape");
+               break;
+       case cdstream:
+               strcpy(type_of_backup, "CDR");
+               break;
+       case udev:
+               strcpy(type_of_backup, "udev");
+               break;
+       case iso:
+               strcpy(type_of_backup, "ISO");
+               break;
+       case nfs:
+               strcpy(type_of_backup, "nfs");
+               break;
+       case usb:
+               strcpy(type_of_backup, "USB");
+               break;
+       default:
+               strcpy(type_of_backup, "ISO");
+       }
+       return (type_of_backup);
+}
+

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

@@ -1 @@
-/* libmondo-tools.c                                  misc tools
-   $Id$
+/* $Id$
+misc tools
 */
-
 
 /**
@@ -16 +15 @@
 #include "mondostructures.h"
 #include "libmondo-tools.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
@@ -45 +44 @@
 
 /**
- * The place where /boot is mounted.
- */
-char *g_boot_mountpt = NULL;
+ * The place where /boot is mounted. - Used locally only
+ */
+static char *g_boot_mountpt = NULL;
 
 /**
@@ -77 +76 @@
 
 extern t_bkptype g_backup_media_type;
+extern char *g_backup_media_string;
 
 extern bool am_I_in_disaster_recovery_mode(void);
@@ -111 +111 @@
         newtSuspend();
 #endif
-    printf("ASSERTION FAILED: `%s'\n", exp);
-    printf("\tat %s:%d in %s\n\n", file, line, function);
-    printf("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
+    printf(_("ASSERTION FAILED: `%s'\n"), exp);
+    printf(_("\tat %s:%d in %s\n\n"), file, line, function);
+    printf(_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
     do {
         is_valid = TRUE;
@@ -140 +140 @@
         case '\n':
             printf
-                ("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
+                (_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
             break;
         default:
             is_valid = FALSE;
-            printf("Invalid choice.\n");
+            printf(_("Invalid choice.\n"));
             break;
         }
@@ -171 +171 @@
     char *tmp;
 
-    malloc_string(tmp);
-    strcpy(tmp,
-           "for i in `find /root /home -type d -name Desktop -maxdepth 2`; do \
+    mr_asprintf(&tmp,
+             "for i in `find /root /home -type d -name Desktop -maxdepth 2`; do \
 file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; \
 awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } \
@@ -202 +201 @@
     return ("i386");
 #endif
+#ifdef __X86_64__
+    return ("x86_64");
+#endif
 #ifdef __IA64__
     return ("ia64");
@@ -209 +211 @@
 
 
-
+/* BERLIOS: Use uname instead */
 double get_kernel_version(void)
 {
@@ -237 +239 @@
 
 
-
-
-
 /**
  * Get the current time.
@@ -248 +247 @@
     return (long) time((void *) 0);
 }
-
-
-
-
-
 
 
@@ -295 +289 @@
 
 
-
-
 /**
  * Insert modules that Mondo requires.
@@ -308 +300 @@
     system("kldstat | grep ext2fs  || kldload ext2fs 2> /dev/null");
 #else
-    system("modprobe dos &> /dev/null");
-    system("modprobe fat &> /dev/null");
-    system("modprobe vfat &> /dev/null");
-    //  system("modprobe osst &> /dev/null");
+    system("modprobe -a dos fat vfat loop &> /dev/null");
 #endif
 }
@@ -349 +338 @@
 int post_param_configuration(struct s_bkpinfo *bkpinfo)
 {
-    char *extra_cdrom_params;
-    char *mondo_mkisofs_sz;
-    char *command;
-    char *mtpt;
-    char *hostname, *ip_address;
+    char *extra_cdrom_params = NULL;
+    char *mondo_mkisofs_sz = NULL;
+    char *command = NULL;
+    char *hostname = NULL;
+    char *ip_address = NULL;
     int retval = 0;
     long avm = 0;
-    char *colon;
-    char *cdr_exe;
-    char *tmp;
-    char call_before_iso_user[MAX_STR_LEN] = "\0";
+    char *colon = NULL;
+    char *cdr_exe = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *call_before_iso_user = NULL;
     int rdsiz_MB;
-    char *iso_dev;
-    char *iso_mnt;
-    char *iso_tmp;
-    char *iso_path;
+    char *iso_dev = NULL;
+    char *iso_mnt = NULL;
+    char *iso_tmp = NULL;
+    char *iso_path = NULL;
     FILE *fd1 = NULL;
 
     assert(bkpinfo != NULL);
-    malloc_string(extra_cdrom_params);
-    malloc_string(mondo_mkisofs_sz);
-    malloc_string(command);
-    malloc_string(mtpt);
-    malloc_string(hostname);
-    malloc_string(ip_address);
-    malloc_string(cdr_exe);
-    malloc_string(tmp);
-    malloc_string(iso_dev);
-    malloc_string(iso_mnt);
-    malloc_string(iso_tmp);
-    malloc_string(iso_path);
     bkpinfo->optimal_set_size =
         (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
@@ -387 +365 @@
     if (bkpinfo->backup_media_type == tape) {
         mr_msg(1, "Bar");
-        sprintf(tmp, "mt -f %s status", bkpinfo->media_device);
+        mr_asprintf(&tmp, "mt -f %s status", bkpinfo->media_device);
         mr_msg(1, "tmp = '%s'", tmp);
         if (run_program_and_log_output(tmp, 3)) {
@@ -393 +371 @@
                 ("Unable to open tape device. If you haven't specified it with -d, do so. If you already have, check your parameter. I think it's wrong.");
         }
+        mr_free(tmp);
     }
     make_hole_for_dir(bkpinfo->scratchdir);
@@ -403 +382 @@
     run_program_and_log_output("cat /etc/*issue*", 5);
     sprintf(g_tmpfs_mountpt, "%s/tmpfs", bkpinfo->tmpdir);
-    sprintf(command, "mkdir -p %s", g_tmpfs_mountpt);
+    mr_asprintf(&command, "mkdir -p %s", g_tmpfs_mountpt);
     paranoid_system(command);
+    mr_free(command);
     rdsiz_MB = PPCFG_RAMDISK_SIZE + g_tape_buffer_size_MB;
 #ifdef __FreeBSD__
-    strcpy(tmp,
+    mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("vmstat | tail -1 | tr -s ' ' | cut -d' ' -f6"));
     avm += atol(tmp);
-    strcpy(tmp,
+    mr_free(tmp);
+    mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("swapinfo | grep -v Device | tr -s ' ' | cut -d' ' -f4 | tr '\n' '+' | sed 's/+$//' | bc"));
     avm += atol(tmp);
-    sprintf(command, "mdmfs -s %d%c md9 %s", rdsiz_MB, 'm',
-            g_tmpfs_mountpt);
+    mr_free(tmp);
+    mr_asprintf(&command, "mdmfs -s %d%c md9 %s", rdsiz_MB, 'm',
+             g_tmpfs_mountpt);
 #else
-    strcpy(tmp,
+    mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("free | grep ':' | tr -s ' ' '\t' | cut -f2 | head -n1"));
     avm += atol(tmp);
-    sprintf(command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
+    mr_free(tmp);
+    mr_asprintf(&command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
             g_tmpfs_mountpt, rdsiz_MB, 'm');
     run_program_and_log_output("cat /proc/cpuinfo", 5);
+    /* BERLIOS: rpm is not necessarily there ! */
     run_program_and_log_output
         ("rpm -q newt newt-devel slang slang-devel ncurses ncurses-devel gcc",
@@ -440 +424 @@
         log_it("It doesn't seem you have enough swap to use tmpfs. Fine.");
     }
+    mr_free(command);
 
     if (bkpinfo->use_lzo) {
@@ -457 +442 @@
 
     if (bkpinfo->backup_media_type == dvd) {
-        extra_cdrom_params[0] = '\0';
-        mondo_mkisofs_sz[0] = '\0';
         if (find_home_of_exe("growisofs")) {
-            strcpy(cdr_exe, "growisofs");
-        }                       // unlikely to be used
-        else {
+            mr_asprintf(&cdr_exe, "growisofs");
+        } else {
             fatal_error("Please install growisofs.");
         }
         if (bkpinfo->nonbootable_backup) {
-            strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
         } else if
 #ifdef __FreeBSD__
@@ -475 +457 @@
 #ifdef __IA64__
     {
-        strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
     }
 #else
     {
-        strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
@@ -492 +474 @@
             sprintf(bkpinfo->call_make_iso,
                     "%s %s -Z %s . 2>> _ERR_",
-                    mondo_mkisofs_sz,
-                    extra_cdrom_params, bkpinfo->media_device);
-        }
+                    mondo_mkisofs_sz, "", bkpinfo->media_device);
+        }
+        mr_free(mondo_mkisofs_sz);
+
         if (getenv ("SUDO_COMMAND")) {
-            sprintf(command, "strings `which growisofs` | grep -c SUDO_COMMAND");
+            mr_asprintf(&command, "strings `which growisofs` | grep -c SUDO_COMMAND");
             if (!strcmp(call_program_and_get_last_line_of_output(command), "1")) {
                 popup_and_OK("Fatal Error: Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
                 fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
-            }       
+            }
+            mr_free(command);
         }
         mr_msg(2, "call_make_iso (DVD res) is ... %s",
@@ -509 +493 @@
     if (bkpinfo->backup_media_type == cdrw
         || bkpinfo->backup_media_type == cdr) {
-        extra_cdrom_params[0] = '\0';
         if (!bkpinfo->manual_cd_tray) {
-            strcat(extra_cdrom_params, "-waiti ");
+            mr_strcat(extra_cdrom_params, "-waiti ");
         }
         if (bkpinfo->backup_media_type == cdrw) {
-            strcat(extra_cdrom_params, "blank=fast ");
+            mr_strcat(extra_cdrom_params, "blank=fast ");
         }
         if (find_home_of_exe("cdrecord")) {
-            strcpy(cdr_exe, "cdrecord");
+            mr_asprintf(&cdr_exe, "cdrecord");
         } else if (find_home_of_exe("dvdrecord")) {
-            strcpy(cdr_exe, "dvdrecord");
+            mr_asprintf(&cdr_exe, "dvdrecord");
         } else {
             fatal_error("Please install either cdrecord or dvdrecord.");
         }
         if (bkpinfo->nonbootable_backup) {
-            strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
         } else if
 #ifdef __FreeBSD__
@@ -533 +516 @@
 #ifdef __IA64__
     {
-        strcat(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
@@ -549 +532 @@
                         "%s -o %s/temporary.iso . 2>> _ERR_",
                         mondo_mkisofs_sz, bkpinfo->tmpdir);
-                } else {
-                strncpy(call_before_iso_user, bkpinfo->call_before_iso, MAX_STR_LEN);
+            } else {
+                mr_asprintf(&call_before_iso_user, bkpinfo->call_before_iso);
                 sprintf (bkpinfo->call_before_iso,
                                     "( %s -o %s/temporary.iso . 2>> _ERR_ ; %s )",
                         mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
+                mr_free(call_before_iso_user);
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
@@ -569 +553 @@
                     bkpinfo->cdrw_speed);
         }
+        mr_free(mondo_mkisofs_sz);
+        mr_free(cdr_exe);
+        mr_free(extra_cdrom_params);
     }                           // end of CD code
-
-    /*
-       if (bkpinfo->backup_data && bkpinfo->backup_media_type == tape)
-       {
-       sprintf (tmp,
-       "dd if=/dev/zero of=%s bs=%ld count=32 2> /dev/null",
-       bkpinfo->media_device, bkpinfo->internal_tape_block_size);
-       if (system(tmp))
-       {
-       retval++;
-       fprintf (stderr,
-       "Cannot write to tape device. Is the tape set read-only?\n");
-       }
-       } // end of tape code
-     */
-
 
     if (bkpinfo->backup_media_type == iso) {
@@ -597 +568 @@
 
         log_it("isodir = %s", bkpinfo->isodir);
-        sprintf(command, "df -P %s | tail -n1 | cut -d' ' -f1",
-                bkpinfo->isodir);
+        mr_asprintf(&command, "df -P %s | tail -n1 | cut -d' ' -f1",
+                 bkpinfo->isodir);
         log_it("command = %s", command);
-        sprintf(iso_dev, "%s",
-                call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&iso_dev, call_program_and_get_last_line_of_output(command));
+        mr_free(command);
         log_it("res of it = %s", iso_dev);
 
@@ -607 +578 @@
         mr_fprintf(fd1, "iso-dev=%s\n", iso_dev);
 
-        sprintf(command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
-                iso_dev);
+        mr_asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
+                 iso_dev);
+        mr_free(iso_dev);
+
         log_it("command = %s", command);
-        sprintf(iso_mnt, "%s",
-                call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&iso_mnt,call_program_and_get_last_line_of_output(command));
+        mr_free(command);
 
         log_it("res of it = %s", iso_mnt);
@@ -617 +590 @@
         log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
 
-        sprintf(iso_tmp, "%s", bkpinfo->isodir);
-        if (strlen(iso_tmp) < strlen(iso_mnt)) {
-            iso_path[0] = '\0';
+        mr_asprintf(&iso_tmp, "%s", bkpinfo->isodir);
+        if (strlen(iso_tmp) >= strlen(iso_mnt)) {
+            mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt));
         } else {
-            sprintf(iso_path, "%s", iso_tmp + strlen(iso_mnt));
-        }
+            mr_asprintf(&iso_path, "");
+        }
+        mr_free(iso_tmp);
+        mr_free(iso_mnt);
+
         log_it("isodir: %s", iso_path);
         mr_fprintf(fd1, "isodir=%s\n", iso_path);
+        mr_free(iso_path);
 
         log_it("iso-prefix: %s",  bkpinfo->prefix);
@@ -633 +610 @@
 
     if (bkpinfo->backup_media_type == nfs) {
-        strcpy(hostname, bkpinfo->nfs_mount);
+        mr_asprintf(&hostname, bkpinfo->nfs_mount);
         colon = strchr(hostname, ':');
         if (!colon) {
@@ -648 +625 @@
                 retval++;
             } else {
-                strcpy(ip_address, inet_ntoa
-                       ((struct in_addr)
-                        *((struct in_addr *) hent->h_addr)));
-                strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));
+                mr_asprintf(&ip_address, "%s%s", inet_ntoa((struct in_addr)
+                                                *((struct in_addr *) hent->h_addr)),
+                                                strchr(bkpinfo->nfs_mount, ':'));
                 strcpy(bkpinfo->nfs_mount, ip_address);
+                mr_free(ip_address);
             }
         }
         store_nfs_config(bkpinfo);
+        mr_free(hostname);
     }
 
@@ -662 +640 @@
         fprintf(stderr, "Type 'man mondoarchive' for help.\n");
     }
-    sprintf(tmp, "%s", MONDO_TMPISOS);  /* added #define 22 apr 2002 */
+    mr_asprintf(&tmp, "%s", MONDO_TMPISOS);
     if (does_file_exist(tmp)) {
         unlink(tmp);
     }
+    mr_free(tmp);
+
     if (strlen(bkpinfo->tmpdir) < 2 || strlen(bkpinfo->scratchdir) < 2) {
         log_it("tmpdir or scratchdir are blank/missing");
@@ -677 +657 @@
     chmod(bkpinfo->tmpdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
-    mr_free(mtpt);
-    mr_free(extra_cdrom_params);
-    mr_free(mondo_mkisofs_sz);
-    mr_free(command);
-    mr_free(hostname);
-    mr_free(ip_address);
-    mr_free(cdr_exe);
-    mr_free(tmp);
-    mr_free(iso_dev);
-    mr_free(iso_mnt);
-    mr_free(iso_tmp);
-    mr_free(iso_path);
+    g_backup_media_string = bkpinfo->backup_media_string;
     return (retval);
 }
-
 
 
@@ -745 +713 @@
 
     mr_msg(1, "Hi");
+
     assert(bkpinfo != NULL);
+    /* BERLIOS : Useless ?? */
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
+
     bkpinfo->manual_cd_tray = FALSE;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
@@ -769 +740 @@
         strcpy(bkpinfo->isodir, "/");
     } else {
-        strcpy(bkpinfo->isodir, "/root/images/mondo");
+        strcpy(bkpinfo->isodir, "/var/cache/mondo/iso");
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
@@ -778 +749 @@
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
+    bkpinfo->backup_media_string[0] = '\0';
     strcpy(bkpinfo->include_paths, "/");
     bkpinfo->exclude_paths[0] = '\0';
@@ -799 +771 @@
 
 
-
-
 /**
  * Get the remaining free space (in MB) on @p partition.
@@ -808 +778 @@
 long free_space_on_given_partition(char *partition)
 {
-    char command[MAX_STR_LEN], out_sz[MAX_STR_LEN];
-    long res;
+    char *command = NULL;
+    char *out_sz = NULL;
+    long res = 0L;
 
     assert_string_is_neither_NULL_nor_zerolength(partition);
 
-    sprintf(command, "df -m -P %s &> /dev/null", partition);
+    mr_asprintf(&command, "df -m -P %s &> /dev/null", partition);
     if (system(command)) {
         return (-1);
     }                           // partition does not exist
-    sprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
+    mr_free(command);
+
+    mr_asprintf(&command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
             partition);
-    strcpy(out_sz, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&out_sz, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     if (strlen(out_sz) == 0) {
         return (-1);
     }                           // error within df, probably
     res = atol(out_sz);
+    mr_free(out_sz);
     return (res);
 }
-
 
 
@@ -845 +820 @@
 
     /*@ buffers ************ */
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     /*@ int's *************** */
@@ -852 +827 @@
 
 
-    mvaddstr_and_log_it(g_currentY, 0, "Checking sanity of your Linux distribution");
+    mvaddstr_and_log_it(g_currentY, 0,
+                        "Checking sanity of your Linux distribution");
 #ifndef __FreeBSD__
     if (system("which mkfs.vfat &> /dev/null")
@@ -861 +837 @@
             ("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
     }
-    strcpy(tmp,
+    mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
     if (atol(tmp) < 35000) {
         retval++;
-        log_to_screen("You must have at least 32MB of RAM to use Mondo.");
+        log_to_screen(_("You must have at least 32MB of RAM to use Mondo."));
     }
     if (atol(tmp) < 66000) {
         log_to_screen
-            ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
-    }
+            (_("WARNING! You have very little RAM. Please upgrade to 64MB or more."));
+    }
+    mr_free(tmp);
 #endif
 
@@ -878 +855 @@
 
     if (Lres < 50) {
-              fatal_error("Your /var/cache partition has <50MB free. Please adjust your partition table to something saner."); 
+        fatal_error("Your /var/cache partition has <50MB free. Please adjust your partition table to something saner."); 
     }
 
@@ -892 +869 @@
         ("grep ramdisk /proc/devices", FALSE)) {
         if (!ask_me_yes_or_no
-            ("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?"))
+            (_("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?")))
         {
             //          retval++;
             log_to_screen
-                ("It looks as if your kernel lacks ramdisk and initrd support.");
+                (_("It looks as if your kernel lacks ramdisk and initrd support."));
             log_to_screen
-                ("I'll allow you to proceed but FYI, if I'm right, your kernel is broken.");
+                (_("I'll allow you to proceed but FYI, if I'm right, your kernel is broken."));
         }
     }
@@ -921 +898 @@
         !run_program_and_log_output
         ("mount | grep -w dos | grep -vE \"/dev/fd|nexdisk\"", 0)) {
-        log_to_screen("I think you have a Windows 9x partition.");
+        log_to_screen(_("I think you have a Windows 9x partition."));
         retval += whine_if_not_found("parted");
 #ifndef __IA64__
@@ -946 +923 @@
     run_program_and_log_output
         ("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
-    strcpy(tmp,
+    mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("mount | grep -E \"cdr(om|w)\""));
@@ -952 +929 @@
         if (strstr(tmp, "autofs")) {
             log_to_screen
-                ("Your CD-ROM is mounted via autofs. I therefore cannot tell");
+                (_("Your CD-ROM is mounted via autofs. I therefore cannot tell"));
             log_to_screen
-                ("if a CD actually is inserted. If a CD is inserted, please");
-            log_to_screen("eject it. Thank you.");
+                (_("if a CD actually is inserted. If a CD is inserted, please"));
+            log_to_screen(_("eject it. Thank you."));
             log_it
                 ("Ignoring autofs CD-ROM 'mount' since we hope nothing's in it.");
@@ -965 +942 @@
         }
     }
+    mr_free(tmp);
 #ifndef __FreeBSD__
     if (!does_file_exist("/etc/modules.conf")) {
@@ -981 +959 @@
             retval++;
             log_to_screen
-                ("Please find out what happened to /etc/modules.conf");
+                (_("Please find out what happened to /etc/modules.conf"));
         }
     }
@@ -994 +972 @@
 
     if (run_program_and_log_output("mindi -V", 1)) {
-        log_to_screen("Could not ascertain mindi's version number.");
+        log_to_screen(_("Could not ascertain mindi's version number."));
         log_to_screen
-            ("You have not installed Mondo and/or Mindi properly.");
-        log_to_screen("Please uninstall and reinstall them both.");
+            (_("You have not installed Mondo and/or Mindi properly."));
+        log_to_screen(_("Please uninstall and reinstall them both."));
         fatal_error("Please reinstall Mondo and Mindi.");
     }
@@ -1003 +981 @@
         ("mindi --makemountlist /tmp/mountlist.txt.test", 5)) {
         log_to_screen
-            ("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason.");
+            (_("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason."));
         log_to_screen
-            ("Please run that command by hand and examine /var/log/mindi.log");
+            (_("Please run that command by hand and examine /var/log/mindi.log"));
         log_to_screen
-            ("for more information. Perhaps your /etc/fstab file is insane.");
+            (_("for more information. Perhaps your /etc/fstab file is insane."));
         log_to_screen
-            ("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see.");
+            (_("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see."));
         retval++;
     }
@@ -1016 +994 @@
         && !does_file_exist("/etc/raidtab")) {
         log_to_screen
-            ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
+            (_("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat"));
         create_raidtab_from_mdstat("/etc/raidtab");
     }
 
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     return (retval);
@@ -1038 +1016 @@
 {
     /*@ buffer ****************************************************** */
-    char command[MAX_STR_LEN * 2];
-    char tmp[MAX_STR_LEN];
+    char *command = NULL;
+    char *tmp = NULL;
 
     /*@ end vars *************************************************** */
@@ -1045 +1023 @@
     assert_string_is_neither_NULL_nor_zerolength(config_file);
     assert_string_is_neither_NULL_nor_zerolength(label);
+
     if (!does_file_exist(config_file)) {
-        sprintf(tmp, "(read_cfg_var) Cannot find %s config file",
-                config_file);
+        mr_asprintf(&tmp, "(read_cfg_var) Cannot find %s config file",
+                 config_file);
         log_to_screen(tmp);
+        mr_free(tmp);
         value[0] = '\0';
         return (1);
-    } else if (strstr(value, "/dev/") && strstr(value, "t0")
+    /* } BERLIOS: Useless: 
+         else if (strstr(value, "/dev/") && strstr(value, "t0")
                && !strcmp(label, "media-dev")) {
         mr_msg(2, "FYI, I shan't read new value for %s - already got %s",
                 label, value);
         return (0);
-    } else {
-        sprintf(command, "grep '%s .*' %s| cut -d'=' -f2,3,4,5",
+    */ } else {
+        mr_asprintf(&command, "grep '%s .*' %s| cut -d'=' -f2,3,4,5",
                 label, config_file);
         strcpy(value, call_program_and_get_last_line_of_output(command));
+        mr_free(command);
         if (strlen(value) == 0) {
             return (1);
@@ -1069 +1051 @@
 
 
-
 /**
  * Remount @c supermount if it was unmounted earlier.
@@ -1101 +1082 @@
 
 /**
- * Whether we had to stop autofs (if so, restart it at end).
- */
-bool g_autofs_stopped = FALSE;
-
-/**
- * Path to the autofs initscript ("" if none exists).
- */
-char g_autofs_exe[MAX_STR_LEN];
-
-/**
- * Autofs initscript in Xandros Linux distribution.
- */
-#define XANDROS_AUTOFS_FNAME "/etc/init.d/xandros-autofs"
-
-/**
- * Autofs initscript in most Linux distributions.
- */
-#define STOCK_AUTOFS_FNAME "/etc/rc.d/init.d/autofs"
-
-/**
- * If autofs is mounted, stop it (restart at end).
- */
-void stop_autofs_if_necessary()
-{
-    char tmp[MAX_STR_LEN];
-
-    g_autofs_exe[0] = '\0';
-    if (does_file_exist(XANDROS_AUTOFS_FNAME)) {
-        strcpy(g_autofs_exe, XANDROS_AUTOFS_FNAME);
-    } else if (does_file_exist(STOCK_AUTOFS_FNAME)) {
-        strcpy(g_autofs_exe, STOCK_AUTOFS_FNAME);
-    }
-
-    if (!g_autofs_exe[0]) {
-        mr_msg(3, "No autofs detected.");
-    } else {
-        mr_msg(3, "%s --- autofs detected", g_autofs_exe);
-// FIXME -- only disable it if it's running ---  sprintf(tmp, "%s status", autofs_exe);
-        sprintf(tmp, "%s stop", g_autofs_exe);
-        if (run_program_and_log_output(tmp, 2)) {
-            log_it("Failed to stop autofs - I assume it wasn't running");
-        } else {
-            g_autofs_stopped = TRUE;
-            log_it("Stopped autofs OK");
-        }
-    }
-}
-
-/**
- * If autofs was stopped earlier, restart it.
- */
-void restart_autofs_if_necessary()
-{
-    char tmp[MAX_STR_LEN];
-
-    if (!g_autofs_stopped || !g_autofs_exe[0]) {
-        mr_msg(3, "No autofs detected.");
-        return;
-    }
-    sprintf(tmp, "%s start", g_autofs_exe);
-    if (run_program_and_log_output(tmp, 2)) {
-        log_it("Failed to start autofs");
-    } else {
-        g_autofs_stopped = FALSE;
-        log_it("Started autofs OK");
-    }
-}
-
-
-/**
  * If this is a distribution like Gentoo that doesn't keep /boot mounted, mount it.
  */
 void mount_boot_if_necessary()
 {
-    char tmp[MAX_STR_LEN];
-    char command[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *command = NULL;
 
     mr_msg(1, "Started sub");
     mr_msg(4, "About to set g_boot_mountpt[0] to '\\0'");
     g_boot_mountpt[0] = '\0';
-    mr_msg(4, "Done. Great. Seeting command to something");
-    strcpy(command,
-           "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+    mr_msg(4, "Done. Great. Setting command to something");
+    mr_asprintf(&command,
+             "grep -v ':' /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     mr_msg(4, "Cool. Command = '%s'", command);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     mr_msg(4, "tmp = '%s'", tmp);
     if (tmp[0]) {
@@ -1197 +1111 @@
             }
         } else {
-            sprintf(command, "mount | grep -E '^%s'", tmp);
+            mr_asprintf(&command, "mount | grep -E '^%s'", tmp);
             mr_msg(3, "command = %s", command);
             if (run_program_and_log_output(command, 5)) {
                 strcpy(g_boot_mountpt, tmp);
-                sprintf(tmp,
+                mr_asprintf(&tmp1,
                         "%s (your /boot partition) is not mounted. I'll mount it before backing up",
                         g_boot_mountpt);
-                log_it(tmp);
-                sprintf(tmp, "mount %s", g_boot_mountpt);
-                if (run_program_and_log_output(tmp, 5)) {
+                log_it(tmp1);
+                mr_free(tmp1);
+
+                mr_asprintf(&tmp1, "mount %s", g_boot_mountpt);
+                if (run_program_and_log_output(tmp1, 5)) {
                     g_boot_mountpt[0] = '\0';
                     mr_msg(1, "Plan B");
@@ -1217 +1133 @@
                     }
                 }
+                mr_free(tmp1);
             }
-        }
-    }
+            mr_free(command);
+        }
+    }
+    mr_free(tmp);
     mr_msg(1, "Ended sub");
 }
@@ -1229 +1148 @@
 void unmount_boot_if_necessary()
 {
-    char tmp[MAX_STR_LEN];
+    char *tmp;
 
     mr_msg(3, "starting");
     if (g_boot_mountpt[0]) {
-        sprintf(tmp, "umount %s", g_boot_mountpt);
+        mr_asprintf(&tmp, "umount %s", g_boot_mountpt);
         if (run_program_and_log_output(tmp, 5)) {
             log_it("WARNING - unable to unmount /boot");
         }
+        mr_free(tmp);
     }
     mr_msg(3, "leaving");
 }
-
 
 
@@ -1254 +1173 @@
 {
     /*@ buffers ***************************************************** */
-    char command[MAX_STR_LEN * 2];
-    char tempfile[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *command = NULL;
+    char *tempfile = NULL;
+    char *tmp = NULL;
 
 
@@ -1263 +1182 @@
     assert_string_is_neither_NULL_nor_zerolength(label);
     assert(value != NULL);
+
     if (!does_file_exist(config_file)) {
-        sprintf(tmp, "(write_cfg_file) Cannot find %s config file",
-                config_file);
+        mr_asprintf(&tmp, "(write_cfg_file) Cannot find %s config file",
+                 config_file);
         log_to_screen(tmp);
+        mr_free(tmp);
         return (1);
     }
-    strcpy(tempfile,
+    mr_asprintf(&tempfile,
            call_program_and_get_last_line_of_output
            ("mktemp -q /tmp/mojo-jojo.blah.XXXXXX"));
     if (does_file_exist(config_file)) {
-        sprintf(command, "grep -vE '^%s .*$' %s > %s",
+        mr_asprintf(&command, "grep -vE '^%s .*$' %s > %s",
                 label, config_file, tempfile);
         paranoid_system(command);
-    }
-    sprintf(command, "echo \"%s %s\" >> %s", label, value, tempfile);
+        mr_free(command);
+    }
+    mr_asprintf(&command, "echo \"%s %s\" >> %s", label, value, tempfile);
     paranoid_system(command);
-    sprintf(command, "mv -f %s %s", tempfile, config_file);
+    mr_free(command);
+
+    mr_asprintf(&command, "mv -f %s %s", tempfile, config_file);
     paranoid_system(command);
+    mr_free(command);
     unlink(tempfile);
+    mr_free(tempfile);
     return (0);
 }
 
-
-/**
- * If @p y, malloc @p x, else free @p x.
- * @bug This function seems orphaned. Please remove.
- */
-#define do_alloc_or_free_depending(x,y) { if(y) {x=mr_malloc(MAX_STR_LEN);} else {mr_free(x);} }
 
 /**
@@ -1358 +1278 @@
 void restart_magicdev_if_necessary()
 {
-    char *tmp;
-
-    malloc_string(tmp);
+    char *tmp = NULL;
+
     if (g_magicdev_command && g_magicdev_command[0]) {
-        sprintf(tmp, "%s &", g_magicdev_command);
+        mr_asprintf(&tmp, "%s &", g_magicdev_command);
         paranoid_system(tmp);
-    }
-    mr_free(tmp);
+        mr_free(tmp);
+    }
 }
 

branches/stable/mondo/src/include/mr_mem.h

@@ -23 +23 @@
 #define mr_malloc(x) mr_malloc_int((size_t)x,__LINE__,__FILE__)
 #define mr_setenv(x,y) mr_setenv_int(x,y,__LINE__,__FILE__)
+#define mr_strcat(x,y) mr_strcat_int((char **)&x,y, __LINE__,__FILE__);
 
 /* Internal function bringing debuging info 
@@ -32 +33 @@
 extern inline void *mr_malloc_int(size_t size, int line, char *file);
 extern inline void mr_setenv_int(const char *name, const char *value, int line, char *file);
+extern void mr_strcat_int(char **in, const char *add, int line, char *file);
 
 #endif                          /* MR_MEM_H */

branches/stable/mondo/src/include/mr_str.h

@@ -11 +11 @@
 /* functions (public methods) */
 
-extern inline char *mr_strtok(char *instr, const char *delims, int *lastpos);
-extern inline char *mr_stresc(char *instr, char *toesc, const char escchr);
+extern char *mr_strtok(char *instr, const char *delims, int *lastpos);
+extern char *mr_stresc(char *instr, char *toesc, const char escchr);
 extern inline char *mr_date(void);
-extern inline void mr_strip_spaces(char *in_out);
 
 #endif                          /* MR_STR_H */

branches/stable/mondo/src/lib/mr_mem.c

@@ -110 +110 @@
     }
 }
+
+/*
+ * Equivalent function of strcat but safe 
+ * from memory allocation point of view
+ */
+void mr_strcat_int(char **in, const char *add, int line, char *file) {
+    char *p =NULL;
+    
+    if (add == NULL) {
+        return;
+    }
+    if (in == NULL) {
+        mr_msg_int(1,line,file,"Unable to add %s to NULL pointer\nExiting...", add);
+        mr_exit(-1, "Unable to add to a NULL pointer");
+    }
+    if (*in == NULL) {
+        mr_asprintf_int(&p,line,file,add);
+    } else {
+        mr_asprintf_int(&p,line,file,"%s%s",*in,add);
+        mr_free_int((void **)in,line,file);
+    }
+    *in = p;
+}

branches/stable/mondo/src/lib/mr_str.c

@@ -122 +122 @@
  * @param in_out The string to strip spaces/control characters from (modified).
  */
-void mr_strip_spaces(char *in_out)
-{
-    /*@ int ******************************************************** */
+void mr_strip_spaces(char *in_out) {
     int i;
     int j;
     size_t length;
-
-    /*@ end vars *************************************************** */
 
     if (in_out == NULL) {

branches/stable/mondo/src/test/test-mem.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 
@@ -31 +32 @@
     mr_free(str);
 
+    printf("*** Test with mr_strcat\n");
+    mr_asprintf(&str,"Another Chain");
+    mr_strcat(str," of trust");
+    printf("Result: %s\n",str);
+    mr_free(str);
+
     printf("*** Test with mr_getline/mr_free\n");
     fd = mr_fopen("/etc/passwd","r");

branches/stable/mondo/src/test/test-mem.res

@@ -1 @@
-*** Test with mr_free
+*** Test with mr_malloc/mr_free
 pointer is NOT null
 pointer is null
+*** Test with mr_asprintf/mr_free
+Result: Chain of trust
+*** Test with mr_strcat
+Result: Another Chain of trust
+*** Test with mr_getline/mr_free
+1st Result: root:x:0:0:root:/root:/bin/bash
+2nd Result: bin:x:1:1:bin:/bin:/bin/sh
+3rd Result: another line
 *** Test with NULL
 pointer is null