Changeset 783 in MondoRescue for trunk/mondo/mondo/mondorestore

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

Location:

trunk/mondo/mondo/mondorestore

Files:

• Makefile.am (modified) (2 diffs)
• mondo-prep.c (modified) (23 diffs)
• mondo-restore-EXT.h (modified) (3 diffs)
• mondo-restore.c (modified) (41 diffs)
• mondo-restore.h (modified) (2 diffs)
• mondo-rstr-compare.c (modified) (7 diffs)
• mondo-rstr-newt.c (modified) (14 diffs)
• mondo-rstr-newt.h (modified) (1 diff)
• mondo-rstr-tools.c (modified) (21 diffs)

trunk/mondo/mondo/mondorestore/Makefile.am

@@ -2 +2 @@
 ## Process with Automake to generate Makefile.in
 ##
+
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/mondo/include
 
 ## Headers
@@ -12 +14 @@
 mondorestore_SOURCES  = mondo-prep.c mondo-restore.c mondo-rstr-newt.c \
                         mondo-rstr-compare.c mondo-rstr-tools.c
-mondorestore_LDADD    = ${top_builddir}/mondo/common/libmondo.a @MONDORESTORE_STATIC@
+mondorestore_LDADD    = ${top_builddir}/mondo/common/libmondo.a ${top_builddir}/mondo/lib/libmr.a @MONDORESTORE_STATIC@
+
+

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -9 +9 @@
 
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "mondoprep.h"
@@ -53 +53 @@
     char *command;
     int lino;
-    int i;
     FILE *fout;
     char *buf;
-    const int blocksize = 512;
     struct list_of_disks *drivelist = NULL;
 // If LVMs are present and a zero-and-reboot wasn't recently undertaken
 // then zero & insist on reboot.
