Changeset 1594 in MondoRescue for branches/stable/mondo/src/mondoarchive/mondo-cli.c

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)

File:

• branches/stable/mondo/src/mondoarchive/mondo-cli.c (modified) (11 diffs)

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