Changeset 1106 in MondoRescue for trunk/mondo

Timestamp:

Feb 7, 2007, 11:55:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1082:1105 $SVN_M/branches/stable

Location:

trunk/mondo/src

Files:

• common/libmondo-archive.c (modified) (11 diffs)
• common/libmondo-devices.h (modified) (3 diffs)
• common/libmondo-fifo-EXT.h (modified) (1 diff)
• common/libmondo-filelist.c (modified) (4 diffs)
• common/libmondo-files.c (modified) (4 diffs)
• common/libmondo-raid.c (modified) (4 diffs)
• common/libmondo-tools-EXT.h (modified) (4 diffs)
• common/libmondo-tools.c (modified) (3 diffs)
• common/libmondo-tools.h (modified) (3 diffs)
• common/newt-specific-EXT.h (modified) (3 diffs)
• common/newt-specific.c (modified) (3 diffs)
• common/newt-specific.h (modified) (4 diffs)
• include/mr_err.h (modified) (1 diff)
• include/mr_file.h (copied) (copied from branches/stable/mondo/src/include/mr_file.h )
• include/mr_mem.h (modified) (1 diff)
• include/mr_msg.h (modified) (1 diff)
• include/mr_str.h (modified) (1 diff)
• include/my-stuff.h (modified) (2 diffs)
• lib/Makefile.am (modified) (1 diff)
• lib/mr_err.c (modified) (2 diffs)
• lib/mr_file.c (copied) (copied from branches/stable/mondo/src/lib/mr_file.c )
• lib/mr_mem.c (modified) (6 diffs)
• lib/mr_msg.c (modified) (2 diffs)
• lib/mr_str.c (modified) (2 diffs)
• mondoarchive/main.c (modified) (5 diffs)
• mondorestore/mondo-prep.c (modified) (2 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (9 diffs)
• mondorestore/mondo-rstr-newt.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools-EXT.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (9 diffs)
• mondorestore/mondo-rstr-tools.h (modified) (1 diff)
• test/mktest (modified) (3 diffs)
• test/test-mem.c (copied) (copied from branches/stable/mondo/src/test/test-mem.c )

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

@@ -20 +20 @@
 #include "mr_mem.h"
 #include "mr_err.h"
+#include "mr_str.h"
+#include "mr_file.h"
 
 #include "libmondo-string-EXT.h"
@@ -544 +546 @@
     /*@ buffer ************************************************************ */
     char *tmp = NULL;
-    char *tmp1 = NULL;
-    char *tmp2 = NULL;
     char *command = NULL;
     char *use_lzo_sz = NULL;
@@ -559 +559 @@
     char *devs_to_exclude = NULL;
     char *use_lilo_sz = NULL;
-    char *value = NULL;
     char *bootdev = NULL;
-
 
     /*@ char ************************************************************** */
@@ -572 +570 @@
     int res = 0;
     long estimated_total_noof_slices = 0;
+
+    FILE *fd = NULL;
+    FILE *fd1 = NULL;
 
     assert(bkpinfo != NULL);
@@ -606 +607 @@
         mr_asprintf(&tape_device, " ");
     }
+    /* BERLIOS: This parameter is not used after? */
+    mr_free(tape_size_sz);
     if (bkpinfo->use_lzo) {
         mr_asprintf(&use_lzo_sz, "yes");
@@ -759 +762 @@
     mr_asprintf(&tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bkpinfo->boot_device)) {
-        mr_msg(1, "%ld: Unable to write one-liner boot device", __LINE__);
-    }
-    mr_free(tmp);
-    /* BERLIOS: Use bkptype_to_string without LANG */
-    switch (bkpinfo->backup_media_type) {
-    case cdr:
-        mr_asprintf(&value, "cdr");
-        break;
-    case cdrw:
-        mr_asprintf(&value, "cdrw");
-        break;
-    case cdstream:
-        mr_asprintf(&value, "cdstream");
-        break;
-    case tape:
-        mr_asprintf(&value, "tape");
-        break;
-    case udev:
-        mr_asprintf(&value, "udev");
-        break;
-    case iso:
-        mr_asprintf(&value, "iso");
-        break;
-    case nfs:
-        mr_asprintf(&value, "nfs");
-        break;
-    case dvd:
-        mr_asprintf(&value, "dvd");
-        break;
-    case usb:
-        strcpy(value, "usb");
-        break;
-    default:
-        fatal_error("Unknown backup_media_type");
-    }
-    mr_asprintf(&tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
-    if (write_one_liner_data_file(tmp, value)) {
-        res++;
-        mr_msg(1, "%ld: Unable to write one-liner backup-media-type",
-                __LINE__);
-    }
-    mr_free(value);
-    mr_free(tmp);
-    log_to_screen(bkpinfo->tmpdir);
-    mr_asprintf(&tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir);
-    if (write_one_liner_data_file(tmp, bootldr_str)) {
-        res++;
-        mr_msg(1, "%ld: Unable to write one-liner bootloader.name",
-                __LINE__);
-    }
-    mr_free(bootldr_str);
-    mr_free(tmp);
-    mr_asprintf(&tmp, "%s/DIFFERENTIAL", bkpinfo->tmpdir);
-    if (bkpinfo->differential) {
-        res += write_one_liner_data_file(tmp, "1");
-    } else {
-        res += write_one_liner_data_file(tmp, "0");
-    }
-    mr_free(tmp);
-
-    if (g_getfattr) {
-        mr_asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
-        if (write_one_liner_data_file(tmp1, "TRUE")) {
-            mr_msg(1, "%ld: Unable to write one-liner XATTR",
-                __LINE__);
-        }
-        mr_free(tmp1);
-    }
-    if (g_getfacl) {
-        mr_asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
-        if (write_one_liner_data_file(tmp1, "TRUE")) {
-            mr_msg(1, "%ld: Unable to write one-liner ACL",
-                __LINE__);
-        }
-        mr_free(tmp1);
+        mr_msg(1, "Unable to write one-liner boot device");
+
     }
 
@@ -850 +780 @@
         log_OS_error("Unable to make mnt floppy directory");
     }
