Changeset 1185 in MondoRescue

Timestamp:

Feb 19, 2007, 1:51:26 AM (18 years ago)

Author:

Bruno Cornec

Message:

Merges in trunk modifications coming from stable (common)

Location:

trunk/mondo/src/common

Files:

• Makefile.am (modified) (1 diff)
• libmondo-devices-EXT.h (modified) (1 diff)
• libmondo-devices.h (modified) (1 diff)
• libmondo-raid-EXT.h (modified) (1 diff)
• libmondo-string-EXT.h (modified) (2 diffs)
• libmondo-string.c (modified) (20 diffs)
• libmondo-string.h (modified) (1 diff)
• libmondo-tools-EXT.h (modified) (1 diff)
• libmondo-tools.c (modified) (29 diffs)
• libmondo-tools.h (modified) (1 diff)
• libmondo-verify.c (modified) (25 diffs)
• newt-specific.c (modified) (32 diffs)

trunk/mondo/src/common/Makefile.am

@@ -10 +10 @@
 
 libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
-                    libmondo-msg.c \
                        libmondo-filelist.c libmondo-files.c libmondo-fork.c \
                        libmondo-mountlist.c libmondo-raid.c \

trunk/mondo/src/common/libmondo-devices-EXT.h

@@ -32 +32 @@
 extern int interactively_obtain_media_parameters_from_user(struct s_bkpinfo
                                                            *, bool);
-
 extern void insist_on_this_cd_number(struct s_bkpinfo *bkpinfo,
                                      int cd_number_i_want);

trunk/mondo/src/common/libmondo-devices.h

@@ -30 +30 @@
                                                     bool);
 
-
-
 void insist_on_this_cd_number(struct s_bkpinfo *bkpinfo,
                               int cd_number_i_want);

trunk/mondo/src/common/libmondo-raid-EXT.h

@@ -50 +50 @@
 #else
 extern void add_disk_to_raid_device(struct list_of_disks *disklist,
-                                    char *device_to_add, int index);
+                                    char *device_to_add, int idx);
 #endif
 

trunk/mondo/src/common/libmondo-string-EXT.h

@@ -9 +9 @@
                                       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,
@@ -26 +25 @@
 extern int strcmp_inc_numbers(char *stringA, char *stringB);
 extern char *strip_afio_output_line(char *input);
-extern void strip_spaces(char *in_out);
 extern char *trim_empty_quotes(char *incoming);
 extern char *truncate_to_drive_name(char *partition);

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

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
+
 #include "mondostructures.h"
 #include "libmondo-string.h"
@@ -16 +18 @@
 #include "libmondo-tools-EXT.h"
 #include <math.h>
-#include "mr_mem.h"
 
 /*@unused@*/
@@ -38 +39 @@
 char *build_partition_name(const char *drive, int partno)
 {
-    char *p, *c;
-    char *partition;
+    char *p = NULL;
+    char *c = NULL;
+    char *partition = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(partno >= 0);
 
-    mr_asprintf(&partition, "%s", drive);
+    mr_asprintf(&partition, drive);
     p = partition;
     /* is this a devfs device path? */
@@ -79 +81 @@
 void center_string(char *in_out, int width)
 {
-    char *scratch;
-    char *out;
-    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);
@@ -93 +95 @@
         return;
     }
-    for (p = in_out; *p == ' '; p++);
-    mr_asprintf(&scratch, p);
-    strip_spaces (scratch);
+    mr_asprintf(&scratch, in_out);
+    mr_strip_spaces(scratch);
     len = (int) strlen(scratch);
     mid = width / 2;
@@ -177 +178 @@
 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);
 
     if (!incoming[0]) {
-        return (0);
+        return(0L);
     }
     if (strchr(incoming, '.')) {
@@ -225 +226 @@
 
 /**
- * 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?
- */
-/* BERLIOS; useless ?
-char *leftpad_string(char *incoming, int width)
-{
-    char *output;
-
-    int i;
-
-    assert(incoming != NULL);
-    assert(width > 2);
-
-    mr_asprintf(&output, "%s", incoming);
-    for (i = (int) strlen(output); i < width; i++) {
-        output[i] = ' ';
-    }
-    output[i] = '\0';
-    return (output);
-}
-*/
-
-
-
-/**
  * Turn a marker byte (e.g. BLK_START_OF_BACKUP) into a string (e.g. "BLK_START_OF_BACKUP").
  * Unknown markers are identified as "BLK_UNKNOWN (%d)" where %d is the decimal value.
@@ -353 +325 @@
 
     /*@ buffer *********************************************************** */
-    char *output;
+    char *output = NULL;
 
     assert(mountlist != NULL);
@@ -376 +348 @@
 
     /*@ buffers ********************************************************* */
-    char *output;
+    char *output = NULL;
 
     /*@ char     ******************************************************** */
-    char p;
+    char p = NULL;
 
     assert(label != NULL);
@@ -415 +387 @@
     switch (i) {
     case 0:
-        mr_asprintf(&output, "%s", "zero");
+        mr_asprintf(&output, "zero");
         break;
     case 1:
-        mr_asprintf(&output, "%s", "one");
+        mr_asprintf(&output, "one");
         break;
     case 2:
-        mr_asprintf(&output, "%s", "two");
+        mr_asprintf(&output, "two");
         break;
     case 3:
-        mr_asprintf(&output, "%s", "three");
+        mr_asprintf(&output, "three");
         break;
     case 4:
-        mr_asprintf(&output, "%s", "four");
+        mr_asprintf(&output, "four");
         break;
     case 5:
-        mr_asprintf(&output, "%s", "five");
+        mr_asprintf(&output, "five");
         break;
     case 6:
-        mr_asprintf(&output, "%s", "six");
+        mr_asprintf(&output, "six");
         break;
     case 7:
-        mr_asprintf(&output, "%s", "seven");
+        mr_asprintf(&output, "seven");
         break;
     case 8:
-        mr_asprintf(&output, "%s", "eight");
+        mr_asprintf(&output, "eight");
         break;
     case 9:
-        mr_asprintf(&output, "%s", "nine");
+        mr_asprintf(&output, "nine");
     case 10:
-        mr_asprintf(&output, "%s", "ten");
+        mr_asprintf(&output, "ten");
     default:
         mr_asprintf(&output, "%d", i);
@@ -462 +434 @@
 {
     /*@ buffers *** */
-    char *input;
+    char *input = NULL;
 
     /*@ pointers * */
-    char *p;
+    char *p = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(ip);
@@ -516 +488 @@
         mr_asprintf(&suffix, ".%s", s);
     } else {
-        mr_asprintf(&suffix, "%s", "");
+        mr_asprintf(&suffix, "");
     }
     mr_asprintf(&output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno,
@@ -686 +658 @@
 
 /**
- * Remove all characters whose ASCII value is less than or equal to 32
- * (spaces and control characters) from both sides of @p in_out.
- * @param in_out The string to strip spaces/control characters from (modified).
- */
-void strip_spaces(char *in_out)
-{
-    /*@ buffers ***************************************************** */
-    char *tmp;
-    char *tmp1;
-
-    /*@ pointers **************************************************** */
-    char *p;
-
-    /*@ int ******************************************************** */
-    int i;
-    int original_incoming_length;
-
-    /*@ end vars *************************************************** */
-
-    assert(in_out != NULL);
-    original_incoming_length = (int) strlen(in_out);
-    for (i = 0; in_out[i] <= ' ' && i < (int) strlen(in_out); i++);
-    mr_asprintf(&tmp, "%s", in_out + i);
-    for (i = (int) strlen(tmp); i > 0 && tmp[i - 1] <= 32; i--);
-    tmp[i] = '\0';
-    for (i = 0; i < original_incoming_length; i++) {
-        in_out[i] = ' ';
-    }
-    in_out[i] = '\0';
-    i = 0;
-    p = tmp;
-    while (*p != '\0') {
-        in_out[i] = *(p++);
-        in_out[i + 1] = '\0';
-        if (in_out[i] < 32 && i > 0) {
-            if (in_out[i] == 8) {
-                i--;
-            } else if (in_out[i] == 9) {
-                in_out[i++] = ' ';
-            } else if (in_out[i] == '\r') {
-                mr_asprintf(&tmp1, "%s", in_out + i);
-                strcpy(in_out, tmp1);
-                mr_free(tmp1);
-                i = -1;
-                continue;
-            } else if (in_out[i] == '\t') {
-                for (i++; i % 5; i++);
-            } else if (in_out[i] >= 10 && in_out[i] <= 13) {
-                break;
-            } else {
-                i--;
-            }
-        } else {
-            i++;
-        }
-    }
-    in_out[i] = '\0';
-    mr_free(tmp);
-}
-
-
-/**
  * If there are double quotes "" around @p incoming then remove them.
  * This does not affect other quotes that may be embedded within the string.
@@ -781 +691 @@
 {
     int i = strlen(partition) - 1;
-    char *c;
+    char *c = NULL;
 
 #ifdef __FreeBSD__
@@ -851 +761 @@
 {
     int sev = 0;
-    char *reason;
-    char *filename;
+    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))) {
-        mr_asprintf(&filename, "%s", fn + strlen(MNT_RESTORING));
+        mr_asprintf(&filename, fn + strlen(MNT_RESTORING));
     } else if (fn[0] != '/') {
         mr_asprintf(&filename, "/%s", fn);
     } else {
-        mr_asprintf(&filename, "%s", fn);
+        mr_asprintf(&filename, fn);
     }
 
@@ -943 +853 @@
         sev = 1;
         mr_asprintf(&reason,
-                 "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
+                _("Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence."));
     }
     mr_free(filename);
@@ -956 +866 @@
     return (sev);
 }
-
 
 
@@ -1013 +922 @@
     }
 
-/* update screen */
+    /* update screen */
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         percentage =
@@ -1031 +940 @@
     }
     j = trunc(percentage / 5);
-    tmp1 = (char *) malloc((j + 1) * sizeof(char));
+    tmp1 = (char *) mr_malloc((j + 1) * sizeof(char));
     for (i = 0, p = tmp1; i < j; i++, p++) {
         *p = '*';
@@ -1037 +946 @@
     *p = '\0';
 
-    tmp2 = (char *) malloc((20 - j + 1) * sizeof(char));
+    tmp2 = (char *) mr_malloc((20 - j + 1) * sizeof(char));
     for (i = 0, p = tmp2; i < 20 - j; i++, p++) {
         *p = '.';

trunk/mondo/src/common/libmondo-string.h

@@ -22 +22 @@
 int strcmp_inc_numbers(char *stringA, char *stringB);
 char *strip_afio_output_line(char *input);
-void strip_spaces(char *in_out);
 char *trim_empty_quotes(char *incoming);
 char *truncate_to_drive_name(char *partition);

trunk/mondo/src/common/libmondo-tools-EXT.h

@@ -6 +6 @@
 extern void clean_up_KDE_desktop_if_necessary(void);
 extern long get_time(void);
-extern void (*log_debug_msg) (int debug_level, const char *szFile,
-                              const char *szFunction, int nLine,
-                              const char *fmt, ...);
-extern void standard_log_debug_msg(int debug_level, const char *szFile,
-                                   const char *szFunction, int nLine,
-                                   const char *fmt, ...);
 extern int read_cfg_var(char *config_file, char *label, char *value);
 extern int write_cfg_var(char *config_file, char *label, char *value);

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

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 #include "mr_file.h"
 
@@ -24 +25 @@
 #include <arpa/inet.h>
 #endif
-#include "mr_mem.h"
 
 /*@unused@*/
@@ -199 +199 @@
 
 
-char *get_architecture()
+char *get_architecture(void)
 {
 #ifdef __IA32__
@@ -205 +205 @@
 #endif
 #ifdef __X86_64__
-    return ("x86-64");
+    return ("x86_64");
 #endif
 #ifdef __IA64__
@@ -215 +215 @@
 
 
-double get_kernel_version()
+double get_kernel_version(void)
 {
     char *p, *tmp;
@@ -242 +242 @@
 
 
-
-
-
 /**
  * Get the current time.
  * @return number of seconds since the epoch.
  */
-long get_time()
+long get_time(void)
 {
     return (long) time((void *) 0);
 }
-
-
-
-
-
 
 
@@ -298 +290 @@
 }
 #endif
-
-
 
 
@@ -354 +344 @@
     char *mondo_mkisofs_sz = NULL;
     char *command = NULL;
-    char *hostname = NULL, *ip_address = NULL;
+    char *hostname = NULL;
+    char *ip_address = NULL;
     int retval = 0;
     long avm = 0;
@@ -363 +354 @@
     char *call_before_iso_user = NULL;
     int rdsiz_MB;
+    char *iso_dev = NULL;
+    char *iso_mnt = NULL;
+    char *iso_tmp = NULL;
     char *iso_path = NULL;
     FILE *fd1 = NULL;
@@ -400 +394 @@
     avm += atol(tmp);
     mr_free(tmp);
-    tmp = call_program_and_get_last_line_of_output
+    tmp1 = 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);
@@ -412 +406 @@
     mr_free(tmp);
     mr_asprintf(&command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
-             g_tmpfs_mountpt, rdsiz_MB, 'm');
+            g_tmpfs_mountpt, rdsiz_MB, 'm');
     run_program_and_log_output("cat /proc/cpuinfo", 5);
     /* BERLIOS: rpm is not necessarily there ! */
@@ -495 +489 @@
                 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(tmp);
             mr_free(command);
@@ -507 +501 @@
         || bkpinfo->backup_media_type == cdr) {
         if (!bkpinfo->manual_cd_tray) {
-            mr_asprintf(&extra_cdrom_params, "-waiti ");
+            mr_strcat(extra_cdrom_params, "-waiti ");
         }
         if (bkpinfo->backup_media_type == cdrw) {
-            if (extra_cdrom_params != NULL) {
-                mr_asprintf(&tmp, extra_cdrom_params);
-                mr_free(extra_cdrom_params);
-                mr_asprintf(&extra_cdrom_params, "%s blank=fast ", tmp);
-            } else {
-                mr_asprintf(&extra_cdrom_params, "blank=fast ");
-            }
+            mr_strcat(extra_cdrom_params, "blank=fast ");
         }
         tmp = find_home_of_exe("cdrecord");
@@ -600 +588 @@
 
         fd1 = mr_fopen(MONDORESTORECFG, "a");
-        mr_fprintf(fd1, "iso-dev %s\n", iso_dev);
+        mr_fprintf(fd1, "iso-dev=%s\n", iso_dev);
 
         mr_asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
@@ -611 +599 @@
 
         log_it("res of it = %s", iso_mnt);
-        mr_fprintf(fd1, "iso-mnt %s\n", iso_mnt);
+        mr_fprintf(fd1, "iso-mnt=%s\n", iso_mnt);
         log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
 
@@ -617 +605 @@
         if (strlen(iso_tmp) >= strlen(iso_mnt)) {
             mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt));
+        } else {
+            mr_asprintf(&iso_path, "");
         }
         mr_free(iso_tmp);
@@ -622 +612 @@
 
         log_it("isodir: %s", iso_path);
-        mr_fprintf(fd1, "isodir %s\n", iso_path);
+        mr_fprintf(fd1, "isodir=%s\n", iso_path);
         mr_free(iso_path);
 
         log_it("iso-prefix: %s",  bkpinfo->prefix);
-        mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix);
+        mr_fprintf(fd1, "iso-prefix=%s\n", bkpinfo->prefix);
 
         mr_fclose(fd1);
