Changeset 1954 in MondoRescue

Timestamp:

May 27, 2008, 1:13:52 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Simplify some function interface with bkpinfo global
• Modify bkpinfo->media_device when OBDR to force using non-rewionding dev and improve backup

Location:

branches/2.2.6/mondo/src/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-stream-EXT.h (modified) (1 diff)
• libmondo-stream.c (modified) (7 diffs)
• libmondo-stream.h (modified) (1 diff)

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

@@ -1250 +1250 @@
             openout_cdstream(bkpinfo->media_device, bkpinfo->cdrw_speed);
         } else {
-            openout_tape(bkpinfo->media_device, bkpinfo->internal_tape_block_size); /* sets g_tape_stream */
+            openout_tape(); /* sets g_tape_stream */
         }
         if (!g_tape_stream) {

branches/2.2.6/mondo/src/common/libmondo-stream-EXT.h

@@ -13 +13 @@
 extern int openin_tape();
 extern int openout_cdstream(char *cddev, int speed);
-extern int openout_tape(char *tapedev, long internal_tape_block_size);
+extern int openout_tape();
 extern int read_file_from_stream_to_file(
                                          char *outfile, long long size);

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

@@ -605 +605 @@
 
 
-int set_tape_block_size_with_mt(char *tapedev,
-                                long internal_tape_block_size)
+int set_tape_block_size_with_mt(long internal_tape_block_size)
 {
     char *tmp;
     int res;
 
-    if (strncmp(tapedev, "/dev/", 5)) {
+    if (strncmp(bkpinfo->media_device, "/dev/", 5)) {
         log_msg(1,
                 "Not using 'mt setblk'. This isn't an actual /dev entry.");
@@ -617 +616 @@
     }
     malloc_string(tmp);
-    sprintf(tmp, "mt -f %s setblk %ld", tapedev, internal_tape_block_size);
+    sprintf(tmp, "mt -f %s setblk %ld", bkpinfo->media_device, internal_tape_block_size);
     res = run_program_and_log_output(tmp, 3);
     paranoid_free(tmp);
@@ -678 +677 @@
 /**
  * Handle OBDR if we were asked to do so
+ * @param tapedev The tape device to open for reading.
+ */
+void skip_obdr()
+{
+    char *command = NULL;
+
+    asprintf(&command, "mt -f %s fsf 2",bkpinfo->media_device);
+    run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+
+}
+
+/**
+ * Handle OBDR if we were asked to do so
  * @param tapedev The tape device to open for writing.
  * @return 0 for success, nonzero for failure.
@@ -683 +698 @@
  * EXISTING DATA on the tape!
  */
-void skip_obdr(char *tapedev)
-{
-    char *command = NULL;
-    char *ntapedev = NULL;
-
-    ntapedev = get_non_rewind_dev(tapedev);
-    if (ntapedev == NULL) {
-        log_it("Not skipping OBDR");
-    }
-
-    asprintf(&command, "mt -f %s fsf 2",ntapedev);
-    run_program_and_log_output(command, 1);
-    paranoid_free(command);
-
-    set_tape_block_size_with_mt(ntapedev, bkpinfo->internal_tape_block_size);
-
-    paranoid_free(ntapedev);
-}
-
-int create_obdr(char *tapedev)
-{
-
-    char *ntapedev = NULL;
+int create_obdr()
+{
+
     char *command = NULL;
     int res = 0;
 
-    ntapedev = get_non_rewind_dev(tapedev);
-    if (ntapedev == NULL) {
-        log_it("Skipping OBDR");
-        return(1);
-    }
-
     /* OBDR: First block 10 kB of zero bs = 512 */
-    asprintf(&command, "mt -f %s compression off",tapedev);
+    asprintf(&command, "mt -f %s compression off",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    asprintf(&command, "mt -f %s rewind",tapedev);
+    asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    set_tape_block_size_with_mt(ntapedev, 512);
-
-    asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20",ntapedev);
+    set_tape_block_size_with_mt(512);
+
+    asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
     /* OBDR: then ISO boot image bs = 2048 */
-    set_tape_block_size_with_mt(ntapedev, 2048);
-
-    asprintf(&command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",ntapedev);
+    set_tape_block_size_with_mt(2048);
+
+    asprintf(&command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    set_tape_block_size_with_mt(ntapedev, bkpinfo->internal_tape_block_size);
-
-    paranoid_free(ntapedev);
+    set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
 }
 
@@ -756 +743 @@
     char fname[MAX_STR_LEN];
     char *datablock;
+    char *ntapedev = NULL;
     char tmp[MAX_STR_LEN];
     char old_cwd[MAX_STR_LEN];
@@ -786 +774 @@
         return (0);
     }
-    if (bkpinfo->use_obdr) {
-        skip_obdr(bkpinfo->media_device);
-    } else {
-        set_tape_block_size_with_mt(bkpinfo->media_device,
-                                bkpinfo->internal_tape_block_size);
-    }
-
+    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));
+        skip_obdr();
+    } else {
+        if (ntapedev == 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);
@@ -909 +901 @@
  * EXISTING DATA on the tape!
  */
-int openout_tape(char *tapedev, long internal_tape_block_size)
-{
-
-    g_current_media_number = 1;
-    if (g_tape_stream) {
-        log_it("FYI - I won't 'openout' the tape. It's already open.");
-        return (0);
-    }
-    if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
-        fatal_error("Cannot alloc mem for tape catalog");
-    }
-    g_tapecatalog->entries = 0;
-    g_tape_posK = 0;
-
-    if (bkpinfo->use_obdr) {
-        create_obdr(tapedev);
-    } else {
-        set_tape_block_size_with_mt(tapedev, internal_tape_block_size);
-    }
-    log_it("Opening OUT tape");
-    if (!
-        (g_tape_stream =
-         open_device_via_buffer(tapedev, 'w', internal_tape_block_size))) {
-        log_OS_error(g_tape_fifo);
-        log_to_screen("Cannot openin stream device");
-        return (1);
-    }
+int openout_tape() {
+
+char *ntapedev = NULL;
+
+g_current_media_number = 1;
+if (g_tape_stream) {
+    log_it("FYI - I won't 'openout' the tape. It's already open.");
     return (0);
+}
+if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
+    fatal_error("Cannot alloc mem for tape catalog");
+}
+g_tapecatalog->entries = 0;
+g_tape_posK = 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));
+    create_obdr();
+} else {
+    if (ntapedev == NULL) {
+        log_it("Not able to create OBDR - Restore will have to be done manually");
+    }
+    set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+}
+paranoid_free(ntapedev);
+log_it("Opening OUT tape");
+if (!
+    (g_tape_stream =
+     open_device_via_buffer(tapedev, 'w', bkpinfo->internal_tape_block_size))) {
+    log_OS_error(g_tape_fifo);
+    log_to_screen("Cannot openin stream device");
+    return (1);
+}
+return (0);
 }
 

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

@@ -14 +14 @@
 int openin_tape();
 int openout_cdstream(char *cddev, int speed);
-int openout_tape(char *tapedev, long internal_tape_block_size);
+int openout_tape();
 int read_file_from_stream_to_file(char *outfile,
                                   long long size);