+
+    /* Prepare interface with mindi through a configuration file
+     * under /var/cache/mondo by default 
+     * and the mondorestore configuration file at the same time that
+     * will be included by mindi on the initrd */
+
+    fd = mr_fopen(MONDO_CACHE"/mindi.conf", "w");
+    fd1 = mr_fopen(MONDORESTORECFG, "a");
+
+    mr_fprintf(fd, "mindi_kernel=%s\n", bkpinfo->kernel_path);
+    mr_fprintf(fd, "mindi_use_own_kernel=yes\n");
+
+    mr_fprintf(fd1, "files-in-filelist %ld\n", lines_in_filelist);
+    mr_fprintf(fd1, "internal-tape-block-size %ld\n", bkpinfo->internal_tape_block_size);
+    mr_fprintf(fd1, "total-slices %ld\n", estimated_total_noof_slices);
+    mr_fprintf(fd1, "excluded-devs %s\n", devs_to_exclude);
+    mr_free(devs_to_exclude);
+    mr_fprintf(fd1, "image-devs %s\n", bkpinfo->image_devs);
+    mr_fprintf(fd1, "last-filelist-number %s\n", last_filelist_number);
+    mr_free(last_filelist_number);
+    mr_fprintf(fd1, "bootloader.name %s\n", bootldr_str);
+    mr_free(bootldr_str);
+    mr_fprintf(fd1, "bootloader.device %s\n", bkpinfo->boot_device);
+
+    switch (bkpinfo->backup_media_type) {
+    case cdr:
+        mr_fprintf(fd1, "backup-media-type cdr\n");
+        break;
+    case cdrw:
+        mr_fprintf(fd1, "backup-media-type cdrw\n");
+        break;
+    case cdstream:
+        mr_fprintf(fd1, "backup-media-type cdstream\n");
+        break;
+    case tape:
+        mr_fprintf(fd1, "backup-media-type tape\n");
+        break;
+    case udev:
+        mr_fprintf(fd1, "backup-media-type udev\n");
+        break;
+    case iso:
+        mr_fprintf(fd1, "backup-media-type iso\n");
+        break;
+    case nfs:
+        mr_fprintf(fd1, "backup-media-type nfs\n");
+        break;
+    case dvd:
+        mr_fprintf(fd1, "backup-media-type dvd\n");
+        break;
+    case usb:
+        mr_fprintf(fd1, "backup-media-type usb\n");
+        break;
+    default:
+        fatal_error("Unknown backup_media_type");
+    }
+
+    if (bkpinfo->backup_media_type == usb) {
+        mr_fprintf(fd, "mindi_write_usb=yes\n");
+        mr_fprintf(fd, "mindi_usb_device=%s\n", bkpinfo->media_device);
+    }
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        mr_fprintf(fd, "mindi_write_tape=yes\n");
+        mr_fprintf(fd, "mindi_tape_device=%s\n", bkpinfo->media_device);
+        mr_fprintf(fd1, "media-dev %s\n", bkpinfo->media_device);
+        mr_fprintf(fd1, "media-size %ld\n", bkpinfo->media_size[1]);
+    }
+    if (bkpinfo->compression_level > 0) {
+        mr_fprintf(fd1, "use-comp yes\n");
+    } else {
+        mr_fprintf(fd1, "use-comp no\n");
+    }
+    if (bkpinfo->use_gzip) {
+        mr_fprintf(fd1, "use-gzip yes\n");
+    } else {
+        mr_fprintf(fd1, "use-gzip no\n");
+    }
+    if (bkpinfo->use_lzo) {
+        mr_fprintf(fd1, "use-lzo yes\n");
+    } else {
+        mr_fprintf(fd1, "use-lzo no\n");
+    }
+    if (bkpinfo->use_star) {
+        mr_fprintf(fd1, "use-star yes\n");
+    } else {
+        mr_fprintf(fd1, "use-star no\n");
+    }
+    if (g_getfattr) {
+        mr_fprintf(fd1, "xattr yes\n");
+    } else {
+        mr_fprintf(fd1, "xattr no\n");
+    }
+    if (g_getfacl) {
+        mr_fprintf(fd1, "acl yes\n");
+    } else {
+        mr_fprintf(fd1, "acl no\n");
+    }
+
+    if (g_cd_recovery) {
+        mr_fprintf(fd1, "use-cdrecovery yes\n");
+    } else {
+        mr_fprintf(fd1, "use-cdrecovery no\n");
+    }
+
+    if (bkpinfo->make_cd_use_lilo) {
+        mr_fprintf(fd1, "use-lilo yes\n");
+    } else {
+        mr_fprintf(fd1, "use-lilo no\n");
+    }
+    if (bkpinfo->nonbootable_backup) {
+        mr_fprintf(fd1, "non-bootable yes\n");
+    } else {
+        mr_fprintf(fd1, "non-bootable no\n");
+    }
+    if (bkpinfo->differential) {
+        mr_fprintf(fd1, "differential 1\n");
+    } else {
+        mr_fprintf(fd1, "differential 0\n");
+    }
+
+    mr_fclose(fd);
+    mr_fprintf(fd1, "datestamp %s\n", mr_date());
+    mr_fclose(fd1);
+
+    mr_asprintf(&command, "mindi --custom '%s' '%s/images'", 
+                bkpinfo->tmpdir, bkpinfo->scratchdir);
+            //bkpinfo->tmpdir,      // parameter #2
+            //bkpinfo->scratchdir,  // parameter #3
+            //bkpinfo->kernel_path, // parameter #4
+            //tape_device,          // parameter #5
+            //tape_size_sz,         // parameter #6
+            //lines_in_filelist,        // parameter #7 (INT)
+            //use_lzo_sz,               // parameter #8
+            //cd_recovery_sz,           // parameter #9
+            //bkpinfo->image_devs,  // parameter #10
+            //broken_bios_sz,           // parameter #11 always yes
+            //last_filelist_number, // parameter #12 (STRING)
+            //estimated_total_noof_slices,  // parameter #13 (INT)
+            //devs_to_exclude,      // parameter #14
+            //use_comp_sz,          // parameter #15
+            //use_lilo_sz,          // parameter #16
+            //use_star_sz,          // parameter #17
+            //bkpinfo->internal_tape_block_size,    // parameter #18 (LONG)
+            //bkpinfo->differential,    // parameter #19 (INT)
+            //use_gzip_sz);         // parameter #20 (STRING)
+
+    mr_msg(2, command);
+
+
+    res = run_program_and_log_to_screen(command, "Generating boot+data disks");
     mr_free(command);