@@ -648 +638 @@
             } else {
                 mr_asprintf(&ip_address, "%s%s", inet_ntoa((struct in_addr)
-                                                        *((struct in_addr
-                                                           *) hent->
-                                                          h_addr)),
-                         strchr(bkpinfo->nfs_mount, ':'));
+                                                *((struct in_addr *) hent->h_addr)),
+                                                strchr(bkpinfo->nfs_mount, ':'));
                 mr_allocstr(bkpinfo->nfs_mount, ip_address);
                 mr_free(ip_address);
@@ -684 +672 @@
     return (retval);
 }
-
 
 
@@ -710 +697 @@
     }
 
-    unlink(MONDO_TRACEFILE);
     run_program_and_log_output("rm -Rf /tmp/changed.files*", FALSE);
     if ((g_mondo_home = find_and_store_mondoarchives_home()) == NULL) {
@@ -811 +797 @@
     char *command = NULL;
     char *out_sz = NULL;
-    long res;
+    long res = 0L;
 
     assert_string_is_neither_NULL_nor_zerolength(partition);
@@ -822 +808 @@
 
     mr_asprintf(&command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
-             partition);
+            partition);
     out_sz = call_program_and_get_last_line_of_output(command);
     mr_free(command);
+
     if (strlen(out_sz) == 0) {
         return (-1);
@@ -832 +819 @@
     return (res);
 }
-
 
 
@@ -1062 +1048 @@
         return (0);
     */ } else {
-        mr_asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
+        mr_asprintf(&command, "grep '%s .*' %s| cut -d'=' -f2,3,4,5",
                 label, config_file);
         value = call_program_and_get_last_line_of_output(command);
@@ -1110 +1096 @@
 void mount_boot_if_necessary()
 {
-    char *tmp;
-    char *tmp1;
-    char *command;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *command = NULL;
 
     mr_msg(1, "Started sub");
@@ -1140 +1126 @@
                 mr_asprintf(&g_boot_mountpt, tmp);
                 mr_asprintf(&tmp1,
-                         "%s (your /boot partition) is not mounted. I'll mount it before backing up",
-                         g_boot_mountpt);
+                        "%s (your /boot partition) is not mounted. I'll mount it before backing up",
+                        g_boot_mountpt);
                 log_it(tmp1);
                 mr_free(tmp1);
@@ -1190 +1176 @@
 
 
-
 /**
  * Write a line to a configuration file. Writes a line of the form,
@@ -1202 +1187 @@
 {
     /*@ buffers ***************************************************** */
-    char *command;
-    char *tempfile;
-    char *tmp;
+    char *command = NULL;
+    char *tempfile = NULL;
+    char *tmp = NULL;
 
 
@@ -1238 +1223 @@
     return (0);
 }
+
 
 /**

trunk/mondo/src/common/libmondo-tools.h

@@ -9 +9 @@
 
 long get_time(void);
-extern void (*log_debug_msg) (int debug_level, const char *szFile,
-                              const char *szFunction, int nLine,
-                              const char *fmt, ...);
-void standard_log_debug_msg(int debug_level, const char *szFile,
-                            const char *szFunction, int nLine,
-                            const char *fmt, ...);
 int read_cfg_var(char *config_file, char *label, char *value);
 int write_cfg_var(char *config_file, char *label, char *value);

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

@@ -9 +9 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
+
 #include "mondostructures.h"
 #include "libmondo-verify.h"
@@ -18 +20 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "mr_mem.h"
 
 /*@unused@*/
@@ -50 +51 @@
 {
     /*@ buffer ********************************************************** */
-    char *command;
-    char *afio_found_changes;
+    char *command = NULL;
+    char *afio_found_changes = NULL;
 
     /*@ int ************************************************************* */
@@ -66 +67 @@
     sync();
 
-/*  s-printf (command,
-       "grep \"afio: \" %s | awk '{j=substr($0,8); i=index(j,\": \");printf \"/%%s\\n\",substr(j,1,i-2);}' | sort -u | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"/dev/.*\" > %s",
-       stderr_fname, afio_found_changes);
-*/
 
     mr_msg(1, "Now scanning log file for 'afio: ' stuff");
@@ -183 +180 @@
 }
 
-
 /**
  * Verify all slices stored on the inserted CD (or a mounted ISO image).
@@ -197 +193 @@
 {
 
+    /*@ buffer ********************************************************** */
     char *tmp = NULL;
     char *tmp1 = NULL;
@@ -235 +232 @@
             mr_asprintf(&sz_exe, "lzop");
         } else if (bkpinfo->use_gzip) {
-            strcpy(sz_exe, "gzip");
-        } else if (bkpinfo->use_gzip) {
-            strcpy(sz_exe, "gzip");
+            mr_asprintf(&sz_exe, "gzip");
         } else {
             mr_asprintf(&sz_exe, "bzip2");
         }
     } else {
-        mr_asprintf(&sz_exe, " ");
+        mr_asprintf(&sz_exe, "");
     }
 
