Changeset 1161 in MondoRescue

Timestamp:

Feb 14, 2007, 1:13:49 PM (18 years ago)

Author:

Bruno Cornec

Message:

Update trunk with the latest feedback from stable (obtained with meld) - First pass

Location:

trunk/mondo/src/common

Files:

• libmondo-archive.c (modified) (75 diffs)
• libmondo-devices.c (modified) (28 diffs)
• libmondo-fifo.c (modified) (3 diffs)
• libmondo-filelist.c (modified) (13 diffs)
• libmondo-files.c (modified) (11 diffs)
• libmondo-fork.c (modified) (5 diffs)
• libmondo-mountlist.c (modified) (1 diff)

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

@@ -13 +13 @@
 #include <sys/ipc.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <unistd.h>
 
@@ -19 +20 @@
 #include "mr_conf.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 #include "mr_err.h"
 #include "mr_str.h"
@@ -207 +209 @@
     unsigned int res = 0;
     int tries = 0;
-    char *command;
-    char *tmp;
-    char *p;
+    char *command = NULL;
+    char *tmp = NULL;
+    char *p =NULL;
+    char *tmp1 = NULL;
 
     if (!does_file_exist(filelist)) {
@@ -330 +333 @@
         log_to_screen(tmp);
         mr_free(tmp);
-            return (1);
+        return (1);
     }
     mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
@@ -349 +352 @@
             zipparams = tmp1;
         } else {
-            mr_asprintf(&zipparams, " ");
             mr_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
@@ -440 +442 @@
 {
     int retval = 0, res = 0;
-    char *tmp;
+    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
     set_g_cdrom_and_g_dvd_to_bkpinfo_value(bkpinfo);
+
     if (bkpinfo->backup_media_type == dvd) {
 #ifdef DVDRWFORMAT
@@ -468 +471 @@
     }
 
-/*
-      mr_asprintf(&tmp, "wc -l %s/archives/filelist.full > %s/archives/filelist.count",bkpinfo->scratchdir, bkpinfo->scratchdir);
-      if (run_program_and_log_output(tmp, 2))
-        { fatal_error("Failed to count filelist.full"); }
-*/
     mr_asprintf(&tmp, "gzip -9 %s/archives/filelist.full",
              bkpinfo->scratchdir);
@@ -507 +505 @@
     run_program_and_log_output(tmp, 1);
     mr_free(tmp);
+    retval += make_those_afios_phase(bkpinfo);  // backup regular files
     retval += make_those_slices_phase(bkpinfo); // backup BIG files
     retval += do_that_final_phase(bkpinfo); // clean up
@@ -577 +576 @@
 
     mr_asprintf(&tmp,
-             "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
-             bkpinfo->exclude_paths);
+            "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
+            bkpinfo->exclude_paths);
+
     devs_to_exclude = call_program_and_get_last_line_of_output(tmp);
     mr_free(tmp);
+
     mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
     mr_msg(2, tmp);
@@ -596 +597 @@
     }
     lines_in_filelist = count_lines_in_file(tmp);
-    mr_free(tmp);
-    mr_asprintf(&tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
     last_filelist_number = last_line_of_file(tmp);
     mr_free(tmp);
+
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size[1]);
@@ -675 +675 @@
         if (bkpinfo->boot_loader != '\0') {
             mr_asprintf(&tmp, "User specified boot loader. It is '%c'.",
-                     bkpinfo->boot_loader);
+                    bkpinfo->boot_loader);
             mr_msg(2, tmp);
             mr_free(tmp);
@@ -683 +683 @@
         if (bkpinfo->boot_device != NULL) {
             mr_asprintf(&tmp, "User specified boot device. It is '%s'.",
-                     bkpinfo->boot_device);
+                    bkpinfo->boot_device);
             mr_msg(2, tmp);
             mr_free(tmp);
@@ -757 +757 @@
     }
     mr_asprintf(&tmp, "Your boot loader is %s and it boots from %s",
-             bootldr_str, bkpinfo->boot_device);
+            bootldr_str, bkpinfo->boot_device);
     log_to_screen(tmp);
     mr_free(tmp);
@@ -780 +780 @@
         log_OS_error("Unable to make mnt floppy directory");
     }