-
-    mr_asprintf(&tmp, "BTW, I'm telling Mindi your kernel is '%s'",
-             bkpinfo->kernel_path);
-    log_to_screen(tmp);
-    mr_free(tmp);
-
-    mr_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
-
-    if (bkpinfo->backup_media_type == usb) {
-        mr_asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
-    } else {
-        mr_asprintf(&tmp2,"");
-    }
-
-    // Watch it! This next line adds a parameter...
-    if (bkpinfo->nonbootable_backup) {
-        mr_asprintf(&tmp, " NONBOOTABLE");
-    } else {
-        mr_asprintf(&tmp, " ");
-    }
-
-    mr_asprintf(&command,
-            "mindi %s --custom '%s' '%s/images' '%s' '%s' \
-'%s' %ld '%s' '%s' '%s' \
-'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", 
-            tmp2,
-            bkpinfo->tmpdir,        // parameter #2
-            bkpinfo->scratchdir,    // parameter #3
-            bkpinfo->kernel_path,   // parameter #4
-            tape_device,            // parameter #5
-            tape_size_sz,           // parameter #6
-            lines_in_filelist,      // parameter #7 (INT)
-            use_lzo_sz,             // parameter #8
-            cd_recovery_sz,         // parameter #9
-            bkpinfo->image_devs,    // parameter #10
-            broken_bios_sz,         // parameter #11
-            last_filelist_number,   // parameter #12 (STRING)
-            estimated_total_noof_slices,    // parameter #13 (INT)
-            devs_to_exclude,        // parameter #14
-            use_comp_sz,            // parameter #15
-            use_lilo_sz,            // parameter #16
-            use_star_sz,            // parameter #17
-            bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
-            bkpinfo->differential,  // parameter #19 (INT)
-            use_gzip_sz,            // parameter #20 (STRING)
-            tmp);
-    mr_free(tmp);
-    mr_free(tape_size_sz);
-    mr_free(use_lzo_sz);
-    mr_free(tape_device);
-    mr_free(use_star_sz);
-    mr_free(use_comp_sz);
-    mr_free(broken_bios_sz);
-    mr_free(cd_recovery_sz);
-    mr_free(last_filelist_number);
-    mr_free(devs_to_exclude);
-    mr_free(use_lilo_sz);
-    mr_free(use_gzip_sz);
-    mr_free(tmp2);
-
-    mr_msg(2, command);
-
-    //  popup_and_OK("Pausing");
-    res = run_program_and_log_to_screen(command,
-                                        "Generating boot+data disks");
-    mr_free(command);
-
     if (bkpinfo->nonbootable_backup) {
         res = 0;
@@ -1176 +1188 @@
         closeout_tape(bkpinfo);
     } else {
-        /* write final ISO */
+        /* write final ISO/USB */
         res = write_final_iso_if_necessary(bkpinfo);
         retval += res;
@@ -1868 +1880 @@
         if (bkpinfo->nonbootable_backup) {
             mr_msg(1, "Making nonbootable backup");
-// FIXME --- change mkisofs string to MONDO_MKISOFS_NONBOOTABLE and add ' .' at end
             res = eval_call_to_make_ISO(bkpinfo,
                                         "mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
@@ -3563 +3574 @@
         bkpinfo->media_size[g_current_media_number]) {
         mr_asprintf(&tmp,
-                 "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.",
-                 (long) space_occupied_by_cd(bkpinfo->scratchdir),
-                 (long) bkpinfo->media_size[g_current_media_number]);
+                "Warning! %s is too big. It occupies %ld KB, which is more than the %ld KB allowed.",
+                media_descriptor_string(bkpinfo->backup_media_type),
+                (long) space_occupied_by_cd(bkpinfo->scratchdir),
+                (long) bkpinfo->media_size[g_current_media_number]);
         log_to_screen(tmp);
         mr_free(tmp);
     }
-    mr_asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
-             bkpinfo->nfs_remote_dir, bkpinfo->prefix,
-             g_current_media_number);
+    if (bkpinfo->backup_media_type != usb) {
+        mr_asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
+            bkpinfo->nfs_remote_dir, bkpinfo->prefix,
+            g_current_media_number);
+    } else {
+    }
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
-        res = make_iso_fs(bkpinfo, isofile);
+        if (bkpinfo->backup_media_type != usb) {
+            res = make_iso_fs(bkpinfo, isofile);
+        } else {
+        }
         if (g_current_media_number == 1 && !res
             && (bkpinfo->backup_media_type == cdr
@@ -3854 +3872 @@
 
 setenv("MONDO_SHARE", MONDO_SHARE, 1);
+setenv("MONDORESTORECFG", MONDORESTORECFG, 1);
+setenv("MONDO_CACHE", MONDO_CACHE, 1);
 }
 

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

@@ -2 +2 @@
  * $Id$
  */
+
+#ifndef LIBMONDO_DEVICES_H
+# define LIBMONDO_DEVICES_H
 
 bool am_I_in_disaster_recovery_mode(void);
@@ -36 +39 @@
 int eject_device(char *);
 
-char *list_of_NFS_mounts_only();
+char *list_of_NFS_mounts_only(void);
 
 void sensibly_set_tmpdir_and_scratchdir(struct s_bkpinfo *bkpinfo);
@@ -57 +60 @@
 char *which_partition_format(const char *drive);
 char *bkptype_to_string(t_bkptype bt);
+
+#endif /* LIBMONDO_DEVICES_H */

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

@@ -4 +4 @@
                                     long internal_block_size);
 extern void sigpipe_occurred(int);