-    buf = malloc(blocksize);
     if (does_file_exist("/tmp/i-want-my-lvm"))  // FIXME - cheating :)
     {
@@ -89 +86 @@
             log_to_screen("Please hit 'Enter' to reboot.");
             for (lino = 0; lino < drivelist->entries; lino++) {
-                for (i = 0; i < blocksize; i++) {
-                    buf[i] = 0;
-                }
-                sprintf(buf, "%s\n", MONDO_WAS_HERE);
+                asprintf(&buf, "%s\n", MONDO_WAS_HERE);
                 fout = fopen(drivelist->el[lino].device, "w+");
                 if (!fout) {
@@ -98 +92 @@
                             drivelist->el[lino].device);
                 } else {
-                    if (1 != fwrite(buf, blocksize, 1, fout)) {
+                    if (1 != fwrite(buf, strlen(buf)+1, 1, fout)) {
                         log_msg(1, "Failed to wipe %s",
                                 drivelist->el[lino].device);
@@ -107 +101 @@
                     fclose(fout);
                 }
+                paranoid_free(buf);
             }
             sync();
@@ -257 +252 @@
     for (getline(&incoming, &n1, fin); !feof(fin); getline(&incoming, &n1, fin)) {
         fgetpos(fin, &orig_pos);
-        /* BERLIOS : Strange no ? */
+        /* we want to execute lines begining with a # */
         if (incoming[0] != '#') {
             continue;
@@ -268 +263 @@
         }
         if ((p = strstr(incoming, "vgcreate"))) {
-// include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
+            // include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
             for (getline(&tmp, &n, fin); !feof(fin); getline(&tmp, &n, fin)) {
                 if (tmp[0] == '#') {
@@ -287 +282 @@
                 }
             }
-            malloc_string(tmp1);
-            strcpy(tmp1, p + strlen("vgcreate") + 1);
+            asprintf(&tmp1, p + strlen("vgcreate") + 1);
             for (q = tmp1; *q > 32; q++);
             *q = '\0';
@@ -294 +288 @@
             asprintf(&tmp, "rm -Rf /dev/%s", tmp1);
             paranoid_free(tmp1);
+
             run_program_and_log_output(tmp, 1);
             paranoid_free(tmp);
@@ -304 +299 @@
         }
         for (p = incoming + 1; *p == ' '; p++);
-        paranoid_free(command);
-        asprintf(&command, p);
+        paranoid_alloc(command,p);
         for (p = command; *p != '\0'; p++);
         for (; *(p - 1) < 32; p--);
         *p = '\0';
+
+        /* BERLIOS: we should rather define LVMv1 or v2 and use it */
         res = run_program_and_log_output(command, 5);
         if (res > 0 && (p = strstr(command, "lvm "))) {
@@ -338 +334 @@
             log_msg(5, "p='%s' --> extents=%ld", p, extents);
             paranoid_free(tmp);
+
             p = strstr(command, "-L");
             if (!p) {
@@ -349 +346 @@
                         *q = ' ';
                     }
+                    /* BERLIOS: Dangerous: no size control !! */
                     sprintf(p, "%ld", extents);
                     i = strlen(p);
@@ -359 +357 @@
                         *(q - 1) = ' ';
                     }
+                    /* BERLIOS: Dangerous: no size control !! */
                     sprintf(p, "%ld%c", extents, 'm');
                     i = strlen(p);
@@ -673 +672 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+#ifdef __FreeBSD__
     char *line = NULL;
     char *status = NULL;
@@ -679 +679 @@
     size_t n = 0;
     size_t n1 = 0;
+#endif
 
     /** end ****************************************************************/
@@ -1525 +1526 @@
             // If so, then we just call label_drive_or_slice() and return.
             char c;
+            char *command;
+
             if (current_devno == 1) {
                 // try DangerouslyDedicated mode
@@ -1538 +1541 @@
                                                  drivename,
                                                  0);
-                    char command[MAX_STR_LEN];
-                    sprintf(command, "disklabel -B %s",
+                    asprintf(&command, "disklabel -B %s",
                             basename(drivename));
                     if (system(command)) {
@@ -1546 +1548 @@
                              ("Warning! Unable to make the drive bootable."));
                     }
+                    paranoid_free(command);
                     paranoid_free(device_str);
 
@@ -2077 +2080 @@
         asprintf(&partcode, "8e");
     } else if (format[0] == '\0') { /* LVM physical partition */
-        asprintf(&partcode, "");
+        asprintf(&partcode, "%s", "");
     } else if (strlen(format) >= 1 && strlen(format) <= 2) {
         asprintf(&partcode, format);
@@ -2375 +2378 @@
 
     assert_string_is_neither_NULL_nor_zerolength(format);
-    assert(program != NULL);
 
     if (strcmp(format, "swap") == 0) {
 #ifdef __FreeBSD__
-        strcpy(program, "true");
+        asprintf(&program, "true");
 #else
-        strcpy(program, "mkswap");
+        asprintf(&program, "mkswap");
 #endif
     } else if (strcmp(format, "vfat") == 0) {
-        strcpy(program, "format-and-kludge-vfat");
+        asprintf(&program, "format-and-kludge-vfat");
 #ifndef __FreeBSD__
     } else if (strcmp(format, "reiserfs") == 0) {
-        strcpy(program, "mkreiserfs -ff");
+        asprintf(&program, "mkreiserfs -ff");
     } else if (strcmp(format, "xfs") == 0) {
-        strcpy(program, "mkfs.xfs -f -q");
+        asprintf(&program, "mkfs.xfs -f -q");
     } else if (strcmp(format, "jfs") == 0) {
-        strcpy(program, "mkfs.jfs");
+        asprintf(&program, "mkfs.jfs");
     } else if (strcmp(format, "ext3") == 0) {
-        strcpy(program, "mkfs -t ext2 -F -j -q");
+        asprintf(&program, "mkfs -t ext2 -F -j -q");
     } else if (strcmp(format, "minix") == 0) {
-        strcpy(program, "mkfs.minix");
+        asprintf(&program, "mkfs.minix");
 #endif
     } else if (strcmp(format, "ext2") == 0) {
-        strcpy(program, "mke2fs -F -q");
+        asprintf(&program, "mke2fs -F -q");
     } else {
 #ifdef __FreeBSD__
-        sprintf(program, "newfs_%s", format);
+        asprintf(&program, "newfs_%s", format);
 #else
-        sprintf(program, "mkfs -t %s -c", format);  // -c checks for bad blocks
+        asprintf(&program, "mkfs -t %s -c", format);    // -c checks for bad blocks
 #endif
         asprintf(&tmp, "Unknown format (%s) - assuming '%s' will do", format,
@@ -2504 +2506 @@
     }
 
-    /*
-       sprintf (tmp, "cp -f %s %s.pre-resize", g_mountlist_fname, g_mountlist_fname);
-       run_program_and_log_output (tmp, FALSE);
-     */
-
     current_size_of_drive = get_phys_size_of_drive(drive_name);
 
@@ -2600 +2597 @@
     assert(mountlist != NULL);
 
-    if (g_mountlist_fname[0] == '\0') {
+    if (g_mountlist_fname == NULL) {
         log_it
             ("resize_mountlist_prop...() - warning - mountlist fname is blank");
@@ -2648 +2645 @@
     if (c && strncmp(c, "/disc", 5) == 0) {
         /* yup its devfs, change the "disc" to "part" so the existing code works */
-        strcpy(c + 1, "part");
+        strncpy(c + 1, "part", (size_t)5);
     }
     drivemntlist->entries = 0;

trunk/mondo/mondo/mondorestore/mondo-restore-EXT.h

@@ -10 +10 @@
 extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
 extern bool g_I_have_just_nuked;
-extern char *g_tmpfs_mountpt;
 extern char *g_isodir_device;
 extern char *g_isodir_format;
@@ -32 +31 @@
                          struct raidlist_itself *);
 extern void sort_mountlist_by_device(struct mountlist_itself *);
-extern void find_pathname_of_executable_preferably_in_RESTORING(char *,
-                                                                char *,
-                                                                char *);
 extern int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
                             struct raidlist_itself *);
@@ -53 +49 @@
 extern int restore_a_biggiefile_from_CD(struct s_bkpinfo *, long,
                                         struct s_node *);
-extern int restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *,
-                                            long, char *, long long,
-                                            struct s_node *);
+extern char *restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *,
+                                            long, struct s_node *, int);
 extern int restore_a_tarball_from_CD(char *, int, struct s_node *);
 extern int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, int,

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

@@ -13 +13 @@
 #include <unistd.h>
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -158 +158 @@
     assert(raidlist != NULL);
     if (!bkpinfo->disaster_recovery) {
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
         log_msg(2, "I guess you're testing edit_mountlist()");
     }
@@ -310 +310 @@
 /**************************************************************************
  *END_  EXTRACT_CONFIG_FILE_FROM_RAMDISK                                  *
- **************************************************************************/
-
-
-/**
- * Locate an executable in the directory structure rooted at @p restg.
- * @param out_path Where to put the executable.
- * @param fname The basename of the executable.
- * @param restg The directory structure to look in.
- * @note If it could not be found in @p restg then @p fname is put in @p out_path.
- * @ingroup restoreUtilityGroup
- */
-void
-find_pathname_of_executable_preferably_in_RESTORING(char *out_path,
-                                                    char *fname,
-                                                    char *restg)
-{
-    assert(out_path != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(fname);
-
-    sprintf(out_path, "%s/sbin/%s", restg, fname);
-    if (does_file_exist(out_path)) {
-        sprintf(out_path, "%s/usr/sbin/%s", restg, fname);
-        if (does_file_exist(out_path)) {
-            sprintf(out_path, "%s/bin/%s", restg, fname);
-            if (does_file_exist(out_path)) {
-                sprintf(out_path, "%s/usr/bin/%s", restg, fname);
-                if (does_file_exist(out_path)) {
-                    strcpy(out_path, fname);
-                }
-            }
-        }
-    }
-}
-
-/**************************************************************************
- *END_FIND_PATHNAME_OF_EXECUTABLE_PREFERABLY_IN_RESTORING                 *
  **************************************************************************/
 
@@ -534 +498 @@
              ask_me_yes_or_no
              (_("Do you want me to restore _some_ of your data?")))) {
-        old_restpath = bkpinfo->restore_path;
+        asprintf(&old_restpath,bkpinfo->restore_path);
         for (done = FALSE; !done;) {
             unlink("/tmp/filelist.full");
@@ -548 +512 @@
                     if (!strcmp(bkpinfo->restore_path, "/")) {
                         if (!ask_me_yes_or_no(_("Are you sure?"))) {
-                            paranoid_free(bkpinfo->restore_path);
-                            bkpinfo->restore_path = old_restpath;
+                            paranoid_alloc(bkpinfo->restore_path, old_restpath);
                             goto gotos_suck;
                         }
@@ -558 +521 @@
                     free_filelist(filelist);
                 } else {
-                    bkpinfo->restore_path = old_restpath;
+                    paranoid_alloc(bkpinfo->restore_path,old_restpath);
                     free_filelist(filelist);
                 }
@@ -569 +532 @@
             }
         }
+        paranoid_free(old_restpath);
     } else {
         mvaddstr_and_log_it(g_currentY++,
@@ -630 +594 @@
                             ("Warning - errors occurred during the restore phase."));
     }