@@ -381 +376 @@
 {
     /*@ buffers ********************************************************* */
-    char *command;
-    char *outlog;
+    char *command = NULL;
+    char *outlog = NULL;
     char *tmp = NULL;
-    //  char *p;
 
     /*@ pointers ******************************************************* */
-    FILE *pin;
+    FILE *pin = NULL;
 
     size_t n = 0;
@@ -399 +393 @@
     log_it("Verifying fileset '%s'", tarball_fname);
 
-    /*  chdir("/"); */
     mr_asprintf(&outlog, "%s/afio.log", bkpinfo->tmpdir);
 
@@ -430 +423 @@
     if (strstr(tarball_fname, ".star")) {
         bkpinfo->use_star = TRUE;
-        if (strstr(tarball_fname, ".bz2"))
+        if (strstr(tarball_fname, ".bz2")) {
             mr_asprintf(&command,
                      "star -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s",
@@ -436 +429 @@
                      (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog,
                      outlog);
+        } else {
+            mr_asprintf(&command,"");
+        }
     } else {
         bkpinfo->use_star = FALSE;
@@ -446 +442 @@
 
     if (length_of_file(outlog) < 10) {
+        /* BERLIOS: This seems useless !! */
         mr_asprintf(&command, "cat %s >> %s", outlog, MONDO_LOGFILE);
     } else {
@@ -488 +485 @@
     mr_free(command);
 
-    /*  chdir(old_pwd); */
-    //  s-printf (tmp, "uniq -u %s >> %s", "/tmp/mondo-verify.err", MONDO_LOGFILE);
-    //  paranoid_system (tmp);
-    //  unlink ("/tmp/mondo-verify.err");
     return (0);
 }
@@ -543 +536 @@
 
     /*@ buffers ********************************************************** */
-    char *tmp;
-    char *tarball_fname;
+    char *tmp = NULL;
+    char *tarball_fname = NULL;
 
     /*@ pointers ********************************************************* */
-    char *p;
+    char *p = NULL;
 
     assert(bkpinfo != NULL);
@@ -563 +556 @@
 
     mr_asprintf(&tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
-    /* BERLIOS : useless
-       mr_asprintf(&tmp, "Temporarily copying file from tape to '%s'",
-       tarball_fname);
-       log_it(tmp); 
-       mr_free(tmp);
-     */
     read_file_from_stream_to_file(bkpinfo, tarball_fname, size);
     res = verify_a_tarball(bkpinfo, tarball_fname);
     if (res) {
-        mr_asprintf(&tmp,
-                 "Afioball '%s' no longer matches your live filesystem",
-                 p);
-        mr_msg(0, tmp);
-        mr_free(tmp);
+        mr_msg(0, "Afioball '%s' no longer matches your live filesystem", p);
         retval++;
     }
@@ -604 +587 @@
 
     /*@ char ************************************************************ */
-    char *test_file;
-    char *biggie_cksum;
-    char *orig_cksum;
-    char *tmp;
+    char *test_file = NULL;
+    char *biggie_cksum = NULL;
+    char *orig_cksum = NULL;
+    char *tmp = NULL;
     char *slice_fnam = (char *) &res;
 
@@ -626 +609 @@
     }
     mr_asprintf(&test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
-    mr_asprintf(&tmp,
-             "Temporarily copying biggiefile %s's slices from tape to '%s'",
-             p, test_file);
-    log_it(tmp);
-    mr_free(tmp);
     for (res =
          read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
@@ -704 +682 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *fname = (char *) &res;    /* Should NOT be NULL */
-    char *curr_xattr_list_fname;
-    char *curr_acl_list_fname;
+    char *curr_xattr_list_fname = NULL;
+    char *curr_acl_list_fname = NULL;
 
     /*@ long long *************************************************** */
@@ -772 +750 @@
         }
         mr_asprintf(&tmp, "Verifying fileset #%ld", current_afioball_number);
-        /*log_it(tmp); */
         update_progress_form(tmp);
         mr_free(tmp);
@@ -824 +801 @@
     /*@ buffers ******************************************************** */
     char *orig_fname = (char *) &ctrl_chr;  /* Should NOT be NULL */
-    char *logical_fname;
-    char *comment;
-    char *curr_xattr_list_fname;
-    char *curr_acl_list_fname;
+    char *logical_fname = NULL;
+    char *comment = NULL;
+    char *curr_xattr_list_fname = NULL;
+    char *curr_acl_list_fname = NULL;
     /*@ pointers ******************************************************* */
-    char *p;
+    char *p = NULL;
 
     /*@ long long size ************************************************* */
@@ -931 +908 @@
 
     /*@ buffers ******************************************************** */
-    char *mountpoint;
-    char *command;
-    char *tmp;
-    char *fname;
+    char *mountpoint = NULL;
+    char *command = NULL;
+    char *tmp = NULL;
+    char *fname = NULL;
 #ifdef __FreeBSD__
     char mdd[32];
@@ -991 +968 @@
             log_to_screen(tmp);
             mr_free(tmp);
+            mr_free(command);
             return (1);
         }
@@ -1014 +992 @@
     verify_all_slices_on_CD(bkpinfo, mountpoint);
 
+    mr_asprintf(&command, "umount %s", mountpoint);
 #ifdef __FreeBSD__
     ret = 0;
-    mr_asprintf(&command, "umount %s", mountpoint);
     ret += system(command);
-
     ret += kick_vn(mddevice);
     if (ret)
 #else
-    mr_asprintf(&command, "umount %s", mountpoint);
-
     if (system(command))
 #endif
@@ -1067 +1042 @@
 
     /*@ buffers ******************************************************** */
-    char *tmp;
-    char *changed_files_fname;
+    char *tmp = NULL;
+    char *changed_files_fname = NULL;
 
     /*@ long *********************************************************** */
@@ -1089 +1064 @@
 
     /* close tape; exit */
-    //  fclose(g_tape_stream); <-- not needed; is handled by closein_tape()
     paranoid_system
         ("rm -f /tmp/biggies.changed /tmp/changed.files.[0-9]* 2> /dev/null");

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

@@ -19 +19 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
+#include "mr_str.h"
+
 #include "mondostructures.h"
 #include "newt-specific.h"
@@ -27 +30 @@
 #include "libmondo-fork-EXT.h"
 #include "newt-specific-EXT.h"
-#include "mr_mem.h"
 
 /*@unused@*/
@@ -36 +38 @@
 extern char *g_mondo_home;
 extern char *ps_options;
-    extern char *ps_proc_id;
+extern char *ps_proc_id;
 
 extern void set_signals(int);
@@ -65 +67 @@
     *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
+
+newtComponent g_isoform_main = NULL,    ///< The evalcall form component itself
     g_isoform_header = NULL,    ///< The component for the evalcall form title
     g_isoform_scale = NULL, ///< The progress bar component in the evalcall form
     g_isoform_timeline = NULL,  ///< The line of the evalcall form that shows the time elapsed/remaining
     g_isoform_pcline = NULL;    ///< The line of the evalcall form that shows the percent completed/remaining
+
 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).
@@ -79 +83 @@
 int g_currentY = 3;         ///< The row to write background progress messages to. Incremented each time a message is written.
 extern int g_current_media_number;
-    pid_t g_main_pid = 0;       ///< The PID of the main Mondo process.
+pid_t g_main_pid = 0;       ///< The PID of the main Mondo process.
 long g_maximum_progress = 999;  ///< The maximum amount of progress (100%) for the currently opened progress form.
 long g_current_progress = -999; ///< The current amount of progress (filelist #, etc.) for the currently opened progress form.
@@ -85 +89 @@
 bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
 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.
+char *g_erase_tmpdir_and_scratchdir = NULL; ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
 char *g_selfmounted_isodir = NULL;  ///< Holds the NFS mountpoint if mounted via mondoarchive.
 
 /* @} - end of globalGroup */
-
-//int g_fd_in=-1, g_fd_out=-1;
 
 void popup_and_OK(char *);
@@ -104 +106 @@
  * @return TRUE for yes; FALSE for no.
  */
-    bool ask_me_yes_or_no(char *prompt) {
-
-        /*@ buffers ********************************************************** */
-        char *tmp = NULL;
-        int i;
-        size_t n = 0;
-
-         assert_string_is_neither_NULL_nor_zerolength(prompt);
-
-        if (g_text_mode) {
-            while (1) {
+bool ask_me_yes_or_no(char *prompt) {
+
+    /*@ buffers ********************************************************** */
+    char *tmp = NULL;
+    int i;
+    size_t n = 0;
+
+     assert_string_is_neither_NULL_nor_zerolength(prompt);
+
+    if (g_text_mode) {
+        while (1) {
+            sync();
+            printf
+                ("---promptdialogYN---1--- %s\r\n---promptdialogYN---Q--- [yes] [no] ---\r\n--> ",
+                 prompt);
+            mr_getline(&tmp, &n, stdin);
+            if (tmp[strlen(tmp) - 1] == '\n')
+                tmp[strlen(tmp) - 1] = '\0';
+            i = (int) strlen(tmp);
+            if (i > 0 && tmp[i - 1] < 32) {
+                tmp[i - 1] = '\0';
+            }
+            if (strstr(_("yesYES"), tmp)) {
+                mr_free(tmp);
+                return (TRUE);
+            } else if (strstr(_("NOno"), tmp)) {
+                mr_free(tmp);
+                return (FALSE);
+            } else {
                 sync();
                 printf
-                    ("---promptdialogYN---1--- %s\r\n---promptdialogYN---Q--- [yes] [no] ---\r\n--> ",
-                     prompt);
-                mr_getline(&tmp, &n, stdin);
-                if (tmp[strlen(tmp) - 1] == '\n')
-                    tmp[strlen(tmp) - 1] = '\0';
-
-                i = (int) strlen(tmp);
-                if (i > 0 && tmp[i - 1] < 32) {
-                    tmp[i - 1] = '\0';
-                }
-                if (strstr(_("yesYES"), tmp)) {
-                    mr_free(tmp);
-                    return (TRUE);
-                } else if (strstr(_("NOno"), tmp)) {
-                    mr_free(tmp);
-                    return (FALSE);
-                } else {
-                    sync();
-                    printf
-                        (_("Please enter either YES or NO (or yes or no, or y or n, or...)\n"));
-                }
-            }
-        } else {
-            return (popup_with_buttons(prompt, _("Yes"), _("No")));
-        }
-    }
+                    (_("Please enter either YES or NO (or yes or no, or y or n, or...)\n"));
+            }
+        }
+    } else {
+        return (popup_with_buttons(prompt, _("Yes"), _("No")));
+    }
+}
 
 
@@ -153 +154 @@
     bool ask_me_OK_or_cancel(char *prompt) {
 
-        /*@ buffer *********************************************************** */
-        char *tmp = NULL;
-        int i;
-        size_t n = 0;
-
-        assert_string_is_neither_NULL_nor_zerolength(prompt);
-        if (g_text_mode) {
-            sync();
-            printf
-                ("---promptdialogOKC---1--- %s\r\n---promptdialogOKC---Q--- [OK] [Cancel] ---\r\n--> ",
-                 prompt);
-            mr_getline(&tmp, &n, stdin);
-            if (tmp[strlen(tmp) - 1] == '\n')
-                tmp[strlen(tmp) - 1] = '\0';
-
+    /*@ buffer *********************************************************** */
+    char *tmp = NULL;
+    int i;
+    size_t n = 0;
+
+    assert_string_is_neither_NULL_nor_zerolength(prompt);
+    if (g_text_mode) {
+        sync();
+        printf
+            ("---promptdialogOKC---1--- %s\r\n---promptdialogOKC---Q--- [OK] [Cancel] ---\r\n--> ",
+             prompt);
+        mr_getline(&tmp, &n, stdin);
+        if (tmp[strlen(tmp) - 1] == '\n')
+            tmp[strlen(tmp) - 1] = '\0';
             i = (int) strlen(tmp);
-            if (i > 0 && tmp[i - 1] < 32) {
-                tmp[i - 1] = '\0';
-            }
-            if (strstr(_("okOKOkYESyes"), tmp)) {
-                mr_free(tmp);
-                return (TRUE);
-            } else {
-                mr_free(tmp);
-                return (FALSE);
-            }
+        if (i > 0 && tmp[i - 1] < 32) {
+            tmp[i - 1] = '\0';
+        }
+        if (strstr(_("okOKOkYESyes"), tmp)) {
+            mr_free(tmp);
+            return (TRUE);
         } else {
-            return (popup_with_buttons(prompt, _(" Okay "), _("Cancel")));
-        }
-    }
+            mr_free(tmp);
+            return (FALSE);
+        }
+    } else {
+        return (popup_with_buttons(prompt, _(" Okay "), _("Cancel")));
+    }
+}
 
 
@@ -251 +251 @@
 }
 
+
 /**
  * Exit Mondo with a fatal error.
@@ -256 +257 @@
  * @note This function never returns.
  */
-    void
-     fatal_error(char *error_string) {
-        /*@ buffers ***************************************************** */
-        char *fatalstr;
-        char *tmp;
-        char *command;
-        static bool already_exiting = FALSE;
-        int i;
-
-        /*@ end vars **************************************************** */
-
-        mr_asprintf(&fatalstr, "-------FATAL ERROR---------");
-        set_signals(FALSE);     // link to external func
-        g_exiting = TRUE;
-        mr_msg(1, "%s - '%s'", fatalstr, error_string);
-        printf("%s - %s\n", fatalstr, error_string);
-        if (getpid() == g_mastermind_pid) {
-            mr_msg(2, "mastermind %d is exiting", (int) getpid());
+void fatal_error(char *error_string) {
+    /*@ buffers ***************************************************** */
+    char *fatalstr = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
+    static bool already_exiting = FALSE;
+    int i = 0;
+
+    /*@ end vars **************************************************** */
+
+    mr_asprintf(&fatalstr, "-------FATAL ERROR---------");
+    set_signals(FALSE);     // link to external func
+    g_exiting = TRUE;
+    mr_msg(1, "%s - '%s'", fatalstr, error_string);
+    printf("%s - %s\n", fatalstr, error_string);
+    if (getpid() == g_mastermind_pid) {
+        mr_msg(2, "mastermind %d is exiting", (int) getpid());
+        kill(g_main_pid, SIGTERM);
+        finish(1);
+    }
+
+    if (getpid() != g_main_pid) {
+        if (g_mastermind_pid != 0 && getpid() != g_mastermind_pid) {
+            mr_msg(2, "non-m/m %d is exiting", (int) getpid());
             kill(g_main_pid, SIGTERM);
             finish(1);
         }
-
-        if (getpid() != g_main_pid) {
-            if (g_mastermind_pid != 0 && getpid() != g_mastermind_pid) {
-                mr_msg(2, "non-m/m %d is exiting", (int) getpid());
-                kill(g_main_pid, SIGTERM);
-                finish(1);
-            }
-        }
-
-        mr_msg(3, "OK, I think I'm the main PID.");
-        if (already_exiting) {
-            mr_msg(3, "...I'm already exiting. Give me time, Julian!");
-            finish(1);
-        }
-
-        already_exiting = TRUE;
-        mr_msg(2, "I'm going to do some cleaning up now.");
-        paranoid_system("killall mindi 2> /dev/null");
-        kill_anything_like_this("/mondo/do-not");
-        kill_anything_like_this("mondo.tmp");
-        kill_anything_like_this("ntfsclone");
-        sync();
-        if (g_tmpfs_mountpt != NULL) {
-            mr_asprintf(&tmp, "umount %s", g_tmpfs_mountpt);
-            chdir("/");
-            for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
-                mr_msg(2, "Waiting for child processes to terminate");
-                sleep(1);
-                run_program_and_log_output(tmp, 5);
-            }
-            mr_free(tmp);
-        }
-
-        if (g_erase_tmpdir_and_scratchdir) {
-            run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5);
-        }
-
-        if (g_selfmounted_isodir) {
-            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
-            run_program_and_log_output(command, 5);
-            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
-            run_program_and_log_output(command, 5);
-            mr_free(g_selfmounted_isodir);
-        }
-
-        if (!g_text_mode) {
-            mr_msg(0, fatalstr);
-            mr_msg(0, error_string);
-            newtFinished();
-        }
-
-        printf
-                (_("If you require technical support, please contact the mailing list.\n"));
-        printf(_("See http://www.mondorescue.org for details.\n"));
-        printf
-                (_("The list's members can help you, if you attach that file to your e-mail.\n"));
-        printf(_("Log file: %s\n"), MONDO_LOGFILE);
-        printf(_("Mondo has aborted.\n"));
-        register_pid(0, "mondo");   // finish() does this too, FYI
-        if (!g_main_pid) {
-            mr_msg(3, "FYI - g_main_pid is blank");
-        }
-        finish(254);
-    }
-
+    }
+
+    mr_msg(3, "OK, I think I'm the main PID.");
+    if (already_exiting) {
+        mr_msg(3, "...I'm already exiting. Give me time, Julian!");
+        finish(1);
+    }
+
+    already_exiting = TRUE;
+    mr_msg(2, "I'm going to do some cleaning up now.");
+    paranoid_system("killall mindi 2> /dev/null");
+    kill_anything_like_this("/mondo/do-not");
+    kill_anything_like_this("tmp.mondo");
+    kill_anything_like_this("ntfsclone");
+    sync();
+    if (g_tmpfs_mountpt != NULL) {
+        mr_asprintf(&tmp, "umount %s", g_tmpfs_mountpt);
+        chdir("/");
+        for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
+            mr_msg(2, "Waiting for child processes to terminate");
+            sleep(1);
+            run_program_and_log_output(tmp, 5);
+        }
+        mr_free(tmp);
+    }
+
+    if (g_erase_tmpdir_and_scratchdir[0]) {
+        run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5);
+    }
+
+    if (g_selfmounted_isodir) {
+        mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
+        run_program_and_log_output(command, 5);
+        mr_free(command);
+
+        mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+        run_program_and_log_output(command, 5);
+        mr_free(command);
+    }
+
+    if (!g_text_mode) {
+        mr_msg(0, fatalstr);
+        mr_msg(0, error_string);
+        newtFinished();
+    }
+
+    printf(_("If you require technical support, please contact the mailing list.\n"));
+    printf(_("See http://www.mondorescue.org for details.\n"));
+    printf(_("The list's members can help you, if you attach that file to your e-mail.\n"));
+    printf(_("Log file: %s\n"), MONDO_LOGFILE);
+    printf(_("Mondo has aborted.\n"));
+    register_pid(0, "mondo");   // finish() does this too, FYI
+    if (!g_main_pid) {
+        mr_msg(3, "FYI - g_main_pid is blank");
+    }
+    finish(254);
+}
 
 
@@ -350 +349 @@
  * @note This function never returns.
  */