-extern void kill_buffer();
+extern void kill_buffer(void);

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

@@ -395 +395 @@
 
 
-int call_exe_and_pipe_output_to_fd(char *syscall, FILE * pout)
+int call_exe_and_pipe_output_to_fd(char *sys_call, FILE * pout)
 {
     FILE *pattr;
@@ -401 +401 @@
     size_t n = 0;
 
-    pattr = popen(syscall, "r");
+    pattr = popen(sys_call, "r");
     if (!pattr) {
-        mr_msg(1, "Failed to open fattr() %s", syscall);
+        mr_msg(1, "Failed to open fattr() %s", sys_call);
         return (1);
     }
     if (feof(pattr)) {
-        mr_msg(1, "Failed to call fattr() %s", syscall);
+        mr_msg(1, "Failed to call fattr() %s", sys_call);
         paranoid_pclose(pattr);
         return (2);
@@ -426 +426 @@
     FILE *pout;
     char *pout_command;
-    char *syscall;
+    char *sys_call;
     char *file_to_analyze = NULL;
     char *strtmp = NULL;
@@ -454 +454 @@
         /* BERLIOS : to be checked */
         mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
-        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);
+        mr_asprintf(&sys_call, "%s 2>> /dev/null", strtmp);
         mr_free(strtmp);
-        call_exe_and_pipe_output_to_fd(syscall, pout);
-        mr_free(syscall);
+        call_exe_and_pipe_output_to_fd(sys_call, pout);
+        mr_free(sys_call);
     }
     paranoid_fclose(fin);

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

@@ -19 +19 @@
 #include "libmondo-string-EXT.h"
 #include "mr_mem.h"
+
+#include "mr_file.h"
 
 /*@unused@*/
@@ -1044 +1046 @@
     char *command = NULL;
 
+    FILE *fd1 = NULL;
+
     /*@ pointers ***** */
     char *p;
@@ -1096 +1100 @@
             ("Unable to find ethN (eth0, eth1, ...) adapter via NFS mount you specified.");
     }
-    make_hole_for_dir("/var/cache/mondo-archive");
     /********
     * If the NFS device that found above is a bonded device, 
@@ -1121 +1124 @@
     }
 
-    mr_asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_dev);
     mr_free(nfs_dev);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_ipaddr);
-    mr_free(nfs_client_ipaddr);
-    mr_free(tmp);
-
-    mr_asprintf(&tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_netmask);
-    mr_free(nfs_client_netmask);
-    mr_free(tmp);
-
-    mr_asprintf(&tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_defgw);
-    mr_free(nfs_client_defgw);
-    mr_free(tmp);
-
-    mr_asprintf(&tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_broadcast);
-    mr_free(nfs_client_broadcast);
-    mr_free(tmp);
-
-    mr_asprintf(&tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_server_ipaddr);
-    mr_free(nfs_server_ipaddr);
-    mr_free(tmp);
-
-    mr_asprintf(&tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
-    mr_free(tmp);
-
-    mr_asprintf(&tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
-    mr_free(tmp);
-
-    mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->prefix);
-    mr_free(tmp);
+    fd1 = mr_fopen(MONDORESTORECFG, "a");
+    mr_fprintf(fd1, "nfs-dev %s\n", nfs_dev);
+    mr_fprintf(fd1, "nfs-client-ipaddr %s\n", nfs_client_ipaddr);
+    mr_fprintf(fd1, "nfs-client-netmask %s\n", nfs_client_netmask);
+    mr_fprintf(fd1, "nfs-client-broadcast %s\n", nfs_client_broadcast);
+    mr_fprintf(fd1, "nfs-client-defgw %s\n", nfs_client_defgw);
+    mr_fprintf(fd1, "nfs-server-ipaddr %s\n", nfs_server_ipaddr);
+    mr_fprintf(fd1, "nfs-server-mount %s\n", bkpinfo->nfs_mount);
+    mr_fprintf(fd1, "nfs-server-path %s\n", bkpinfo->nfs_remote_dir);
+    mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix);
+    mr_fclose(fd1);
 
     log_it("Finished storing NFS configuration");

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

@@ -214 +214 @@
  */
 void add_disk_to_raid_device(struct list_of_disks *disklist,
-                             char *device_to_add, int index)
+                             char *device_to_add, int idx)
 {
     int items;
@@ -222 +222 @@
     items = disklist->entries;
     strcpy(disklist->el[items].device, device_to_add);
-    disklist->el[items].index = index;
+    disklist->el[items].index = idx;
     items++;
     disklist->entries = items;
@@ -652 +652 @@
 
     struct list_of_disks *disklist = NULL;
-    int index = 0;
     int v = 0;
 
@@ -708 +707 @@
             mr_free(tmp);
         } else {
-            index = atoi(valueB);
-            add_disk_to_raid_device(disklist, value, index);
+            add_disk_to_raid_device(disklist, value, atoi(valueB));
         }
         mr_free(labelB);

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

@@ -1 @@
-/* libmondo-tools-EXT.h */
+/* $Id$ */
+
+#ifndef LIBMONDO_TOOLS_EXT_H
+#define LIBMONDO_TOOLS_EXT_H
 
 extern void clean_up_KDE_desktop_if_necessary(void);
-extern long get_time();
+extern long get_time(void);
 extern void (*log_debug_msg) (int debug_level, const char *szFile,
                               const char *szFunction, int nLine,
@@ -17 +20 @@
 extern void initialize_raidrec(struct raid_device_record *raidrec);
 #endif
-extern int some_basic_system_sanity_checks();
+extern int some_basic_system_sanity_checks(void);
 
 
@@ -40 +43 @@
 extern void free_libmondo_global_strings(void);
 
-extern double get_kernel_version();
-extern char *get_architecture();
+extern double get_kernel_version(void);
+extern char *get_architecture(void);
 
 extern bool does_nonMS_partition_exist(void);
@@ -48 +51 @@
 extern void stop_magicdev_if_necessary(void);
 extern void restart_magicdev_if_necessary(void);
+
+#endif /* LIBMONDO_TOOLS_EXT_H */

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

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_file.h"
+
 #include "mondostructures.h"
 #include "libmondo-tools.h"
@@ -362 +364 @@
     int rdsiz_MB;
     char *iso_path = NULL;
+    FILE *fd1 = NULL;
 
     assert(bkpinfo != NULL);
@@ -592 +595 @@
                  bkpinfo->isodir);
         log_it("command = %s", command);