+    mr_free(command);
 
     /* Prepare interface with mindi through a configuration file
@@ -927 +928 @@
     mr_msg(2, command);
 
-
     res = run_program_and_log_to_screen(command, "Generating boot+data disks");
     mr_free(command);
@@ -941 +941 @@
 
         mr_asprintf(&command,
-                 "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
-                 bkpinfo->scratchdir);
+                "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
+                bkpinfo->scratchdir);
         mr_msg(2, command);
         run_program_and_log_output(command, FALSE);
@@ -949 +949 @@
         if (bkpinfo->nonbootable_backup) {
             mr_asprintf(&command, "cp -f %s/all.tar.gz %s/images",
-                     bkpinfo->tmpdir, bkpinfo->scratchdir);
+                    bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
                 fatal_error("Unable to create temporary duff tarball");
-                mr_free(command);
-            }
-        }
+            }
+            mr_free(command);
+            
+        }
+/*
         mr_asprintf(&command, "cp -f %s/mindi-*oot*.img %s/images",
                  bkpinfo->tmpdir, bkpinfo->scratchdir);
@@ -960 +962 @@
         run_program_and_log_output(command, FALSE);
         mr_free(command);
-
+*/
         mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
                  bkpinfo->scratchdir, bkpinfo->tmpdir);
@@ -1032 +1034 @@
 
     struct s_bkpinfo *bkpinfo;
-    char *tmp;
+    char *tmp = NULL;
     int res = 0, retval = 0;
     int *p_archival_threads_running;
@@ -1115 +1117 @@
                 this_thread_no, archiving_set_no);
         res = archive_this_fileset(bkpinfo, archiving_filelist_fname,
-                                   archiving_afioball_fname,
-                                   archiving_set_no);
+                                 archiving_afioball_fname,
+                                 archiving_set_no);
         mr_free(archiving_afioball_fname);
         mr_free(archiving_filelist_fname);
@@ -1157 +1159 @@
             this_thread_no);
     mr_free(archiving_filelist_fname);
+    mr_free(archiving_afioball_fname);
     pthread_exit(NULL);
 }
@@ -1276 +1279 @@
     paranoid_system(command);
     mr_free(command);
+
     wipe_archives(bkpinfo->scratchdir);
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -1309 +1313 @@
 
     /*@ buffers *********************************************************** */
-    char *command;
+    char *command = NULL;
     char *tempfile;
 
@@ -1334 +1338 @@
 /* if not Debian then go ahead & use fdformat */
     tempfile = call_program_and_get_last_line_of_output("mktemp -q /tmp/mondo.XXXXXXXX");
-    mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile,
-             tempfile, tempfile);
+    mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile, tempfile);
     mr_msg(3, command);
     open_evalcall_form(title);
@@ -1395 +1398 @@
     char *title;
 
-
     assert_string_is_neither_NULL_nor_zerolength(device);
+
     if (!system("which superformat > /dev/null 2> /dev/null")) {
         mr_asprintf(&command, "superformat %s", device);
@@ -1441 +1444 @@
     }
 }
+
 
 /**
@@ -1480 +1484 @@
     char *storing_filelist_fname;
     char *storing_afioball_fname;
-    char *tmp;
+    char *tmp = NULL;
     char *media_usage_comment;
     pthread_t archival_thread[ARCH_THREADS];
@@ -1714 +1718 @@
 
     /*@ buffers ****************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *old_pwd;
-    char *result_sz;
-    char *message_to_screen;
-    char *sz_blank_disk;
-    char *tmp2;
-    char *tmp3;
+    char *result_sz = NULL;
+    char *message_to_screen = NULL;
+    char *sz_blank_disk = NULL;
+    char *tmp2 = NULL;
+    char *tmp3 = NULL;
     bool cd_is_mountable;
 
@@ -1757 +1761 @@
     if (bkpinfo->call_before_iso != NULL) {
         mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
-                 g_current_media_number);
+                g_current_media_number);
         res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_before_iso,
-                                    destfile, g_current_media_number,
-                                    MONDO_LOGFILE, message_to_screen);
+                                destfile, g_current_media_number,
+                                MONDO_LOGFILE, message_to_screen);
         if (res) {
             log_to_screen("%s...failed", message_to_screen);
@@ -1772 +1776 @@
     if (bkpinfo->call_make_iso != NULL) {
         mr_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
+/* Useless ?
         mr_asprintf(&tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
+*/
         mr_asprintf(&message_to_screen, "Making an ISO (%s #%d)",
                  bkpinfo->backup_media_string,
@@ -1930 +1936 @@
             }
         }
+        mr_free(message_to_screen);
         if (res) {
             log_to_screen("%s...failed", result_sz);
@@ -1936 +1943 @@
         }
         retval += res;
-        mr_free(message_to_screen);
         mr_free(result_sz);
     }
@@ -2037 +2043 @@
 
     /*@ pointers ******************************************* */