-    void
-     finish(int signal_code) {
-        char *command = NULL;
-
-<<<<<<< .courant
-=======
-        /*  if (signal_code==0) { popup_and_OK("Please press <enter> to quit."); } */
-
-        /* newtPopHelpLine(); */
-
->>>>>>> .fusion-droit.r1105
-        register_pid(0, "mondo");
-        chdir("/");
-        run_program_and_log_output("umount " MNT_CDROM, FALSE);
-        run_program_and_log_output("rm -Rf /mondo.scratch.* /mondo.tmp.*",
+void finish(int signal_code) {
+    char *command = NULL;
+
+    register_pid(0, "mondo");
+    chdir("/");
+    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    run_program_and_log_output("rm -Rf /mondo.scratch.* /mondo.tmp.*",
                                    FALSE);
-        if (g_erase_tmpdir_and_scratchdir) {
-            run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
-        }
-        if (g_selfmounted_isodir) {
-            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
-            run_program_and_log_output(command, 1);
-            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
-            run_program_and_log_output(command, 1);
-            mr_free(g_selfmounted_isodir);
-        }
-        if (!g_text_mode) {
-            if (does_file_exist("/THIS-IS-A-RAMDISK")) {
-                mr_msg(1, "Calling newtFinished()");
-                newtFinished();
-            } else {
-                mr_msg(1, "Calling newtSuspend()");
-                newtSuspend();
-            }
-        }
-<<<<<<< .courant
-        printf(_("Execution run ended; result=%d\n"), signal);
-        printf(_("Type 'less %s' to see the output log\n"), MONDO_LOGFILE);
-=======
-//  system("clear");
-//  iamhere("Finished calling newtFinished");
-        printf("Execution run ended; result=%d\n", signal_code);
-        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
->>>>>>> .fusion-droit.r1105
-        free_libmondo_global_strings();
-        exit(signal_code);
-    }
-
-
-
+    if (g_erase_tmpdir_and_scratchdir) {
+        run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
+    }
+    if (g_selfmounted_isodir) {
+        mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
+        run_program_and_log_output(command, 1);
+        mr_free(command);
+
+        mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+        run_program_and_log_output(command, 1);
+        mr_free(command);
+        mr_free(g_selfmounted_isodir);
+    }
+    if (!g_text_mode) {
+        if (does_file_exist("/THIS-IS-A-RAMDISK")) {
+            mr_msg(1, "Calling newtFinished()");
+            newtFinished();
+        } else {
+            mr_msg(1, "Calling newtSuspend()");
+            newtSuspend();
+        }
+    }
+    printf("Execution run ended; result=%d\n", signal_code);
+    printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
+    free_libmondo_global_strings();
+    exit(signal_code);
+}
 
 
@@ -408 +392 @@
  * @param grep_for_me If not "", then only give lines in @p filename that match this regular expression.
  */
-    void
-     log_file_end_to_screen(char *filename, char *grep_for_me) {
-
-        /*@ buffers ********************************************************** */
-        char *command = NULL;
-        char *tmp = NULL;
-
-        /*@ pointers ********************************************************* */
-        FILE *fin = NULL;
-
-        /*@ int ************************************************************** */
-        int i = 0;
-        size_t n = 0;
-
-        assert_string_is_neither_NULL_nor_zerolength(filename);
-        assert(grep_for_me != NULL);
-
-        if (!does_file_exist(filename)) {
-            return;
-        }
-        if (grep_for_me[0] != '\0') {
-            mr_asprintf(&command, "grep '%s' %s | tail -n%d",
-                     grep_for_me, filename, g_noof_log_lines);
-        } else {
-            mr_asprintf(&command, "tail -n%d %s", g_noof_log_lines, filename);
-        }
-        fin = popen(command, "r");
-        if (!fin) {
-            log_OS_error(command);
-        } else {
-            for (i = 0; i < g_noof_log_lines; i++) {
-                for (;
-                    strlen(err_log_lines[i]) < 2 && !feof(fin);) {
-                    mr_getline(&(err_log_lines[i]), &n, fin);
-                    strip_spaces(err_log_lines[i]);
-                    if (!strncmp(err_log_lines[i], "root:", 5)) {
-                        mr_asprintf(&tmp, "%s", err_log_lines[i] + 6);
-                        mr_free(err_log_lines[i]);
-                        err_log_lines[i] = tmp;
-                    }
-                    if (feof(fin)) {
-                        break;
-                    }
+void log_file_end_to_screen(char *filename, char *grep_for_me) {
+
+    /*@ buffers ********************************************************** */
+    char *command = NULL;
+    char *tmp = NULL;
+
+    /*@ pointers ********************************************************* */
+    FILE *fin = NULL;
+
+    /*@ int ************************************************************** */
+    int i = 0;
+    size_t n = 0;
+
+    assert_string_is_neither_NULL_nor_zerolength(filename);
+    assert(grep_for_me != NULL);
+
+    if (!does_file_exist(filename)) {
+        return;
+    }
+    if (grep_for_me[0] != '\0') {
+        mr_asprintf(&command, "grep '%s' %s | tail -n%d",
+                 grep_for_me, filename, g_noof_log_lines);
+    } else {
+        mr_asprintf(&command, "tail -n%d %s", g_noof_log_lines, filename);
+    }
+    fin = popen(command, "r");
+    if (!fin) {
+        log_OS_error(command);
+    } else {
+        for (i = 0; i < g_noof_log_lines; i++) {
+            for (;
+                strlen(err_log_lines[i]) < 2 && !feof(fin);) {
+                mr_getline(&(err_log_lines[i]), &n, fin);
+                strip_spaces(err_log_lines[i]);
+                if (!strncmp(err_log_lines[i], "root:", 5)) {
+                    mr_asprintf(&tmp, err_log_lines[i] + 6);
+                    mr_free(err_log_lines[i]);
+                    err_log_lines[i] = tmp;
                 }
-            }
-            paranoid_pclose(fin);
-        }
-        refresh_log_screen();
-        mr_free(command);
-    }
+                if (feof(fin)) {
+                    break;
+                }
+            }
+        }
+        paranoid_pclose(fin);
+    }
+    refresh_log_screen();
+    mr_free(command);
+}
 
 
@@ -465 +448 @@
  * @note The message is also written to the logfile.
  */
-    void
-     log_to_screen(const char *fmt, ...) {
-
-        /*@ int ************************************************************** */
-        int i = 0;
-        int j = 0;
-        va_list args;
-
-        /*@ buffers ********************************************************** */
-        char *output = NULL;
-
-
-        va_start(args, fmt);
-        mr_asprintf(&output, fmt, args);
-        mr_msg(0, output);
-        if (strlen(output) > 80) {
-            output[80] = '\0';
-        }
-        va_end(args);
-        i = (int) strlen(output);
-        if (i > 0 && output[i - 1] < 32) {
-            output[i - 1] = '\0';
-        }
-
-        if (err_log_lines) {
-            mr_free(err_log_lines[0]);
-            for (i = 1; i < g_noof_log_lines; i++) {
-                err_log_lines[i - 1] = err_log_lines[i];
-            }
-        }
-        while (strlen(output) > 0 && output[strlen(output) - 1] < 32) {
-            output[strlen(output) - 1] = '\0';
-        }
-        for (j = 0; j < (int) strlen(output); j++) {
-            if (output[j] < 32) {
-                output[j] = ' ';
-            }
-        }
-        if (err_log_lines)
-            err_log_lines[g_noof_log_lines - 1] = output;
-        if (g_text_mode) {
-            printf("%s\n", output);
-        } else {
-            refresh_log_screen();
-        }
-    }
+void log_to_screen(const char *fmt, ...) {
+
+    /*@ int ************************************************************** */
+    int i = 0;
+    int j = 0;
+    va_list args;
+
+    /*@ buffers ********************************************************** */
+    char *output = NULL;
+
+
+    va_start(args, fmt);
+    mr_asprintf(&output, fmt, args);
+    mr_msg(0, output);
+    if (strlen(output) > 80) {
+        output[80] = '\0';
+    }
+    va_end(args);
+    i = (int) strlen(output);
+    if (i > 0 && output[i - 1] < 32) {
+        output[i - 1] = '\0';
+    }
+
+    if (err_log_lines) {
+        mr_free(err_log_lines[0]);
+        for (i = 1; i < g_noof_log_lines; i++) {
+            err_log_lines[i - 1] = err_log_lines[i];
+        }
+    }
+    while (strlen(output) > 0 && output[strlen(output) - 1] < 32) {
+        output[strlen(output) - 1] = '\0';
+    }
+    for (j = 0; j < (int) strlen(output); j++) {
+        if (output[j] < 32) {
+            output[j] = ' ';
+        }
+    }
+    if (err_log_lines)
+        err_log_lines[g_noof_log_lines - 1] = output;
+    if (g_text_mode) {
+        printf("%s\n", output);
+    } else {
+        refresh_log_screen();
+    }
+}
 
 
@@ -538 +520 @@
  * @param ttl The title to use for the evalcall form.
  */
-    void
-     open_evalcall_form(char *ttl) {
-
-        /*@ buffers ********************************************************* */
-        char *title;
-        char *tmp;
-
-        /*@ initialize ****************************************************** */
-        g_isoform_old_progress = -1;
-        g_mysterious_dot_counter = 0;
-
-        assert(ttl != NULL);
-        mr_asprintf(&title, ttl);
-        // BERLIOS: We need to unallocate it somewhere
-        mr_asprintf(&g_isoform_header_str, title);
-        //  center_string (title, 80);
-        if (g_text_mode) {
-            mr_msg(0, title);
-        } else {
-            mr_asprintf(&tmp, title);
-            /* BERLIOS: center_string is now broken replace it ! */
-            //center_string(tmp, 80);
-            newtPushHelpLine(tmp);
-            mr_free(tmp);
-        }
+void open_evalcall_form(char *ttl) {
+
+    /*@ buffers ********************************************************* */
+    char *title = NULL;
+    char *tmp = NULL;
+
+    /*@ initialize ****************************************************** */
+    g_isoform_old_progress = -1;
+    g_mysterious_dot_counter = 0;
+
+    assert(ttl != NULL);
+    mr_asprintf(&title, ttl);
+    // BERLIOS: We need to unallocate it somewhere
+    mr_asprintf(&g_isoform_header_str, title);
+    if (g_text_mode) {
+        mr_msg(0, title);
+    } else {
+        mr_asprintf(&tmp, title);
         /* BERLIOS: center_string is now broken replace it ! */
-        //center_string(g_isoform_header_str, 36);
-        g_isoform_starttime = get_time();
-        if (g_text_mode) {
-            mr_msg(0, g_isoform_header_str);
-        } else {
-            g_isoform_header = newtLabel(1, 1, g_isoform_header_str);
-            g_isoform_scale = newtScale(3, 3, 34, 100);
-            //      newtOpenWindow (20, 6, 40, 7, title);      // "Please Wait");
-            newtCenteredWindow(40, 7, title);
-            g_isoform_main = newtForm(NULL, NULL, 0);
-            g_isoform_timeline = newtLabel(1, 5, "This is the timeline");
-            g_isoform_pcline = newtLabel(1, 6, "This is the pcline");
-            newtFormAddComponents(g_isoform_main, g_isoform_timeline,
-                                  g_isoform_pcline, g_isoform_header,
-                                  g_isoform_scale, NULL);
-            newtRefresh();
-        }
-        update_evalcall_form(0);
-        mr_free(title);
-    }
-
+        //center_string(tmp, 80);
+        newtPushHelpLine(tmp);
+        mr_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) {
+        mr_msg(0, g_isoform_header_str);
+    } else {
+        g_isoform_header = newtLabel(1, 1, g_isoform_header_str);
+        g_isoform_scale = newtScale(3, 3, 34, 100);
+        //      newtOpenWindow (20, 6, 40, 7, title);      // "Please Wait");
+        newtCenteredWindow(40, 7, title);
+        g_isoform_main = newtForm(NULL, NULL, 0);
+        g_isoform_timeline = newtLabel(1, 5, "This is the timeline");
+        g_isoform_pcline = newtLabel(1, 6, "This is the pcline");
+        newtFormAddComponents(g_isoform_main, g_isoform_timeline,
+                              g_isoform_pcline, g_isoform_header,
+                              g_isoform_scale, NULL);
+        newtRefresh();
+    }
+    update_evalcall_form(0);
+    mr_free(title);
+}
 
 
@@ -596 +575 @@
  * @param max_val The maximum amount of progress (number of filesets, etc.)
  */
-    void
-     open_progress_form(char *title, char *b1, char *b2, char *b3,
+void open_progress_form(char *title, char *b1, char *b2, char *b3,
                         long max_val) {
 
-        /*@ buffers ********************************************************* */
-        char *b1c;
-        char *blurb1;
-        char *blurb2;
-        char *blurb3;
-
-        /*@ initialize ****************************************************** */
-        g_mysterious_dot_counter = 0;
-
-        assert(title != NULL);
-        assert(b1 != NULL);
-        assert(b2 != NULL);
-        assert(b3 != NULL);
-
-        mr_asprintf(&blurb1, b1);
-        mr_asprintf(&blurb2, b2);
-        mr_asprintf(&blurb3, b3);
-        mr_asprintf(&b1c, b1);
-        /* BERLIOS: center_string is now broken replace it ! */
-        //center_string(b1c, 80);
-        if (max_val <= 0) {
-            max_val = 1;
-        }
-
-        g_start_time = get_time();
-        g_maximum_progress = max_val;
-        g_current_progress = 0;
-        // BERLIOS: We need to unallocate them
-        mr_asprintf(&g_blurb_str_1, blurb1);
-        mr_asprintf(&g_blurb_str_2, blurb3);
-        mr_asprintf(&g_blurb_str_3, blurb2);
-        if (g_text_mode) {
-            mr_msg(0, blurb1);
-            mr_msg(0, blurb2);
-            mr_msg(0, blurb3);
-        } else {
-            g_blurb1 = newtLabel(2, 1, blurb1);
-            g_blurb2 = newtLabel(2, 2, blurb3);
-            g_blurb3 = newtLabel(2, 4, blurb2);
-            //      newtOpenWindow (10, 4, 60, 11, title);
-            newtCenteredWindow(60, 11, title);
-            g_scale = newtScale(3, 6, 54, g_maximum_progress);
-            g_progressForm = newtForm(NULL, NULL, 0);
-            g_percentline = newtLabel(10, 9, "This is the percentline");
-            g_timeline = newtLabel(10, 8, "This is the timeline");
-            newtFormAddComponents(g_progressForm, g_percentline,
-                                  g_timeline, g_scale, g_blurb1, g_blurb3,
-                                  g_blurb2, NULL);
-            newtPushHelpLine(b1c);
-            newtRefresh();
-        }
-        update_progress_form_full(blurb1, blurb2, blurb3);
-        mr_free(b1c);
-        mr_free(blurb1);
-        mr_free(blurb2);
-        mr_free(blurb3);
-    }
+    /*@ buffers ********************************************************* */
+    char *b1c = NULL;
+    char *blurb1 = NULL;
+    char *blurb2 = NULL;
+    char *blurb3 = NULL;
+
+    /*@ initialize ****************************************************** */
+    g_mysterious_dot_counter = 0;
+
+    assert(title != NULL);
+    assert(b1 != NULL);
+    assert(b2 != NULL);
+    assert(b3 != NULL);
+
+    mr_asprintf(&blurb1, b1);
+    mr_asprintf(&blurb2, b2);
+    mr_asprintf(&blurb3, b3);
+    mr_asprintf(&b1c, b1);
+    /* BERLIOS: center_string is now broken replace it ! */
+    //center_string(b1c, 80);
+    if (max_val <= 0) {
+        max_val = 1;
+    }
+
+    g_start_time = get_time();
+    g_maximum_progress = max_val;
+    g_current_progress = 0;
+    // BERLIOS: We need to unallocate them
+    mr_asprintf(&g_blurb_str_1, blurb1);
+    mr_asprintf(&g_blurb_str_2, blurb3);
+    mr_asprintf(&g_blurb_str_3, blurb2);
+    if (g_text_mode) {
+        mr_msg(0, blurb1);
+        mr_msg(0, blurb2);
+        mr_msg(0, blurb3);
+    } else {
+        g_blurb1 = newtLabel(2, 1, blurb1);
+        g_blurb2 = newtLabel(2, 2, blurb3);
+        g_blurb3 = newtLabel(2, 4, blurb2);
+        //      newtOpenWindow (10, 4, 60, 11, title);
+        newtCenteredWindow(60, 11, title);
+        g_scale = newtScale(3, 6, 54, g_maximum_progress);
+        g_progressForm = newtForm(NULL, NULL, 0);
+        g_percentline = newtLabel(10, 9, "This is the percentline");
+        g_timeline = newtLabel(10, 8, "This is the timeline");
+        newtFormAddComponents(g_progressForm, g_percentline,
+                              g_timeline, g_scale, g_blurb1, g_blurb3,
+                              g_blurb2, NULL);
+        newtPushHelpLine(b1c);
+        newtRefresh();
+    }
+    update_progress_form_full(blurb1, blurb2, blurb3);
+    mr_free(b1c);
+    mr_free(blurb1);
+    mr_free(blurb2);
+    mr_free(blurb3);
+}
+
 
 /**
@@ -662 +641 @@
  * @param prompt The message.
  */
-    void
-     popup_and_OK(char *prompt) {
-        int ch;
-
-        assert_string_is_neither_NULL_nor_zerolength(prompt);
-
-        mr_msg(0, prompt);
-        if (g_text_mode) {
-            printf
-                ("---promptpopup---1--- %s\r\n---promptpopup---Q--- [OK] ---\r\n--> ",
-                 prompt);
-            while (((ch = getchar()) != '\n') && (ch != EOF));
-        } else {
-            (void) popup_with_buttons(prompt, _(" OK "), "");
-        }
-    }
+void popup_and_OK(char *prompt) {
+    int ch;
+
+    assert_string_is_neither_NULL_nor_zerolength(prompt);
+
+    mr_msg(0, prompt);
+    if (g_text_mode) {
+        printf
+            ("---promptpopup---1--- %s\r\n---promptpopup---Q--- [OK] ---\r\n--> ",
+             prompt);
+        while (((ch = getchar()) != '\n') && (ch != EOF));
+    } else {
+        (void) popup_with_buttons(prompt, _(" OK "), "");
+    }
+}
+
 
 /**
@@ -686 +665 @@
  * @return TRUE if the user pressed OK, FALSE if they pressed Cancel.
  */
-    bool popup_and_get_string(char *title, char *b, char *output) {
-
-        /*@ newt ************************************************************ */
-        newtComponent myForm;
-        newtComponent b_1;
-        newtComponent b_2;
-        newtComponent b_res;
-        newtComponent text;
-        newtComponent type_here;
-
-        /*@ pointers ********************************************************* */
-        char **entry_value = NULL;
-
-        /*@ buffers ********************************************************** */
-        char *blurb = NULL;
-        size_t n = 0;
-        bool ret = TRUE;
-
-        assert_string_is_neither_NULL_nor_zerolength(title);
-        assert(b != NULL);
-
-        if (g_text_mode) {
-            printf
-                ("---promptstring---1--- %s\r\n---promptstring---2--- %s\r\n---promptstring---Q---\r\n-->  ",
-                 title, b);
-            mr_free(output);
-            mr_getline(&output, &n, stdin);
-            if (output[strlen(output) - 1] == '\n')
-                output[strlen(output) - 1] = '\0';
-            return (ret);
-        }
-        mr_asprintf(&blurb, b);
-        text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
-
-        type_here =
-            newtEntry(2, newtTextboxGetNumLines(text) + 2,
-                      output, 50,
-                      (void *)entry_value, NEWT_FLAG_RETURNEXIT
-            );
-        b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, _("  OK  "));
-        b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, _("Cancel"));
-        newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
-        myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, text, type_here, b_1, b_2, NULL);
-        /* BERLIOS: center_string is now broken replace it ! */
-        //center_string(blurb, 80);
-        newtPushHelpLine(blurb);
-        mr_free(blurb);
-
-        b_res = newtRunForm(myForm);
-        newtPopHelpLine();
-        if (b_res == b_2) {
-            ret = FALSE;
-        } else {
-            // Copy entry_value before destroying the form
-            // clearing potentially output before
-            mr_allocstr(output,*entry_value);
-        }
-        newtFormDestroy(myForm);
-        newtPopWindow();
+bool popup_and_get_string(char *title, char *b, char *output) {
+
+    /*@ newt ************************************************************ */
+    newtComponent myForm;
+    newtComponent b_1;
+    newtComponent b_2;
+    newtComponent b_res;
+    newtComponent text;
+    newtComponent type_here;
+
+    /*@ pointers ********************************************************* */
+    char **entry_value = NULL;
+
+    /*@ buffers ********************************************************** */
+    char *blurb = NULL;
+    size_t n = 0;
+    bool ret = TRUE;
+
+    assert_string_is_neither_NULL_nor_zerolength(title);
+    assert(b != NULL);
+
+    if (g_text_mode) {
+        printf
+            ("---promptstring---1--- %s\r\n---promptstring---2--- %s\r\n---promptstring---Q---\r\n-->  ",
+             title, b);
+        mr_free(output);
+        mr_getline(&output, &n, stdin);
+        if (output[strlen(output) - 1] == '\n')
+            output[strlen(output) - 1] = '\0';
         return(ret);
     }
+    mr_asprintf(&blurb, b);
+    text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
+
+    type_here =
+        newtEntry(2, newtTextboxGetNumLines(text) + 2,
+                  output, 50,
+                  (void *)entry_value, NEWT_FLAG_RETURNEXIT
+        );
+    b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, _("  OK  "));
+    b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, _("Cancel"));
+    newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, text, type_here, b_1, b_2, NULL);
+    /* BERLIOS: center_string is now broken replace it ! */
+    //center_string(blurb, 80);
+    newtPushHelpLine(blurb);
+    mr_free(blurb);
+
+    b_res = newtRunForm(myForm);
+    newtPopHelpLine();
+    if (b_res == b_2) {
+    ret = FALSE;
+    } else {
+        // Copy entry_value before destroying the form
+        // clearing potentially output before
+        mr_allocstr(output,*entry_value);
+    }
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    return(ret);
+}
 
 
@@ -757 +736 @@
  * @return TRUE if @p button1 was pushed, FALSE otherwise.
  */