-        tmp = call_program_and_get_last_line_of_output(command);
+        iso_dev = call_program_and_get_last_line_of_output(command);
         mr_free(command);
-        log_it("res of it = %s", tmp);
-        mr_asprintf(&tmp1, "%s/ISO-DEV", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp1, tmp);
-        mr_free(tmp1);
+        log_it("res of it = %s", iso_dev);
+
+        fd1 = mr_fopen(MONDORESTORECFG, "a");
+        mr_fprintf(fd1, "iso-dev %s\n", iso_dev);
 
         mr_asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
-                 tmp);
-        mr_free(tmp);
+                 iso_dev);
+        mr_free(iso_dev);
+
         log_it("command = %s", command);
-        tmp = call_program_and_get_last_line_of_output(command);
+        iso_mnt = call_program_and_get_last_line_of_output(command);
         mr_free(command);
-        log_it("res of it = %s", tmp);
-
-        mr_asprintf(&tmp1, "%s/ISO-MNT", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp1, tmp);
-        mr_free(tmp1);
-
-        log_it("isomnt: %s, %d", tmp, strlen(tmp));
-        if (strlen(bkpinfo->isodir) < strlen(tmp)) {
-            mr_asprintf(&iso_path, " ");
-        } else {
-            mr_asprintf(&iso_path, "%s", bkpinfo->isodir + strlen(tmp));
-        }
-        mr_free(tmp);
-
-        mr_asprintf(&tmp, "%s/ISODIR", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, iso_path);
-        mr_free(tmp);
+
+        log_it("res of it = %s", iso_mnt);
+        mr_fprintf(fd1, "iso-mnt %s\n", iso_mnt);
+        log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
+
+        mr_asprintf(&iso_tmp, "%s", bkpinfo->isodir);
+        if (strlen(iso_tmp) >= strlen(iso_mnt)) {
+            mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt));
+        }
+        mr_free(iso_tmp);
+        mr_free(iso_mnt);
+
         log_it("isodir: %s", iso_path);
+        mr_fprintf(fd1, "isodir %s\n", iso_path);
         mr_free(iso_path);
-        mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, bkpinfo->prefix);
+
         log_it("iso-prefix: %s",  bkpinfo->prefix);
-        mr_free(tmp);
-/* End patch */
+        mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix);
+
+        mr_fclose(fd1);
     }                           // end of iso code
 

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

@@ -3 +3 @@
      */
 
+#ifndef LIBMONDO_TOOLS_H
+# define LIBMONDO_TOOLS_H
+
 void clean_up_KDE_desktop_if_necessary(void);
 
-long get_time();
+long get_time(void);
 extern void (*log_debug_msg) (int debug_level, const char *szFile,
                               const char *szFunction, int nLine,
@@ -20 +23 @@
 void initialize_raidrec(struct raid_device_record *raidrec);
 #endif
-int some_basic_system_sanity_checks();
+int some_basic_system_sanity_checks(void);
 
 
@@ -45 +48 @@
 void free_libmondo_global_strings(void);
 
-double get_kernel_version();
-char *get_architecture();
+double get_kernel_version(void);
+char *get_architecture(void);
 bool does_nonMS_partition_exist(void);
 void stop_magicdev_if_necessary(void);
 void restart_magicdev_if_necessary(void);
+
+#endif /* LIBMONDO_TOOLS_H */

trunk/mondo/src/common/newt-specific-EXT.h

@@ -5 +5 @@
 extern bool ask_me_OK_or_cancel(char *prompt);
 extern void close_evalcall_form(void);
-extern void close_progress_form();
+extern void close_progress_form(void);
 extern void fatal_error(char *error_string);
 extern void finish(int signal);
@@ -17 +17 @@
 extern bool popup_and_get_string(char *title, char *b, char *output);
 extern bool popup_with_buttons(char *p, char *button1, char *button2);
-extern void refresh_log_screen();
-extern void setup_newt_stuff();
+extern void refresh_log_screen(void);
+extern void setup_newt_stuff(void);
 extern void update_evalcall_form_ratio(int num, int denom);
 extern void update_evalcall_form(int curr);
@@ -30 +30 @@
 
 extern t_bkptype which_backup_media_type(bool);
-extern int which_compression_level();
+extern int which_compression_level(void);
 
 

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

@@ -351 +351 @@
  */
     void
-     finish(int signal) {
+     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("/");
@@ -378 +385 @@
             }
         }
+<<<<<<< .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);
+        exit(signal_code);
     }
 
