Changeset 3882 in MondoRescue for branches/3.3/mondo/src/common/libmondo-devices.c

Timestamp:

Mar 10, 2024, 12:46:53 AM (4 months ago)

Author:

Bruno Cornec

Message:

More cleanup

• Remove support for cd stream never really tested/useful/... (-C option removed for mondoarchive)
• Remove dvdrecord specificities as obsolete
• Remove types cdr and dvd to keep a single optical
• Remove cdrw_speed param as obsolete now it's automatically detected
• mondoarchive -c has no parameter anymore
• Remove some useless global variables
• Replaces some remaining /mnt/cdrom values by the define MNT_CDROM

File:

• branches/3.3/mondo/src/common/libmondo-devices.c (modified) (5 diffs)

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

@@ -715 +715 @@
         mr_asprintf(output, "%s", "optical");
         break;
-    case cdstream:
-        mr_asprintf(output, "%s", "cdstream");
-        break;
     case netfs:
         mr_asprintf(output, "%s", "netfs");
@@ -2058 +2055 @@
         }
 
-        bkpinfo->compression_level = (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
+        bkpinfo->compression_level = 5;
         if ((bkpinfo->compression_level = which_compression_level()) == -1) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
         }
-        bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
-        bkpinfo->use_lzo = (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
+        bkpinfo->use_lzo = FALSE;
     }
     mvaddstr_and_log_it(2, 0, " ");
@@ -2096 +2092 @@
 
         if (archiving_to_media) {
-            if (bkpinfo->backup_media_type == dvd) {
-                strcpy(tmp1, "1");
+            if (bkpinfo->backup_media_type == optical) {
                 mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
-                log_msg(1, "Setting to DVD defaults");
+                log_msg(1, "Setting to DVD defaults ~4.4GB");
             } else {
-                strcpy(tmp1, "4");
-                mr_asprintf(sz_size, "%d", 650);
-                log_msg(1, "Setting to CD defaults");
-            }
-
-            mr_asprintf(comment, "What speed is your %s writer?", mds);
-            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                if (!popup_and_get_string("Speed", comment, tmp1, 4)) {
-                    log_to_screen("User has chosen not to backup the machine");
-                    mr_free(comment);
-                    finish(1);
-                }
-            }
-            mr_free(comment);
-            bkpinfo->cdrw_speed = atoi(tmp1);   // if DVD then this shouldn't ever be used anyway :)
-
-            strcpy(tmp1, sz_size);
+                mr_asprintf(sz_size, "%d", 0);  // No value for USB
+            }
+
             mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
-            if (!popup_and_get_string("Size", comment, tmp1, 5)) {
+            tmp1 = popup_and_get_string("Size", comment, sz_size, 5)) {
+            if (!tmp1) {
                 log_to_screen("User has chosen not to backup the machine");
                 finish(1);
-            }
-            mr_asprintf(sz_size, "%s", tmp1);
-            bkpinfo->media_size = atoi(sz_size);
-
+            } else {
+                bkpinfo->media_size = atoi(tmp1);
+            }
+            mr_free(tmp1);
             if (bkpinfo->media_size <= 0) {
                 log_to_screen("User has chosen not to backup the machine");
@@ -2131 +2113 @@
             }
         }
-        /* No break because we continue even for usb */
-    case cdstream:
 
         // If media_device not found ask
@@ -2166 +2146 @@
         }
         mr_free(mds);
-
-        if (bkpinfo->backup_media_type == cdstream) {
-            bkpinfo->media_size = 650;
-        }
         break;
+
     case udev:
         if (!ask_me_yes_or_no