-    FILE *fin;
-    char *p;
+    FILE *fin = NULL;
+    char *p = NULL;
 
     /*@ buffers ******************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *bigfile_fname = NULL;
-    char *sz_devfile;
+    char *sz_devfile = NULL;
     char *ntfsprog_fifo = NULL;
     /*@ long *********************************************** */
@@ -2100 +2106 @@
             ftmp = fopen(bigfile_fname, "w");
             paranoid_fclose(ftmp);
-            mr_asprintf(&tmp, "bigfile %s was deleted - creating a dummy",
-                     bigfile_fname);
             delete_when_done = TRUE;
         } else {
@@ -2116 +2120 @@
                 mr_asprintf(&sz_devfile, "%s/%d.%d.000",
                         bkpinfo->tmpdir,
-                         (int) (random() % 32768),
-                         (int) (random() % 32768));
+                        (int) (random() % 32768),
+                        (int) (random() % 32768));
                 mkfifo(sz_devfile, 0x770);
                 ntfsprog_fifo = sz_devfile;
@@ -2128 +2132 @@
                             bigfile_fname, sz_devfile);
                     res = feed_into_ntfsprog(bigfile_fname, sz_devfile);
+                    mr_free(sz_devfile);
                     exit(res);
                     break;
@@ -2134 +2139 @@
                             "feed_into_ntfsprog() called in background --- pid=%ld",
                             (long int) (pid));
-
                     mr_free(sz_devfile);
+                    break;
                 }
             }
@@ -2144 +2149 @@
 
             // Whether partition or biggiefile, just do your thang :-)
-            mr_msg(2, "Bigfile #%ld is '%s' (%ld KB)",
+            mr_msg(5, "Bigfile #%ld is '%s' (%ld KB)",
                     biggie_file_number + 1, bigfile_fname,
                     (long) biggie_fsize >> 10);
@@ -2174 +2179 @@
                 mr_asprintf(&tmp, "Archiving %s ... OK!", bigfile_fname);
             }
-
+            mr_msg(4,tmp);
+            mr_free(tmp);
             if (delete_when_done) {
                 unlink(bigfile_fname);
@@ -2180 +2186 @@
             }
         }
-#ifndef _XWIN
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
             newtRefresh();
         }
-#endif
-    }
-    mr_free(tmp);
+    }
     mr_free(bigfile_fname);
     paranoid_fclose(fin);
@@ -2212 +2215 @@
 
     /*@ buffers ********************************************** */
-    char *curr_filelist_fname;
-    char *curr_afioball_fname;
-    char *curr_xattr_list_fname;
-    char *curr_acl_list_fname;
-    char *tmp;
-    char *media_usage_comment;
+    char *curr_filelist_fname = NULL;
+    char *curr_afioball_fname = NULL;
+    char *curr_xattr_list_fname = NULL;
+    char *curr_acl_list_fname = NULL;
+    char *media_usage_comment = NULL;
+    char *tmp = NULL;
 
     /* BERLIOS: Useless ?
@@ -2254 +2257 @@
         mr_msg(1, "Archiving set %ld", curr_set_no);
         res = archive_this_fileset(bkpinfo, curr_filelist_fname,
-                                   curr_afioball_fname, curr_set_no);
+                                 curr_afioball_fname, curr_set_no);
         retval += res;
         if (res) {
@@ -2399 +2402 @@
 
     /*@ buffers ************************************************** */
-    char *biggielist;
-    char *command;
-    char *blah;
-    char *xattr_fname;
-    char *acl_fname;
+    char *biggielist = NULL;
+    char *command = NULL;
+    char *blah = NULL;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
 
     assert(bkpinfo != NULL);
@@ -2419 +2422 @@
 
     mr_asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
-             biggielist);
+            biggielist);
     paranoid_system(command);
     mr_free(command);
@@ -2515 +2518 @@
 
     /*@ buffers ******************************************************** */
-    char *tmp, *curr_file, *cf;
+    char *tmp = NULL;
+    char *curr_file = NULL;
+    char *cf = NULL;
 
     /*@ long ************************************************************ */
@@ -2528 +2533 @@
             continue;
         }