@@ -650 +664 @@
     void
      popup_and_OK(char *prompt) {
-        char ch;
+        int ch;
 
         assert_string_is_neither_NULL_nor_zerolength(prompt);

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

@@ -3 +3 @@
  */
 
-
+#ifndef NEWT_SPECIFIC_H
+# define NEWT_SPECIFIC_H
 #ifndef H_NEWT
 #include <newt.h>
@@ -11 +12 @@
 bool ask_me_OK_or_cancel(char *prompt);
 void close_evalcall_form(void);
-void close_progress_form();
+void close_progress_form(void);
 void fatal_error(char *error_string);
 void finish(int signal);
@@ -23 +24 @@
 bool popup_and_get_string(char *title, char *b, char *output);
 bool popup_with_buttons(char *p, char *button1, char *button2);
-void refresh_log_screen();
-void setup_newt_stuff();
+void refresh_log_screen(void);
+void setup_newt_stuff(void);
 void update_evalcall_form_ratio(int num, int denom);
 void update_evalcall_form(int curr);
@@ -36 +37 @@
 
 t_bkptype which_backup_media_type(bool);
-int which_compression_level();
+int which_compression_level(void);
 
 
 void popup_changelist_from_file(char *source_file);
+
+#endif /* NEWT_SPECIFIC_H */
+

trunk/mondo/src/include/mr_err.h

@@ -9 +9 @@
 #define MR_ERR_H
 
+#include "mr_msg.h"
+
 /* functions (public methods) */
 
 extern inline void mr_exit(int errorcode, const char *message);
-extern inline void mr_log_exit(int errorcode, const char *message);
+#define mr_log_exit(x,y) {mr_msg(0,y); mr_exit(x, y);}
 
 #endif                          /* MR_ERR_H */

trunk/mondo/src/include/mr_mem.h

@@ -13 +13 @@
 #endif
 #include <stdarg.h>
+#include <stdio.h>
 
 /* functions (public methods) */
 
-extern inline void mr_free(char *allocated);
-extern inline void mr_allocstr(char *alloc, const char *orig);
-extern inline void mr_asprintf(char **alloc, const char *fmt, ...);
-extern inline void mr_getline(char **lineptr, size_t *n, FILE *stream);
-extern inline void *mr_malloc(size_t size);
+#define mr_free(x) mr_free_int((void **)&x,__LINE__,__FILE__)
+#define mr_allocstr(x,y) mr_allocstr_int(x, y,__LINE__,__FILE__)
+#define mr_asprintf(x,y,args...) mr_asprintf_int(x,__LINE__,__FILE__, y, ## args)
+#define mr_getline(x,y,z) mr_getline_int(x, y,z,__LINE__,__FILE__)
+#define mr_malloc(x) mr_malloc_int((size_t)x,__LINE__,__FILE__)
+
+/* Internal function bringing debuging info 
+ * called indirectly through macros */
+extern inline void mr_free_int(void **allocated, int line, char *file);
+extern inline void mr_allocstr_int(char *alloc, const char *orig, int line, char *file);
+extern inline void mr_asprintf_int(char **alloc, int line, char *file, const char *fmt, ...);
+extern inline void mr_getline_int(char **lineptr, size_t *n, FILE *stream, int line, char *file);
+extern inline void *mr_malloc_int(size_t size, int line, char *file);
 
 #endif                          /* MR_MEM_H */

trunk/mondo/src/include/mr_msg.h

@@ -16 +16 @@
 /* functions (public methods) */
 
-extern inline void mr_msg(int debug, const char *fmt, ...);
+#define mr_msg(x,y,args...) {mr_msg_int(x,__LINE__,__FILE__,y,## args);}
 extern void mr_msg_init(const char *configfile, int loglevel);
 extern void mr_msg_close(void);
 
+/* Internal function bringing debuging info 
+ * called indirectly through macros */
+extern inline void mr_msg_int(int debug,int line, const char *file, const char *fmt, ...);
+
 #endif                          /* MR_MSG_H */

trunk/mondo/src/include/mr_str.h

@@ -13 +13 @@
 extern inline char *mr_strtok(char *instr, const char *delims, int *lastpos);
 extern inline char *mr_stresc(char *instr, char *toesc, const char escchr);
+extern inline char *mr_date(void);
 
 #endif                          /* MR_STR_H */

trunk/mondo/src/include/my-stuff.h

@@ -13 +13 @@
 /*The number of lines of log output to keep at the bottom of the screen.*/
 #define NOOF_ERR_LINES  6   
+
+/* Hardcoded: Bad for the moment */
+#define MONDO_CACHE "/var/cache/mondo"
+#define MONDORESTORECFG MONDO_CACHE"/mondo-restore.cfg"
+
 
 /**
@@ -270 +275 @@
  * Free variables and call finish(@p x).
  */
-#define paranoid_MR_finish(x) {free_MR_global_filenames (); if (g_bkpinfo_DONTUSETHIS) mr_free ( g_bkpinfo_DONTUSETHIS ); finish(x); }
+#define paranoid_MR_finish(x) {free_MR_global_filenames (); if (g_bkpinfo_DONTUSETHIS) mr_free ( (void*) g_bkpinfo_DONTUSETHIS ); finish(x); }
 
 /**

trunk/mondo/src/lib/Makefile.am

@@ -7 +7 @@
 noinst_LIBRARIES = libmr.a
 
-libmr_a_SOURCES  = mr_conf.c mr_str.c mr_mem.c mr_err.c mr_msg.c
+libmr_a_SOURCES  = mr_conf.c mr_str.c mr_mem.c mr_err.c mr_msg.c mr_file.c

trunk/mondo/src/lib/mr_err.c

@@ -27 +27 @@
         /* We have to properly end newt */
         /* We have to remind people of log files */
+        mr_msg_close();
 }
 
@@ -38 +39 @@
     exit(errorcode);
 }
-
-void mr_log_exit(int errorcode, const char *message) {
-    mr_msg(0, message);
-    mr_exit(errorcode, message);
-}

trunk/mondo/src/lib/mr_mem.c

@@ -22 +22 @@
 /*
  * Function that frees memory if necessary
+ * A pointer to the memory pointed is passed to it.
+ * *allocated variable points then to the original content 
+ * pointed to by the caller
  */
