Changeset 1969 in MondoRescue for branches/2.2.6/mondo/src/common/libmondo-stream.c

Timestamp:

May 29, 2008, 7:36:58 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Change order of test do that when restoring, cdrecord is really not called ;-)
• mondoarchive already configures correctly the device name to non-rew so avoid doing it again at restore time
• Fix automatic mode handling which was exiting in fact.

File:

• branches/2.2.6/mondo/src/common/libmondo-stream.c (modified) (3 diffs)

branches/2.2.6/mondo/src/common/libmondo-stream.c

@@ -748 +748 @@
     char fname[MAX_STR_LEN];
     char *datablock;
-    char *ntapedev = NULL;
     char tmp[MAX_STR_LEN];
     char old_cwd[MAX_STR_LEN];
@@ -779 +778 @@
         return (0);
     }
-    ntapedev = get_non_rewind_dev(bkpinfo->media_device);
-    if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
-        strncpy(bkpinfo->media_device,ntapedev,(size_t)(MAX_STR_LEN / 4));
+
+    // mondoarchive should have configured everything to give the right non-rew device
+    if ((bkpinfo->use_obdr) && (bkpinfo->media_device != NULL)) {
         res = skip_obdr();
         if (res != 0) {
@@ -787 +786 @@
         }
     } else {
-        if (ntapedev == NULL) {
+        if (bkpinfo->media_device == NULL) {
             log_it("Not able to skip OBDR - Restore will have to be done manually");
         }
         set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
     }
-    paranoid_free(ntapedev);
 
     insist_on_this_tape_number(1);