-        mr_asprintf(&curr_file, "%s", cf);
+        mr_asprintf(&curr_file, cf);
         if (!does_file_exist(curr_file)) {
             mr_msg(1,
@@ -2558 +2563 @@
             continue;
         }
-        mr_asprintf(&curr_file, "%s", cf);
+        mr_asprintf(&curr_file, cf);
 
         mr_asprintf(&tmp, "mv -f %s %s/archives/", curr_file,
@@ -2600 +2605 @@
 {
     /*@ buffer ************************************************************ */
-    char *tmp;
-    char *comment;
-    char *bootdisk_dev;
-    char *datadisk_dev;
-    char *bootdisk_file;
-    char *rootdisk_file;
+    char *tmp = NULL;
+    char *comment = NULL;
+    char *bootdisk_dev =NULL;
+    char *datadisk_dev = NULL;
+    char *bootdisk_file = NULL;
+    char *rootdisk_file = NULL;
 
     /*@ int *************************************************************** */
@@ -2617 +2622 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(imagesdir);
-
 
     if (!ask_me_yes_or_no
@@ -2628 +2632 @@
         system("/usr/sbin/fdcontrol -F 1722 /dev/fd0.1722");
 #endif
-        mr_asprintf(&bootdisk_dev, "%s", DEFAULT_1722MB_DISK);
+        mr_asprintf(&bootdisk_dev, DEFAULT_1722MB_DISK);
     } else if (does_device_exist(BACKUP_1722MB_DISK)) {
         mr_asprintf(&bootdisk_dev, "/dev/fd0H1722");
@@ -2635 +2639 @@
         mr_asprintf(&bootdisk_dev, DEFAULT_1722MB_DISK);
     }
-    mr_asprintf(&datadisk_dev, "%s", "/dev/fd0");
+    mr_asprintf(&datadisk_dev, "/dev/fd0");
     if (!does_device_exist(datadisk_dev)) {
         mr_msg(1, "Warning - can't find a 1.44MB floppy device *sigh*");
-        mr_free(datadisk_dev);
-        mr_asprintf(&datadisk_dev, "%s", "/dev/fd0");
     }
     format_first = ask_me_yes_or_no
         ("Do you want me to format the disks before I write to them?");
 
-/* boot disk */
+    /* boot disk */
     if (ask_me_OK_or_cancel("About to write boot disk")) {
         log_to_screen("Writing boot floppy");
@@ -2705 +2707 @@
             }
             mr_free(rootdisk_file);
-            mr_free(bootdisk_file);
-        }
+            
+        }
+        mr_free(bootdisk_file);
 #endif
     }
@@ -2734 +2737 @@
             res += write_image_to_floppy(datadisk_dev, tmp);
         }
-    }
+        mr_free(tmp);
+    }
+    /* In case of break free mem as well */
     mr_free(tmp);
     mr_free(datadisk_dev);
@@ -2751 +2756 @@
  */
 
-int
-offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo *bkpinfo)
-{
+int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo *bkpinfo) {
+    
     int res = 0;
 
@@ -2827 +2831 @@
     char start_chr;
     char stop_chr;
-    char *curr_file, *cf;
+    char *curr_file = NULL;
+    char *cf = NULL;
     /*@ long long ****************************************************** */
     off_t length_of_incoming_file = (off_t)0;
@@ -2839 +2844 @@
             continue;
         }
-        mr_asprintf(&curr_file, "%s", cf);
+        mr_asprintf(&curr_file, cf);
         if (!does_file_exist(curr_file)) {
             mr_msg(1,
@@ -3115 +3120 @@
 
     /*@ buffers ************************************************** */
-    char *tmp, *checksum_line = NULL, *command;
-    char *tempblock;
-    char *curr_slice_fname_uncompressed;
-    char *curr_slice_fname_compressed;
-    char *file_to_archive;
-    char *file_to_openin;
+    char *tmp = NULL;
+    char *checksum_line = NULL;
+    char *command = NULL;
+    char *tempblock = NULL;
+    char *curr_slice_fname_uncompressed = NULL;
+    char *curr_slice_fname_compressed = NULL;
+    char *file_to_archive = NULL;
+    char *file_to_openin = NULL;
     /*@ pointers ************************************************** */
-    char *pB;
-    FILE *fin, *fout;
+    char *pB = NULL;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
 
     /*@ bool ****************************************************** */
@@ -3134 +3142 @@
     long optimal_set_size;
     bool should_I_compress_slices;
-    char *suffix;               // for compressed slices
+    char *suffix = NULL;                // for compressed slices
 
     /*@ long long ************************************************** */
@@ -3158 +3166 @@
     if (is_this_file_compressed(biggie_filename)
         || bkpinfo->compression_level == 0) {
-        mr_asprintf(&suffix, "%s", "");
+        mr_asprintf(&suffix, "");
         //      log_it("%s is indeed compressed :-)", filename);
         should_I_compress_slices = FALSE;
     } else {
-        mr_asprintf(&suffix, "%s", bkpinfo->zip_suffix);
+        mr_asprintf(&suffix, bkpinfo->zip_suffix);
         should_I_compress_slices = TRUE;
     }
@@ -3199 +3207 @@
             log_OS_error("Unable to popen-in command");
             mr_free(command);
+            mr_free(suffix);
             return (1);
         }
@@ -3207 +3216 @@
     }
     lstat(biggie_filename, &biggiestruct.properties);