+    return(retval);
 }
 
@@ -750 +715 @@
     bool boot_loader_installed = FALSE;
     char *tmp = NULL;
-    char tmpA[MAX_STR_LEN];
-    char tmpB[MAX_STR_LEN];
-    char tmpC[MAX_STR_LEN];
+    char *tmpA = NULL;
+    char *tmpB = NULL;
+    char *tmpC = NULL;
 
     assert(bkpinfo != NULL);
@@ -807 +772 @@
             tmp = call_program_and_get_last_line_of_output("cat /proc/cmdline");
 #endif
-            if (strstr(tmp,,"nopart")) {
+            if (strstr(tmp,"nopart")) {
                 log_msg(2,
                         "Not partitioning drives due to 'nopart' option.");
@@ -949 +914 @@
     if (filelist) {
         save_filelist(filelist, "/tmp/selected-files.txt");
-        old_restpath = bkpinfo->restore_path;
+        asprintf(&old_restpath,bkpinfo->restore_path);
         if (popup_and_get_string(_("Restore path"),
                                  _("Restore files to where? )"),
@@ -957 +922 @@
         }
         free_filelist(filelist);
-        bkpinfo->restore_path = old_restpath;
+        paranoid_alloc(bkpinfo->restore_path,old_restpath);
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1012 +977 @@
     char *bigblk = NULL;
     char *pathname_of_last_file_restored = NULL;
-    int retval = 0;
     int finished = FALSE;
     long sliceno;
@@ -1172 +1136 @@
             asprintf(&tmp3,
                     "Asking for %s #%d so that I may read slice #%ld\n",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number, sliceno);
             log_msg(2, tmp3);
@@ -1178 +1142 @@
 
             asprintf(&tmp3, _("Restoring from %s #%d"),
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(tmp3);
@@ -1198 +1162 @@
                         asprintf(&bzip2_command, "bzip2 -dc %s 2>> %s",tmp2, MONDO_LOGFILE);
                 } else if (does_file_exist(tmp)) {
-                        asprintf(&bzip2_command, "");
+                        asprintf(&bzip2_command, "%s", "");
                 } else {
                     log_to_screen(_("OK, that's pretty fsck0red..."));
@@ -1209 +1173 @@
             }
             asprintf(&tmp3, "Working on %s #%d, file #%ld, slice #%ld ",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number, bigfileno + 1, sliceno);
             log_msg(2, tmp3);
@@ -1300 +1264 @@
     char *command = NULL;
     char *outfile_fname = NULL;
-    char *ntfsprog_command = NULL;
     char *ntfsprog_fifo = NULL;
     char *file_to_openout = NULL;
@@ -1418 +1381 @@
     }
 
-    if (!bkpinfo->zip_exe[0]) {
+    if (bkpinfo->zip_exe == NULL) {
         asprintf(&command, "cat > \"%s\"", file_to_openout);
     } else {
@@ -1649 +1612 @@
                 asprintf(&tmp, " -bz");
             } else {
-                asprintf(&tmp, "");
+                asprintf(&tmp, "%s", "");
             }
             asprintf(&command,
@@ -1792 +1755 @@
             "Restoring from fileset #%ld (%ld KB) on %s #%d",
             current_tarball_number, (long) size >> 10,
-            media_descriptor_string(bkpinfo->backup_media_type),
+            bkpinfo->backup_media_string,
             g_current_media_number);
     log_msg(2, tmp);
@@ -1869 +1832 @@
         // star
         if (filelist) {
-            asprintf(&command, "star -x file=%s %s list=%s 2>> %s", afio_fname, executable
+            asprintf(&command, "star -x file=%s %s list=%s 2>> %s", afio_fname, executable,
                     filelist_subset_fname,MONDO_LOGFILE);
         } else {
@@ -1946 +1909 @@
     long noof_biggiefiles = 0L, bigfileno = 0L, total_slices = 0L;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     bool just_changed_cds = FALSE, finished = FALSE;
     char *xattr_fname = NULL;
@@ -1997 +1961 @@
             log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
                     bigfileno + 1,
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             tmp1 = slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, "");
@@ -2012 +1976 @@
                                          ++g_current_media_number);
                 asprintf(&tmp, _("Restoring from %s #%d"),
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type),
+                        bkpinfo->backup_media_string,
                         g_current_media_number);
                 log_to_screen(tmp);
@@ -2124 +2087 @@
 
     asprintf(&progress_str, _("Restoring from %s #%d"),
-            media_descriptor_string(bkpinfo->backup_media_type),
+            bkpinfo->backup_media_string,
             g_current_media_number);
     log_to_screen(progress_str);
@@ -2174 +2137 @@
             paranoid_free(progress_str);
             asprintf(&progress_str, _("Restoring from %s #%d"),
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(progress_str);
@@ -2182 +2145 @@
                     _("Restoring from fileset #%ld on %s #%d"),
                     current_tarball_number,
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
 //    log_msg(3, "progress_str = %s", progress_str);
@@ -2198 +2161 @@
             }
             asprintf(&tmp, _("%s #%d, fileset #%ld - restore %s"),
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number, current_tarball_number,tmp1);
             paranoid_free(tmp1);
@@ -2260 +2223 @@
     char *xattr_fname = NULL;
     char *acl_fname = NULL;
-    char *p = NULL;
     char *pathname_of_last_biggie_restored = NULL;
     char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
-    long long biggie_size = NULL;
-    FILE *fbw = NULL;
+    long long biggie_size = (long long)0;
+    FILE *fbw;
 
     assert(bkpinfo != NULL);
@@ -2506 +2468 @@
         asprintf(&progress_str, _("Restoring from fileset #%ld on %s #%d"),
                 current_afioball_number,
-                media_descriptor_string(bkpinfo->backup_media_type),
+                bkpinfo->backup_media_string,
                 g_current_media_number);
         res =
@@ -2735 +2697 @@
     malloc_libmondo_global_strings();
 
-    g_mondo_home = call_program_and_get_last_line_of_output("which mondorestore"));
-    sprintf(g_tmpfs_mountpt, "/tmp/tmpfs");
+    g_mondo_home = call_program_and_get_last_line_of_output("which mondorestore");
+    paranoid_alloc(g_tmpfs_mountpt, "/tmp/tmpfs");
     make_hole_for_dir(g_tmpfs_mountpt);
     g_current_media_number = 1; // precaution
@@ -2746 +2708 @@
     reset_bkpinfo(bkpinfo);
     bkpinfo->backup_media_type = none;  // in case boot disk was made for one backup type but user wants to restore from another backup type
+    bkpinfo->backup_media_string = NULL;
     bkpinfo->restore_data = TRUE;   // Well, yeah :-)
     if (am_I_in_disaster_recovery_mode()) {
@@ -2757 +2720 @@
 
     log_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
-    if (strlen(g_mountlist_fname) < 3) {
-        fatal_error
-            ("Serious error in malloc()'ing. Could be a bug in your glibc.");
-    }
     mkdir(MNT_CDROM, 0x770);
 
@@ -2812 +2771 @@
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
         if (!does_file_exist(g_mountlist_fname)) {
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
         }
         res = let_user_edit_the_mountlist(bkpinfo, mountlist, raidlist);
@@ -2839 +2798 @@
         bkpinfo->compression_level = 1;
         g_current_media_number = 2;
-        strcpy(bkpinfo->restore_path, "/tmp/TESTING");
+        paranoid_alloc(bkpinfo->restore_path, "/tmp/TESTING");
         bkpinfo->backup_media_type = dvd;
+        paranoid_free(bkpinfo->backup_media_string);
+        bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
         open_progress_form(_("Reassembling /dev/hda1"),
                            _("Shark is a bit of a silly person."),
@@ -2965 +2926 @@
 
         iamhere("About to call load_mountlist and load_raidtab");
-        strcpy(bkpinfo->restore_path, MNT_RESTORING);
+        paranoid_alloc(bkpinfo->restore_path, MNT_RESTORING);
         read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
         retval = load_mountlist(mountlist, g_mountlist_fname);
@@ -2978 +2939 @@
                 && !is_this_device_mounted(bkpinfo->nfs_mount)) {
                 log_msg(1, "Mounting nfs dir");
-                sprintf(bkpinfo->isodir, "/tmp/isodir");
+                paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
                 asprintf(&tmp, "mount %s -t nfs -o nolock /tmp/isodir",
@@ -3000 +2961 @@
             log_msg(0, "Partitioning only.");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
             res = partition_everything(mountlist);
@@ -3009 +2970 @@
             log_msg(0, "Formatting only.");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
             res = format_everything(mountlist, FALSE, raidlist);
@@ -3018 +2979 @@
             log_msg(0, "Stopping LVM and RAID");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
             res = do_my_funky_lvm_stuff(TRUE, FALSE);

trunk/mondo/mondo/mondorestore/mondo-restore.h

@@ -10 +10 @@
 int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *,
                   struct raidlist_itself *);
-void find_pathname_of_executable_preferably_in_RESTORING(char *, char *,
-                                                         char *);
 int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
                      struct raidlist_itself *);
@@ -22 +20 @@
 int restore_mode(struct s_bkpinfo *, struct mountlist_itself *,
                  struct raidlist_itself *);
-int restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *, long,
-                                     char *, long long, struct s_node *,
-                                     int, char *);
+char *restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *, long,
+                                     struct s_node *, int);
 int restore_a_tarball_from_CD(char *, long, struct s_node *);
 int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, long,

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

@@ -4 +4 @@
 
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -44 +44 @@
     char *p = NULL;
     int i = 0;
-    int n = 0;
+    size_t n = 0;
     int retval = 0;
 
@@ -258 +258 @@
         }
         paranoid_free(tmp);
