Changeset 1977 in MondoRescue for branches/stable/mondo/src/common/libmondo-stream.c

Timestamp:

Jun 2, 2008, 10:49:01 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1938:1976 $SVN_M/branches/2.2.6

File:

• branches/stable/mondo/src/common/libmondo-stream.c (modified) (10 diffs)

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

@@ -2 +2 @@
 
 ...tools for talking to tapes, Monitas streams, etc.
+
 */
 
@@ -364 +365 @@
     int res = 0;
     char *fname = (char *)&res;                 /* Should NOT be NULL */
+    char *tmp = NULL;
 
     // xattr
@@ -371 +373 @@
             wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
         }
-        if (!strstr(fname, "xattr")) {
-            fatal_error("Wrong order for xattr, sunshine.");
+        if (strstr(fname, "xattr") == NULL) {
+            asprintf(&tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
+            fatal_error(tmp);
         }
         read_file_from_stream_to_file(xattr_fname, *ptmp_size);
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
             wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
         }
         mr_msg(1, "Got xattr");
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXTENDED_ATTRIBUTES) {
             wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
         }
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-        if (pctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
+        if (*pctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
             log_msg(1, "No acl attributes found, skipping to afio files");
             return(0);
         } else {
-            if (pctrl_chr != BLK_START_EXTENDED_ATTRIBUTES) {
+            if (*pctrl_chr != BLK_START_EXTENDED_ATTRIBUTES) {
                 wrong_marker(BLK_START_EXTENDED_ATTRIBUTES, *pctrl_chr);
             }
@@ -397 +400 @@
     if (g_getfacl) {
         res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
-        if (!strstr(fname, "acl")) {
-            fatal_error("Wrong order for acl, sunshine.");
-        }
         if (*pctrl_chr != BLK_START_EXAT_FILE) {
             wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
         }
+        if (strstr(fname, "acl") == NULL) {
+            asprintf(&tmp,"Wrong order expected acl, got %s, sunshine.", fname);
+            fatal_error(tmp);
+        }
         read_file_from_stream_to_file(acl_fname, *ptmp_size);
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
             wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
         }
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXTENDED_ATTRIBUTES) {
             wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
@@ -595 +599 @@
 
 
-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)) {
         mr_msg(1,
                 "Not using 'mt setblk'. This isn't an actual /dev entry.");
         return (0);
     }
-    mr_asprintf(&tmp, "mt -f %s setblk %ld", tapedev,
-             internal_tape_block_size);
+    mr_asprintf(&tmp, "mt -f %s setblk %ld",bkpinfo->media_device,internal_tape_block_size);
     res = run_program_and_log_output(tmp, 3);
     mr_free(tmp);
     return (res);
+}
+
+/**
+ * Return the non-rewinding device when passed the normal one
+ * @param tapedev The tape device to open for writing.
+ * @note the caller needs to free the string returned
+ */
+char *get_non_rewind_dev(char *tapedev)
+{
+
+    char *ntapedev = NULL;
+    char *p = NULL;
+    char *q = NULL;
+    char *r = NULL;
+
+    ntapedev = (char *)malloc(strlen(tapedev)+sizeof(char));
+    p = strrchr(tapedev,'/');
+    if (p == NULL) {
+        log_it("Didn't find a '/' in %s",tapedev);
+        return(NULL);
+    }
+
+    /* Copy tapedev content up to the last / */
+    q = tapedev;
+    r = ntapedev;
+    while (q != p) {
+        *r = *q;
+        r++;
+        q++;
+    }
+    /* Copy the '/' */
+    *r = *q;
+    r++;
+    q++;
+    /* Adds a 'n' - non-rewinding */
+    *r = 'n';
+    r++;
+    /* Copy the rest of tapedev */
+    while (*q != '\0') {
+        *r = *q;
+        r++;
+        q++;
+    }
+    *r = '\0';
+    if (mt_says_tape_exists(ntapedev)) {
+        log_it("Non-rewinding tape device is %s",ntapedev);
+    } else {
+        log_it("Unable to find non-rewinding tape device.");
+        ntapedev = NULL;
+    }
+    return(ntapedev);
+}
+
+
+
+/**
+ * Handle OBDR if we were asked to do so
+ * @param tapedev The tape device to open for reading.
+ */
+int skip_obdr(void)
+{
+    char *command = NULL;
+    int res = 0;
+
+    log_it("Skipping OBDR headers");
+    asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    asprintf(&command, "mt -f %s fsf 2",bkpinfo->media_device);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+    return(res);
+}
+
+/**
+ * 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.
+ * @note This should be called ONLY from backup processes. It will OVERWRITE ANY
+ * EXISTING DATA on the tape!
+ */
+int create_obdr(void)
+{
+
+    char *command = NULL;
+    int res = 0;
+
+    log_it("Creating OBDR headers");
+    /* OBDR: First block 10 kB of zero bs = 512 */
+    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",bkpinfo->media_device);
+    res += run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    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(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(bkpinfo->internal_tape_block_size);
+    return(res);
 }
 
@@ -633 +750 @@
     int i;
     int j;
-    int res;
+    int res = 0;
     long length, templong;
     size_t k;
@@ -654 +771 @@
         return (0);
     }
+
+    // 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) {
+            log_it("Not able to skip OBDR - Restore will have to be done manually");
+        }
+    } else {
+        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);
+    }
+
     insist_on_this_tape_number(1);
     mr_asprintf(&outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
     make_hole_for_file(outfname);
-
-    set_tape_block_size_with_mt(bkpinfo->media_device,
-                                bkpinfo->internal_tape_block_size);
 
     log_it("Opening IN tape");
@@ -762 +890 @@
 /**
  * Start writing to a tape device for the backup.
+ * 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.
@@ -767 +896 @@
  * EXISTING DATA on the tape!
  */
-int openout_tape(char *tapedev, long internal_tape_block_size)
-{
+int openout_tape() {
+
     g_current_media_number = 1;
     if (g_tape_stream) {
@@ -777 +906 @@
     g_tape_posK = 0;
 
-    set_tape_block_size_with_mt(tapedev, internal_tape_block_size);
+    if (bkpinfo->use_obdr) {
+        create_obdr();
+    } else {
+        set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+    }
     log_it("Opening OUT tape");
     if (!
         (g_tape_stream =
-         open_device_via_buffer(tapedev, 'w', internal_tape_block_size))) {
+         open_device_via_buffer(bkpinfo->media_device, 'w', internal_tape_block_size))) {
         log_to_screen(_("Cannot openin stream device"));
         return (1);