Changeset 1594 in MondoRescue

Timestamp:

Aug 26, 2007, 12:26:06 PM (18 years ago)

Author:

Bruno Cornec

Message:

Use of conf file entries (iso_burning_*, media_device, media_size)
and adapatation of the rest of the code to that (including bkpinfo)

Location:

branches/stable

Files:

• mondo-doc/distributions/conf/mondorescue.conf (deleted)
• mondo-doc/mondoarchive.8 (modified) (2 diffs)
• mondo/distributions/conf/mondo.conf.dist (modified) (2 diffs)
• mondo/src/common/libmondo-archive-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (23 diffs)
• mondo/src/common/libmondo-archive.h (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (13 diffs)
• mondo/src/common/libmondo-files.c (modified) (2 diffs)
• mondo/src/common/libmondo-fork.c (modified) (2 diffs)
• mondo/src/common/libmondo-stream.c (modified) (2 diffs)
• mondo/src/common/libmondo-tools.c (modified) (7 diffs)
• mondo/src/common/mondostructures.h (modified) (2 diffs)
• mondo/src/common/newt-specific.c (modified) (3 diffs)
• mondo/src/include/mr_conf.h (modified) (2 diffs)
• mondo/src/include/mr_types.h (modified) (1 diff)
• mondo/src/include/my-stuff.h (modified) (5 diffs)
• mondo/src/lib/mr_conf.c (modified) (3 diffs)
• mondo/src/lib/mr_str.c (modified) (1 diff)
• mondo/src/mondoarchive/mondo-cli.c (modified) (11 diffs)
• mondo/src/mondoarchive/mondoarchive.c (modified) (7 diffs)
• mondo/src/mondorestore/mondo-rstr-compare.c (modified) (3 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (8 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (3 diffs)

branches/stable/mondo-doc/mondoarchive.8

@@ -78 +78 @@
 
 .TP
-.BI "-c " speed
-Use CD-R drive as backup device and its (write-once) disks as backup media.
-
-.TP
 .BI "-w " speed
-Use CD-RW drive as backup device and its (write/rewrite) disks as backup media.
+Specify the speed to use for the writer (CR-RW|DVD-+RW|...).
 Mondo will wipe media before writing to them.
 
 .TP
 .BI "-r "
-Use DVD drive as backup device and its disks as backup media. Growisofs decides
-on the best speed for your drive. Note that calling mondoarchive
+Use DVD drive as backup device and its disks as backup media.
+Note that calling mondoarchive
 .B using sudo when writing to DVDs will fail
 because growisofs does not support this - see the growisofs manpage for
@@ -95 +91 @@
 
 .TP
-.BI "-C " speed
+.BI "-C "
 Use CD-R drive as a streaming device, almost like a tape streamer. Use
 write-once disks as backup media.

branches/stable/mondo/distributions/conf/mondo.conf.dist

@@ -14 +14 @@
 mondo_iso_burning_cmd="/usr/bin/cdrecord"
 #mondo_iso_burning_cmd="/usr/bin/growisofs"
+#
+
+#
+# If necessary (different from mondo_media_device), 
+# precise the string used as a device by the previous command
+#mondo_iso_burning_dev="0,0,0"
 
 #
 # ISO Burning CLI command options
 mondo_iso_burning_opt="-eject fs=24m driveropts=burnfree"
-#mondo_iso_burning_options="-J -r -v -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue -o _ISO_ -V _CD#_ -boot-info-table -no-emul-boot -boot-load-size 4"
+#mondo_iso_burning_opt="-J -r -v -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue -o _ISO_ -V _CD#_ -boot-info-table -no-emul-boot -boot-load-size 4"
 
 #
@@ -26 +32 @@
 
 #
-# Default size of media
+# Erase CLI command to use fir RW media
+#
+mondo_rw_erase_cmd="/usr/bin/cdrecord"
+
+#
+# Erase CLI command to use fir RW media
+#
+mondo_rw_erase_opt="blank=fast"
+
+#
+# Default size of media in MiB
 #
 # Use 4480 for DVDs, 650 or 700 for CDs

branches/stable/mondo/src/common/libmondo-archive-EXT.h

@@ -24 +24 @@
 extern int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo
                                                           *bkpinfo);
-extern void pause_and_ask_for_cdr(int, bool *);
+extern void pause_and_ask_for_cdr(int);
 extern int slice_up_file_etc(struct s_bkpinfo *bkpinfo,
                              char *biggie_filename,

branches/stable/mondo/src/common/libmondo-archive.c

@@ -54 +54 @@
     struct seminfo *__buf;
 };
+#endif
 #endif                          /* __FreeBSD__ */
 
@@ -1218 +1219 @@
  * @param bkpinfo The backup information structure. Fields used:
  * - @c backup_media_type
- * - @c cdrw_speed
+ * - @c writer_speed
  * - @c prefix
  * - @c isodir
@@ -1258 +1259 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         if (bkpinfo->backup_media_type == cdstream) {
-            openout_cdstream(bkpinfo->media_device, bkpinfo->cdrw_speed);
+            openout_cdstream(bkpinfo->media_device, bkpinfo->writer_speed);
         } else {
             openout_tape(bkpinfo->media_device, bkpinfo->internal_tape_block_size); /* sets g_tape_stream */
@@ -1582 +1583 @@
     char *tmp = NULL;
     char *old_pwd;
-    char *result_sz = NULL;
     char *message_to_screen = NULL;
     char *sz_blank_disk = NULL;
     char *tmp2 = NULL;
     char *tmp3 = NULL;
-    bool cd_is_mountable;
 
     malloc_string(old_pwd);
@@ -1608 +1607 @@
     mr_free(tmp);
 
-    if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
+    if (bkpinfo->backup_media_type != iso && bkpinfo->manual_cd_tray) {
         popup_and_OK(_("Please insert new media and press Enter."));
     }
@@ -1616 +1615 @@
     /* BERLIOS: Do not ignore getcwd result */
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    mr_asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
+    chmod(bkpinfo->scratchdir,0755);
     chdir(bkpinfo->scratchdir);
 
@@ -1643 +1640 @@
 
         /* if g_current_media_number >= 2 then pause & ask */
-        pause_and_ask_for_cdr(2, &cd_is_mountable);
+        if (bkpinfo->backup_media_type != iso) {
+            pause_and_ask_for_cdr(2);
+        }
         if (retval) {
             log_to_screen
@@ -1649 +1648 @@
         } else {
             res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
-                                        bkpinfo->scratchdir,
-                                        g_current_media_number,
+                                        destfile, g_current_media_number,
                                         MONDO_LOGFILE, message_to_screen);
             if (res) {
@@ -1712 +1710 @@
                 res =
                     eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
-                                          bkpinfo->scratchdir,
+                                          destfile,
                                           g_current_media_number,
                                           MONDO_LOGFILE,
@@ -2469 +2467 @@
                                              bool keep_looping)
 {
-    char *tmp;
     int res = 0;
-    char *bkp;
-    char *cdrecord;
-
-    malloc_string(tmp);
+    char *bkp = NULL;
+    char *cdrecord = NULL;
+
     malloc_string(bkp);
-    malloc_string(cdrecord);
     strcpy(bkp, cdrw_dev);
     if (find_cdrw_device(cdrw_dev)) {
@@ -2482 +2477 @@
     } else {
         if (!system("which cdrecord > /dev/null 2> /dev/null")) {
-            sprintf(cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
+            mr_asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
         } else if (!system("which dvdrecord > /dev/null 2> /dev/null")) {
-            sprintf(cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
+            mr_asprintf(&cdrecord, "dvdrecord dev=%s -atip", cdrw_dev);
         } else {
-            cdrecord[0] = '\0';
             mr_msg(2, "Oh well. I guess I'll just pray then.");
         }
-        if (cdrecord[0]) {
+        if (cdrecord != NULL) {
             if (!keep_looping) {
                 retract_CD_tray_and_defeat_autorun();
@@ -2505 +2499 @@
             }
         }
+        mr_free(cdrecord);
     }
 //  retract_CD_tray_and_defeat_autorun();
-    mr_free(tmp);
-    mr_free(cdrecord);
     mr_free(bkp);
     return (res);
@@ -2517 +2510 @@
  * Asks the user to put a CD-R(W) in the drive.
  * @param ask_for_one_if_more_than_this (unused)
- * @param pmountable If non-NULL, pointed-to value is set to TRUE if the CD is mountable, FALSE otherwise.
  */
 void
-pause_and_ask_for_cdr(int ask_for_one_if_more_than_this, bool * pmountable)
+pause_and_ask_for_cdr(int ask_for_one_if_more_than_this)
 {
 
@@ -2537 +2529 @@
     char *szunmount = NULL;
 
-    malloc_string(tmp);
     malloc_string(szmsg);
     malloc_string(cdrom_dev);
@@ -2566 +2557 @@
       retract_CD_tray_and_defeat_autorun();
 */
-        sprintf(tmp, "umount %s", cdrom_dev);
+        mr_asprintf(&tmp, "umount %s", cdrom_dev);
         run_program_and_log_output(tmp, 1);
+        mr_free(tmp);
         sprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
         sprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
@@ -2573 +2565 @@
         cd_number = -1;
         our_serial_str[0] = '\0';
-        sprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
-        if ((attempt_to_mount_returned_this =
-             run_program_and_log_output(tmp, 1))) {
+        mr_asprintf(&tmp, "mount %s %s", cdrom_dev, mtpt);
+        attempt_to_mount_returned_this = run_program_and_log_output(tmp, 1);
+        mr_free(tmp);
+        if (attempt_to_mount_returned_this) {
             mr_msg(4, "Failed to mount %s at %s", cdrom_dev, mtpt);
             log_to_screen("If there's a CD/DVD in the drive, it's blank.");
-            /*
-               if (interrogate_disk_currently_in_cdrw_drive(cdrw_dev, FALSE))
-               {
-               ok_go_ahead_burn_it = FALSE;
-               log_to_screen("There isn't a writable CD/DVD in the drive.");
-               }
-               else
-               {
-               log_to_screen("Confirmed. There is a blank CD/DVD in the drive.");
-               }
-             */
         } else if (!does_file_exist(szcdno)
                    || !does_file_exist(szserfname)) {
@@ -2598 +2580 @@
                           media_descriptor_string(g_backup_media_type));
             cd_number = atoi(last_line_of_file(szcdno));
-            sprintf(tmp, "cat %s 2> /dev/null", szserfname);
+            mr_asprintf(&tmp, "cat %s 2> /dev/null", szserfname);
             strcpy(our_serial_str,
                    call_program_and_get_last_line_of_output(tmp));
+            mr_free(tmp);
             // FIXME - should be able to use last_line_of_file(), surely?
         }
@@ -2634 +2617 @@
     }
 
-/*
-  if (g_current_media_number > ask_for_one_if_more_than_this)
-    {
-      ok_go_ahead_burn_it = FALSE;
-      log_it("paafcd: %d > %d, so I'll definitely pause.", g_current_media_number > ask_for_one_if_more_than_this);
-    }
-*/
-
     if (!ok_go_ahead_burn_it) {
         eject_device(cdrom_dev);
-        sprintf(tmp,
+        mr_asprintf(&tmp,
                 "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
                 media_descriptor_string(g_backup_media_type),
@@ -2650 +2625 @@
                 media_descriptor_string(g_backup_media_type));
         popup_and_OK(tmp);
+        mr_free(tmp);
         goto gotos_make_me_puke;
     } else {
@@ -2663 +2639 @@
     log_to_screen("Proceeding w/ %s in drive.",
                   media_descriptor_string(g_backup_media_type));
-    mr_free(tmp);
     mr_free(szmsg);
     mr_free(cdrom_dev);
@@ -2672 +2647 @@
     mr_free(our_serial_str);
     mr_free(szunmount);
-    if (pmountable) {
-        if (attempt_to_mount_returned_this) {
-            *pmountable = FALSE;
-        } else {
-            *pmountable = TRUE;
-        }
-    }
-
 }
 
@@ -3300 +3267 @@
         mvaddstr_and_log_it(g_currentY, 0,
                             "Verifying archives against live filesystem");
-        if (bkpinfo->backup_media_type == cdstream) {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");
-        }
         verify_tape_backups(bkpinfo);
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -3314 +3278 @@
     } else {
         g_current_media_number = cdno;
-        if (bkpinfo->backup_media_type != iso) {
-            find_cdrom_device(bkpinfo->media_device, FALSE);    // replace 0,0,0 with /dev/cdrom
-        }
         chdir("/");
         for (cdno = 1; cdno < 99 && bkpinfo->verify_data; cdno++) {

branches/stable/mondo/src/common/libmondo-archive.h

@@ -26 +26 @@
 int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo
                                                    *bkpinfo);
-void pause_and_ask_for_cdr(int, bool *);
+void pause_and_ask_for_cdr(int);
 void set_bit_N_of_array(char *array, int N, bool true_or_false);
 int slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,

branches/stable/mondo/src/common/libmondo-devices.c

@@ -22 +22 @@
 #include "mr_str.h"
 #include "mr_gettext.h"
+#include "mr_conf.h"
 
 #include <sys/ioctl.h>
@@ -47 +48 @@
 extern char *g_selfmounted_isodir;
 extern char *MONDO_LOGFILE;
+extern struct mr_ar_conf *mr_conf;
 
 static char g_cdrw_drive_is_here[MAX_STR_LEN / 4] = "";
@@ -1443 +1445 @@
     char *prompt = NULL;
     int i = 0;
-    int res = 0;
     FILE *fin = NULL;
 
@@ -1466 +1467 @@
         sensibly_set_tmpdir_and_scratchdir(bkpinfo);
     }
-    bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
     bkpinfo->compression_level =
         (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
@@ -1494 +1494 @@
             mr_asprintf(&comment, _("What speed is your %s (re)writer?"),
                     bkpinfo->backup_media_string);
-            if (bkpinfo->backup_media_type == dvd) {
-                find_dvd_device(bkpinfo->media_device, FALSE);
-                mr_asprintf(&tmp, "1");
-                mr_asprintf(&sz_size, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4482 MB
-                mr_msg(1, "Setting to DVD defaults");
-            } else if (bkpinfo->backup_media_type == usb) {
-                strcpy(bkpinfo->media_device, VANILLA_USB_DEVICE);
-                asprintf(&sz_size, "512");
-            } else {
-                strcpy(bkpinfo->media_device, VANILLA_SCSI_CDROM);
-                mr_asprintf(&tmp, "4");
-                mr_asprintf(&sz_size, "650");
-                mr_msg(1, "Setting to CD defaults");
-            }
-            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
+            mr_asprintf(&tmp, "%d", mr_conf->iso_burning_speed);
+            if (bkpinfo->backup_media_type != usb) {
+                /* BERLIOS: NOW that tmp isn't static anymore it does NOT work */
                 if (!popup_and_get_string(_("Speed"), comment, tmp, 4)) {
                     log_to_screen(_("User has chosen not to backup the PC"));
@@ -1516 +1504 @@
             mr_free(comment);
 
-            bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
+            bkpinfo->writer_speed = atoi(tmp);
             mr_free(tmp);
 
-            mr_asprintf(&comment,
-                    _("How much data (in Megabytes) will each %s store?"),
-                    bkpinfo->backup_media_string);
-
-            if (!popup_and_get_string("Size", comment, sz_size, 5)) {
+            mr_asprintf(&comment, _("What is your media device ?"));
+            mr_asprintf(&tmp, mr_conf->media_device);
+
+            if (!popup_and_get_string("Device", comment, tmp, 5)) {
                 log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
@@ -1529 +1516 @@
             mr_free(comment);
 
-            bkpinfo->media_size = atol(sz_size);
-            mr_free(sz_size);
-
-            if (bkpinfo->media_size <= 0L) {
-                log_to_screen(_("User has chosen not to backup the PC"));
-                finish(1);
-            }
-        }
-    case cdstream:
-        if (bkpinfo->disaster_recovery) {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");
-            mr_msg(2, "CD-ROM device assumed to be at %s",
-                    bkpinfo->media_device);
-        } else if (bkpinfo->restore_data
-                   || bkpinfo->backup_media_type == dvd) {
-            if (!bkpinfo->media_device[0]) {
-                strcpy(bkpinfo->media_device, "/dev/cdrom");
-            }                   // just for the heck of it :)
-            mr_msg(1, "bkpinfo->media_device = %s",
-                    bkpinfo->media_device);
-            if (bkpinfo->backup_media_type == dvd
-                || find_cdrom_device(bkpinfo->media_device, FALSE)) {
-                mr_msg(1, "bkpinfo->media_device = %s",
-                        bkpinfo->media_device);
-                mr_asprintf(&comment,
-                        _("Please specify your %s drive's /dev entry"),
-                        bkpinfo->backup_media_string);
-                if (!popup_and_get_string
-                    (_("Device?"), comment, bkpinfo->media_device, MAX_STR_LEN / 4)) {
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = tmp;
+
+            /* Also adapt the burning device if needed */
+            if ((strcmp(bkpinfo->media_device, mr_conf->media_device) != 0) &&
+                (strcmp(mr_conf->media_device,mr_conf->iso_burning_dev) != 0)) {
+                mr_asprintf(&comment, _("What is your burning media device then ?"));
+                mr_asprintf(&tmp, mr_conf->iso_burning_dev);
+    
+                if (!popup_and_get_string("Device", comment, tmp, 5)) {
                     log_to_screen(_("User has chosen not to backup the PC"));
                     finish(1);
                 }
                 mr_free(comment);
-            }
+    
+                /* BCO: We change the mr_conf struct. Check that it doesn't create pb */
+                mr_free(bkpinfo->iso_burning_dev);
+                bkpinfo->iso_burning_dev = tmp;
+            }
+
+            mr_asprintf(&comment,
+                    _("How much data (in Megabytes) will each %s store?"),
+                    bkpinfo->backup_media_string);
+            mr_asprintf(&sz_size, "%d", mr_conf->media_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);
+
+            bkpinfo->media_size = atol(sz_size);
+            mr_free(sz_size);
+
+            if (bkpinfo->media_size <= 0L) {
+                log_to_screen(_("User has chosen not to backup the PC"));
+                finish(1);
+            }
+        }
+
+    case cdstream:
+        if (bkpinfo->disaster_recovery) {
+            mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
+            mr_msg(2, "CD-ROM device assumed to be at %s", bkpinfo->media_device);
+        } else if (bkpinfo->restore_data || bkpinfo->backup_media_type == dvd) {
+            if (!bkpinfo->media_device) {
+                mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
+            }                   // just for the heck of it :)
+            mr_msg(1, "bkpinfo->media_device = %s", bkpinfo->media_device);
+            mr_asprintf(&comment,
+                _("Please specify your %s drive's /dev entry"), bkpinfo->backup_media_string);
+            mr_asprintf(&tmp,"/dev/cdrom");
+            if (!popup_and_get_string
+                (_("Device?"), comment, tmp, MAX_STR_LEN / 4)) {
+                    log_to_screen(_("User has chosen not to backup the PC"));
+                    finish(1);
+                }
+            mr_free(comment);
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device=tmp;
+
             mr_msg(2, "%s device found at %s",
                     bkpinfo->backup_media_string,
                     bkpinfo->media_device);
         } else {
-            if (find_cdrw_device(bkpinfo->media_device)) {
-                bkpinfo->media_device[0] = '\0';
-            }
-            if (bkpinfo->media_device[0]) {
-                mr_asprintf(&tmp,
-                        _("I think I've found your %s burner at SCSI node %s; Is this correct ? (say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details."),
-                        bkpinfo->backup_media_string,
-                        bkpinfo->media_device);
-                if (!ask_me_yes_or_no(tmp)) {
-                    bkpinfo->media_device[0] = '\0';
-                }
-                mr_free(tmp);
-            } else {
-                if (g_kernel_version < 2.6) {
-                    i = popup_and_get_string("Device node?",
-                                             "What is the SCSI node of your CD (re)writer, please?",
-                                             bkpinfo->media_device,
-                                             MAX_STR_LEN / 4);
-                } else {
-                    i = popup_and_get_string("/dev entry?",
-                                             "What is the /dev entry of your CD (re)writer, please?",
-                                             bkpinfo->media_device,
-                                             MAX_STR_LEN / 4);
-                }
-                if (!i) {
+            mr_asprintf(&comment, _("What is your media device ?"));
+            mr_asprintf(&tmp, mr_conf->media_device);
+
+            if (!popup_and_get_string("Device", comment, tmp, 5)) {
+                log_to_screen(_("User has chosen not to backup the PC"));
+                finish(1);
+            }
+            mr_free(comment);
+
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = tmp;
+
+            /* Also adapt the burning device if needed */
+            if ((strcmp(bkpinfo->media_device, mr_conf->media_device) != 0) &&
+                (strcmp(mr_conf->media_device,mr_conf->iso_burning_dev) != 0)) {
+                mr_asprintf(&comment, _("What is your burning media device then ?"));
+                mr_asprintf(&tmp, mr_conf->iso_burning_dev);
+    
+                if (!popup_and_get_string("Device", comment, tmp, 5)) {
                     log_to_screen(_("User has chosen not to backup the PC"));
                     finish(1);
                 }
-            }
-        }
-        if (bkpinfo->backup_media_type == cdstream) {
-            bkpinfo->media_size = (long)650;
-        }
+                mr_free(comment);
+    
+                /* BCO: We change the mr_conf struct. Check that it doesn't create pb */
+                mr_free(bkpinfo->iso_burning_dev);
+                bkpinfo->iso_burning_dev = tmp;
+            }
+
+        }
+        /* BERLIOS: Is it useful ?? */
+        bkpinfo->media_size = (long)650;
         break;
+
     case udev:
         if (!ask_me_yes_or_no
@@ -1607 +1621 @@
             finish(1);
         }
+
     case tape:
-
-        res = find_tape_device_and_size(bkpinfo->media_device, sz_size);
-        if ((res != 0) && (! bkpinfo->media_device[0])) {
-            mr_msg(3, "Ok, using vanilla scsi tape.");
-            strcpy(bkpinfo->media_device, VANILLA_SCSI_TAPE);
-            if ((fin = fopen(bkpinfo->media_device, "r"))) {
-                paranoid_fclose(fin);
-            } else {
-                mr_msg(2, "Don't know what your tape device is :-(");
-            }
-        }
-        if (bkpinfo->media_device[0]) {
+        if (bkpinfo->media_device) {
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
                 paranoid_fclose(fin);
             } else {
                 if (does_file_exist("/tmp/mondo-restore.cfg")) {
+                    /* BERLIOS: NOW that bkpinfo->media_device isn't static anymore it does NOT work */
                     read_cfg_var("/tmp/mondo-restore.cfg", "media-dev",
                                  bkpinfo->media_device);
                 }
             }
-            mr_asprintf(&tmp,
+            mr_asprintf(&comment,
                     _("I think I've found your tape streamer at %s; am I right on the money?"),
                     bkpinfo->media_device);
-            if (!ask_me_yes_or_no(tmp)) {
+            if (!ask_me_yes_or_no(comment)) {
+                mr_asprintf(&tmp,bkpinfo->media_device);
                 if (!popup_and_get_string
-                    ("Device name?",
-                    "What is the /dev entry of your tape streamer?",
-                    bkpinfo->media_device, MAX_STR_LEN / 4)) {
+                    (_("Device name?"),
+                    _("What is the /dev entry of your tape streamer?"),
+                    tmp, MAX_STR_LEN / 4)) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
-            }
-            mr_free(tmp);
+                mr_free(bkpinfo->media_device);
+                bkpinfo->media_device = tmp;
+            }
+            mr_free(comment);
         } else {
+            mr_asprintf(&tmp,bkpinfo->media_device);
             if (!popup_and_get_string
-                ("Device name?",
-                 "What is the /dev entry of your tape streamer?",
-                 bkpinfo->media_device, MAX_STR_LEN / 4)) {
+                (_("Device name?"),
+                 _("What is the /dev entry of your tape streamer?"),
+                 tmp, MAX_STR_LEN / 4)) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = tmp;
         }
         mr_asprintf(&tmp, "ls -l %s", bkpinfo->media_device);
@@ -1656 +1667 @@
         }
         mr_free(tmp);
-        mr_msg(4, "sz_size = %s", sz_size);
-        mr_free(sz_size);
         bkpinfo->media_size = 0L;
         mr_msg(4, "media_size = %ld", bkpinfo->media_size);
-        if (bkpinfo->media_size <= 0L) {
-            bkpinfo->media_size = 0L;
-        }
         if (archiving_to_media) {
             if ((bkpinfo->compression_level =
@@ -1797 +1803 @@
         mr_msg(3, "prefix set to %s", bkpinfo->prefix);
 
-        bkpinfo->media_size = (long)650;
+        if (archiving_to_media) {
+            if (!popup_and_get_string
+                ("Size.",
+                "Please enter how big you want each NFS image to be (in megabytes).",
+                sz_size, 16)) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+            bkpinfo->media_size = atol(sz_size);
+            if (bkpinfo->media_size <= 0L) {
+                log_to_screen(_("User has chosen not to backup the PC"));
+                finish(1);
+            }
+        }
         mr_msg(3, "Just set nfs_remote_dir to %s",
                 bkpinfo->nfs_remote_dir);
@@ -1826 +1845 @@
                 }
                 bkpinfo->media_size = atol(sz_size);
+            /* BERLIOS: this should be useless
+            */
             } else {
                 bkpinfo->media_size = (long)650;
@@ -1974 +1995 @@
         g_ISO_restore_mode = TRUE;
     }
-#ifdef __FreeSD__
+#ifdef __FreeBSD__
 // skip
 #else
@@ -2156 +2177 @@
 
     mr_asprintf(&mountdev, bkpinfo->media_device);
-    if (!mountdev[0]) {
-        log_it
-            ("(what_number_cd_is_this) Warning - media_device unknown. Finding out...");
-        find_cdrom_device(bkpinfo->media_device, FALSE);
-    }
     if (!is_this_device_mounted(MNT_CDROM)) {
         mount_CDROM_here(mountdev, MNT_CDROM);

branches/stable/mondo/src/common/libmondo-files.c

@@ -1271 +1271 @@
 {
     FILE *fout = NULL;
-    char *tmp = NULL;
     int retval = 0;
 
@@ -1279 +1278 @@
         paranoid_fclose(fout);
         mr_msg(2, "Created %s", outfile);
-        mr_asprintf(&tmp, "chmod +x %s", outfile);
-        paranoid_system(tmp);
-        mr_free(tmp);
-
+        chmod(outfile,0755);
         retval = 0;
     } else {

branches/stable/mondo/src/common/libmondo-fork.c

@@ -119 +119 @@
     midway_call = mr_malloc(1200);
 
+    mr_msg(5,"isofile: %s - cd_number_str: %d", isofile, cd_number_str);
     mr_asprintf(&cd_number_str, "%d", cd_no);
     resolve_naff_tokens(midway_call, basic_call, isofile, "_ISO_");
@@ -152 +153 @@
         }
         if (retval) {
-            mr_msg(2, "Basic call '%s' returned an error.", basic_call);
+            mr_msg(2, "Ultimate call '%s' returned an error.", ultimate_call);
             popup_and_OK(_("Press ENTER to continue."));
             popup_and_OK

branches/stable/mondo/src/common/libmondo-stream.c

@@ -329 +329 @@
     log_it("At this point, dev = %s and res = %d", dev, res);
 
-    strcpy(tmp, call_program_and_get_last_line_of_output("\
-cdrecord -scanbus 2> /dev/null | tr -s '\t' ' ' | \
-grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | \
-awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'"));
+    mr_asprintf(&command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'", cdr_exe);
+    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
 
     siz[0] = '\0';
@@ -1296 +1295 @@
         mr_asprintf(&command,
                  "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
-                 bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
+                 bkpinfo->iso_burning_dev, bkpinfo->writer_speed, MONDO_LOGFILE,
                  MONDO_LOGFILE);
         log_it("Opening OUT to next CD with the command");

branches/stable/mondo/src/common/libmondo-tools.c

@@ -329 +329 @@
  * - Used: @c bkpinfo->backup_data
  * - Used: @c bkpinfo->backup_media_type
- * - Used: @c bkpinfo->cdrw_speed
+ * - Used: @c bkpinfo->writer_speed
  * - Used: @c bkpinfo->compression_level
  * - Used: @c bkpinfo->include_paths
@@ -485 +485 @@
         }
         if (bkpinfo->manual_cd_tray) {
-            if (strstr(mr_conf->mondo_iso_burning_cmd,"growisofs") == NULL) {
+            if (strstr(mr_conf->iso_burning_cmd,"growisofs") != NULL) {
                 fatal_error("Unable to use manual CD tray with growisofs");
             }
@@ -502 +502 @@
             sprintf(bkpinfo->call_make_iso,
                     "%s %s %s dev=%s speed=%d %s/temporary.iso",
-                    mr_conf->mondo_iso_burning_cmd,
+                    mr_conf->iso_burning_cmd,
                     extra_cdrom_params, 
-                    mr_conf->mondo_iso_burning_opt, 
-                    bkpinfo->media_device,
-                    bkpinfo->cdrw_speed, 
+                    mr_conf->iso_burning_opt, 
+                    bkpinfo->iso_burning_dev,
+                    bkpinfo->writer_speed, 
                     bkpinfo->tmpdir);
         } else {
-            if (strstr(mr_conf->mondo_iso_burning_cmd,"growisofs") == NULL) {
-                if (getenv ("SUDO_COMMAND")) {
-                    mr_asprintf(&command, "strings `which growisofs` | grep -c SUDO_COMMAND");
-                    if (!strcmp(call_program_and_get_last_line_of_output(command), "1")) {
-                        fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
+            if (bkpinfo->backup_media_type == iso) {
+                sprintf(bkpinfo->call_make_iso,
+                    "%s %s . 2>> %s",
+                        mr_conf->iso_creation_cmd,
+                        mondo_mkisofs_sz, 
+                        MONDO_LOGFILE);
+            } else {
+                if (strstr(mr_conf->iso_burning_cmd,"growisofs") != NULL) {
+                    if (getenv ("SUDO_COMMAND")) {
+                        mr_asprintf(&command, "strings %s | grep -c SUDO_COMMAND", mr_conf->iso_burning_cmd);
+                        if (!strcmp(call_program_and_get_last_line_of_output(command), "1")) {
+                            fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
+                        }
+                        mr_free(command);
                     }
-                    mr_free(command);
+                    sprintf(bkpinfo->call_make_iso,
+                        "%s %s %s %s -Z %s -speed=%d . 2>> %s",
+                        mr_conf->iso_burning_cmd,
+                        mondo_mkisofs_sz, 
+                        extra_cdrom_params, 
+                        mr_conf->iso_burning_opt,
+                        bkpinfo->iso_burning_dev,
+                        bkpinfo->writer_speed,
+                        MONDO_LOGFILE);
+                } else {
+                    sprintf(bkpinfo->call_make_iso,
+                        "%s %s . 2>> %s | %s %s %s dev=%s speed=%d -",
+                        mr_conf->iso_creation_cmd,
+                        mondo_mkisofs_sz, 
+                        MONDO_LOGFILE,
+                        mr_conf->iso_burning_cmd,
+                        extra_cdrom_params, 
+                        mr_conf->iso_burning_opt,
+                        bkpinfo->iso_burning_dev,
+                        bkpinfo->writer_speed);
                 }
-                sprintf(bkpinfo->call_make_iso,
-                    "%s %s %s %s -Z %s -speed=%d . 2>> %s",
-                    mr_conf->mondo_iso_burning_cmd,
-                    mondo_mkisofs_sz, 
-                    extra_cdrom_params, 
-                    mr_conf->mondo_iso_burning_opt,
-                    bkpinfo->media_device,
-                    bkpinfo->cdrw_speed,
-                    MONDO_LOGFILE);
-            } else {
-                sprintf(bkpinfo->call_make_iso,
-                    "%s %s . 2>> %s | %s %s %s dev=%s speed=%d -",
-                    mr_conf->iso_creation_cmd,
-                    mondo_mkisofs_sz, 
-                    MONDO_LOGFILE,
-                    mr_conf->mondo_iso_burning_cmd,
-                    extra_cdrom_params, 
-                    mr_conf->mondo_iso_burning_opt,
-                    bkpinfo->media_device,
-                    bkpinfo->cdrw_speed);
+            mr_free(mondo_mkisofs_sz);
+            mr_free(extra_cdrom_params);
             }
         }
-        mr_free(mondo_mkisofs_sz);
-        mr_free(extra_cdrom_params);
     }                           // end of CD code
 
@@ -684 +692 @@
 void reset_bkpinfo(struct s_bkpinfo *bkpinfo)
 {
+    char *tmp = NULL;
+
     mr_msg(1, "Hi");
 
@@ -692 +702 @@
     bkpinfo->manual_cd_tray = FALSE;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-    bkpinfo->media_device[0] = '\0';
-    bkpinfo->media_size = 0L;
+    mr_asprintf(&tmp,mr_conf->media_device);
+    bkpinfo->media_device = tmp;
+    mr_asprintf(&tmp,mr_conf->iso_burning_dev);
+    bkpinfo->iso_burning_dev = tmp;
+
+    bkpinfo->media_size = mr_conf->iso_burning_speed;
     bkpinfo->boot_loader = '\0';
     bkpinfo->boot_device[0] = '\0';
@@ -732 +746 @@
     bkpinfo->wipe_media_first = FALSE;
     bkpinfo->differential = FALSE;
-    bkpinfo->cdrw_speed = 0;
+    bkpinfo->writer_speed = mr_conf->iso_burning_speed;
 // patch by Herman Kuster  
     bkpinfo->differential = 0;
@@ -848 +862 @@
     }
 #endif
-    retval += whine_if_not_found(mr_conf->mr_iso_creation_cmd);
-    retval += whine_if_not_found(mr_conf->mondo_iso_burning_cmd);
+    retval += whine_if_not_found(mr_conf->iso_creation_cmd);
+    retval += whine_if_not_found(mr_conf->iso_burning_cmd);
     retval += whine_if_not_found(MKE2FS_OR_NEWFS);
     retval += whine_if_not_found("bzip2");

branches/stable/mondo/src/common/mondostructures.h

@@ -308 +308 @@
    * If backup_media_type is anything else, this should be blank.
    */
-    char media_device[MAX_STR_LEN / 4];
+    char *media_device;
+
+    /* SCSI node (a la 0,0,0) or NULL if we use the media_device */
+    char *iso_burning_dev;
 
   /**
@@ -566 +569 @@
    * The speed of the CD-R[W] drive.
    */
-    int cdrw_speed;
+    int writer_speed;
 
   /**

branches/stable/mondo/src/common/newt-specific.c

@@ -698 +698 @@
 
     /*@ buffers ********************************************************** */
-    char *blurb = NULL;
-    char *original_contents = NULL;
     bool ret = TRUE;
+    size_t n = 0;
 
     assert_string_is_neither_NULL_nor_zerolength(title);
@@ -706 +705 @@
     assert(output != NULL);
 
+    n = strlen(output) + 1;
     if (g_text_mode) {
         printf
             ("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ",
              title, b);
-        (void) fgets(output, maxsize, stdin);
-        if (output[strlen(output) - 1] == '\n')
+        mr_getline(&output, &n, stdin);
+        if ((strlen(output) > 1) && (output[strlen(output) - 1] == '\n')) {
             output[strlen(output) - 1] = '\0';
+        }
         return(ret);
     }
-    mr_asprintf(&blurb, b);
-    text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
-    mr_asprintf(&original_contents, output);
-    output[0] = '\0';
+
+    text = newtTextboxReflowed(2, 1, b, 48, 5, 5, 0);
     type_here =
         newtEntry(2, newtTextboxGetNumLines(text) + 2,
-                  original_contents, 50,
-#ifdef __cplusplus
-                  0, NEWT_FLAG_RETURNEXIT
-#else
+                  output, 50,
                   (void *) &entry_value, NEWT_FLAG_RETURNEXIT
-#endif
         );
     b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, _("  OK  "));
@@ -736 +731 @@
     center_string(blurb, 80);
     */
-    newtPushHelpLine(blurb);
-    mr_free(blurb);
+    newtPushHelpLine(b);
 
     b_res = newtRunForm(myForm);
-    strcpy(output, entry_value);
     newtPopHelpLine();
     if (b_res == b_2) {
-        strcpy(output, original_contents);
         ret = FALSE;
+    } else {
+        mr_allocstr(output, newtEntryGetValue(entry_value));
     }
     newtFormDestroy(myForm);
     newtPopWindow();
-    mr_free(original_contents);
     return(ret);
 }

branches/stable/mondo/src/include/mr_conf.h

@@ -27 +27 @@
     /* ISO Burning CLI command to use */
     char *iso_burning_cmd;
+    /* ISO Burning device to use (optional) */
+    char *iso_burning_dev;
     /* ISO Burning CLI command options */
     char *iso_burning_opt;
@@ -121 +123 @@
 extern void mr_conf_close(void);
 
-/*read integer number after string str in the current file*/
-extern int mr_conf_iread(const char *field_name);
+/*read integer number (under a string format to be freed later on) after string str in the current file*/
+/* use atoi after */
+extern char *mr_conf_iread(const char *field_name);
 
-/*read double/float number after string str in the current file*/
-extern double mr_conf_fread(const char *field_name);
+/*read double/float number (under a string format to be freed later on) after string str in the current file*/
+/* use atof after */
+extern char *mr_conf_fread(const char *field_name);
 
-/*read boolean after string str in the current file*/
-extern bool mr_conf_bread(const char *field_name);
+/*read boolean (under a string format to be freed later on) after string str in the current file*/
+/* use mr_atob after */
+extern char *mr_conf_bread(const char *field_name);
 
 /*

branches/stable/mondo/src/include/mr_types.h

@@ -19 +19 @@
 #endif
 
+extern bool mr_atob(const char *str);
+
 #endif                          /* MR_TYPES_H */

branches/stable/mondo/src/include/my-stuff.h

@@ -238 +238 @@
 #define MNT_RESTORING "/mnt/RESTORING"
 
-/** @def VANILLA_SCSI_CDROM The first SCSI CD-ROM in the system (most likely to be the one to write to). */
 /** @def VANILLA_SCSI_TAPE  The SCSI tape radical on the system (most likely to be the one towrite to. */
 /** @def DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE A string whose presence in a device name indicates the
@@ -248 +247 @@
 /** @def CP_BIN The GNU @c cp binary to use. */
 #ifdef __FreeBSD__
-#define VANILLA_SCSI_CDROM  "/dev/cd0"
 #define VANILLA_SCSI_TAPE   "/dev/sa"
-#define VANILLA_USB_DEVICE  "/dev/tobegivenbyfreebsdguru"
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/vinum/"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
@@ -258 +255 @@
 #define CP_BIN      "gcp"
 #else
-#define VANILLA_SCSI_CDROM  "/dev/scd0"
 #define VANILLA_SCSI_TAPE   "/dev/st0"
-#define VANILLA_USB_DEVICE  "/dev/sda"
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
@@ -299 +294 @@
 #define log_it(format, args...) mr_msg(2, format, ## args)
 
-#define DEFAULT_DVD_DISK_SIZE 4480  ///< The default size (in MB) of a DVD disk, unless the user says otherwise.
-
 #define DEFAULT_DEBUG_LEVEL 4   ///< By default, don't log messages with a loglevel higher than this.
+#define DEFAULT_MR_LOGLEVEL 4
 
 #define SZ_NTFSPROG_VOLSIZE "1048576"   // was 4096
@@ -309 +303 @@
 #define MNT_FLOPPY "/mnt/floppy"
 
-#define DEFAULT_MR_LOGLEVEL 4
-
 #endif                          /* _MY_STUFF_H_ */

branches/stable/mondo/src/lib/mr_conf.c

@@ -192 +192 @@
 
 /*read integer number after string str in the current file*/
-int mr_conf_iread(const char *field_name) {
+char *mr_conf_iread(const char *field_name) {
     char *p = NULL;             /*pointer to the field */
-    int ret = 0;                /*return value */
+    char *p1 = NULL;            /*return field */
 
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        ret = atoi(p);
-        }
-    return ret;
+        mr_asprintf(&p1, "%d", p);
+        }
+    return p1;
 }
 
 /*read float/double number after string str in the current file*/
-double mr_conf_fread(const char *field_name) {
+char *mr_conf_fread(const char *field_name) {
     char *p = NULL;             /*pointer to the field */
-    double ret = 0.0;               /*return value */
+    char *p1 = NULL;            /*return field */
 
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        ret = atof(p);
-    }
-    return ret;
+        mr_asprintf(&p1, "%f", p);
+    }
+    return p1;
 }
 
@@ -265 +265 @@
 
 /*read boolean after string str in the current file*/
-bool mr_conf_bread(const char *field_name) {
+char *mr_conf_bread(const char *field_name) {
     char *p = NULL;             /*pointer to the field */
-    bool ret = FALSE;
+    char *p1 = NULL;                /*pointer to the field */
     
-    p = mr_conf_sread(field_name);
+    p = mr_conf_read(field_name);
     if (p != NULL) {
         /* match if yes/true/1 */
@@ -275 +275 @@
             (strncasecmp(p, "t" , (size_t)1) == 0) ||
             (strncasecmp(p, "1" , (size_t)1) == 0)) {
-            ret = TRUE;
-        }
-    }
-    return ret;
+            mr_asprintf(&p1, "%d", TRUE);
+        } else {
+            mr_asprintf(&p1, "%d", FALSE);
+        }
+    }
+    return p1;
+}
+
+/* Convert a string with decimal value of TRUE/FALSE in boolean */
+bool mr_atob(const char *str) {
+    bool ret = FALSE;
+    char *p = NULL;
+
+    mr_asprintf(&p, "%d", FALSE);
+    if (strcmp(str,p) != 0) {
+        ret = TRUE;
+    }
+    mr_free(p);
+    return(ret);
 }
 

branches/stable/mondo/src/lib/mr_str.c

@@ -13 +13 @@
  
 /**
- * Safe alternative to standard function strok()
- * Build a partition name from a drive and a partition number.
+ * Safe alternative to standard function strtok()
  * @param instr
  * @param delims

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -93 +93 @@
         flag_set[i] = FALSE;
     }
-    bkpinfo->media_size = (long)650;
-    res =
-        retrieve_switches_from_command_line(argc, argv, flag_val,
+    res = retrieve_switches_from_command_line(argc, argv, flag_val,
                                             flag_set);
     retval += res;
@@ -152 +150 @@
     assert(value != NULL);
 
-    bkpinfo->media_size = 0L;   /* dummy value */
     mr_asprintf(&tmp, value);
     q = strchr(tmp, ',');
@@ -211 +208 @@
 
     /* compulsory */
-    i = flag_set['c'] + flag_set['i'] + flag_set['n'] +
+    i = flag_set['i'] + flag_set['n'] +
         flag_set['t'] + flag_set['u'] + flag_set['r'] +
         flag_set['w'] + flag_set['C'] + flag_set['U'];
@@ -316 +313 @@
 
     if (g_kernel_version >= 2.6 && !flag_set['d']
-        && (flag_set['c'] || flag_set['w'])) {
+        && flag_set['w']) {
         fatal_error
             ("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
@@ -331 +328 @@
     }
 
-    if (flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) {
+    if (flag_set['w'] || flag_set['C'] || flag_set['r']) {
         if (!flag_set['r'] && g_kernel_version <= 2.5
             && strstr(flag_val['d'], "/dev/")) {
@@ -352 +349 @@
                 ("Please install dvdrecord/cdrecord and try again.");
         }
-        if (flag_set['C']) {
-            bkpinfo->cdrw_speed = atoi(flag_val['C']);
-            if (bkpinfo->cdrw_speed < 1) {
-                fatal_error
-                    ("You specified a silly speed for a CD-R[W] drive");
-            }
-            if (!flag_set['L']) {
-                log_to_screen
-                    (_("You must use -L with -C. Therefore I am setting it for you."));
-                flag_set['L'] = 1;
-                flag_val['L'][0] = '\0';
-            }
-        } else {
-            mr_msg(3, "flag_val['c'] = %s", flag_val['c']);
+        if (flag_set['w']) {
             mr_msg(3, "flag_val['w'] = %s", flag_val['w']);
-            if (flag_set['c']) {
-                bkpinfo->cdrw_speed = atoi(flag_val['c']);
-            } else if (flag_set['w']) {
-                bkpinfo->cdrw_speed = atoi(flag_val['w']);
-            } else if (flag_set['r']) {
-                bkpinfo->cdrw_speed = 1;    /*atoi(flag_val['r']); */
-            }
-
-            if (bkpinfo->cdrw_speed < 1) {
-                fatal_error
-                    ("You specified a silly speed for a CD-R[W] drive");
-            }
+            bkpinfo->writer_speed = atoi(flag_val['w']);
+        }
+
+        if (bkpinfo->writer_speed < 1) {
+            fatal_error
+                ("You specified a silly speed for a burner");
         }
     }
@@ -431 +409 @@
             fatal_error
                 ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
-        }
-        if (!flag_set['s']) {
-            sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4482 MB
-            strcat(flag_val['s'], "m");
-            log_to_screen
-                (_("You did not specify a size (-s) for DVD. I'm guessing %s."),
-                 flag_val['s']);
-            flag_set['s'] = 1;
         }
     }
@@ -457 +427 @@
                 }
             } else if (flag_set['u'] || flag_set['t']) {
+                /* Force autidetection */
                 bkpinfo->media_size = 0L;
             } else {
@@ -492 +463 @@
     }
 
-    if (flag_set['c']) {
-        bkpinfo->backup_media_type = cdr;
-    }
     if (flag_set['C']) {
         bkpinfo->backup_media_type = cdstream;
@@ -659 +627 @@
             strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
-            strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
+            mr_asprintf(&tmp2,flag_val['d']);
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = tmp2;
         }
     }
@@ -678 +648 @@
 
     if (!flag_set['d']
-        && (flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['U'])) {
-        if (g_kernel_version >= 2.6) {
-            if (popup_and_get_string
-                (_("Device"), _("Please specify the device"),
-                 bkpinfo->media_device, MAX_STR_LEN / 4)) {
-                retval++;
-                log_to_screen(_("User opted to cancel."));
-            }
-        } else if (find_cdrw_device(bkpinfo->media_device)) {
-            retval++;
-            log_to_screen
-                (_("Tried and failed to find CD-R[W] drive automatically.\n"));
+        && (flag_set['w'] || flag_set['C'] || flag_set['U'])) {
+        if (bkpinfo->media_device) {
+            mr_msg(4, "Using device %s", bkpinfo->media_device);
+            strncpy(flag_val['d'], bkpinfo->media_device, MAX_STR_LEN / 4);
+            flag_set['d'] = TRUE;
         } else {
-            flag_set['d'] = TRUE;
-            strncpy(flag_val['d'], bkpinfo->media_device, MAX_STR_LEN / 4);
+            fatal_error(_("No device provided either on command line or in the configuration file"));
         }
     }

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -96 +96 @@
     mr_msg(7, "Seven...");
     mr_msg(8, "Eight...");
-    printf("See %s for details of backup run.\n", MONDO_LOGFILE);
+    printf(_("See %s for details of backup run.\n"), MONDO_LOGFILE);
 }
 
@@ -133 +133 @@
 }
 
+/* reset/empty the mr_ar_conf structure from mondo's conf file */
+static void mr_ar_reset_conf(struct mr_ar_conf *mr_cnf) {
+
+    /* This should correspond to the default conf file */
+    /* Especially for boolean values */
+    mr_cnf->iso_creation_cmd = NULL;
+    mr_cnf->iso_creation_opt = NULL;
+    mr_cnf->iso_burning_cmd = NULL;
+    mr_cnf->iso_burning_opt = NULL;
+    mr_cnf->iso_burning_dev = NULL;
+    mr_cnf->iso_burning_speed = 0;
+    mr_cnf->media_size = 0;
+    mr_cnf->media_device = NULL;
+    mr_cnf->iso_burning_dev = NULL;
+    mr_cnf->manual_tray = FALSE;
+    mr_cnf->log_level = 0;
+    mr_cnf->prefix = NULL;
+    mr_cnf->external_tape_blocksize = 0;
+    mr_cnf->internal_tape_blocksize = 0;
+    mr_cnf->slice_size = 0;
+    mr_cnf->deplist_file = NULL;
+    mr_cnf->create_mindi_cd = FALSE;
+    mr_cnf->kernel = NULL;
+    mr_cnf->additional_modules = NULL;
+    mr_cnf->boot_loader = NULL;
+    mr_cnf->differential = FALSE;
+    mr_cnf->compression_tool = NULL;
+    mr_cnf->compression_level = 0;
+    mr_cnf->exclude_paths = NULL;
+    mr_cnf->include_paths = NULL;
+    mr_cnf->ui_mode = NULL;
+    mr_cnf->automatic_restore = FALSE;
+    mr_cnf->scratch_dir = NULL;
+    mr_cnf->tmp_dir = NULL;
+    mr_cnf->images_dir = NULL;
+}
+
 /* fill the mr_ar_conf structure from mindi's conf file */
 static void mr_ar_store_conf_mindi(struct mr_ar_conf *mr_cnf) {
@@ -153 +190 @@
     char *p = NULL;
 
-    mr_asprintf(&p, mr_conf_sread("mondo_iso_burning_cmd"));
-    mr_cnf->iso_burning_cmd = p;
-    p = NULL;
-
-    mr_asprintf(&p, mr_conf_sread("mondo_iso_burning_opt"));
-    mr_cnf->iso_burning_opt = p;
-    p = NULL;
-
-    mr_cnf->iso_burning_speed = mr_conf_iread("mondo_iso_burning_speed");
-    mr_cnf->media_size = mr_conf_iread("mondo_media_size");
-
-    mr_asprintf(&p, mr_conf_sread("mondo_media_device"));
-    mr_cnf->media_device = p;
-    p = NULL;
-
-    mr_cnf->manual_tray = mr_conf_bread("mondo_manual_tray");
-    mr_cnf->log_level = mr_conf_iread("mondo_log_level");
-
-    mr_asprintf(&p, mr_conf_sread("mondo_prefix"));
-    mr_cnf->prefix = p;
-    p = NULL;
-
-    mr_cnf->external_tape_blocksize = mr_conf_iread("mondo_external_tape_blocksize");
-    mr_cnf->internal_tape_blocksize = mr_conf_iread("mondo_internal_tape_blocksize");
-    mr_cnf->slice_size = mr_conf_iread("mondo_slice_size");
-
-    mr_asprintf(&p, mr_conf_sread("mondo_deplist_file"));
-    mr_cnf->deplist_file = p;
-    p = NULL;
-
-    mr_cnf->create_mindi_cd = mr_conf_bread("mondo_create_mindi_cd");
-
-    mr_asprintf(&p, mr_conf_sread("mondo_kernel"));
-    mr_cnf->kernel = p;
-    p = NULL;
-
-    mr_asprintf(&p, mr_conf_sread("mondo_additional_modules"));
-    mr_cnf->additional_modules = p;
-    p = NULL;
-
-    mr_asprintf(&p, mr_conf_sread("mondo_boot_loader"));
-    mr_cnf->boot_loader = p;
-    p = NULL;
-
-    mr_cnf->differential = mr_conf_bread("mondo_differential");
-
-    mr_asprintf(&p, mr_conf_sread("mondo_compression_tool"));
-    mr_cnf->compression_tool = p;
-    p = NULL;
-
-    mr_cnf->compression_level = mr_conf_iread("mondo_compression_level");
-
-    mr_asprintf(&p, mr_conf_sread("mondo_exclude_paths"));
-    mr_cnf->exclude_paths = p;
-    p = NULL;
-
-    mr_asprintf(&p, mr_conf_sread("mondo_include_paths"));
-    mr_cnf->include_paths = p;
-    p = NULL;
-
-    mr_asprintf(&p, mr_conf_sread("mondo_ui_mode"));
-    mr_cnf->ui_mode = p;
-    p = NULL;
-
-    mr_cnf->automatic_restore = mr_conf_bread("mondo_automatic_restore");
-
-    mr_asprintf(&p, mr_conf_sread("mondo_scratch_dir"));
-    mr_cnf->scratch_dir = p;
-    p = NULL;
-
-    mr_asprintf(&p, mr_conf_sread("mondo_tmp_dir"));
-    mr_cnf->tmp_dir = p;
-    p = NULL;
-
-    mr_asprintf(&p, mr_conf_sread("mondo_images_dir"));
-    mr_cnf->images_dir = p;
-    p = NULL;
+    p = mr_conf_sread("mondo_iso_burning_cmd");
+    if (p != NULL) {
+        mr_cnf->iso_burning_cmd = p;
+    }
+
+    p = mr_conf_sread("mondo_iso_burning_opt");
+    if (p != NULL) {
+        mr_cnf->iso_burning_opt = p;
+    }
+
+    p = mr_conf_sread("mondo_iso_burning_dev");
+    if (p != NULL) {
+        mr_cnf->iso_burning_dev = p;
+    }
+
+    p = mr_conf_iread("mondo_iso_burning_speed");
+    if (p != NULL ) {
+        mr_cnf->iso_burning_speed = atoi(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_iread("mondo_media_size");
+    if (p != NULL ) {
+        mr_cnf->media_size = atoi(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_sread("mondo_media_device");
+    if (p != NULL) {
+        mr_cnf->media_device = p;
+    }
+    /* If no specific device name for the burning command (a la ATAPI:0,0,0), 
+     * then use the normal device name (a la /dev/hda) */
+    if ((mr_cnf->iso_burning_dev == NULL) && (mr_cnf->media_device != NULL)) {
+        mr_asprintf(&p, mr_cnf->media_device);
+        mr_cnf->iso_burning_dev = p;
+    }
+
+    p = mr_conf_bread("mondo_manual_tray");
+    if (p != NULL) {
+        mr_cnf->manual_tray = mr_atob(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_iread("mondo_log_level");
+    if (p != NULL) {
+        mr_cnf->log_level = atoi(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_sread("mondo_prefix");
+    if (p != NULL) {
+        mr_cnf->prefix = p;
+    }
+
+    p = mr_conf_iread("mondo_external_tape_blocksize");
+    if (p != NULL) {
+        mr_cnf->external_tape_blocksize = atoi(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_iread("mondo_internal_tape_blocksize");
+    if (p != NULL) {
+        mr_cnf->internal_tape_blocksize = atoi(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_iread("mondo_slice_size");
+    if (p != NULL) {
+        mr_cnf->slice_size = atoi(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_sread("mondo_deplist_file");
+    if (p != NULL) {
+        mr_cnf->deplist_file = p;
+    }
+
+    p = mr_conf_bread("mondo_create_mindi_cd");
+    if (p != NULL) {
+        mr_cnf->create_mindi_cd = mr_atob(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_sread("mondo_kernel");
+    if (p != NULL) {
+        mr_cnf->kernel = p;
+    }
+
+    p = mr_conf_sread("mondo_additional_modules");
+    if (p != NULL) {
+        mr_cnf->additional_modules = p;
+    }
+
+    p = mr_conf_sread("mondo_boot_loader");
+    if (p != NULL) {
+        mr_cnf->boot_loader = p;
+    }
+
+    p = mr_conf_bread("mondo_differential");
+    if (p != NULL) {
+        mr_cnf->differential = mr_atob(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_sread("mondo_compression_tool");
+    if (p != NULL) {
+        mr_cnf->compression_tool = p;
+    }
+
+    p = mr_conf_iread("mondo_compression_level");
+    if (p != NULL) {
+        mr_cnf->compression_level = atoi(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_sread("mondo_exclude_paths");
+    if (p != NULL) {
+        mr_cnf->exclude_paths = p;
+    }
+
+    p = mr_conf_sread("mondo_include_paths");
+    if (p != NULL) {
+        mr_cnf->include_paths = p;
+    }
+
+    p = mr_conf_sread("mondo_ui_mode");
+    if (p != NULL) {
+        mr_cnf->ui_mode = p;
+    }
+
+    p = mr_conf_bread("mondo_automatic_restore");
+    if (p != NULL) {
+        mr_cnf->automatic_restore = mr_atob(p);
+        mr_free(p);
+    }
+
+    p = mr_conf_sread("mondo_scratch_dir");
+    if (p != NULL) {
+        mr_cnf->scratch_dir = p;
+    }
+
+    p = mr_conf_sread("mondo_tmp_dir");
+    if (p != NULL) {
+        mr_cnf->tmp_dir = p;
+    }
+
+    p = mr_conf_sread("mondo_images_dir");
+    if (p != NULL) {
+        mr_cnf->images_dir = p;
+    }
     mr_msg(5, "Directory for images is %s", mr_cnf->images_dir);
 }
@@ -242 +353 @@
     mr_free(mr_cnf->iso_creation_opt);
     mr_free(mr_cnf->iso_burning_cmd);
+    mr_free(mr_cnf->iso_burning_dev);
     mr_free(mr_cnf->iso_burning_opt);
     mr_free(mr_cnf->media_device);
@@ -301 +413 @@
     (void) textdomain("mondo");
 #endif
-    printf(_("Initializing..."));
+    printf(_("Initializing...\n"));
 
     /* Reference a dummy cleanup function for mr_exit temporarily */
@@ -327 +439 @@
 
     /* Conf file management */
+    mr_conf = mr_malloc(sizeof(struct mr_ar_conf));
+    mr_ar_reset_conf(mr_conf);
     /* Check md5 sum before */
     /* Get content */
@@ -332 +446 @@
             mr_log_exit(-1, "Unable to open "MONDO_CONF_DIR"/mondo.conf.dist");
     }
-    mr_conf = malloc(sizeof(struct mr_ar_conf));
     mr_ar_store_conf(mr_conf);
     /* Reference the right cleanup function for mr_exit now it's allocated */
     mr_cleanup = &mr_ar_cleanup;
-
     mr_conf_close();
+
+    if (mr_conf_open(MONDO_CONF_DIR"/mondo.conf") == 0) {
+        mr_ar_store_conf(mr_conf);
+        mr_conf_close();
+    }
 
     /* Check md5 sum before */

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -298 +298 @@
     if (res) {
         log_OS_error(command);
-        log_msg(2, tmp);
+        mr_msg(2, tmp);
     }
     mr_free(command);
@@ -594 +594 @@
 
     kill_petris();
-    paranoid_free(new);
-    paranoid_free(cwd);
+    mr_free(new);
+    mr_free(cwd);
     return (retval);
 }
@@ -635 +635 @@
     if (bkpinfo->disaster_recovery
         && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        strcpy(bkpinfo->media_device,
+        mr_allocstr(bkpinfo->media_device,
                last_line_of_file("/tmp/CDROM-LIVES-HERE"));
-    } else {
-        find_cdrom_device(bkpinfo->media_device, FALSE);
     }
     res = verify_tape_backups(bkpinfo);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -674 +674 @@
         if (bkpinfo->disaster_recovery
             && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-            strcpy(bkpinfo->media_device,
+            mr_allocstr(bkpinfo->media_device,
                    last_line_of_file("/tmp/CDROM-LIVES-HERE"));
-        } else {
-            find_cdrom_device(bkpinfo->media_device, TRUE);
         }
 
@@ -725 +723 @@
                                FALSE);
     if (run_program_and_log_output("ls " MNT_RESTORING " /tmp", FALSE)) {
-        run_program_and_log_output("chmod 1777 " MNT_RESTORING "/tmp",
-                                   FALSE);
+        chmod(MNT_RESTORING "/tmp",1777 );
     }
     run_program_and_log_output("mkdir -p " MNT_RESTORING
                                "/var/run/console", FALSE);
-    run_program_and_log_output("chmod 777 " MNT_RESTORING "/dev/null",
-                               FALSE);
+    chmod(MNT_RESTORING "/dev/null",0777);
     run_program_and_log_output("cd " MNT_RESTORING
                                "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done",
@@ -838 +834 @@
     if (bkpinfo->disaster_recovery) {
         if (bkpinfo->backup_media_type == cdstream) {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");
-            bkpinfo->media_size = (long)1999*1024;
+            mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
             bkpinfo->media_size = (long)650;    /* good guess */
         } else if (bkpinfo->backup_media_type == tape
@@ -846 +841 @@
                 fatal_error("Cannot get tape device name from cfg file");
             }
-            strcpy(bkpinfo->media_device, value);
+            mr_allocstr(bkpinfo->media_device, value);
             read_cfg_var(cfg_file, "media-size", value);
             bkpinfo->media_size = atol(value);
@@ -852 +847 @@
                     bkpinfo->media_device);
         } else {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");    /* we don't really need this var */
-            bkpinfo->media_size = (long)1999*1024;  /* 650, probably, but we don't need this var anyway */
+            mr_allocstr(bkpinfo->media_device, "/dev/cdrom");   /* we don't really need this var */
             bkpinfo->media_size = (long)1999*1024;  /* 650, probably, but we don't need this var anyway */
             mr_msg(2, "Backup medium is CD-R[W]");
@@ -1019 +1013 @@
                             "Unable to mount isodir. Perhaps this is really a CD backup?");
                     bkpinfo->backup_media_type = cdr;
-                    strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
+                    mr_allocstr(bkpinfo->media_device, "/dev/cdrom");   /* superfluous */
                     bkpinfo->isodir[0] = '\0';
                     mr_free(iso_mnt);
@@ -2150 +2144 @@
 
             if (strlen(bkpinfo->media_device) == 0) {
-                strcpy(bkpinfo->media_device, "/dev/st0");
+                mr_allocstr(bkpinfo->media_device, "/dev/st0");
                 mr_msg(2, "media_device is blank; assuming %s",
                         bkpinfo->media_device);
@@ -2157 +2151 @@
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
-                strcpy(bkpinfo->media_device, "/dev/st0");
+                mr_allocstr(bkpinfo->media_device, "/dev/st0");
                 if (extract_cfg_file_and_mountlist_from_tape_dev
                     (bkpinfo->media_device)) {
-                    strcpy(bkpinfo->media_device, "/dev/osst0");
+                    mr_allocstr(bkpinfo->media_device, "/dev/osst0");
                     if (extract_cfg_file_and_mountlist_from_tape_dev
                         (bkpinfo->media_device)) {
-                        strcpy(bkpinfo->media_device, "/dev/ht0");
+                        mr_allocstr(bkpinfo->media_device, "/dev/ht0");
                         if (extract_cfg_file_and_mountlist_from_tape_dev
                             (bkpinfo->media_device)) {
                             mr_msg(3,
                                     "I tried lots of devices but none worked.");
-                            strcpy(bkpinfo->media_device, tmp);
+                            mr_allocstr(bkpinfo->media_device, tmp);
                         }
                     }

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -912 +912 @@
     }
     interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    if (!bkpinfo->media_device[0]) {
+    if (!bkpinfo->media_device) {
         mr_msg(2, "Warning - failed to find media dev");
     } else {
@@ -954 +954 @@
     }
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
-    if ((!bkpinfo->please_dont_eject) && (bkpinfo->media_device != NULL)) {
+    if ((!bkpinfo->please_dont_eject) && (bkpinfo->media_device)) {
         eject_device(bkpinfo->media_device);
     }
@@ -3037 +3037 @@
     if (argc == 3 && strcmp(argv[1], "--paa") == 0) {
         g_current_media_number = atoi(argv[2]);
-        pause_and_ask_for_cdr(5, NULL);
+        pause_and_ask_for_cdr(5);
         paranoid_MR_finish(0);
     } else if (!bkpinfo->disaster_recovery) {   // live!