Changeset 3874 in MondoRescue

Timestamp:

Mar 7, 2024, 7:23:09 PM (7 weeks ago)

Author:

Bruno Cornec

Message:

remove differentiated support for cdrw

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-archive.c (modified) (10 diffs)
• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-devices-EXT.h (modified) (1 diff)
• common/libmondo-devices.c (modified) (8 diffs)
• common/libmondo-files.c (modified) (1 diff)
• common/libmondo-string.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• common/mondostructures.h (modified) (2 diffs)
• common/newt-specific.c (modified) (5 diffs)
• mondoarchive/mondoarchive.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

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

@@ -680 +680 @@
     case cdr:
         mr_asprintf(value, "cdr");
-        break;
-    case cdrw:
-        mr_asprintf(value, "cdrw");
         break;
     case cdstream:
@@ -1771 +1768 @@
     }
 
-    if (bkpinfo->backup_media_type == cdr
-        || bkpinfo->backup_media_type == cdrw) {
+    if (bkpinfo->backup_media_type == cdr) {
         if (is_this_device_mounted(bkpinfo->media_device)) {
             log_msg(2, "Warning - %s mounted. I'm unmounting it before I burn to it.", bkpinfo->media_device);
@@ -2457 +2453 @@
 /**
  * Make sure the user has a valid CD-R(W) in the CD drive.
- * @param cdrw_dev Set to the CD-R(W) device checked.
+ * @param cd_dev Set to the CD-R(W) device checked.
  * @param keep_looping If TRUE, keep pestering user until they insist
  * or insert a correct CD; if FALSE, only check once.
  * @return 0 (there was an OK CD in the drive) or 1 (there wasn't).
  */
-int interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev,
+int interrogate_disk_currently_in_cddrive(char *cd_dev,
                                              bool keep_looping)
 {
@@ -2469 +2465 @@
     char *cdrecord = NULL;
 
-    mr_asprintf(bkp, "%s", cdrw_dev);
-    if (find_cdrw_device(cdrw_dev)) {
-        strcpy(cdrw_dev, bkp);
-    } else {
+    mr_asprintf(bkp, "%s", cd_dev);
+    if ((cd_dev = find_dvd_device()) != NULL) {
         if (!system("which cdrecord > /dev/null 2> /dev/null")) {
-            mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
+            mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cd_dev);
         } else if (!system("which dvdrecord > /dev/null 2> /dev/null")) {
-            mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
+            mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cd_dev);
         } else {
             log_msg(2, "Oh well. I guess I'll just pray then.");
@@ -2516 +2510 @@
     char *tmp = NULL;
     char *cdrom_dev = NULL;
-    char *cdrw_dev = NULL;
+    char *cd_dev = NULL;
     char *our_serial_str = NULL;
     bool ok_go_ahead_burn_it;
@@ -2527 +2521 @@
     char *mds = NULL;
 
-    malloc_string(cdrw_dev);
+    malloc_string(cd_dev);
 
     mds = media_descriptor_string(g_backup_media_type);
@@ -2604 +2598 @@
         log_msg(2,
                 "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?", mds);
-        if (interrogate_disk_currently_in_cdrw_drive(cdrw_dev, FALSE)) {
+        if (interrogate_disk_currently_in_cddrive(cd_dev, FALSE)) {
             ok_go_ahead_burn_it = FALSE;
             log_to_screen("There isn't a writable %s in the drive.", mds);
@@ -2633 +2627 @@
 
     mr_free(cdrom_dev);
-    paranoid_free(cdrw_dev);
+    paranoid_free(cd_dev);
     mr_free(mtpt);
     if (pmountable) {
@@ -3101 +3095 @@
         }
         if (g_current_media_number == 1 && !res
-            && (bkpinfo->backup_media_type == cdr
-                || bkpinfo->backup_media_type == cdrw)) {
+            && (bkpinfo->backup_media_type == cdr)) {
             if ((tmp = find_cdrom_device()) == NULL) {  // make sure find_cdrom_device() finds, records CD-R's loc
                 log_msg(3, "*Sigh* Mike, I hate your computer.");
@@ -3204 +3197 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     } else if (bkpinfo->backup_data)
-        //bkpinfo->backup_media_type == cdrw || bkpinfo->backup_media_type == cdr))
+        // bkpinfo->backup_media_type == cdr))
     {
         log_msg(2,

branches/3.3/mondo/src/common/libmondo-cli.c

@@ -534 +534 @@
     if (flag_set['u']) {
         bkpinfo->backup_media_type = udev;
-    }
-    if (flag_set['w']) {
-        bkpinfo->backup_media_type = cdrw;
     }
     if (flag_set['U']) {

branches/3.3/mondo/src/common/libmondo-devices-EXT.h

@@ -25 +25 @@
 extern int kick_vn(char *vn);
 extern char which_boot_loader(char *which_device);
-
-
-
-extern int find_cdrw_device(char *cdrw_device);
-
 
 extern int interactively_obtain_media_parameters_from_user(bool);

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

@@ -55 +55 @@
 extern char *call_program_and_get_last_line_of_output(const char *);
 
-static char g_cdrw_drive_is_here[MAX_STR_LEN / 4] = "";
+static char g_cd_drive_is_here[MAX_STR_LEN / 4] = "";
 static char g_cdrom_drive_is_here[MAX_STR_LEN / 4] = "";
 static char g_dvd_drive_is_here[MAX_STR_LEN / 4] = "";
@@ -105 +105 @@
         if (strlen(g_dvd_drive_is_here) > 0) {
             inject_device(g_dvd_drive_is_here);
-        }
-        if (strlen(g_cdrw_drive_is_here) > 0) {
-            inject_device(g_cdrw_drive_is_here);
         }
     }
@@ -188 +185 @@
     case cdr:
         strcpy(output, "cdr");
-        break;
-    case cdrw:
-        strcpy(output, "cdrw");
         break;
     case cdstream:
@@ -501 +495 @@
     }
     return (res);
-}
-
-
-
-
-
-
-/**
- * Locate a CD-R/W writer's SCSI node.
- * @param cdrw_device SCSI node will be placed here.
- * @return 0 for success, nonzero for failure.
- */
-int find_cdrw_device(char *cdrw_device)
-{
-    /*@ buffers ************************ */
-    char *tmp = NULL;
-    char *cdr_exe = NULL;
-    char *command = NULL;
-
-    if (g_cdrw_drive_is_here[0]) {
-        strcpy(cdrw_device, g_cdrw_drive_is_here);
-        log_msg(3, "Been there, done that. Returning %s", cdrw_device);
-        return (0);
-    }
-    if (g_backup_media_type == dvd) {
-        log_msg(1, "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
-        return (1);
-    }
-    run_program_and_log_output("insmod ide-scsi", -1);
-    if ((cdr_exe = find_home_of_exe("cdrecord")) == NULL) {
-        if ((cdr_exe = find_home_of_exe("wodim")) == NULL) {
-            cdr_exe = find_home_of_exe("dvdrecord");
-        }
-    }
-    if (cdr_exe != NULL) {
-        mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1", cdr_exe);
-        tmp = call_program_and_get_last_line_of_output(command);
-        mr_free(command);
-    }
-    if ((tmp == NULL) || (strlen(tmp) < 2)) {
-        mr_free(tmp);
-        mr_free(cdr_exe);
-        return (1);
-    } else {
-        strcpy(cdrw_device, tmp);
-        log_it("Found CDRW device - %s", cdrw_device);
-        strcpy(g_cdrw_drive_is_here, cdrw_device);
-        mr_free(tmp);
-        mr_free(cdr_exe);
-        return (0);
-    }
 }
 
@@ -786 +729 @@
                                         (found_it =
                                          set_dev_to_this_if_rx_OK(output,
-                                                                  g_cdrw_drive_is_here)))
+                                                                  g_cd_drive_is_here)))
                                     {
                                         retval = 1;
@@ -837 +780 @@
     }
 
-    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
+    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cd_drive_is_here);
 
     log_msg(1, "command=%s", command);
@@ -2249 +2192 @@
     switch (bkpinfo->backup_media_type) {
     case cdr:
-    case cdrw:
     case dvd:
     case usb:
@@ -2338 +2280 @@
             log_msg(2, "%s device found at %s", mds, bkpinfo->media_device);
         } else {
-            if ((find_cdrw_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
+            if ((find_cdrom_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
                 mr_free(bkpinfo->media_device);
             }

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

@@ -19 +19 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-string-EXT.h"
-#include "libmondo-newt-specific-EXT.h"
+#include "newt-specific-EXT.h"
 
 /*@unused@*/

branches/3.3/mondo/src/common/libmondo-string.c

@@ -1040 +1040 @@
         mr_asprintf(type_of_backup, "CDR");
         break;
-    case cdrw:
-        mr_asprintf(type_of_backup, "CDRW");
-        break;
     case tape:
         mr_asprintf(type_of_backup, "tape");

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

@@ -486 +486 @@
 
 // CD-R or CD-RW
-    if (bkpinfo->backup_media_type == cdrw
-        || bkpinfo->backup_media_type == cdr) {
+    if (bkpinfo->backup_media_type == cdr) {
         if (!bkpinfo->manual_cd_tray) {
             mr_asprintf(extra_cdrom_params, "-waiti ");
         }
-        if (bkpinfo->backup_media_type == cdrw) {
-            mr_asprintf(extra_cdrom_params, "blank=fast ");
-        }
-        if (extra_cdrom_params == NULL) {
-            // If not initialized earlier, do it now
-            mr_asprintf(extra_cdrom_params, " ");
-        }
+        mr_asprintf(extra_cdrom_params, "%s", "blank=fast ");
         if ((cdr_exe = find_home_of_exe("cdrecord")) == NULL) {
             if ((cdr_exe = find_home_of_exe("wodim")) == NULL) {

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

@@ -173 +173 @@
     iso,                        ///< Back up to ISO images.
     cdr,                        ///< Back up to recordable CDs (do not erase them).
-    cdrw,                       ///< Back up to CD-RWs and blank them first.
     dvd,                        ///< Back up to DVD+R[W] or DVD-R[W] disks.
     cdstream,                   ///< Back up to recordable CDs but treat them like a tape streamer.
@@ -339 +338 @@
   /**
    * The device we're backing up to.
-   * If backup_media_type is @b cdr, @b cdrw, or @b cdstream, this should be the SCSI node (e.g. 0,1,0).
+   * If backup_media_type is @b cdr, or @b cdstream, this should be the SCSI node (e.g. 0,1,0).
    * If backup_media_type is @b dvd, @b tape, @b usb or @b udev, this should be a /dev entry.
    * If backup_media_type is anything else, this should be blank.

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

@@ -1225 +1225 @@
 /**
  * Ask the user which backup media type they would like to use.
- * The choices are @p none (exit to shell), @c cdr, @c cdrw, @c dvd,
+ * The choices are @p none (exit to shell), @c cdr, @c dvd,
  * @c tape, @c cdstream, @c udev (only when @p g_text_mode is TRUE), @c netfs,
  * and @c iso.
@@ -1240 +1240 @@
         char *title_sz = NULL;
         char *minimsg_sz = NULL;
-        static t_bkptype possible_bkptypes[] = { none, cdr, cdrw, dvd, tape, cdstream, udev, netfs, iso };
-        static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
+        static t_bkptype possible_bkptypes[] = { none, cdr, dvd, tape, cdstream, udev, netfs, iso };
+        static char *possible_responses[] = { "none", "cdr", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
         char *outstr = NULL;
         char *instr = NULL;
@@ -1289 +1289 @@
         newtCenteredWindow(34, 17, minimsg_sz);
         b1 = newtButton(1, 1, "CD-R disks ");
-        b2 = newtButton(17, 1, "CD-RW disks");
         b3 = newtButton(1, 9, "Tape drive ");
         b4 = newtButton(17, 5, "USB Key/Disk");
@@ -1297 +1296 @@
         b8 = newtButton(17, 13, "    Exit   ");
         myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8, NULL);
+        newtFormAddComponents(myForm, b1, b5, b3, b7, b4, b6, b8, NULL);
         b_res = newtRunForm(myForm);
         newtFormDestroy(myForm);
@@ -1303 +1302 @@
         if (b_res == b1) {
             output = cdr;
-        } else if (b_res == b2) {
-            output = cdrw;
         } else if (b_res == b3) {
             output = tape;

branches/3.3/mondo/src/mondoarchive/mondoarchive.c

@@ -27 +27 @@
 extern bool g_text_mode;
 extern char *g_boot_mountpt;
-extern char *g_cdrw_drive_is_here;
+extern char *g_cd_drive_is_here;
 static char *g_cdrom_drive_is_here = NULL;
 static char *g_dvd_drive_is_here = NULL;
@@ -281 +281 @@
         g_loglevel = 10;
         setup_newt_stuff();
-        malloc_string(tmp);
-        if (find_cdrw_device(tmp)) {
+        if ((tmp = find_cdrom_device()) == NULL) {
             printf("Failed to find CDR-RW drive\n");
         } else {
             printf("CD-RW is at %s\n", tmp);
-        }
-        tmp[0] = '\0';
-        if (find_cdrom_device(tmp, atoi(argv[2]))) {
-            printf("Failed to find CD-ROM drive\n");
-        } else {
-            printf("CD-ROM is at %s\n", tmp);
         }
         mr_free(tmp);

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

@@ -671 +671 @@
     } else if (!strcmp(value, "cdr")) {
         bkpinfo->backup_media_type = cdr;
-    } else if (!strcmp(value, "cdrw")) {
-        bkpinfo->backup_media_type = cdrw;
     } else if (!strcmp(value, "dvd")) {
         bkpinfo->backup_media_type = dvd;