-void mr_free(void *allocated) {
+void mr_free_int(void **allocated, int line, const char *file) {
 
     /* free man pages says that if allocated is NULL 
      * nothing happens 
      */
-    free(allocated);
-    allocated = NULL;
+    if (*allocated != NULL) {
+        free(*allocated);
+        *allocated = NULL;
+    } else {
+        mr_msg_int(0,line,file,"Attempt to reference NULL pointer\nExiting...");
+        mr_exit(-1,"Attempt to reference NULL pointer");
+    }
 }
 
 /* encapsulation function for malloc */
-void *mr_malloc(size_t size) {
+void *mr_malloc_int(size_t size, int line, const char *file) {
     
     void *ret;
@@ -39 +47 @@
     ret = malloc(size);
     if (ret == NULL) {
-        mr_log_exit(-1,"Unable to alloc memory in mr_malloc\nExiting...");
+        mr_msg_int(0,line,file,"Unable to alloc memory in mr_malloc\nExiting...");
+        mr_exit(-1,"Unable to alloc memory in mr_malloc");
     }
     return(ret);
@@ -45 +54 @@
 
 /* encapsulation function for getline */
-void mr_getline(char **lineptr, size_t *n, FILE *stream) {
+void mr_getline_int(char **lineptr, size_t *n, FILE *stream, int line, const char *file) {
     
     ssize_t ret;
@@ -51 +60 @@
     ret = getline(lineptr,n,stream);
     if (ret == -1) {
-        mr_log_exit(-1,"Unable to alloc memory in mr_getline\nExiting...");
+        mr_msg_int(0,line,file,"Unable to alloc memory in mr_getline\nExiting...",line,file);
+        mr_exit(-1,"Unable to alloc memory in mr_getline");
     }
 }
 
 /* encapsulation function for asprintf */
-void mr_asprintf(char **strp, const char *fmt, ...) {
+void mr_asprintf_int(char **strp, int line, const char *file, const char *fmt, ...) {
 
     int res = 0;
@@ -64 +74 @@
     res = vasprintf(strp, fmt, args);
     if (res == -1) {
-        mr_log_exit(-1,"Unable to alloc memory in mr_asprintf\nExiting...");
+        mr_msg_int(0,line,file,"Unable to alloc memory in mr_asprintf\nExiting...",line,file);
+        mr_exit(-1,"Unable to alloc memory in mr_asprintf");
     }
     va_end(args);
@@ -73 +84 @@
  * freeing it before in any case
  */
-void mr_allocstr(char *alloc, const char *orig) {
+void mr_allocstr_int(char *alloc, const char *orig, int line, const char *file) {
 
-    mr_free((void *)alloc); 
-    mr_asprintf(&alloc, orig);
+    mr_free_int((void **)&alloc, line, file); 
+    mr_asprintf_int(&alloc, line, file, orig);
 }

trunk/mondo/src/lib/mr_msg.c

@@ -52 +52 @@
  * Function that log a message. Not called directly 
  * but through other functions
+ * fmt needs to be just before ...
  */
-void mr_msg(int debug, const char *fmt, ...) {
+void mr_msg_int(int debug, int line, const char *file, const char *fmt, ...) {
 
     int i = 0;
@@ -74 +75 @@
             for (i = 1; i < debug; i++)
                 fprintf(fout, "  ");
-            fprintf(fout, "%s->%s#%d: ", __FILE__, __FUNCTION__, __LINE__);
+            fprintf(fout, "%s #%d: ", file, line);
         }
         va_start(args,fmt);

trunk/mondo/src/lib/mr_str.c

@@ -8 +8 @@
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 
 #include "mr_mem.h"
@@ -105 +106 @@
     return retstr;
 }
+
+/* Return a string containing the date */
+char *mr_date(void) {
+    
+    time_t tcurr;
+
+    tcurr = time(NULL);
+    return(ctime(&tcurr));
+}
+

trunk/mondo/src/mondoarchive/main.c

@@ -15 +15 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include "my-stuff.h"
 #include "../common/mondostructures.h"
@@ -21 +25 @@
 
 #include "mr_mem.h"
+#include "mr_str.h"
+#include "mr_file.h"
 
 // for CVS
@@ -124 +130 @@
 }
 
-/* Return a string containing the date */
-char *mr_date(void) {
-    
-    time_t tcurr;
-
-    tcurr = time(NULL);
-    return(ctime(&tcurr));
-}
-
 /*-----------------------------------------------------------*/
 
@@ -144 +141 @@
 {
     struct s_bkpinfo *bkpinfo;
+    struct stat stbuf;
     char *tmp;
     int res = 0;
@@ -192 +190 @@
     setenv("ARCH", get_architecture(), 1);
 
-    /* Add MONDO_SHARE environment variable for mindi */
+    /* Add MONDO_SHARE + others environment variable for mindi */
     setenv_mondo_share();
+
+    if (stat(MONDO_CACHE, &stbuf) != 0) {
+        mr_mkdir(MONDO_CACHE,0x755);
+    }
 
     /* Configure the bkpinfo structure, global file paths, etc. */

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

@@ -2010 +2010 @@
     system("clear");
     newtResume();
-    mr_free(drivelist);
+    mr_free((void*) drivelist);
     return (retval);
 }
@@ -2604 +2604 @@
     }
     log_to_screen(_("Mountlist adjusted to suit current hard drive(s)"));
-    mr_free(drivelist);
+    mr_free((void*) drivelist);
 }
 

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

@@ -67 +67 @@
     /** int ****************************************************************/
     int i = 0;
-    int index = 0;
+    int idx = 0;
     int currline = 0;
     int items = 0;
@@ -103 +103 @@
             log_it("I don't know what this button does");
         } else {
-            index = find_next_free_index_in_disklist(disklist);
+            idx = find_next_free_index_in_disklist(disklist);
 
             items = disklist->entries;
             strcpy(disklist->el[items].device,
                    unallocated_raid_partitions->el[currline].device);
-            disklist->el[items].index = index;
+            disklist->el[items].index = idx;
             disklist->entries = ++items;
 
@@ -1733 +1733 @@
         calculate_raid_device_size(mountlist, raidlist,
                                    raidrec->raid_device);
-    mr_free(bkp_raidrec);
+    mr_free((void*) bkp_raidrec);
 #endif
 }
@@ -2259 +2259 @@
 
     /** int ***************************************************************/
-    int index = -1;
+    int idx = -1;
     int pos = 0;
 
@@ -2269 +2269 @@
     for (done = FALSE; !done;) {
         for (pos = 0;
-             pos < disklist->entries && disklist->el[pos].index <= index;
+             pos < disklist->entries && disklist->el[pos].index <= idx;
              pos++);
         if (pos >= disklist->entries) {
             done = TRUE;
         } else {
-            index = disklist->el[pos].index;
-        }
-    }
-    return (index + 1);
+            idx = disklist->el[pos].index;
+        }
+    }
+    return (idx + 1);
 }
 