-    if (strlen(checksum_line) <= MAX_STR_LEN) {
+    if (strlen(biggie_filename) <= MAX_STR_LEN) {
         strcpy(biggiestruct.filename, biggie_filename);
     } else {
@@ -3229 +3238 @@
     fout = fopen(tmp, "w");
     mr_free(tmp);
+
     (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
     paranoid_fclose(fout);
@@ -3240 +3250 @@
         log_to_screen(tmp);
         mr_free(tmp);
-
         mr_free(suffix);
         return (1);
@@ -3262 +3271 @@
         if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {
             log_OS_error(curr_slice_fname_uncompressed);
-
             mr_free(curr_slice_fname_uncompressed);
             mr_free(curr_slice_fname_compressed);
@@ -3268 +3276 @@
             return (1);
         }
-        if (!(tempblock = (char *) malloc(256 * 1024))) {
-            fatal_error("malloc error 256*1024");
-        }
+        tempblock = mr_malloc(256 * 1024);
         if ((i == bkpinfo->optimal_set_size / 256)
             && (totalread < 1.1 * totallength)) {
@@ -3279 +3285 @@
                     (void) fwrite(tempblock, 1, blksize, fout);
                 } else {
+                    mr_free(tempblock);
+                    mr_free(curr_slice_fname_uncompressed);
+                    mr_free(curr_slice_fname_compressed);
                     break;
                 }
@@ -3302 +3311 @@
                     log_OS_error(command);
                 }
-                //              did_I_compress_slice = TRUE;
+                mr_free(command);
+                //          did_I_compress_slice = TRUE;
             } else {
                 /* BERLIOS: Useless 
@@ -3310 +3320 @@
                  */
                 res = 0;        // don't do it :)
-                //              did_I_compress_slice = FALSE;
+                //          did_I_compress_slice = FALSE;
             }
             retval += res;
@@ -3329 +3339 @@
                          slice_num);
             }
-#ifndef _XWIN
             if (!g_text_mode) {
                 newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -3336 +3345 @@
                 mr_msg(2, tmp);
             }
-#else
-            mr_msg(2, tmp);
-#endif
             mr_free(tmp);
-            mr_asprintf(&file_to_archive, "%s", curr_slice_fname_compressed);
+            mr_asprintf(&file_to_archive, curr_slice_fname_compressed);
             g_current_progress++;
         } else {                /* if i==0 then ... */
 
             finished = TRUE;
-            mr_asprintf(&file_to_archive, "%s",
-                     curr_slice_fname_uncompressed);
+            mr_asprintf(&file_to_archive, curr_slice_fname_uncompressed);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                 break;
@@ -3405 +3410 @@
 {
     /*@ buffers ********************************************* */
-    char *tmp;
-    char *dir;
+    char *tmp = NULL;
+    char *dir = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(d);
@@ -3461 +3466 @@
 
     /*@ buffers ************************************************** */
-    char *tmp;
+    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
@@ -3634 +3639 @@
         }
     }
-/*
-  if (using_nfs)
-    {
-      mr_asprintf(&tmp,"mv -f %s %s/%s/", isofile, bkpinfo->isodir, bkpinfo->nfs_remote_dir);
-      if (run_program_and_log_output(tmp, FALSE))
-        { log_to_screen("Unable to move ISO to NFS dir"); }
-    }
-*/
     mr_free(isofile);
 
