Changeset 1951 in MondoRescue

Timestamp:

May 26, 2008, 6:40:27 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Correct function to hqndle non-rewinding dev

File:

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

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

@@ -623 +623 @@
 }
 
+/**
+ * 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);
+}
+
+
 
 /**
@@ -846 +898 @@
         return (1);
     }
-}
-
-/**
- * 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;
-
-    ntapedev = (char *)malloc(strlen(tapedev)+sizeof(char));
-    p = strrchr(tapedev,'/');
-    if (p == NULL) {
-        return(NULL);
-    }
-
-    /* Copy tapedev content up to the last / */
-    q = tapedev;
-    while (q != p) {
-        *ntapedev = *q;
-        ntapedev++;
-        q++;
-    }
-    /* Copy the '/' */
-    *ntapedev = *q;
-    ntapedev++;
-    q++;
-    /* Adds a 'n' - non-rewinding */
-    *ntapedev = 'n';
-    ntapedev++;
-    /* Copy the rest of tapedev */
-    while (*q != '\0') {
-        *ntapedev = *q;
-        ntapedev++;
-        q++;
-    }
-    *ntapedev = '\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);
 }