+
         if (use_star) {
             if (strcmp(compressor_exe, "bzip2")) {
@@ -264 +265 @@
             }
         } else {
-            asprintf(&tmp, compressor_exe);
-            sprintf(compressor_exe, "-P %s -Z", tmp);
+            tmp = compressor_exe;
+            asprintf(&compressor_exe, "-P %s -Z", tmp);
             paranoid_free(tmp);
         }
@@ -299 +300 @@
         log_OS_error(command);
     }
+    paranoid_free(command);
+
     if (length_of_file(logfile) > 5) {
-        sprintf(command,
+        asprintf(&command,
                 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vx \"dev/.*\" >> /tmp/changed.txt",
                 logfile);
         system(command);
+        paranoid_free(command);
         archiver_errors = count_lines_in_file(logfile);
     } else {
         archiver_errors = 0;
     }
-    paranoid_free(command);
 
     if (archiver_errors) {
@@ -353 +356 @@
 
     asprintf(&progress_str, _("Comparing with %s #%d "),
-            media_descriptor_string(bkpinfo->backup_media_type),
+            bkpinfo->backup_media_string,
             g_current_media_number);
 
@@ -402 +405 @@
             paranoid_free(progress_str);
             asprintf(&progress_str, _("Comparing with %s #%d "),
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(progress_str);

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

@@ -537 +537 @@
     char *personalities = NULL;
     char *prompt = NULL;
-    char *sz = NULL;
     int out = 0, res = 0;
 
@@ -544 +543 @@
     system
         ("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    personalities = last_line_of_file("/tmp/raid-personalities.txt"));
+    personalities = last_line_of_file("/tmp/raid-personalities.txt");
     asprintf(&prompt, _("Please enter the RAID level you want. %s"),
              personalities);
@@ -616 +615 @@
     int i = 0;
     int pos = 0;
-
-    /** buffers ***********************************************************/
-    char *tmp = NULL;
 
     assert(mountlist != NULL);
@@ -858 +854 @@
             popup_and_OK(tmp);
         } else {
+            paranoid_free(av->el[lino].label);
+            paranoid_free(av->el[lino].value);
             memcpy((void *) &av->el[lino], (void *) &av->el[av->entries--],
                    sizeof(struct raid_var_line));
+            /* BERLIOS: New way of doing should be replaced by line below. Hope it's ok.
+             * Will be when memory for struct is also dynamically allocated
+            av->el[lino] = av->el[av->entries--];
+                   */
         }
     }
@@ -1323 +1325 @@
                                                  device);
                 if (j < 0) {
-                    sprintf(tmp,
+                    asprintf(&tmp,
                             _
                             ("/etc/raidtab does not have an entry for %s; please delete it and add it again"),
                             mountlist->el[currline].device);
                     popup_and_OK(tmp);
+                    paranoid_free(tmp);
                 } else {
                     log_it(_("edit_raidlist_entry - calling"));
@@ -1499 +1502 @@
 
     void *keylist[10];
-    void *curr_choice;
+    void *curr_choice = NULL;
 
     int currline2 = 0;
@@ -1971 +1974 @@
             raidrec->additional_vars.el[lino].label, sz_out);
     if (popup_and_get_string(header, comment, sz_out)) {
-        strcpy(raidrec->additional_vars.el[lino].value, sz_out);
+        paranoid_free(raidrec->additional_vars.el[lino].value);
+        raidrec->additional_vars.el[lino].value = sz_out;
     }
     paranoid_free(header);
     paranoid_free(comment);
-    paranoid_free(sz_out);
 }
 #endif
@@ -2015 +2018 @@
     int currline = 0;
     int finished = FALSE;
+    int res = 0;
 
     /** buffers **********************************************************/
@@ -2025 +2029 @@
     assert(raidlist != NULL);
 
-    asprintf(&flaws_str_A, "xxxxxxxxx");
-    asprintf(&flaws_str_B, "xxxxxxxxx");
-    asprintf(&flaws_str_C, "xxxxxxxxx");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
         log_to_screen(_("Arbitrary limits suck, man!"));
@@ -2045 +2046 @@
             _("Format"), _("Size (MB)"));
     headerMsg = newtLabel(2, 1, tmp);
