Changeset 87 in MondoRescue for trunk

Timestamp:

Oct 27, 2005, 10:03:00 PM (20 years ago)

Author:

bcornec

Message:

• Now use -Wall to compile
• asprintf for newt-specific.c
• Bug in libmondo-string.c line 1120: if we use %% in this format, then the percentage is printeed wrongly (after the real percentage we have a huge number)

Location:

trunk/mondo

Files:

• configure.in (modified) (2 diffs)
• mondo/common/libmondo-archive.c (modified) (10 diffs)
• mondo/common/libmondo-devices.c (modified) (4 diffs)
• mondo/common/libmondo-filelist.c (modified) (1 diff)
• mondo/common/libmondo-files.c (modified) (3 diffs)
• mondo/common/libmondo-mountlist.c (modified) (1 diff)
• mondo/common/libmondo-raid.c (modified) (1 diff)
• mondo/common/libmondo-string.c (modified) (12 diffs)
• mondo/common/libmondo-tools.c (modified) (1 diff)
• mondo/common/libmondo-verify.c (modified) (1 diff)
• mondo/common/my-stuff.h (modified) (6 diffs)
• mondo/common/newt-specific.c (modified) (57 diffs)
• mondo/mondoarchive/main.c (modified) (1 diff)
• mondo/mondoarchive/mondo-cli.c (modified) (2 diffs)
• mondo/mondorestore/mondo-restore.c (modified) (2 diffs)
• mondo/mondorestore/mondo-rstr-compare.c (modified) (2 diffs)
• mondo/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

trunk/mondo/configure.in

@@ -89 +89 @@
     #x86_64*)
         ARCH=i386
-        CPPFLAGS="$CPPFLAGS -D__IA32__"
+        CPPFLAGS="$CPPFLAGS -D__IA32__ -Wall"
         ;;
     ia64*)
         ARCH=ia64
-        CPPFLAGS="$CPPFLAGS -D__IA64__"
+        CPPFLAGS="$CPPFLAGS -D__IA64__ -Wall"
         ;;
     *)
@@ -140 +140 @@
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr])
+AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
 
 if test -n "$qt_includes"; then

trunk/mondo/mondo/common/libmondo-archive.c

@@ -2 +2 @@
 
 subroutines to handle the archiving of files
-
 */
 
@@ -514 +513 @@
  * - @c media_size
  * - @c nonbootable_backup
- * - @c scratchdir
  * - @c tmpdir
  * - @c use_lzo
@@ -528 +526 @@
     /*@ buffer ************************************************************ */
     char *tmp;
-    char *scratchdir;
     char *command;
     char *use_lzo_sz;
@@ -871 +868 @@
 
     //  popup_and_OK("Pausing");
-
     res = run_program_and_log_to_screen(command,
                                         "Generating boot+data disks");
@@ -1508 +1504 @@
                 (misc_counter_that_is_not_important + 1) % 5;
             /* BERLIOS: media_usage_comment was NOT initialized !!! */
-            /* maybe : */
-            asprintf(&media_usage_comment, "%s",
-                     percent_media_full_comment(bkpinfo));
+            /* maybe  */
+            tmp = percent_media_full_comment(bkpinfo);
+            asprintf(&media_usage_comment, "%s", tmp);
+            paranoid_free(tmp);
             if (!misc_counter_that_is_not_important) {
                 update_progress_form(media_usage_comment);
@@ -1535 +1532 @@
                 sleep(5);
             }
-            asprintf(&media_usage_comment, "%s",
-                     percent_media_full_comment(bkpinfo));
+            tmp = percent_media_full_comment(bkpinfo);
+            asprintf(&media_usage_comment, "%s", tmp);
+            paranoid_free(tmp);
             /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1644 +1642 @@
     char *message_to_screen;
     char *sz_blank_disk;
-    char *fnam;
     char *tmp2;
     char *tmp3;
@@ -2186 +2183 @@
         }
 
-        asprintf(&media_usage_comment, "%s",
-                 percent_media_full_comment(bkpinfo));
+        tmp = percent_media_full_comment(bkpinfo);
+        asprintf(&media_usage_comment, "%s", tmp);
+        paranoid_free(tmp);
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -3167 +3165 @@
                              bkpinfo->tmpdir, suffix));
 
-        asprintf(&tmp, "%s", percent_media_full_comment(bkpinfo));
+        tmp = percent_media_full_comment(bkpinfo);
         update_progress_form(tmp);
         paranoid_free(tmp);
@@ -3380 +3378 @@
     asprintf(&tmp, "Writing the final ISO");
     log_msg(2, tmp);
-    /* BERLIOS: that function seems strange to me
-       center_string(tmp, 80);
-     */
+    /* BERLIOS: center_string is now broken
+    center_string(tmp, 80);
+    */
 #ifndef _XWIN
     if (!g_text_mode) {

trunk/mondo/mondo/common/libmondo-devices.c

@@ -2213 +2213 @@
             ("I, Mojo Jojo, shall defeat those pesky Powerpuff Girls!");
     }
-
     if (archiving_to_media) {
 
@@ -2364 +2363 @@
     log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device,
            bkpinfo->boot_loader);