-    bool popup_with_buttons(char *p, char *button1, char *button2) {
-
-        /*@ buffers *********************************************************** */
-        char *prompt;
-        char *tmp = NULL;
-        size_t n = 0;
-
-        /*@ newt ************************************************************** */
-        newtComponent myForm;
-        newtComponent b_1;
-        newtComponent b_2;
-        newtComponent b_res;
-        newtComponent text;
-
-        assert_string_is_neither_NULL_nor_zerolength(p);
-        assert(button1 != NULL);
-        assert(button2 != NULL);
-        if (g_text_mode) {
-            if (strlen(button2) == 0) {
-                printf("%s (%s) --> ", p, button1);
-            } else {
-                printf("%s (%s or %s) --> ", p, button1, button2);
-            }
-            for (mr_asprintf(&tmp, " ");
-                 strcmp(tmp, button1) && (strlen(button2) == 0
-                                          || strcmp(tmp, button2));) {
-                printf("--> ");
+bool popup_with_buttons(char *p, char *button1, char *button2) {
+
+    /*@ buffers *********************************************************** */
+    char *prompt;
+    char *tmp = NULL;
+    size_t n = 0;
+
+    /*@ newt ************************************************************** */
+    newtComponent myForm;
+    newtComponent b_1;
+    newtComponent b_2;
+    newtComponent b_res;
+    newtComponent text;
+
+    assert_string_is_neither_NULL_nor_zerolength(p);
+    assert(button1 != NULL);
+    assert(button2 != NULL);
+
+    if (g_text_mode) {
+        if (strlen(button2) == 0) {
+            printf("%s (%s) --> ", p, button1);
+        } else {
+            printf("%s (%s or %s) --> ", p, button1, button2);
+            }
+            for (mr_asprintf(&tmp, "");
+             strcmp(tmp, button1) && (strlen(button2) == 0
+                                      || strcmp(tmp, button2));) {
+            printf("--> ");
                 mr_free(tmp);
                 mr_getline(&tmp, &n, stdin);
             }
-            if (!strcmp(tmp, button1)) {
-                mr_free(tmp);
-                return (TRUE);
-            } else {
-                mr_free(tmp);
-                return (FALSE);
-            }
-        }
-
-        mr_asprintf(&prompt, p);
-        text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
-        b_1 =
-            newtButton(20 -
-                       ((button2[0] !=
-                         '\0') ? strlen(button1) +
-                        2 : strlen(button1) / 2),
-                       newtTextboxGetNumLines(text) + 3, button1);
-        if (button2[0] != '\0') {
-            b_2 =
-                newtButton(24, newtTextboxGetNumLines(text) + 3, button2);
-        } else {
-            b_2 = NULL;
-        }
-        //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
-        newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, _("Alert"));
-        myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, text, b_1, b_2, NULL);
-        /* BERLIOS: center_string is now broken replace it ! */
-        //center_string(prompt, 80);
-        newtPushHelpLine(prompt);
-        mr_free(prompt);
-        b_res = newtRunForm(myForm);
-        newtPopHelpLine();
-        newtFormDestroy(myForm);
-        newtPopWindow();
-        if (b_res == b_1) {
+        if (!strcmp(tmp, button1)) {
+            mr_free(tmp);
             return (TRUE);
         } else {
+            mr_free(tmp);
             return (FALSE);
         }
     }
 
-
+    mr_asprintf(&prompt, p);
+    text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
+    b_1 =
+        newtButton(20 -
+                   ((button2[0] !=
+                     '\0') ? strlen(button1) +
+                    2 : strlen(button1) / 2),
+                   newtTextboxGetNumLines(text) + 3, button1);
+    if (button2[0] != '\0') {
+        b_2 =
+            newtButton(24, newtTextboxGetNumLines(text) + 3, button2);
+    } else {
+        b_2 = NULL;
+    }
+    //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
+    newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, _("Alert"));
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, text, b_1, b_2, NULL);
+    /* BERLIOS: center_string is now broken replace it ! */
+    //center_string(prompt, 80);
+    newtPushHelpLine(prompt);
+    mr_free(prompt);
+
+    b_res = newtRunForm(myForm);
+    newtPopHelpLine();
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    if (b_res == b_1) {
+        return (TRUE);
+    } else {
+        return (FALSE);
+    }
+}
 
 
@@ -836 +815 @@
  * on the screen.
  */