@@ -3684 +3681 @@
 {
     int res = 0, retval = 0, cdno = 0;
-    char *tmp;
+    char *tmp = NULL;
     long diffs = 0;
 
@@ -3869 +3866 @@
 /* @} - end of utilityGroup */
 
-void setenv_mondo_share(void) {
-
-setenv("MONDO_SHARE", MONDO_SHARE, 1);
-setenv("MONDORESTORECFG", MONDORESTORECFG, 1);
-setenv("MONDO_CACHE", MONDO_CACHE, 1);
+void setenv_mondo_var(void) {
+
+    char *tmp = NULL;
+    char *p = NULL;
+    char *path_min = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin";
+
+    mr_setenv("MONDO_SHARE",MONDO_SHARE);
+    mr_setenv("MONDORESTORECFG",MONDORESTORECFG);
+    mr_setenv("MONDO_CACHE",MONDO_CACHE);
+
+    if ((p = getenv("PATH")) == NULL) {
+        mr_asprintf(&p,path_min);
+    }
+    mr_asprintf(&tmp, "%s:%s",p, path_min);
+    mr_free(p);
+    mr_setenv("PATH",tmp);
+    mr_free(tmp);
 }
 

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

@@ -18 +18 @@
 #include "libmondo-stream-EXT.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 
 #include <sys/ioctl.h>
@@ -169 +170 @@
 bool am_I_in_disaster_recovery_mode(void)
 {
-    char *tmp, *comment;
+    char *tmp = NULL;
+    char *comment = NULL;
     bool is_this_a_ramdisk = FALSE;
 
@@ -219 +221 @@
  * @ingroup stringGroup
  */
-char *bkptype_to_string(t_bkptype bt)
+static char *bkptype_to_string(t_bkptype bt)
 {
     char *output = NULL;
-
-    mr_free(output);
 
     switch (bt) {
@@ -250 +250 @@
         mr_asprintf(&output, _("udev"));
         break;
+    case usb:
+        mr_asprintf(&output, _("usb"));
+        break;
     default:
         mr_asprintf(&output, _("default"));
@@ -268 +271 @@
 int eject_device(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int res1 = 0, res2 = 0;
 
@@ -309 +312 @@
 int inject_device(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int i;
 
@@ -337 +340 @@
 
     /*@ buffers *********************************************************** */
-    char *tmp;
-    bool ret;
+    char *tmp = NULL;
+    bool ret = FALSE;
 
     assert_string_is_neither_NULL_nor_zerolength(device);
@@ -380 +383 @@
 {
     /*@ buffers **************************************************** */
-    char *program;
+    char *program = NULL;
     char *incoming = NULL;
-    char *searchstr;
-    char *tmp;
+    char *searchstr = NULL;
+    char *tmp = NULL;
 
     /*@ ints ******************************************************* */
@@ -444 +447 @@
 {
     /*@ buffers **************************************************** */
-    char *command;
+    char *command = NULL;
 
     /*@ end vars *************************************************** */
@@ -475 +478 @@
 {
     /*@ buffers **************************************************** */
-    char *command;
+    char *command = NULL;
     /*@ end vars *************************************************** */
     int ret;
@@ -1148 +1151 @@
     /*@ buffers ***************************************************** */
     char *incoming = NULL;
-    char *device_with_tab;
-    char *device_with_space;
-    char *tmp;
+    char *device_with_tab = NULL;
+    char *device_with_space = NULL;
+    char *tmp = NULL;
     size_t n = 0;
 
@@ -1190 +1193 @@
         {
             paranoid_pclose(fin);
+            mr_free(incoming);
             return(TRUE);
         }
@@ -1232 +1236 @@
             mr_free(mddevice);
             mr_asprintf(&mddevice, "vn%ic", vndev++);
-
             mr_free(command);
             mr_asprintf(&command, "vnconfig %s %s", mddevice, fname);
@@ -1281 +1284 @@
          ("/sbin/sysctl -n kern.osreldate")) < 500000) {
         mr_asprintf(&command, "vnconfig -d %s", dname);
-        ret = system(command);
-        mr_free(command);
-        return(ret);
     } else {
         mr_asprintf(&command, "mdconfig -d -u %s", dname);
-        ret = system(command);
-        mr_free(command);
-        return(ret);
-    }
-     /*NOTREACHED*/ return 255;
+    }
+    ret = system(command);
+    mr_free(command);
+    return(ret);
 }
 #endif
@@ -1315 +1314 @@
 
     /*@ buffers ********************************************************* */
-    char *tmp;
-    char *request;
+    char *tmp = NULL;
+    char *request = NULL;
 
     assert(bkpinfo != NULL);
@@ -1328 +1327 @@
         return;
     }
-
     mr_asprintf(&tmp, "mkdir -p " MNT_CDROM);
     run_program_and_log_output(tmp, 5);
@@ -1708 +1706 @@
             mr_asprintf(&comment,
                     _("How much data (in Megabytes) will each media store?"));
-            if (!popup_and_get_string(_("Size"), comment, sz_size)) {
+            if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
                 log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
+            mr_free(comment);
             for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
                 bkpinfo->media_size[i] = atoi(sz_size);
@@ -1719 +1718 @@
                 finish(1);
             }
-            mr_free(comment);
         }
         if (bkpinfo->disaster_recovery) {
@@ -1769 +1767 @@
 
             mr_free(command);
-            mr_asprintf(&command, "echo hi > %s/%s/.dummy.txt",
-                     bkpinfo->isodir, bkpinfo->nfs_remote_dir);
+            mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir,
+                    bkpinfo->nfs_remote_dir);
         }
         mr_free(command);
@@ -1984 +1982 @@
     log_it("media size = %ld", bkpinfo->media_size[1]);
     log_it("media type = %s", bkpinfo->backup_media_string);
-    mr_free(tmp);
     log_it("prefix = %s", bkpinfo->prefix);
     log_it("compression = %ld", bkpinfo->compression_level);
@@ -2021 +2018 @@
            */
 }
-
-
 /* @} - end of utilityGroup */
+
 
 /**
@@ -2034 +2030 @@
 {
     char *tmp = NULL;
-    char *command = NULL;
-    char *sz = NULL;
+    char *command = NULL;
+    char *sz = NULL;
     int i = 0;
 
@@ -2086 +2082 @@
 bool set_dev_to_this_if_rx_OK(char *output, char *dev)
 {
-    char *command;
+    char *command = NULL;
 
     mr_free(output);
@@ -2142 +2138 @@
         mr_free(mountdev);
         mr_free(tmp);
-
         return (cd_number);
     }
@@ -2200 +2195 @@
  * @note Under Linux, all drives are examined, not just @p which_device.
  */
+char which_boot_loader(char *which_device)
+{
 #ifdef __FreeBSD__
-char which_boot_loader(char *which_device)
-{
     int count_lilos = 0;
     int count_grubs = 0;
@@ -2241 +2236 @@
         return ('U');
     }
-}
-
 #else
-
-char which_boot_loader(char *which_device)
-        /* which_device is allocated here and needs to be freed by caller */
-{
     /*@ buffer ***************************************************** */
     char *list_drives_cmd;
@@ -2310 +2299 @@
         return ('U');
     }
-}
-#endif
+#endif
+}
 
 
@@ -2435 +2424 @@
     mr_free(tmp);
     mr_msg(0, "Found %s partition table format type", output);