@@ -2335 +2335 @@
                 char *isodir_path, bool nuke_me_please)
 {
+    char *value = NULL;
 
     /** initialize ********************************************************/
-
-    // %d no var ???
-    // log_it("%d - AAA - isodir_path = %s", isodir_path);
+    malloc_string(value);
+
     if (isodir_device == NULL) {
         mr_asprintf(&isodir_device, "/dev/");
@@ -2346 +2346 @@
         mr_asprintf(&isodir_path, "/");
     }
-    if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
-        mr_free(isodir_device);
-        isodir_device = last_line_of_file("/tmp/NFS-SERVER-MOUNT");
+    if (read_cfg_var(g_mondo_cfg_file, "nfs-server-path", value) == 0) {
+        read_cfg_var(g_mondo_cfg_file, "nfs-server-mount", isodir_device);
+        mr_free(isodir_format);
         mr_asprintf(&isodir_format, "nfs");
         mr_free(isodir_path);
-        isodir_path = last_line_of_file("/tmp/NFS-SERVER-PATH");
-    }
+        mr_asprintf(isodir_path, value);
+    }
+    mr_free(value);
+
     if (nuke_me_please) {
         return (TRUE);
@@ -2451 +2453 @@
  * Dummy function that proves that we can get to the point where Mondo is run.
  */
-void nuke_mode_dummy()
+void nuke_mode_dummy(void)
 {
 
@@ -2912 +2914 @@
                sizeof(struct list_of_disks));
     }
-    mr_free(bkp_raidrec);
-    mr_free(bkp_disklist);
-    mr_free(bkp_raidlist);
-    mr_free(unallocated_raid_partitions);
+    mr_free((void*) bkp_raidrec);
+    mr_free((void*) bkp_disklist);
+    mr_free((void*) bkp_raidlist);
+    mr_free((void*) unallocated_raid_partitions);
 }
 #endif

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

@@ -120 +120 @@
 char *mountlist_entry_to_string(struct mountlist_itself *, int);
 void mvaddstr_and_log_it(int, int, char *);
-void nuke_mode_dummy();
+void nuke_mode_dummy(void);
 char *number_of_disks_as_string(int, char *);
 void open_evalcall_form(char *);

trunk/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -3 +3 @@
 **/
 
-extern void free_MR_global_filenames();
+extern void free_MR_global_filenames(void);
 extern void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *);
 extern bool is_file_in_list(char *, char *, char *);    /* needle, haystack, preamble */

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

@@ -55 +55 @@
  * Free the malloc()s for the filename variables.
  */
-void free_MR_global_filenames()
+void free_MR_global_filenames(void)
 {
     mr_free(g_biggielist_txt);
@@ -537 +537 @@
 
     assert(p_external_copy_of_mountlist != NULL);
-    mountlist = mr_malloc(sizeof(struct mountlist_itself));
+    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
     memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
            sizeof(struct mountlist_itself));
@@ -620 +620 @@
     }
     run_program_and_log_output("df -m", 3);
-    mr_free(mountlist);
+    mr_free((void*) mountlist);
     return (retval);
 }
@@ -918 +918 @@
 
     read_cfg_var(cfg_file, "acl", value);
-    if (strstr(value, "TRUE")) {
+    if (strstr(value, "yes")) {
         mr_asprintf(&g_getfacl,"setfacl");
         mr_msg(1, "We will restore ACLs");
@@ -926 +926 @@
     }
     read_cfg_var(cfg_file, "xattr", value);
-    if (strstr(value, "TRUE")) {
+    if (strstr(value, "yes")) {
         mr_asprintf(&g_getfattr,"setfattr");
         mr_msg(1, "We will restore XATTRs");
@@ -2027 +2027 @@
     assert(p_external_copy_of_mountlist != NULL);
 
-    mountlist = mr_malloc(sizeof(struct mountlist_itself));
+    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
     memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
            sizeof(struct mountlist_itself));
@@ -2120 +2120 @@
         log_to_screen(_("All partitions were unmounted OK."));
     }
-    mr_free(mountlist);
+    mr_free((void*) mountlist);
     return (retval);
 }
@@ -2441 +2441 @@
     char *screen_message = NULL;
 
-    raidlist = mr_malloc(sizeof(struct raidlist_itself));
+    raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
 
     assert(wait_for_percentage <= 100);
@@ -2479 +2479 @@
         }
     }
-    mr_free(raidlist);
-}
+    mr_free((void*) raidlist);
+}

trunk/mondo/src/mondorestore/mondo-rstr-tools.h

@@ -3 +3 @@
 **/
 
-void free_global_filenames();
+void free_global_filenames(void);
 void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *);
 bool is_file_in_list(char *, char *, char *);   /* needle, haystack, preamble */

trunk/mondo/src/test/mktest

@@ -7 +7 @@
 
 lib="../lib/mr_conf.c ../lib/mr_msg.c ../lib/mr_err.c ../lib/mr_mem.c"
-OPT="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_REENTRANT -Wstrict-prototypes -Wshadow -funsigned-char -Wunused -Winit-self -Wcast-align -O2 -g -I../common -I../include"
+OPT="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_REENTRANT -Wstrict-prototypes -Wshadow -funsigned-char -Wunused -Winit-self -Wcast-align -fno-strict-aliasing -O2 -g -I../common -I../include"
 
 echo "Generating test-msg"
@@ -15 +15 @@
 echo "Generating test-conf"
 gcc $OPT test-conf.c $lib -o test-conf
+echo "Generating test-mem"
+gcc $OPT test-mem.c $lib -o test-mem
 
 echo "Testing against previous run"
-for f in test-conf test-string test-msg; do
+for f in test-conf test-string test-msg test-mem; do
     chmod 755 $f
     ./$f > /tmp/$f.res
@@ -23 +25 @@
     if [ $? -ne 0 ]; then
         echo "$f test KO !!"
+    else
+        echo "$f test OK"
     fi
     valgrind -q --error-exitcode=1 --leak-check=yes ./$f 2>&1 > /tmp/valgrind-$f.res