-    void
-     refresh_log_screen() {
-
-        /*@ int *********************************************************** */
-        int i = 0;
-
-
-        if (g_text_mode || !err_log_lines) {
-            return;
-        }
-        for (i = g_noof_log_lines - 1; i >= 0; i--) {
-            newtDrawRootText(0, i + g_noof_rows - 1 - g_noof_log_lines,
-                             "                                                                                ");
-        }
-        newtRefresh();
-        for (i = g_noof_log_lines - 1; i >= 0; i--) {
-            //BERLIOS : removed for now, Think it's useless : err_log_lines[i][79] = '\0';
-            newtDrawRootText(0, i + g_noof_rows - 1 - g_noof_log_lines,
-                             err_log_lines[i]);
-        }
-        newtRefresh();
-    }
+void refresh_log_screen(void) {
+
+    /*@ int *********************************************************** */
+    int i = 0;
+
+
+    if (g_text_mode || !err_log_lines) {
+        return;
+    }
+    for (i = g_noof_log_lines - 1; i >= 0; i--) {
+        newtDrawRootText(0, i + g_noof_rows - 1 - g_noof_log_lines,
+                         "                                                                                ");
+    }
+    newtRefresh();
+
+    for (i = g_noof_log_lines - 1; i >= 0; i--) {
+        //BERLIOS : removed for now, Think it's useless : err_log_lines[i][79] = '\0';
+        newtDrawRootText(0, i + g_noof_rows - 1 - g_noof_log_lines,
+                         err_log_lines[i]);
+    }
+    newtRefresh();
+}
 
 
@@ -864 +843 @@
  * only allocate some memory.
  */
-    void
-     setup_newt_stuff() {
-
-        /*@ int *********************************************************** */
-        int i = 0;
-        int cols;
-
-        if (!g_text_mode) {
-            newtInit();
-            newtCls();
-            newtPushHelpLine
-                (_("Welcome to Mondo Rescue, by Dev Team and the Internet. All rights reversed."));
-            /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
-            newtDrawRootText(18, 0, WELCOME_STRING);
-            newtRefresh();
-            newtGetScreenSize(&cols, &g_noof_rows);
-            g_noof_log_lines = (g_noof_rows / 5) + 1;
-        }
-
-        err_log_lines =
-            (char **) mr_malloc(sizeof(char *) * g_noof_log_lines);
-        if (!err_log_lines) {
-            fatal_error("Out of memory");
-        }
-
-        for (i = 0; i < g_noof_log_lines; i++) {
-            err_log_lines[i] = NULL;
-        }
-    }
+void setup_newt_stuff(void) {
+
+    /*@ int *********************************************************** */
+    int i = 0;
+    int cols;
+
+    if (!g_text_mode) {
+        newtInit();
+        newtCls();
+        newtPushHelpLine
+            (_("Welcome to Mondo Rescue, by Dev Team and the Internet. All rights reversed."));
+        newtDrawRootText(18, 0, WELCOME_STRING);
+        newtRefresh();
+        newtGetScreenSize(&cols, &g_noof_rows);
+        g_noof_log_lines = (g_noof_rows / 5) + 1;
+    }
+
+    err_log_lines =
+        (char **) mr_malloc(sizeof(char *) * g_noof_log_lines);
+
+    for (i = 0; i < g_noof_log_lines; i++) {
+        err_log_lines[i] = NULL;
+    }
+}
 
 
@@ -899 +873 @@
  * @param num The numerator of the ratio.
  */
