Changeset 3880 in MondoRescue for branches/3.3/mondo/src

Timestamp:

Mar 9, 2024, 3:05:43 PM (4 months ago)

Author:

Bruno Cornec

Message:

Change semantic of -w option for mondoarchive by using it to indicate that we want to wipe media before writing

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-cli.c (modified) (6 diffs)
• libmondo-tools.c (modified) (1 diff)
• mondostructures.h (modified) (1 diff)

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

@@ -205 +205 @@
     i = flag_set['c'] + flag_set['i'] + flag_set['n'] +
         flag_set['t'] + flag_set['u'] + flag_set['r'] +
-        flag_set['w'] + flag_set['C'] + flag_set['U'];
+        flag_set['C'] + flag_set['U'];
     if ((i == 0) && (! bkpinfo->restore_data)) {
         retval++;
@@ -311 +311 @@
     }
 
-    if (g_kernel_version >= 2.6 && !flag_set['d'] && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
+    if (g_kernel_version >= 2.6 && !flag_set['d'] && flag_set['c'] && (! bkpinfo->restore_data)) {
         fatal_error("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
     }
@@ -325 +325 @@
     }
 
-    if ((flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) && (! bkpinfo->restore_data)) {
+    if ((flag_set['c'] || flag_set['C'] || flag_set['r']) && (! bkpinfo->restore_data)) {
         if (system("which cdrecord > /dev/null 2> /dev/null") && system("which dvdrecord > /dev/null 2> /dev/null")) {
             fatal_error("Please install dvdrecord/cdrecord and try again.");
@@ -341 +341 @@
         } else {
             log_msg(3, "flag_val['c'] = %s", flag_val['c']);
-            log_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']); */
@@ -426 +423 @@
         if (flag_set['w']) {
             bkpinfo->wipe_media_first = TRUE;
-        }                       /* CD-RW */
+        }                       /* DVD/CD-RW */
     }
 
@@ -740 +737 @@
     }
 
-    if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+    if (!flag_set['d'] && (flag_set['c'] || flag_set['C'])) {
             tmp1 = mr_popup_and_get_string("Device", "Please specify the device", bkpinfo->media_device);
             if (tmp1 == NULL) {

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

@@ -488 +488 @@
             mr_asprintf(extra_cdrom_params, "-waiti ");
         }
-        mr_asprintf(extra_cdrom_params, "%s", "blank=fast ");
+        if (bkpinfo->wipe_media_first) {
+            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

@@ -598 +598 @@
 
   /**
-   * If TRUE, then pass cdrecord the argument "blank=fast" to wipe the CDs before
-   * writing to them. This has no effect for DVDs.
+   * If TRUE, then pass cdrecord the argument "blank=fast" to wipe the media before
+   * writing to them.
    */
     bool wipe_media_first;