-    flawsLabelA = newtLabel(2, 13, flaws_str_A);
-    flawsLabelB = newtLabel(2, 14, flaws_str_B);
-    flawsLabelC = newtLabel(2, 15, flaws_str_C);
+    flawsLabelA = newtLabel(2, 13, "x");
+    flawsLabelB = newtLabel(2, 14, "x");
+    flawsLabelC = newtLabel(2, 15, "x");
     partitionsListbox =
         newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -2057 +2058 @@
                           bEdit, bDelete, bReload, bCancel, bOK, NULL);
     while (!finished) {
-        evaluate_mountlist(mountlist, flaws_str_A, flaws_str_B,
+        res = evaluate_mountlist(mountlist, flaws_str_A, flaws_str_B,
                            flaws_str_C);
         newtLabelSetText(flawsLabelA, flaws_str_A);
         newtLabelSetText(flawsLabelB, flaws_str_B);
         newtLabelSetText(flawsLabelC, flaws_str_C);
+
+        paranoid_free(flaws_str_A);
+        paranoid_free(flaws_str_B);
+        paranoid_free(flaws_str_C);
+
         b_res = newtRunForm(myForm);
         /* BERLIOS: This needs to be re-written */
         if (b_res == bOK) {
-            if (!evaluate_mountlist
-                (mountlist, flaws_str_A, flaws_str_B, flaws_str_C)) {
+            if (!res) {
                 finished =
                     ask_me_yes_or_no
@@ -2113 +2118 @@
             }
         }
-        paranoid_free(flaws_str_A);
-        paranoid_free(flaws_str_B);
-        paranoid_free(flaws_str_C);
     }
     newtFormDestroy(myForm);
@@ -2413 +2415 @@
     raidrec = &raidlist->el[pos_in_raidlist];
     initialize_raidrec(raidrec);
-    strcpy(raidrec->OSSWAP(raid_device, volname),
+    asprintf(&raidrec->OSSWAP(raid_device, volname),
            OSSWAP(device, basename(device)));
 #ifndef __FreeBSD__
@@ -2647 +2649 @@
                    (void *) &raidrec->additional_vars.el[i],
                    sizeof(struct raid_var_line));
+            /* BERLIOS : To be changed */
         }
         raidrec->additional_vars.entries--;

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.h

@@ -3 +3 @@
 **/
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"

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

@@ -5 +5 @@
 #include <unistd.h>
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -39 +39 @@
 
 extern t_bkptype g_backup_media_type;
+extern char *g_backup_media_string;
 
 extern int g_partition_table_locked_up;
@@ -290 +291 @@
     assert(bkpinfo != NULL);
     g_ISO_restore_mode = TRUE;
+
+    paranoid_free(g_isodir_device);
     read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
     if (bkpinfo->disaster_recovery) {
 /* Patch Conor Daly 26-june-2004 
  * Don't let this clobber an existing bkpinfo->isodir */
-        if (!bkpinfo->isodir[0]) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
+        if (!bkpinfo->isodir) {
+            paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
         }
 /* End patch */
@@ -344 +347 @@
     i = what_number_cd_is_this(bkpinfo);    /* has the side-effect of calling mount_cdrom() */
     asprintf(&tmp, "%s #%d has been mounted via loopback mount",
-            media_descriptor_string(bkpinfo->backup_media_type), i);
+            bkpinfo->backup_media_string, i);
     log_msg(1, tmp);
     paranoid_free(tmp);
@@ -497 +500 @@
 {
     char *mount_cmd = NULL;
-    char *tmp = NULL;
     int i, res;
 #ifdef __FreeBSD__
@@ -519 +521 @@
         log_msg(2, "Mounting for NFS thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
+        if ((!bkpinfo->isodir || !strcmp(bkpinfo->isodir, "/"))
             && am_I_in_disaster_recovery_mode()) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
+            paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
@@ -663 +665 @@
         asprintf(&p2, ",user_xattr");
     } else {
-        asprintf(&p2, "");
+        asprintf(&p2, "%s", "");
     }
     paranoid_free(tmp);
@@ -671 +673 @@
         asprintf(&p3, ",acl");
     } else {
-        asprintf(&p3, "");
+        asprintf(&p3, "%s", "");
     }
     paranoid_free(tmp);
@@ -789 +791 @@
     char *value = NULL;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *command = NULL;
     char *iso_mnt = NULL;
@@ -836 +839 @@
 
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                paranoid_free(bkpinfo->prefix);
-                bkpinfo->prefix = value;
+                paranoid_alloc(bkpinfo->prefix,value);
             } else {
                 paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
@@ -845 +847 @@
             paranoid_free(value);
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                paranoid_free(bkpinfo->prefix);
-                bkpinfo->prefix = value;
+                paranoid_alloc(bkpinfo->prefix,value);
             } else {
                 paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
@@ -869 +870 @@
         } else if (bkpinfo->backup_media_type == tape
                    || bkpinfo->backup_media_type == udev) {
+            paranoid_free(bkpinfo->media_device);
             if (read_cfg_var(cfg_file, "media-dev", bkpinfo->media_device)) {
                 fatal_error("Cannot get tape device name from cfg file");
@@ -964 +966 @@
                     "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
         } else {
+            paranoid_free(bkpinfo->nfs_mount);
+            paranoid_free(bkpinfo->nfs_remote_dir);
             read_cfg_var(g_mondo_cfg_file, "nfs-server-mount",
                          bkpinfo->nfs_mount);
@@ -976 +980 @@
          * isodir in disaster recovery mode
          */
-        old_isodir = bkpinfo->isodir;
+        paranoid_alloc(old_isodir,bkpinfo->isodir);
         read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
         read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
         if (iso_mnt && iso_path) {
+            paranoid_free(bkpinfo->isodir);
             asprintf(&bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
-        } else {
-            bkpinfo->isodir = old_isodir;
         }
         paranoid_free(iso_mnt);
@@ -992 +995 @@
                     ("user nominated isodir differs from archive, keeping user's choice: %s %s\n",
                      old_isodir, bkpinfo->isodir);
-                if (bkpinfo->isodir != old_isodir) {
-                    paranoid_free(old_isodir);
-                }
-            } else {
-                paranoid_free(old_isodir);
-            }
-        }
-
+            }
+        }
+        paranoid_free(old_isodir);
+
+        paranoid_free(g_isodir_device);
         read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
         log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