-    return (output);
-}
-
+    return(output);
+}
 /* @} - end of deviceGroup */

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

@@ -28 +28 @@
 #include "libmondo.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 
 /**
@@ -155 +156 @@
 void kill_buffer()
 {
-    char *tmp;
-    char *command;
+    char *tmp = NULL;
+    char *command = NULL;
 
     sync();
@@ -175 +176 @@
     mr_asprintf(&command, "kill %s", tmp);
     mr_msg(2, "kill_buffer() --- command = %s", command);
-
     if (strlen(tmp) > 0) {
         run_program_and_log_output(command, TRUE);

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

@@ -19 +19 @@
 #include "mr_str.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 
 #include <time.h>
@@ -332 +333 @@
        then update_progress_form() won't show the "time taken / time remaining"
        line. The bug only crops up AFTER the call to chop_filelist(). Weird. */
-#ifndef _XWIN
     if (!g_text_mode) {
         open_progress_form("", "", "", "", 100);
@@ -339 +339 @@
         newtPopWindow();
     }
-#endif
     return (curr_set_no + 1);
 }
@@ -386 +385 @@
     }
     filelist->ch = '\0';
-    mr_free((void *)filelist);
+    mr_free(filelist);
     depth--;
     if (depth == 0) {
@@ -490 +489 @@
 {
     char *command = NULL;
-    char *tmp = NULL;
     int retval = 0;
 
@@ -542 +540 @@
     mr_asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
              (int) (random() % 32768));
+
     mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
@@ -752 +751 @@
         return (add_string_at_node(node->right, string_to_add));
     }
+
     // walk down tree if appropriate
     if (node->down != NULL && node->ch == char_to_add) {
@@ -765 +765 @@
         return (1);
     }
+
     // add here
     newnode = (struct s_node *) mr_malloc(sizeof(struct s_node));
@@ -1216 +1217 @@
 long g_skeleton_entries = 0;
 
-
 /**
  * Wrapper around mondo_makefilelist().
@@ -1234 +1234 @@
     /*@ int **************************************************** */
     int res = 0;
-    /*@ buffers ************************************************ */
 
     assert(bkpinfo != NULL);
@@ -1343 +1342 @@
         system(strtmp);
         mr_free(strtmp);
-        mr_free(tmp);
-
         mr_asprintf(&tmp, "wc -l %s | awk '{print $1;}'", skeleton_filelist);
         tmp1 = call_program_and_get_last_line_of_output(tmp);
@@ -1522 +1519 @@
     char *tmp1 = NULL;
     char *tmp2 = NULL;