-    void
-     update_evalcall_form(int num) {
-
-        /*@ long ************************************************************ */
-        long current_time = 0;
-        long time_taken = 0;
-        long time_total_est = 0;
-        long time_remaining = 0;
-
-        /*@ buffers ********************************************************** */
-        char *timeline_str;
-        char *pcline_str;
-        char *taskprogress;
-        char *tmp1;
-        char *tmp2;
-        char *p;
-
-        /*@ int ************************************************************** */
-        int percentage = 0;
-        int i = 0;
-        int j = 0;
-
-        //log_it("update_eval_call_form called");
-        if (num < 1) {
-            percentage = 1;
+void update_evalcall_form(int num) {
+
+    /*@ long ************************************************************ */
+    long current_time = 0L;
+    long time_taken = 0L;
+    long time_total_est = 0L;
+    long time_remaining = 0L;
+
+    /*@ buffers ********************************************************** */
+    char *timeline_str = NULL;
+    char *pcline_str = NULL;
+    char *taskprogress = NULL;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
+    char *p = NULL;
+
+    /*@ int ************************************************************** */
+    int percentage = 0;
+    int i = 0;
+    int j = 0;
+
+    if (num < 1) {
+        percentage = 1;
+    } else {
+        percentage = (int) trunc(num);
+    }
+
+    current_time = get_time();
+    time_taken = current_time - g_isoform_starttime;
+    if (num) {
+        time_total_est = time_taken * 100 / num;
+        time_remaining = time_total_est - time_taken;
+    } else {
+        time_remaining = 0;
+    }
+    if (!g_text_mode) {
+        newtLabelSetText(g_isoform_header, g_isoform_header_str);
+    }
+    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;
+        mr_asprintf(&timeline_str,
+                 _("%2ld:%02ld taken            %2ld:%02ld remaining"),
+                 time_taken / 60, time_taken % 60, time_remaining / 60,
+                 time_remaining % 60);
+        if (percentage < 3) {
+            tmp1 =
+                (char *) malloc(g_mysterious_dot_counter *
+                                sizeof(char));
+            for (i = 0, p = tmp1; i < g_mysterious_dot_counter - 1;
+                 i++, p++) {
+                *p = '.';
+            }
+            *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 = ' ';
+            }
+            *p = '\0';
+            mr_asprintf(&pcline_str, " Working%s%s %c", tmp1, tmp2,
+                 special_dot_char(g_mysterious_dot_counter));
+            mr_free(tmp1);
+            mr_free(tmp2);
         } else {
-            percentage = (int) trunc(num);
-        }
-
-        current_time = get_time();
-        time_taken = current_time - g_isoform_starttime;
-        if (num) {
-            time_total_est = time_taken * 100 / num;
-            time_remaining = time_total_est - time_taken;
+            mr_asprintf(&pcline_str,
+                     _(" %3d%% done              %3d%% to go"),
+                     percentage, 100 - percentage);
+        }
+        if (g_text_mode) {
+            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 >= 3) {
+                mr_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");
+                mr_free(taskprogress);
+            }
         } else {
-            time_remaining = 0;
-        }
-        if (!g_text_mode) {
-            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;
-            mr_asprintf(&timeline_str,
-                     _("%2ld:%02ld taken            %2ld:%02ld remaining"),
-                     time_taken / 60, time_taken % 60, time_remaining / 60,
-                     time_remaining % 60);
-            if (percentage < 3) {
-                tmp1 =
-                    (char *) malloc(g_mysterious_dot_counter *
-                                    sizeof(char));
-                for (i = 0, p = tmp1; i < g_mysterious_dot_counter - 1;
-                     i++, p++) {
-                    *p = '.';
-                }
-                *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 = ' ';
-                }
-                *p = '\0';
-
-                mr_asprintf(&pcline_str, " Working%s%s %c", tmp1, tmp2,
-                         special_dot_char(g_mysterious_dot_counter));
-                mr_free(tmp1);
-                mr_free(tmp2);
-            } else {
-                mr_asprintf(&pcline_str,
-                         _(" %3d%% done              %3d%% to go"),
-                         percentage, 100 - percentage);
-            }
-            if (g_text_mode) {
-                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 >= 3) {
-                    mr_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");
-                    mr_free(taskprogress);
-                }
-            } else {
-                newtScaleSet(g_isoform_scale,
-                             (unsigned long long) percentage);
-                newtLabelSetText(g_isoform_pcline, pcline_str);
-                if (percentage >= 3) {
-                    newtLabelSetText(g_isoform_timeline, timeline_str);
-                }
-            }
-            mr_free(timeline_str);
-            mr_free(pcline_str);
-        }
-        if (!g_text_mode) {
-//      log_it("refreshing");
-            newtRefresh();
-        }
-    }
+            newtScaleSet(g_isoform_scale,
+                         (unsigned long long) percentage);
+            newtLabelSetText(g_isoform_pcline, pcline_str);
+            if (percentage >= 3) {
+                newtLabelSetText(g_isoform_timeline, timeline_str);
+            }
+        }
+        mr_free(timeline_str);
+        mr_free(pcline_str);
+    }
+    if (!g_text_mode) {
+        newtRefresh();
+    }
+}
 
 
@@ -1026 +994 @@
  * @param blurb3 The new third line of the blurb; use @p g_blurb_str_2 (no, that's not a typo) to keep it the same.
  */
-    void
-     update_progress_form(char *blurb3) {
-        /*  log_it("update_progress_form --- called"); */
-        if (g_current_progress == -999) {
-            /* log_it("You're trying to update progress form when it ain't open. Aww, that's OK. I'll let it go. It's a bit naughty but it's a nonfatal error. No prob, Bob."); */
-            return;
-        }
-        mr_free(g_blurb_str_2);
-        mr_asprintf(&g_blurb_str_2, blurb3);
-        update_progress_form_full(g_blurb_str_1, g_blurb_str_2,
-                                  g_blurb_str_3);
-    }
+void update_progress_form(char *blurb3) {
+    if (g_current_progress == -999) {
+        return;
+    }
+    mr_free(g_blurb_str_2);
+    mr_asprintf(&g_blurb_str_2, blurb3);
+    update_progress_form_full(g_blurb_str_1, g_blurb_str_2,
+                              g_blurb_str_3);
+}
 
 
@@ -1046 +1011 @@
  * @param blurb3 The third line of the blurb. Use @p g_blurb_str_2 (no, that's not a typo either) to keep it the same.
  */
-    void
-     update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
-        /*@ long ***************************************************** */
-        long current_time = 0;
-        long time_taken = 0;
-        long time_remaining = 0;
-        long time_total_est = 0;
-
-        /*@ int ******************************************************* */
-        int percentage = 0;
-        int i = 0;
-        int j = 0;
-
-        /*@ buffers *************************************************** */
-        char *percentline_str;
-        char *timeline_str;
-        char *taskprogress;
-        char *tmp;
+void update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
+    /*@ long ***************************************************** */
+    long current_time = 0L;
+    long time_taken = 0L;
+    long time_remaining = 0L;
+    long time_total_est = 0L;
+
+    /*@ int ******************************************************* */
+    int percentage = 0;
+    int i = 0;
+
+    /*@ buffers *************************************************** */
+    char *percentline_str = NULL;
+    char *timeline_str = NULL;
+    char *taskprogress = NULL;
+    char *tmp = NULL;
         char *tmp1;
         char *tmp2;
         char *p;
 
-//  mr_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
-        if (!g_text_mode) {
-            assert(blurb1 != NULL);
-            assert(blurb2 != NULL);
-            assert(blurb3 != NULL);
-            assert(g_timeline != NULL);
-        }
-
-        current_time = get_time();
-        time_taken = current_time - g_start_time;
-        if (g_maximum_progress == 0) {
-            percentage = 0;
-        } else {
-            if (g_current_progress > g_maximum_progress) {
-                mr_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);
-                mr_msg(0, tmp);
-                mr_free(tmp);
-                g_current_progress = g_maximum_progress;
-            }
-            percentage =
-                (int) ((g_current_progress * 100L) / g_maximum_progress);
-        }
-        if (percentage < 1) {
-            percentage = 1;
-        }
+    if (!g_text_mode) {
+        assert(blurb1 != NULL);
+        assert(blurb2 != NULL);
+        assert(blurb3 != NULL);
+        assert(g_timeline != NULL);
+    }
+
+    current_time = get_time();
+    time_taken = current_time - g_start_time;
+    if (g_maximum_progress == 0) {
+        percentage = 0;
+    } else {
+        if (g_current_progress > g_maximum_progress) {
+            mr_msg(0, "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld",
+                     blurb1, blurb2, blurb3, g_current_progress,
+                     g_maximum_progress);
+            g_current_progress = g_maximum_progress;
+        }
+        percentage =
+            (int) ((g_current_progress * 100L) / g_maximum_progress);
+    }
+    if (percentage < 1) {
+        percentage = 1;
+    }
+    if (percentage > 100) {
+        percentage = 100;
+    }
+    if (g_current_progress) {
+        time_total_est =
+            time_taken * (long) g_maximum_progress /
+            (long) (g_current_progress);
+        time_remaining = time_total_est - time_taken;
+    } else {
+        time_remaining = 0;
+    }
+    /* BERLIOS/ Is it useful here ? */
+    //g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
+    mr_asprintf(&timeline_str,
+            "%2ld:%02ld taken               %2ld:%02ld remaining  ",
+            time_taken / 60, time_taken % 60, time_remaining / 60,
+            time_remaining % 60);
+    mr_asprintf(&percentline_str,
+             " %3d%% done                 %3d%% to go", percentage,
+             100 - percentage);
+
+    if (g_text_mode) {
+        printf(_("---progress-form---1--- %s\n"), blurb1);
+        printf(_("---progress-form---2--- %s\n"), blurb2);
+        printf(_("---progress-form---3--- %s\n"), blurb3);
+        printf(_("---progress-form---E---\n"));
+
+        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) {
-            percentage = 100;
-        }
-        if (g_current_progress) {
-            time_total_est =
-                time_taken * (long) g_maximum_progress /
-                (long) (g_current_progress);
-            time_remaining = time_total_est - time_taken;
-        } else {
-            time_remaining = 0;
-        }
-        /* BERLIOS/ Is it useful here ? */
-        //g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
-        mr_asprintf(&timeline_str,
-                 "%2ld:%02ld taken               %2ld:%02ld remaining  ",
-                 time_taken / 60, time_taken % 60, time_remaining / 60,
+            mr_msg(2, _("percentage = %d"), percentage);
+        }
+        mr_asprintf(&taskprogress,
+                 _("TASK:  [%s%s] %3d%% done; %2ld:%02ld to go"), tmp1,
+                 tmp2, percentage, time_remaining / 60,
                  time_remaining % 60);
-        mr_asprintf(&percentline_str,
-                 " %3d%% done                 %3d%% to go", percentage,
-                 100 - percentage);
-
-        if (g_text_mode) {
-            printf(_("---progress-form---1--- %s%s"), blurb1, "\r\n");
-            printf(_("---progress-form---2--- %s%s"), blurb2, "\r\n");
-            printf(_("---progress-form---3--- %s%s"), blurb3, "\r\n");
-            printf(_("---progress-form---E---\n"));
-
-            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) {
-                mr_msg(2, _("percentage = %d"), percentage);
-            }
-            mr_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);
-            mr_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);
-            newtLabelSetText(g_blurb3, blurb2);
-            newtScaleSet(g_scale, (unsigned long long) g_current_progress);
-            if (percentage >= 2) {
-                newtLabelSetText(g_timeline, timeline_str);
-            }
-            newtLabelSetText(g_percentline, percentline_str);
-            newtRefresh();
-        }
-        mr_free(percentline_str);
-        mr_free(timeline_str);
-    }
+
+        printf(_("---progress-form---4--- %s\r\n"), taskprogress);
+        mr_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);
+        newtLabelSetText(g_blurb3, blurb2);
+        newtScaleSet(g_scale, (unsigned long long) g_current_progress);
+        if (percentage >= 2) {
+            newtLabelSetText(g_timeline, timeline_str);
+        }
+        newtLabelSetText(g_percentline, percentline_str);
+        newtRefresh();
+    }
+    mr_free(percentline_str);
+    mr_free(timeline_str);
+}
 
 
@@ -1176 +1135 @@
  * @return The backup type chosen, or @c none if the user chose "Exit to shell".
  */
-    t_bkptype which_backup_media_type(bool restoring) {
-
-        /*@ char ************************************************************ */
-        t_bkptype output;
-
-
-        /*@ newt ************************************************************ */
-        char *title_sz;
-        char *minimsg_sz;
-        static t_bkptype possible_bkptypes[] =
-            { none, cdr, cdrw, dvd, tape, cdstream, udev, nfs, iso };
-        static char *possible_responses[] =
-            { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev",
-            "nfs", "iso", NULL
-        };
-        char *outstr = NULL;
-        t_bkptype backup_type;
-        int i;
+t_bkptype which_backup_media_type(bool restoring) {
+
+    /*@ char ************************************************************ */
+    t_bkptype output;
+
+
+    /*@ newt ************************************************************ */
+    char *title_sz = NULL;
+    char *minimsg_sz = NULL;
+    static t_bkptype possible_bkptypes[] =
+        { none, cdr, cdrw, dvd, tape, cdstream, udev, nfs, iso, usb };
+    static char *possible_responses[] =
+        { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev",
+"nfs", "iso", "usb", NULL };
+    char *outstr = NULL;
+    t_bkptype backup_type;
+    int i = 0;
         size_t n = 0;
 
-        newtComponent b1;
-        newtComponent b2;
-        newtComponent b3;
-        newtComponent b4;
-        newtComponent b5;
-        newtComponent b6;
-        newtComponent b7;
-        newtComponent b8;
-        newtComponent b_res;
-        newtComponent myForm;
-
-        if (g_text_mode) {
-            for (backup_type = none; backup_type == none;) {
-                printf(_("Backup type ("));
-                for (i = 0; possible_responses[i]; i++) {
-                    printf("%c%s", (i == 0) ? '\0' : ' ',
-                           possible_responses[i]);
+    newtComponent b1;
+    newtComponent b2;
+    newtComponent b3;
+    newtComponent b4;
+    newtComponent b5;
+    newtComponent b6;
+    newtComponent b7;
+    newtComponent b8;
+    newtComponent b_res;
+    newtComponent myForm;
+
+    if (g_text_mode) {
+        for (backup_type = none; backup_type == none;) {
+            printf(_("Backup type ("));
+            for (i = 0; possible_responses[i]; i++) {
+                printf("%c%s", (i == 0) ? '\0' : ' ',
+                       possible_responses[i]);
+            }
+            printf(")\n--> ");
+                mr_getline(&outstr, &n, stdin);
+            mr_strip_spaces(outstr);
+            for (i = 0; possible_responses[i]; i++) {
+                if (!strcmp(possible_responses[i], outstr)) {
+                    backup_type = possible_bkptypes[i];
                 }
-                printf(")\n--> ");
-                mr_getline(&outstr, &n, stdin);
-                strip_spaces(outstr);
-                for (i = 0; possible_responses[i]; i++) {
-                    if (!strcmp(possible_responses[i], outstr)) {
-                        backup_type = possible_bkptypes[i];
-                    }
-                }
-            }
-            mr_free(outstr);
-            return (backup_type);
-        }
-        newtDrawRootText(18, 0, WELCOME_STRING);
-        if (restoring) {
-            mr_asprintf(&title_sz,
-                     _("Please choose the backup media from which you want to read data."));
-            mr_asprintf(&minimsg_sz, _("Read from:"));
-        } else {
-            mr_asprintf(&title_sz,
-                     _("Please choose the backup media to which you want to archive data."));
-            mr_asprintf(&minimsg_sz, _("Backup to:"));
-        }
-        newtPushHelpLine(title_sz);
-        mr_free(title_sz);
+            }
+        }
+        mr_free(outstr);
+        return (backup_type);
+    }
+    newtDrawRootText(18, 0, WELCOME_STRING);
+    if (restoring) {
+        mr_asprintf(&title_sz,
+                 _("Please choose the backup media from which you want to read data."));
+        mr_asprintf(&minimsg_sz, _("Read from:"));
+    } else {
+        mr_asprintf(&title_sz,
+                 _("Please choose the backup media to which you want to archive data."));
+        mr_asprintf(&minimsg_sz, _("Backup to:"));
+    }
+    newtPushHelpLine(title_sz);
+    mr_free(title_sz);
 
         //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
@@ -1243 +1201 @@
         mr_free(minimsg_sz);
 
-        b1 = newtButton(1, 1, _("CD-R disks "));
-        b2 = newtButton(17, 1, _("CD-RW disks"));
-        b3 = newtButton(1, 9, _("Tape drive "));
-        b4 = newtButton(17, 5, _("CD streamer"));
-        b5 = newtButton(1, 5, _(" DVD disks "));
-        b6 = newtButton(17, 9, _(" NFS mount "));
-        b7 = newtButton(1, 13, _(" Hard disk "));
-        b8 = newtButton(17, 13, _("    Exit   "));
-        myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8,
-                              NULL);
-        b_res = newtRunForm(myForm);
-        newtFormDestroy(myForm);
-        newtPopWindow();
-        if (b_res == b1) {
-            output = cdr;
-        } else if (b_res == b2) {
-            output = cdrw;
-        } else if (b_res == b3) {
-            output = tape;
-        } else if (b_res == b4) {
-            output = cdstream;
-        } else if (b_res == b5) {
-            output = dvd;
-        } else if (b_res == b6) {
-            output = nfs;
-        } else if (b_res == b7) {
-            output = iso;
-        } else {
-            output = none;
-        }
-        newtPopHelpLine();
-        return (output);
-    }
+    /* BERLIOS: USB ?? */
+    b1 = newtButton(1, 1, _("CD-R disks "));
+    b2 = newtButton(17, 1, _("CD-RW disks"));
+    b3 = newtButton(1, 9, _("Tape drive "));
+    b4 = newtButton(17, 5, _("CD streamer"));
+    b5 = newtButton(1, 5, _(" DVD disks "));
+    b6 = newtButton(17, 9, _(" NFS mount "));
+    b7 = newtButton(1, 13, _(" Hard disk "));
+    b8 = newtButton(17, 13, _("    Exit   "));
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8,
+                          NULL);
+    b_res = newtRunForm(myForm);
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    if (b_res == b1) {
+        output = cdr;
+    } else if (b_res == b2) {
+        output = cdrw;
+    } else if (b_res == b3) {
+        output = tape;
+    } else if (b_res == b4) {
+        output = cdstream;
+    } else if (b_res == b5) {
+        output = dvd;
+    } else if (b_res == b6) {
+        output = nfs;
+    } else if (b_res == b7) {
+        output = iso;
+    } else {
+        output = none;
+    }
+    newtPopHelpLine();
+    return (output);
+}
 
 
@@ -1284 +1243 @@
  * @return The compression level (0-9) chosen, or -1 for "Exit".
  */
