Changeset 1594 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Aug 26, 2007, 12:26:06 PM (17 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/mondo/src/common

Files:

• libmondo-archive-EXT.h (modified) (1 diff)
• libmondo-archive.c (modified) (23 diffs)
• libmondo-archive.h (modified) (1 diff)
• libmondo-devices.c (modified) (13 diffs)
• libmondo-files.c (modified) (2 diffs)
• libmondo-fork.c (modified) (2 diffs)
• libmondo-stream.c (modified) (2 diffs)
• libmondo-tools.c (modified) (7 diffs)
• mondostructures.h (modified) (2 diffs)
• newt-specific.c (modified) (3 diffs)

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);
 }