-    char *sz_datefile;
+    char *sz_datefile = NULL;
     char *sz_filelist = NULL;
     char *exclude_paths = NULL;
@@ -1734 +1731 @@
     size_t len = 0;             // Scrub's patch doesn't work without that
 
-//  mr_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
     mr_msg(5, "starting");
     mr_msg(5, "needles_list_fname = %s", needles_list_fname);

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

@@ -45 +45 @@
     /*@ buffers ***************************************************** */
     static char *output = NULL;
-    char *command;
-    char *tmp;
+
+    char *command = NULL;
+    char *tmp = NULL;
     size_t n = 0;
 
@@ -94 +95 @@
 
     /*@ buffers ***************************************************** */
-    char *command;
+    char *command = NULL;
     char *incoming = NULL;
-    char *tmp;
+    char *tmp = NULL;
 
     /*@ long ******************************************************** */
@@ -207 +208 @@
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Unable to openout outfname");
+        mr_free(infname);
         mr_free(outfname);
         return;
@@ -600 +602 @@
 void register_pid(pid_t pid, char *name_str)
 {
-    char *tmp;
-    char *lockfile_fname;
+    char *tmp = NULL;
+    char *lockfile_fname = NULL;
     int res;
     size_t n = 0;
@@ -754 +756 @@
 }
 
-
 /**
  * Determine the amount of space (in KB) occupied by a mounted CD.
@@ -942 +943 @@
 {
     /*@ Char buffers ** */
-    char *command;
+    char *command = NULL;
     char *tmp;
     char old_pwd[MAX_STR_LEN];
@@ -964 +965 @@
     mr_free(command);
 
-    mr_asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
-
     /* i18n */
     mr_asprintf(&command, CP_BIN " --parents /usr/share/locale/*/LC_MESSAGES/mondo.mo %s",bkpinfo->scratchdir);
@@ -972 +971 @@
     mr_free(command);
 
+    mr_asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
     if (does_file_exist(tmp)) {
         log_it("Untarring payload %s to scratchdir %s", tmp,
@@ -1114 +1114 @@
                 "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
         mac_addr = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+
         mr_asprintf(&command,
-                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1  | cut -d' ' -f1", mac_addr);
+                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1  | cut -d' ' -f1", mac_addr, nfs_dev);
         mr_free(nfs_dev);
         nfs_dev = call_program_and_get_last_line_of_output(command);
@@ -1125 +1127 @@
 
     mr_free(nfs_dev);
-    mr_free(tmp);
-
     fd1 = mr_fopen(MONDORESTORECFG, "a");
     mr_fprintf(fd1, "nfs-dev %s\n", nfs_dev);
@@ -1266 +1266 @@
 int make_grub_install_scriptlet(char *outfile)
 {
-    FILE *fout;
-    char *tmp;
+    FILE *fout = NULL;
+    char *tmp = NULL;
     int retval = 0;
 

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

@@ -69 +69 @@
 
     /*@ buffers      *** */
-    char *midway_call, *ultimate_call, *tmp, *command,
-        *cd_number_str;
-    char *p;
+    char *midway_call, *ultimate_call, *tmp;
+    char *p = NULL; 
+    char *cd_number_str = NULL;
+    char *command = NULL;
+    
 
 /*@***********   End Variables ***************************************/
@@ -80 +82 @@
     assert_string_is_neither_NULL_nor_zerolength(isofile);
     assert_string_is_neither_NULL_nor_zerolength(logstub);
+
     midway_call = mr_malloc(1200);
     ultimate_call = mr_malloc(1200);
@@ -260 +263 @@
 
     /*@ buffers **************************************************** */
-    char *tmp;
-    char *command;
-    char *lockfile;
+    char *tmp = NULL;
+    char *command = NULL;
+    char *lockfile = NULL;
 
     /*@ end vars *************************************************** */
@@ -304 +307 @@
     res = pclose(fin);
     /* Log actual pclose errors. */
-    if (errno)
+    if (errno) {
         mr_msg(5, "pclose err: %d", errno);
+    }
     /* Check if we have a valid status. If we do, extract the called program's exit code. */
     /* If we don't, highlight this fact by returning -1. */
@@ -590 +594 @@
 
     /*@ buffers *********************************************************** */
-    char *command;
+    char *command = NULL;
     /*@ pointers ********************************************************** */
     static int chldres = 0;

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

@@ -17 +17 @@
 #include "newt-specific-EXT.h"
 #include "mr_mem.h"
-#include "mr_mem.h"
+#include "mr_msg.h"
 
 /*@unused@*/