@@ -1029 +1029 @@
                     paranoid_free(iso_mnt);
                     paranoid_free(iso_path);
-                    asprintf(&iso_mnt, "");
-                    asprintf(&iso_path, "");
+                    asprintf(&iso_mnt, "%s", "");
+                    asprintf(&iso_path, "%s", "");
 
                     if (mount_cdrom(bkpinfo)) {
@@ -1069 +1069 @@
     }
     g_backup_media_type = bkpinfo->backup_media_type;
+    bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
+    g_backup_media_string = bkpinfo->backup_media_string;
     return (0);
 }
@@ -1823 +1825 @@
     assert(bkpinfo != NULL);
 
-    malloc_string(g_tmpfs_mountpt);
-
     asprintf(&g_biggielist_txt, "%s/%s",bkpinfo->tmpdir , BIGGIELIST_TXT_STUB);
     asprintf(&g_filelist_full, "%s/%s", bkpinfo->tmpdir, FILELIST_FULL_STUB);
@@ -1830 +1830 @@
     asprintf(&g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these",
             bkpinfo->tmpdir);
+    paranoid_free(g_mondo_cfg_file);
+    paranoid_free(g_mountlist_fname);
     if (bkpinfo->disaster_recovery) {
         asprintf(&g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
@@ -2110 +2112 @@
 {
     int retval = 0;
-    char *device = NULL;
     char *command = NULL;
     char *cfg_file = NULL;
@@ -2364 +2365 @@
 
     g_backup_media_type = bkpinfo->backup_media_type;
+    bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
+    g_backup_media_string = bkpinfo->backup_media_string;
     return (retval);
 }