+    log_it("prefix = %s", bkpinfo->prefix);
     if (bkpinfo->media_size[0] < 0) {
         if (archiving_to_media) {
@@ -2892 +2892 @@
     char *command;
     char *fdisk;
-    struct stat buf;
 
     malloc_string(tmp);
@@ -2900 +2899 @@
 // BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere
 #ifdef __IA64__
+    struct stat buf;
+
     sprintf(fdisk, "/usr/local/bin/fdisk");
     if (stat(fdisk, &buf) != 0) {

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -1337 +1337 @@
     /*@ int **************************************************** */
     int res = 0;
-// patch by Herman Kuster
-// end patch
     int *p_res = &res;
 
     /*@ buffers ************************************************ */
-//  char command[MAX_STR_LEN*2];
-
-    /*@ i don't have any idea ********************************** */
 
     assert(bkpinfo != NULL);

trunk/mondo/mondo/common/libmondo-files.c

@@ -699 +699 @@
  * @return The return value of @c mkdir.
  */
+/* BERLIOS: This function shouldn't call system at all */
 int make_hole_for_dir(char *outdir_fname)
 {
@@ -717 +718 @@
  * @bug Return value unnecessary.
  */
+/* BERLIOS: This function shouldn't call system at all */
 int make_hole_for_file(char *outfile_fname)
 {
@@ -1310 +1312 @@
         sprintf(tmp,
                 "Your backup will probably occupy a single CD/tape/ISO. Maybe two.");
-    } else if (scratchLL > 4) {
-        sprintf(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.",

trunk/mondo/mondo/common/libmondo-mountlist.c

@@ -381 +381 @@
     char *tmp;
     char *device;
-    char *mountpoint;
 
     /*@ long *********************************************************** */

trunk/mondo/mondo/common/libmondo-raid.c

@@ -905 +905 @@
     char *stub;
     char *incoming = NULL;
-    char *raid_devname;
     char *p, *q, *r;
     int diskno;

trunk/mondo/mondo/common/libmondo-string.c

@@ -68 +68 @@
 /**
  * Pad a string on both sides so it appears centered.
- * @param in_out The string to be center-padded (modified).
+ * @param in_out The string to be center-padded (modified). The caller needs to free this string
  * @param width The width of the final result.
  */
@@ -74 +74 @@
 {
     char *scratch;
+    char *out;
     char *p;
     int i;                      /* purpose */
@@ -87 +88 @@
     }
     for (p = in_out; *p == ' '; p++);
-    asprintf(&scratch, "%s", p);
+    asprintf(&scratch, p);
     len = (int) strlen(scratch);
     mid = width / 2;
@@ -95 +96 @@
     }
     in_out[i] = '\0';
-    strcat(in_out, scratch);
+    asprintf(&out, "%s%s", in_out, scratch);
     paranoid_free(scratch);
+    in_out = out;
 }
 
@@ -863 +865 @@
 int severity_of_difference(char *fn, char *out_reason)
 {
-    int sev;
+    int sev = 0;
     char *reason;
     char *filename;
 
-    malloc_string(reason);
-// out_reason might be null on purpose, so don't bomb if it is :) OK?
+    // 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))) {
@@ -878 +879 @@
     }
 
-    sev = 3;
-    sprintf(reason,
-            "Changed since backup. Consider running a differential backup in a day or two.");
     if (!strncmp(filename, "/var/", 5)) {
         sev = 2;
-        sprintf(reason,
+        asprintf(&reason,
                 "/var's contents will change regularly, inevitably.");
     }
     if (!strncmp(filename, "/home", 5)) {
         sev = 2;
-        sprintf(reason,
+        asprintf(&reason,
                 "It's in your /home partiton. Therefore, it is important.");
     }
     if (!strncmp(filename, "/usr/", 5)) {
         sev = 3;
-        sprintf(reason,
+        asprintf(&reason,
                 "You may have installed/removed software during the backup.");
     }
     if (!strncmp(filename, "/etc/", 5)) {
         sev = 3;
-        sprintf(reason,
+        asprintf(&reason,
                 "Do not edit config files while backing up your PC.");
     }
@@ -904 +902 @@
         || !strcmp(filename, "/etc/mtab")) {
         sev = 1;
-        sprintf(reason, "This file changes all the time. It's OK.");
+        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?");
+        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.");
+        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?");
+        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?");
+        asprintf(&reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/slocate", 16)) {
         sev = 1;
-        sprintf(reason,
+        asprintf(&reason,
                 "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
     }
@@ -931 +929 @@
         || !strcmp(filename + strlen(filename) - 4, ".log")) {
         sev = 1;
-        sprintf(reason,
+        asprintf(&reason,
                 "Log files change frequently as the computer runs. Fret not.");
     }
     if (!strncmp(filename, "/var/spool", 10)) {
         sev = 1;
-        sprintf(reason,
+        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.");
+        asprintf(&reason, "Mail was sent/received during backup.");
     }
     if (filename[strlen(filename) - 1] == '~') {
         sev = 1;
-        sprintf(reason,
+        asprintf(&reason,
                 "Backup copy of another file which was modified recently.");
     }
     if (strstr(filename, "cache")) {
         sev = 1;
-        sprintf(reason,
+        asprintf(&reason,
                 "Part of a cache of data. Caches change from time to time. Don't worry.");
     }
@@ -958 +956 @@
         || strstr(filename, "/.Xauthority")) {
         sev = 1;
-        sprintf(reason,
+        asprintf(&reason,
                 "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
     }
     paranoid_free(filename);
 
-    if (out_reason) {
-        strcpy(out_reason, reason);
-    }
-    paranoid_free(reason);
+    if (sev == 0) {
+        sev = 3;
+        asprintf(&reason,
+            "Changed since backup. Consider running a differential backup in a day or two.");
+    }
+
+    out_reason = reason;
     return (sev);
 }
@@ -1000 +1001 @@
  * - @c bkpinfo->media_size
  * - @c bkpinfo->scratchdir
- * @return The string indicating media fill.
+ * @return The string indicating media fill. Needs to be freed by caller
  * @note The returned string points to static storage that will be overwritten with each call.
  */
@@ -1006 +1007 @@
 {
     /*@ int *********************************************** */
-    int percentage;
+    int percentage = 0;
+    int i;
     int j;
 
     /*@ buffers ******************************************* */
-    static char outstr[MAX_STR_LEN];
-    char *pos_w_commas, *tmp;
+    char *outstr;
+    char *tmp;
+    char *tmp1;
+    char *tmp2;
+    char *prepstr;
+    char *p;
 
     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) {
+        asprintf(&tmp, "%lld", g_tape_posK);
+        asprintf(&outstr, "Volume %d: %s kilobytes archived so far",
+                g_current_media_number, commarize(tmp));
+        paranoid_free(tmp);
         return (outstr);
     }
@@ -1034 +1034 @@
             (int) (g_tape_posK / 10 /
                    bkpinfo->media_size[g_current_media_number]);
-        if (percentage > 100) {
-            percentage = 100;
-        }
-        sprintf(outstr, "Volume %d: [", g_current_media_number);
+        asprintf(&prepstr, "Volume %d: [", g_current_media_number);
     } else {
         percentage =
             (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 /
                    bkpinfo->media_size[g_current_media_number]);
-        sprintf(outstr, "%s %d: [",
+        asprintf(&prepstr, "%s %d: [",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
     }
-    for (j = 0; j < percentage; j += 5) {
-        strcat(outstr, "*");
-    }
-    for (; j < 100; j += 5) {
-        strcat(outstr, ".");
-    }
-    j = (int) strlen(outstr);
-    sprintf(outstr + j, "] %d%% used", percentage);
-    paranoid_free(pos_w_commas);
-    paranoid_free(tmp);
+    if (percentage > 100) {
+        percentage = 100;
+    }
+    j = trunc(percentage/5);
+    tmp1 = (char *)malloc((j + 1) * sizeof(char));
+    for (i = 0, p = tmp1 ; i < j ; i++, p++) {
+            *p = '*';
+    }
+    *p = '\0';
+
+    tmp2 = (char *)malloc((20 - j + 1) * sizeof(char));
+    for (i = 0, p = tmp2 ; i < 20 - j ; i++, p++) {
+            *p = '.';
+    }
+    *p = '\0';
+
+    /* BERLIOS There is a bug here I can't solve for the moment. If you 
+     * replace %% in the asprintf below by 'percent' it just works, but 
+     * like this it creates a huge number. Memory pb somewhere */
+    /*
+    log_it("percentage: %d", percentage);
+    asprintf(&outstr, "%s%s%s] %3d%% used", prepstr, tmp1, tmp2, percentage);
+    */
+    asprintf(&outstr, "%s%s%s] %3d percent used", prepstr, tmp1, tmp2, percentage);
+    paranoid_free(prepstr);
+    paranoid_free(tmp1);
+    paranoid_free(tmp2);
     return (outstr);
 }

trunk/mondo/mondo/common/libmondo-tools.c

@@ -719 +719 @@
         fprintf(stderr, "Type 'man mondoarchive' for help.\n");
     }
-    sprintf(tmp, "%s", MONDO_TMPISOS);  /* added #define 22 apr 2002 */
+    sprintf(tmp, "%s", MONDO_TMPISOS);
     if (does_file_exist(tmp)) {
         unlink(tmp);

trunk/mondo/mondo/common/libmondo-verify.c

@@ -815 +815 @@
 
     /*@ buffers ******************************************************** */
-    char *tmp;
     char *orig_fname, *logical_fname;
     char *comment;

trunk/mondo/mondo/common/my-stuff.h

@@ -1 @@
-/* my-stuff.h
-   $Id$
-.
-
-
-07/14
-- ARCH_THREADS is now 2; buffers, 4
-
-07/10
-- added acl, xattr stuff
-
-06/19
-- added AUX_VER
-
-06/14
-- added DO_MBR_PLEASE
-
-04/17
-- replaced INTERNAL_TAPE_BLK_SIZE with g_internal_tape_block_size
-  and DEFAULT_INTERNAL_TAPE_BLOCK_SIZE
-
-04/13
-- log_msg is now calling standard_log_debug_msg, not the alias (log_debug_msg)
-
-04/03/2004
-- added star and SELINUX support
-
-11/20/2003
-- boot from isolinux.bin, not mindi-boot.2880.img
-
-11/15
-- reduced SLICE_SIZE from 8192 to 4096
-
-10/08
-- set p-i-h volsize to 1GB
-
-10/21
-- added MNT_CDROM and FREELOADER
-
-10/11
-- added DEFAULT_DVD_DISK_SIZE
-- added PARTIMAGE_DEBUG_LEVEL
-
-09/27
-- better logging
-
-09/24
-- added MR_LOGFILE="/tmp/mondo-restore.log"
-
-09/22
-- added bool, FALSE, TRUE
-
-09/20
-- increasd PPCFG_RAMDISK_SIZE to 150
-
-09/12
-- reduced MAX_STR_LEN from 512 to 460
-
-09/10
-- moved PPCFG_RAMDISK_SIZE here
-
-09/05
-- better config.h stuff
-
-06/05
-- changed fgrep to grep
-
-05/19
-- added CP_BIN
-
-05/05
-- added #include <sys/param.h> and sys/sem.h and ioctl.h
-
-05/03
-- added kill_anything_like_this()
-
-04/24/2003
-- added *STUB #define's
-
-11/22/2002
-- added INTERNAL_TAPE_BLK_SIZE
-
-10/10
-- use #define to create XMondo-friendly log file name if appropriate
-
-08/30
-- changed ARBITRARY_MAXIMUM to 512
-
-08/26
-- set MAX_STR_LEN at 512 but halved it within many _structures_
-- changed ARBITRARY_MAXIMUM to 128
-
-08/08
-- added '#include <signal.h>'
-- added WELCOME_STRING
-
-06/19
-- changed tape block size from 8192 to 65536
-
-04/08
-- added manual_cd_tray flag to bkpinfo
-
-03/31
-- added restore_path to struct s_bkpinfo
-
-03/21
-- updated version# to 1.42
-
-02/20
-- added bkpinfo->using_cdstream
-
-02/06
-- added MONDO_VERSION
-
-02/02
-- added MONDO_CFG_FILE
-- added SLICE_SIZE
-
-01/31
-- removed MINDI_HOME: it is unnecessary
-- replaced MONDO_HOME with variable g_mondo_home
-
-01/25
-- added MONDO_HOME, MINDI_HOME
-
-01/21
-- added s_node{} structure
-
-01/17
-- added sys/shm.h, types.h, ipc.h
-
-01/02/2002
-- added that groovy bkpinfo{} stuff
-
-11/29/2001
-- added raidlist{} struct
-
-08/27
-- stuff
-*/
+/* $Id$ */
 
 #define AUX_VER "2.05_berlios"
-
 #define HAVE_MALLOC 1
-
 
 // Extra info for ACLs and SELINUX users
@@ -155 +14 @@
  * The main header file for Mondo.
  */
+#ifndef _MY_STUFF_H_
+#define _MY_STUFF_H_
+
+/* Required for the use of asprintf */
+#define __USE_GNU
+
+#include <stdio.h>
 
 #if !defined(bool) && !defined(__cplusplus)
@@ -165 +31 @@
 #endif
 
-#ifndef _MY_STUFF_H_
-#define _MY_STUFF_H_
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -175 +38 @@
 #include <getopt.h>
 #endif
+
 #include <sys/types.h>
 #include <sys/shm.h>
@@ -181 +45 @@
 #include <sys/sem.h>
 #include <sys/param.h>
-#include <stdio.h>
+
 #include <stdlib.h>
 #ifndef  __USE_FILE_OFFSET64
@@ -528 +392 @@
 #define DEFAULT_MR_LOGLEVEL 4
 
-/* Required for the use of asprintf */
-#define _GNU_SOURCE
-
 #endif                          /* _MY_STUFF_H_ */

trunk/mondo/mondo/common/newt-specific.c

@@ -49 +49 @@
     bool g_exiting = FALSE;
 
-/**
- * Padding below the Newt components, to overcome bugs in Newt.
- */
-    char g_haharrrrr[500];
-
-
     newtComponent g_timeline = NULL,    ///< The line of the progress form that shows the time elapsed/remaining
         g_percentline = NULL,   ///< The line of the progress form that shows the percent completed/remaining
@@ -67 +61 @@
  * Padding above the Newt components, to overcome bugs in Newt.
  */
-    char g_jim_lad_yarr[500];
     char **err_log_lines = NULL,    ///< The list of log lines to show on the screen.
-        g_blurb_str_1[MAX_NEWT_COMMENT_LEN] = "",   ///< The string for line 1 of the blurb in the progress form
-        g_blurb_str_2[MAX_NEWT_COMMENT_LEN] = "",   ///< The string for line 2 of the blurb in the progress form
-        g_blurb_str_3[MAX_NEWT_COMMENT_LEN] = "";   ///< The string for line 3 (updated continuously) of the blurb in the progress form
+        *g_blurb_str_1, ///< The string for line 1 of the blurb in the progress form
+        *g_blurb_str_2, ///< The string for line 2 of the blurb in the progress form
+        *g_blurb_str_3; ///< The string for line 3 (updated continuously) of the blurb in the progress form
     newtComponent g_isoform_main = NULL,    ///< The evalcall form component itself
         g_isoform_header = NULL,    ///< The component for the evalcall form title
@@ -79 +72 @@
     long g_isoform_starttime;   ///< The time (in seconds since the epoch) that the evalcall form was opened.
     int g_isoform_old_progress = -1;    ///< The most recent progress update of the evalcall form (percent).
-    char g_isoform_header_str[MAX_STR_LEN] = "                                                                                                               "; ///< The string for the evalcall form title.
+    char *g_isoform_header_str; ///< The string for the evalcall form title.
     int g_mysterious_dot_counter;   ///< The counter for the twirling baton (/ | \\ - ...) on percentage less than 3
     int g_noof_log_lines = 6;   ///< The number of lines to show in the log at the bottom of the screen.
@@ -91 +84 @@
     long g_start_time = 0;      ///< The time (in seconds since the epoch) that the progress form was opened.
     bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
-    char g_xmondo_stdin[MAX_NEWT_COMMENT_LEN],  ///< ... @bug Unneeded w/current XMondo.
-     g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
     bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
     char *g_erase_tmpdir_and_scratchdir;    ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
@@ -255 +246 @@
      fatal_error(char *error_string) {
         /*@ buffers ***************************************************** */
-        char fatalstr[MAX_NEWT_COMMENT_LEN] =
-            "-------FATAL ERROR---------";
+        char *fatalstr;
         char *tmp;
         char *command;
@@ -264 +254 @@
         /*@ end vars **************************************************** */
 
-        malloc_string(command);
+        asprintf(&fatalstr, "-------FATAL ERROR---------");
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
-        log_msg(1, "Fatal error received - '%s'", error_string);
-        printf("Fatal error... %s\n", error_string);
+        log_msg(1, "%s - '%s'", fatalstr, error_string);
+        printf("%s - %s\n", fatalstr, error_string);
         if (getpid() == g_mastermind_pid) {
             log_msg(2, "mastermind %d is exiting", (int) getpid());
@@ -323 +313 @@
         }
 
-        printf("---FATALERROR--- %s\n", error_string);
         system
             ("cat /var/log/mondo-archive.log | gzip -9 > /tmp/MA.log.gz 2> /dev/null");
         if (!strstr(g_version, "cvs") && !strstr(g_version, "svn")) {
             printf
-                ("Please try the snapshot (the version with 'cvs' and the date in its filename)");
+                ("Please try the latest SVN version ");
             printf
-                ("to see if that fixes the problem. Please don't bother the mailing list with");
+                ("to see if that fixes the problem.\nPlease don't bother the mailing list with");
             printf
-                ("your problem UNTIL you've tried the snapshot. The snapshot contains bugfixes");
+                ("your problem UNTIL you've tried the snapshot.\nThe snapshot contains bugfixes");
             printf
-                ("which might help you. Go to http://www.mondorescue.org/download/download.html");
-            printf("For more information.\n");
+                ("which might help you.\nGo to http://mondorescue.berlios.de");
+            printf(" for more information.\n");
             log_msg(0,
                     "Please DON'T contact the mailing list. Try the SNAPSHOTS.");
@@ -565 +554 @@
         g_isoform_old_progress = -1;
         g_mysterious_dot_counter = 0;
-        malloc_string(title);
-        malloc_string(tmp);
 
         assert(ttl != NULL);
-        strcpy(title, ttl);
-        strcpy(g_isoform_header_str, title);
-//  center_string (title, 80);
+        asprintf(&title, ttl);
+        // BERLIOS: We need to unallocate it somewhere
+        asprintf(&g_isoform_header_str, title);
+        //  center_string (title, 80);
         if (g_text_mode) {
             log_msg(0, title);
         } else {
-            strcpy(tmp, title);
-            center_string(tmp, 80);
+            asprintf(&tmp, title);
+            /* BERLIOS: center_string is now broken replace it ! */
+            //center_string(tmp, 80);
             newtPushHelpLine(tmp);
-        }
-        center_string(g_isoform_header_str, 36);
+            paranoid_free(tmp);
+        }
+        /* BERLIOS: center_string is now broken replace it ! */
+        //center_string(g_isoform_header_str, 36);
         g_isoform_starttime = get_time();
         if (g_text_mode) {
@@ -597 +588 @@
         }
         update_evalcall_form(0);
-        paranoid_free(tmp);
         paranoid_free(title);
     }
@@ -625 +615 @@
         g_mysterious_dot_counter = 0;
 
-        malloc_string(b1c);
-        malloc_string(blurb1);
-        malloc_string(blurb2);
-        malloc_string(blurb3);
-
         assert(title != NULL);
         assert(b1 != NULL);
@@ -635 +620 @@
         assert(b3 != NULL);
 
-        strcpy(blurb1, b1);
-        strcpy(blurb2, b2);
-        strcpy(blurb3, b3);
-        strcpy(b1c, b1);
-        center_string(b1c, 80);
+        asprintf(&blurb1, b1);
+        asprintf(&blurb2, b2);
+        asprintf(&blurb3, b3);
+        asprintf(&b1c, b1);
+        /* BERLIOS: center_string is now broken replace it ! */
+        //center_string(b1c, 80);
         if (max_val <= 0) {
             max_val = 1;
@@ -647 +633 @@
         g_maximum_progress = max_val;
         g_current_progress = 0;
-        strcpy(g_blurb_str_1, blurb1);
-        strcpy(g_blurb_str_2, blurb3);
-        strcpy(g_blurb_str_3, blurb2);
+        // BERLIOS: We need to unallocate them
+        asprintf(&g_blurb_str_1, blurb1);
+        asprintf(&g_blurb_str_2, blurb3);
+        asprintf(&g_blurb_str_3, blurb2);
         if (g_text_mode) {
             log_msg(0, blurb1);
@@ -724 +711 @@
         char *original_contents;
 
-        blurb = malloc(MAX_NEWT_COMMENT_LEN);
-        original_contents = malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(title);
         assert(b != NULL);
@@ -737 +722 @@
             if (output[strlen(output) - 1] == '\n')
                 output[strlen(output) - 1] = '\0';
-            paranoid_free(blurb);
-            paranoid_free(original_contents);
             return (TRUE);
         }
-        strcpy(blurb, b);
+        asprintf(&blurb, b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
-        strcpy(original_contents, output);
+        asprintf(&original_contents, output);
         output[0] = '\0';
         type_here =
@@ -760 +743 @@
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, text, type_here, b_1, b_2, NULL);
-        center_string(blurb, 80);
+        /* BERLIOS: center_string is now broken replace it ! */
+        //center_string(blurb, 80);
         newtPushHelpLine(blurb);
+        paranoid_free(blurb);
         b_res = newtRunForm(myForm);
         strcpy(output, entry_value);
@@ -769 +754 @@
         if (b_res == b_2) {
             strcpy(output, original_contents);
-            paranoid_free(blurb);
             paranoid_free(original_contents);
             return (FALSE);
         } else {
-            paranoid_free(blurb);
             paranoid_free(original_contents);
             return (TRUE);
@@ -790 +773 @@
 
         /*@ buffers *********************************************************** */
-        char *prompt, *tmp;
+        char *prompt;
+        char *tmp = NULL;
+        size_t n = 0;
 
         /*@ newt ************************************************************** */
@@ -799 +784 @@
         newtComponent text;
 
-        prompt = malloc(MAX_NEWT_COMMENT_LEN);
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(p);
         assert(button1 != NULL);
@@ -810 +793 @@
                 printf("%s (%s or %s) --> ", p, button1, button2);
             }
-            for (tmp[0] = '\0';
+            for (asprintf(&tmp,"");
                  strcmp(tmp, button1) && (strlen(button2) == 0
                                           || strcmp(tmp, button2));) {
                 printf("--> ");
-                (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+                paranoid_free(tmp);
+                (void) getline(&tmp, &n, stdin);
             }
             if (!strcmp(tmp, button1)) {
                 paranoid_free(tmp);
-                paranoid_free(prompt);
                 return (TRUE);
             } else {
                 paranoid_free(tmp);
-                paranoid_free(prompt);
                 return (FALSE);
             }
         }
 
-        strcpy(prompt, p);
+        asprintf(&prompt, p);
         text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
         b_1 =
@@ -845 +827 @@
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, text, b_1, b_2, NULL);
-        center_string(prompt, 80);
+        /* BERLIOS: center_string is now broken replace it ! */
+        //center_string(prompt, 80);
         newtPushHelpLine(prompt);
+        paranoid_free(prompt);
         b_res = newtRunForm(myForm);
         newtPopHelpLine();
@@ -852 +836 @@
         newtPopWindow();
         if (b_res == b_1) {
-            paranoid_free(tmp);
-            paranoid_free(prompt);
             return (TRUE);
         } else {
-            paranoid_free(tmp);
-            paranoid_free(prompt);
             return (FALSE);
         }
@@ -936 +916 @@
 
 /**
- * Update the evalcall form to show (<tt>num</tt>/<tt>denom</tt>)*100 %.
+ * Update the evalcall form to show <tt>num</tt> %.
  * @param num The numerator of the ratio.
- * @param denom The denomenator of the ratio.
  */
     void
-     update_evalcall_form_ratio(int num, int denom) {
+     update_evalcall_form(int num) {
 
         /*@ long ************************************************************ */
@@ -953 +932 @@
         char *pcline_str;
         char *taskprogress;
+        char *tmp1;
+        char *tmp2;
+        char *p;
 
         /*@ int ************************************************************** */
@@ -959 +941 @@
         int j = 0;
 
-        malloc_string(timeline_str);
-        malloc_string(pcline_str);
-        malloc_string(taskprogress);
-        timeline_str[0] = '\0';
-//  log_it("update_eval_call_form called");
-        if (num * 100 < denom) {
+        //log_it("update_eval_call_form called");
+        if (num < 1) {
             percentage = 1;
         } else {
-            percentage = (num * 100 + denom / 2) / denom;
+            percentage = (int)trunc(num) ;
         }
 
@@ -973 +951 @@
         time_taken = current_time - g_isoform_starttime;
         if (num) {
-            time_total_est = time_taken * denom / num;
+            time_total_est = time_taken * 100 / num;
             time_remaining = time_total_est - time_taken;
         } else {
@@ -981 +959 @@
             newtLabelSetText(g_isoform_header, g_isoform_header_str);
         }
+        /* BERLIOS: 27 should be a parameter */
         g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
         if ((percentage < 3 && g_isoform_old_progress < 3)
             || percentage > g_isoform_old_progress) {
             g_isoform_old_progress = percentage;
-            sprintf(timeline_str,
+            asprintf(&timeline_str,
                     "%2ld:%02ld taken            %2ld:%02ld remaining",
                     time_taken / 60, time_taken % 60, time_remaining / 60,
                     time_remaining % 60);
             if (percentage < 3) {
-                sprintf(pcline_str, " Working");
-                for (j = 0; j < g_mysterious_dot_counter; j++) {
-                    strcat(pcline_str, ".");
+                tmp1 = (char *)malloc(g_mysterious_dot_counter * sizeof(char));
+                for (i = 0, p = tmp1 ; i < g_mysterious_dot_counter - 1 ; i++, p++) {
+                        *p = '.';
                 }
-                for (; j < 27; j++) {
-                    strcat(pcline_str, " ");
+                *p = '\0';
+
+                /* BERLIOS: 27 should be a parameter */
+                tmp2 = (char *)malloc(27-g_mysterious_dot_counter * sizeof(char));
+                for (i = 0, p = tmp2 ; i < 27 - g_mysterious_dot_counter - 1 ; i++, p++) {
+                        *p = ' ';
                 }
-                sprintf(pcline_str + strlen(pcline_str), " %c",
-                        special_dot_char(g_mysterious_dot_counter));
+                *p = '\0';
+
+                asprintf(&pcline_str, " Working%s%s %c", tmp1, tmp2, special_dot_char(g_mysterious_dot_counter));
+                paranoid_free(tmp1);
+                paranoid_free(tmp2);
             } else {
-                sprintf(pcline_str, " %3d%% done              %3d%% to go",
+                asprintf(&pcline_str, " %3d%% done              %3d%% to go",
                         percentage, 100 - percentage);
             }
             if (g_text_mode) {
-                sprintf(taskprogress, "TASK:  [");
-                for (i = 0; i < percentage; i += 5) {
-                    strcat(taskprogress, "*");
+                j = trunc(percentage/5);
+                tmp1 = (char *)malloc((j + 1) * sizeof(char));
+                for (i = 0, p = tmp1 ; i < j ; i++, p++) {
+                        *p = '*';
                 }
-                for (; i < 100; i += 5) {
-                    strcat(taskprogress, ".");
+                *p = '\0';
+
+                tmp2 = (char *)malloc((20 - j + 1) * sizeof(char));
+                for (i = 0, p = tmp2 ; i < 20 - j ; i++, p++) {
+                        *p = '.';
                 }
+                *p = '\0';
+
                 if (percentage >= 3) {
-                    sprintf(taskprogress + strlen(taskprogress),
-                            "] %3d%% done; %2ld:%02ld to go", percentage,
-                            time_remaining / 60, time_remaining % 60);
+                    asprintf(&taskprogress, "TASK:  [%s%s] %3d%% done; %2ld:%02ld to go", tmp1, tmp2, percentage, time_remaining / 60, time_remaining % 60);
                     printf("---evalcall---1--- %s\r\n",
                            g_isoform_header_str);
                     printf("---evalcall---2--- %s\r\n", taskprogress);
                     printf("---evalcall---E---\r\n");
+                    paranoid_free(taskprogress);
                 }
             } else {
@@ -1028 +1019 @@
                 }
             }
+            paranoid_free(timeline_str);
+            paranoid_free(pcline_str);
         }
         if (!g_text_mode) {
@@ -1033 +1026 @@
             newtRefresh();
         }
-        paranoid_free(timeline_str);
-        paranoid_free(pcline_str);
-        paranoid_free(taskprogress);
-    }
-
-
-
-/**
- * Update the evalcall form to show @p curr %.
- * @param curr The current amount of progress (percentage) in the evalcall form.
- */
-    void
-     update_evalcall_form(int curr) {
-        update_evalcall_form_ratio(curr, 100);
-    }
-
+    }
 
 
@@ -1063 +1041 @@
             return;
         }
-        strcpy(g_blurb_str_2, blurb3);
+        paranoid_free(g_blurb_str_2);
+        asprintf(&g_blurb_str_2, blurb3);
         update_progress_form_full(g_blurb_str_1, g_blurb_str_2,
                                   g_blurb_str_3);
@@ -1086 +1065 @@
         int percentage = 0;
         int i = 0;
+        int j = 0;
 
         /*@ buffers *************************************************** */
@@ -1092 +1072 @@
         char *taskprogress;
         char *tmp;
+        char *tmp1;
+        char *tmp2;
+        char *p;
 
 //  log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
-        percentline_str = malloc(MAX_NEWT_COMMENT_LEN);
-        timeline_str = malloc(MAX_NEWT_COMMENT_LEN);
-        taskprogress = malloc(MAX_NEWT_COMMENT_LEN);
-        malloc_string(tmp);
         if (!g_text_mode) {
             assert(blurb1 != NULL);
@@ -1105 +1084 @@
         }
 
-        percentline_str[0] = '\0';
-
         current_time = get_time();
         time_taken = current_time - g_start_time;
@@ -1113 +1090 @@
         } else {
             if (g_current_progress > g_maximum_progress) {
-                sprintf(tmp,
+                asprintf(&tmp,
                         "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld",
                         blurb1, blurb2, blurb3, g_current_progress,
                         g_maximum_progress);
                 log_msg(0, tmp);
+                paranoid_free(tmp);
                 g_current_progress = g_maximum_progress;
             }
@@ -1137 +1115 @@
             time_remaining = 0;
         }
-        g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
-        sprintf(timeline_str,
+        /* BERLIOS/ Is it useful here ? */
+        //g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
+        asprintf(&timeline_str,
                 "%2ld:%02ld taken               %2ld:%02ld remaining  ",
                 time_taken / 60, time_taken % 60, time_remaining / 60,
                 time_remaining % 60);
-        sprintf(percentline_str, " %3d%% done                 %3d%% to go",
+        asprintf(&percentline_str, " %3d%% done                 %3d%% to go",
                 percentage, 100 - percentage);
 
@@ -1150 +1129 @@
             printf("---progress-form---3--- %s\r\n", blurb3);
             printf("---progress-form---E---\n");
-            sprintf(taskprogress, "TASK:  [");
-            for (i = 0; i < percentage; i += 5) {
-                strcat(taskprogress, "*");
-            }
-            for (; i < 100; i += 5) {
-                strcat(taskprogress, ".");
-            }
+
+            j = trunc(percentage/5);
+            tmp1 = (char *)malloc((j + 1) * sizeof(char));
+            for (i = 0, p = tmp1 ; i < j ; i++, p++) {
+                    *p = '*';
+            }
+            *p = '\0';
+
+            tmp2 = (char *)malloc((20 - j + 1) * sizeof(char));
+            for (i = 0, p = tmp2 ; i <  20 - j ; i++, p++) {
+                    *p = '.';
+            }
+            *p = '\0';
+
             if (percentage > 100) {
                 log_msg(2, "percentage = %d", percentage);
             }
-            sprintf(taskprogress + strlen(taskprogress),
-                    "] %3d%c", percentage, '%');
-            sprintf(taskprogress + strlen(taskprogress),
-                    " done; %2ld:%02ld to go",
-                    time_remaining / 60, time_remaining % 60);
+            asprintf(&taskprogress, "TASK:  [%s%s] %3d%% done; %2ld:%02ld to go", tmp1, tmp2, percentage, time_remaining / 60, time_remaining % 60);
+
             printf("---progress-form---4--- %s\r\n", taskprogress);
-        } else {
-            center_string(blurb1, 54);
-            center_string(blurb2, 54);
-            center_string(blurb3, 54);
+            paranoid_free(taskprogress);
+        } else {
+            /* BERLIOS: center_string is now broken replace it ! */
+            //center_string(blurb1, 54);
+            /* BERLIOS: center_string is now broken replace it ! */
+            //center_string(blurb2, 54);
+            /* BERLIOS: center_string is now broken replace it ! */
+            //center_string(blurb3, 54);
             newtLabelSetText(g_blurb1, blurb1);
             newtLabelSetText(g_blurb2, blurb3);
@@ -1182 +1169 @@
         paranoid_free(percentline_str);
         paranoid_free(timeline_str);
-        paranoid_free(taskprogress);
-        paranoid_free(tmp);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
+    }
 
 
@@ -1222 +1195 @@
             "nfs", "iso", NULL
         };
-        char *outstr;
+        char *outstr = NULL;
         t_bkptype backup_type;
         int i;
+        size_t n = 0;
 
         newtComponent b1;
@@ -1237 +1211 @@
         newtComponent myForm;
 
-        title_sz = malloc(MAX_NEWT_COMMENT_LEN);
-        minimsg_sz = malloc(MAX_NEWT_COMMENT_LEN);
-        outstr = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             for (backup_type = none; backup_type == none;) {
@@ -1248 +1219 @@
                 }
                 printf(")\n--> ");
-                (void) fgets(outstr, MAX_NEWT_COMMENT_LEN, stdin);
+                (void) getline(&outstr, &n, stdin);
                 strip_spaces(outstr);
                 for (i = 0; possible_responses[i]; i++) {
@@ -1256 +1227 @@
                 }
             }
-            paranoid_free(title_sz);
-            paranoid_free(minimsg_sz);
             paranoid_free(outstr);
             return (backup_type);
@@ -1263 +1232 @@
         newtDrawRootText(18, 0, WELCOME_STRING);
         if (restoring) {
-            strcpy(title_sz,
+            asprintf(&title_sz,
                    "Please choose the backup media from which you want to read data.");
-            strcpy(minimsg_sz, "Read from:");
-        } else {
-            strcpy(title_sz,
+            asprintf(&minimsg_sz, "Read from:");
+        } else {
+            asprintf(&title_sz,
                    "Please choose the backup media to which you want to archive data.");
-            strcpy(minimsg_sz, "Backup to:");
+            asprintf(&minimsg_sz, "Backup to:");
         }
         newtPushHelpLine(title_sz);
+        paranoid_free(title_sz);
+
         //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
         newtCenteredWindow(34, 17, minimsg_sz);
+        paranoid_free(minimsg_sz);
+
         b1 = newtButton(1, 1, "CD-R disks ");
         b2 = newtButton(17, 1, "CD-RW disks");
@@ -1306 +1279 @@
         }
         newtPopHelpLine();
-        paranoid_free(title_sz);
-        paranoid_free(minimsg_sz);
-        paranoid_free(outstr);
         return (output);
     }
-
-
 
 
@@ -1368 +1336 @@
 
 
-
-
-
 /**
  * Load @p source_file (a list of files) into @p filelist. There can be no more than
@@ -1381 +1346 @@
         int i;
         bool done;
-        char *tmp;
+        char *reason = NULL;
+        char *tmp = NULL;
+        size_t n = 0;
         FILE *fin;
         struct s_filelist_entry dummy_fle;
 
-        malloc_string(tmp);
         assert(filelist != NULL);
         assert_string_is_neither_NULL_nor_zerolength(source_file);
@@ -1394 +1360 @@
             log_msg(2, "Can't open %s; therefore, cannot popup list",
                     source_file);
-            paranoid_free(tmp);
             return (1);
         }
@@ -1404 +1369 @@
                 break;
             }
-            (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, fin);
+            (void) getline(&tmp, &n, fin);
             i = (int) strlen(tmp);
             if (i < 2) {
@@ -1419 +1384 @@
             }
             filelist->el[filelist->entries].severity =
-                severity_of_difference(tmp, NULL);
+                severity_of_difference(tmp, reason);
+            paranoid_free(reason);
             strcpy(filelist->el[filelist->entries].filename, tmp);
             if (feof(fin)) {
@@ -1431 +1397 @@
             return (1);
         }
+        paranoid_free(tmp);
+
         for (done = FALSE; !done;) {
             done = TRUE;
@@ -1456 +1424 @@
             }
         }
-        paranoid_free(tmp);
         iamhere("leaving");
         return (0);
@@ -1470 +1437 @@
  */
     char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
-        static char comment[100];
-        char *tmp;
+        char *comment;
 
         iamhere("entering");
-        malloc_string(tmp);
         assert(flentry != NULL);
         if (flentry->severity == 0) {
-            strcpy(tmp, "0   ");
+            asprintf(&comment, "0     %93s", flentry->filename);
         } else if (flentry->severity == 1) {
-            strcpy(tmp, "low ");
+            asprintf(&comment, "low   %93s", flentry->filename);
         } else if (flentry->severity == 2) {
-            strcpy(tmp, "med ");
-        } else {
-            strcpy(tmp, "high");
-        }
-        strcat(tmp, "  ");
-        strncat(tmp, flentry->filename, 100);
-        tmp[98] = '\0';
-        strcpy(comment, tmp);
-        paranoid_free(tmp);
+            asprintf(&comment, "med   %93s", flentry->filename);
+        } else {
+            asprintf(&comment, "high  %93s", flentry->filename);
+        }
         iamhere("leaving");
         return (comment);
@@ -1504 +1464 @@
  */
     void popup_changelist_from_file(char *source_file) {
-        char *reason;
+        char *reason = NULL;
         newtComponent myForm;
         newtComponent bClose;
@@ -1527 +1487 @@
 
         struct s_filelist *filelist;
-        malloc_string(reason);
-        tmp = malloc(5000);
-        malloc_string(differ_sz);
         assert_string_is_neither_NULL_nor_zerolength(source_file);
         if (g_text_mode) {
             log_msg(2, "Text mode. Therefore, no popup list.");
-            goto free_to_go;
+            return;
         }
         log_msg(2, "Examining file %s", source_file);
@@ -1540 +1497 @@
         if (lng < 1) {
             log_msg(2, "No lines in file. Therefore, no popup list.");
-            paranoid_free(reason);
-            goto free_to_go;
+            return;
         } else if (lng >= ARBITRARY_MAXIMUM) {
             log_msg(2, "Too many files differ for me to list.");
-            goto free_to_go;
+            return;
         }
 
@@ -1555 +1511 @@
             log_msg(2, "Can't open %s; therefore, cannot popup list",
                     source_file);
-            paranoid_free(reason);
             return;
         }
@@ -1568 +1523 @@
                                    keylist[i]);
         }
-        sprintf(differ_sz,
+        asprintf(&differ_sz,
                 "  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
                 i);
         newtPushHelpLine(differ_sz);
+        paranoid_free(differ_sz);
+
         bClose = newtCompactButton(10, 15, " Close  ");
         bSelect = newtCompactButton(30, 15, " Select ");
-        sprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
+        asprintf(&tmp, "%-10s               %-20s", "Priority", "Filename");
         headerMsg = newtLabel(2, 1, tmp);
+        paranoid_free(tmp);
+
         newtOpenWindow(5, 4, 70, 16, "Non-matching files");
         myForm = newtForm(NULL, NULL, 0);
@@ -1596 +1555 @@
                         severity_of_difference(filelist->el[currline].
                                                filename, reason);
-                        sprintf(tmp, "%s --- %s",
+                        asprintf(&tmp, "%s --- %s",
                                 filelist->el[currline].filename, reason);
                         popup_and_OK(tmp);
+                        paranoid_free(tmp);
+                        paranoid_free(reason);
                     }
                 }
@@ -1606 +1567 @@
         newtPopWindow();
         newtPopHelpLine();
-      free_to_go:
-        paranoid_free(reason);
-        paranoid_free(tmp);
-        paranoid_free(differ_sz);
-        return;
     }
 

trunk/mondo/mondo/mondoarchive/main.c

@@ -319 +319 @@
     welcome_to_mondoarchive();
     distro_specific_kludges_at_start_of_mondoarchive();
-    sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
-            bkpinfo->scratchdir);
+    // BERLIOS : too early, bkpinfo is not initialized ??
+    //sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
     g_kernel_version = get_kernel_version();
 

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -161 +161 @@
 /** @def BOOT_LOADER_CHARS The characters allowed for boot loader on this platform. */
 
-#include <pthread.h>
 #include "../common/my-stuff.h"
 #include "../common/mondostructures.h"
 #include "mondo-cli-EXT.h"
 #include "../common/libmondo.h"
-
-
+#include <pthread.h>
 
 #ifndef VERSION
 #define VERSION AUX_VER
 #endif
-
 
 
@@ -263 +260 @@
         retrieve_switches_from_command_line(argc, argv, flag_val,
                                             flag_set);
+    log_it("value: %s", flag_val['s']);
     retval += res;
     if (!retval) {

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -381 +381 @@
  * #include statements                                                    *
  **************************************************************************/
-#include <pthread.h>
 #include "../common/my-stuff.h"
 #include "../common/mondostructures.h"
@@ -389 +388 @@
 #include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
+#include <pthread.h>
 
 extern void success_message(void);

trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

@@ -55 +55 @@
 
 
-#include <pthread.h>
 #include "../common/my-stuff.h"
 #include "../common/mondostructures.h"
@@ -64 +63 @@
 #include "mondo-restore-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
+#include <pthread.h>
 
 //static char cvsid[] = "$Id$";

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -124 +124 @@
 
 
-#include <pthread.h>
 #include "../common/my-stuff.h"
 #include "../common/mondostructures.h"
@@ -132 +131 @@
 //#include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools.h"
+#include <pthread.h>
 
 extern bool g_sigpipe_caught;