-    int
-     which_compression_level() {
-
-        /*@ char ************************************************************ */
-        int output = none;
-
-
-        /*@ newt ************************************************************ */
-
-        newtComponent b1;
-        newtComponent b2;
-        newtComponent b3;
-        newtComponent b4;
-        newtComponent b5;
-        newtComponent b_res;
-        newtComponent myForm;
-
-        newtDrawRootText(18, 0, WELCOME_STRING);
-        newtPushHelpLine
-            (_("   Please specify the level of compression that you want."));
-        //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
-        newtCenteredWindow(34, 13, _("How much compression?"));
-        b1 = newtButton(4, 1, _("Maximum"));
-        b2 = newtButton(18, 1, _("Average"));
-        b3 = newtButton(4, 5, _("Minimum"));
-        b4 = newtButton(18, 5, _(" None  "));
-        b5 = newtButton(4, 9, _("         Exit        "));
-        myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, b1, b3, b2, b4, b5, NULL);
-        b_res = newtRunForm(myForm);
-        newtFormDestroy(myForm);
-        newtPopWindow();
-        if (b_res == b1) {
-            output = 9;
-        } else if (b_res == b2) {
-            output = 4;
-        } else if (b_res == b3) {
-            output = 1;
-        } else if (b_res == b4) {
-            output = 0;
-        } else if (b_res == b5) {
-            output = -1;
-        }
-        newtPopHelpLine();
-        return (output);
-    }
+int which_compression_level(void) {
+
+    /*@ char ************************************************************ */
+    int output = none;
+
+    /*@ newt ************************************************************ */
+    newtComponent b1;
+    newtComponent b2;
+    newtComponent b3;
+    newtComponent b4;
+    newtComponent b5;
+    newtComponent b_res;
+    newtComponent myForm;
+
+    newtDrawRootText(18, 0, WELCOME_STRING);
+    newtPushHelpLine
+        (_("   Please specify the level of compression that you want."));
+    //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
+    newtCenteredWindow(34, 13, _("How much compression?"));
+    b1 = newtButton(4, 1, _("Maximum"));
+    b2 = newtButton(18, 1, _("Average"));
+    b3 = newtButton(4, 5, _("Minimum"));
+    b4 = newtButton(18, 5, _(" None  "));
+    b5 = newtButton(4, 9, _("         Exit        "));
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, b1, b3, b2, b4, b5, NULL);
+    b_res = newtRunForm(myForm);
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    if (b_res == b1) {
+        output = 9;
+    } else if (b_res == b2) {
+        output = 4;
+    } else if (b_res == b3) {
+        output = 1;
+    } else if (b_res == b4) {
+        output = 0;
+    } else if (b_res == b5) {
+        output = -1;
+    }
+    newtPopHelpLine();
+    return (output);
+}
 
 
@@ -1338 +1294 @@
  * @param source_file The file containing a list of filenames to load into @p filelist.
  */
-    int load_filelist_into_array(struct s_filelist *filelist,
+int load_filelist_into_array(struct s_filelist *filelist,
                                  char *source_file) {
-        int i;
-        bool done;
+    int i;
+    bool done;
+    char *tmp = NULL;
+    size_t n = 0;
+    FILE *fin = NULL;
+    struct s_filelist_entry dummy_fle;
         char *reason = NULL;
-        char *tmp = NULL;
-        size_t n = 0;
-        FILE *fin;
-        struct s_filelist_entry dummy_fle;
-
-        assert(filelist != NULL);
-        assert_string_is_neither_NULL_nor_zerolength(source_file);
-
-        iamhere("entering");
-        if (!(fin = fopen(source_file, "r"))) {
-            log_OS_error(source_file);
-            mr_msg(2, "Can't open %s; therefore, cannot popup list",
-                    source_file);
-            return (1);
-        }
-        mr_msg(2, "Loading %s", source_file);
-        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
-             filelist->entries++) {
+
+    assert(filelist != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(source_file);
+
+    iamhere("entering");
+    if (!(fin = fopen(source_file, "r"))) {
+        log_OS_error(source_file);
+        mr_msg(2, "Can't open %s; therefore, cannot popup list",
+                source_file);
+        return (1);
+    }
+    mr_msg(2, "Loading %s", source_file);
+    for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
+         filelist->entries++) {
+        if (feof(fin)) {
+            break;
+        }
+        mr_getline(&tmp, &n, fin);
+        i = (int) strlen(tmp);
+        if (i < 2) {
             if (feof(fin)) {
                 break;
             }
-            mr_getline(&tmp, &n, fin);
-            i = (int) strlen(tmp);
-            if (i < 2) {
-                if (feof(fin)) {
-                    break;
-                }
-            }
-            if (tmp[i - 1] < 32) {
-                tmp[--i] = '\0';
-            }
-            if (i < 2) {
-                if (feof(fin)) {
-                    break;
-                }
-            }
-            if (!does_file_exist(tmp)) {
-                if (feof(fin)) {
-                    break;
-                }
-            }
-            filelist->el[filelist->entries].severity =
-                severity_of_difference(tmp, reason);
-            mr_free(reason);
-            strcpy(filelist->el[filelist->entries].filename, tmp);
+        }
+        if (tmp[i - 1] < 32) {
+            tmp[--i] = '\0';
+        }
+        if (i < 2) {
             if (feof(fin)) {
                 break;
             }
         }
-        paranoid_fclose(fin);
-        if (filelist->entries >= ARBITRARY_MAXIMUM) {
-            log_to_screen(_("Arbitrary limits suck, man!"));
-            mr_free(tmp);
-            return (1);
-        }
-        mr_free(tmp);
-
-        for (done = FALSE; !done;) {
-            done = TRUE;
-            for (i = 0; i < filelist->entries - 1; i++) {
-//          if (strcmp(filelist->el[i].filename, filelist->el[i+1].filename) > 0)
-                if (filelist->el[i].severity < filelist->el[i + 1].severity
-                    || (filelist->el[i].severity ==
-                        filelist->el[i + 1].severity
-                        && strcmp(filelist->el[i].filename,
-                                  filelist->el[i + 1].filename) > 0)) {
-                    memcpy((void *) &dummy_fle,
-                           (void *) &(filelist->el[i]),
-                           sizeof(struct s_filelist_entry));
-                    memcpy((void *) &(filelist->el[i]),
-                           (void *) &(filelist->el[i + 1]),
-                           sizeof(struct s_filelist_entry));
-                    memcpy((void *) &(filelist->el[i + 1]),
-                           (void *) &dummy_fle,
-                           sizeof(struct s_filelist_entry));
-                    mr_msg(2, "Swapping %s and %s",
-                            filelist->el[i].filename,
-                            filelist->el[i + 1].filename);
-                    done = FALSE;
-                }
-            }
-        }
-        iamhere("leaving");
-        return (0);
-    }
-
+        if (!does_file_exist(tmp)) {
+            if (feof(fin)) {
+                break;
+            }
+        }
+        filelist->el[filelist->entries].severity =
+            severity_of_difference(tmp, reason);
+        mr_free(reason);
+        strcpy(filelist->el[filelist->entries].filename, tmp);
+        if (feof(fin)) {
+            break;
+        }
+    }
+    mr_free(tmp);
+
+    paranoid_fclose(fin);
+    if (filelist->entries >= ARBITRARY_MAXIMUM) {
+        log_to_screen(_("Arbitrary limits suck, man!"));
+        return (1);
+    }
+    for (done = FALSE; !done;) {
+        done = TRUE;
+        for (i = 0; i < filelist->entries - 1; i++) {
+            if (filelist->el[i].severity < filelist->el[i + 1].severity
+                || (filelist->el[i].severity ==
+                    filelist->el[i + 1].severity
+                    && strcmp(filelist->el[i].filename,
+                              filelist->el[i + 1].filename) > 0)) {
+                memcpy((void *) &dummy_fle,
+                       (void *) &(filelist->el[i]),
+                       sizeof(struct s_filelist_entry));
+                memcpy((void *) &(filelist->el[i]),
+                       (void *) &(filelist->el[i + 1]),
+                       sizeof(struct s_filelist_entry));
+                memcpy((void *) &(filelist->el[i + 1]),
+                       (void *) &dummy_fle,
+                       sizeof(struct s_filelist_entry));
+                mr_msg(2, "Swapping %s and %s",
+                        filelist->el[i].filename,
+                        filelist->el[i + 1].filename);
+                done = FALSE;
+            }
+        }
+    }
+    iamhere("leaving");
+    return (0);
+}
 
 
@@ -1437 +1390 @@
  * @note The returned value points to static storage that will be overwritten with each call.
  */
-    char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
-        char *comment;
-
-        iamhere("entering");
-        assert(flentry != NULL);
-        if (flentry->severity == 0) {
-            mr_asprintf(&comment, "0     %93s", flentry->filename);
-        } else if (flentry->severity == 1) {
-            mr_asprintf(&comment, "low   %93s", flentry->filename);
-        } else if (flentry->severity == 2) {
-            mr_asprintf(&comment, "med   %93s", flentry->filename);
-        } else {
-            mr_asprintf(&comment, "high  %93s", flentry->filename);
-        }
-        iamhere("leaving");
-        return (comment);
-    }
-
-
-
+char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
+    char *comment = NULL;
+
+    iamhere("entering");
+    assert(flentry != NULL);
+    if (flentry->severity == 0) {
+        mr_asprintf(&comment, "0     %93s", flentry->filename);
+    } else if (flentry->severity == 1) {
+        mr_asprintf(&comment, "low   %93s", flentry->filename);
+    } else if (flentry->severity == 2) {
+        mr_asprintf(&comment, "med   %93s", flentry->filename);
+    } else {
+        mr_asprintf(&comment, "high  %93s", flentry->filename);
+    }
+    iamhere("leaving");
+    return(comment);
+}
 
 
@@ -1474 +1424 @@
 
         /*@ ???? ************************************************************ */
-        void *curr_choice;
+        void *curr_choice = NULL;
         void *keylist[ARBITRARY_MAXIMUM];
 
@@ -1482 +1432 @@
 
         /*@ long ************************************************************ */
-        long i = 0;
-        long lng = 0;
+        long i = 0L;
+        long lng = 0L;
 
         /*@ buffers ********************************************************* */
-        char *tmp;
-        char *differ_sz;
-
-        struct s_filelist *filelist;
+        char *tmp = NULL;
+        char *differ_sz = NULL;
+        struct s_filelist *filelist = NULL;
+
         assert_string_is_neither_NULL_nor_zerolength(source_file);
         if (g_text_mode) {
@@ -1563 +1513 @@
                         popup_and_OK(tmp);
                         mr_free(tmp);
-                        mr_free(reason);
                     }
                 }
@@ -1571 +1520 @@
         newtPopWindow();
         newtPopHelpLine();
+        return;
     }