Changeset 3857 in MondoRescue for branches/3.3/mondo/src/common/libmondo-stream.c

Timestamp:

Mar 6, 2024, 5:30:47 PM (4 months ago)

Author:

Bruno Cornec

Message:

find_tape_device_and_size => find_tape_device as size unused

File:

• branches/3.3/mondo/src/common/libmondo-stream.c (modified) (7 diffs)

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

@@ -251 +251 @@
  * Determine the name and size of the tape device. Tries the SCSI tape for
  * this platform, then the IDE tape, then "/dev/st0", then "/dev/osst0".
- * @param dev Where to put the found tape device.
+ * @param dev Where to put the found tape device. Allocated dynamically by caller or reallocated here
  * @param siz Where to put the tape size (a string like "4GB")
  * @return 0 if success, nonzero if failure (in which @p dev and @p siz are undefined).
  */
-int find_tape_device_and_size(char *dev, char *siz)
-{
+int find_tape_device(char *dev) {
     char *tmp = NULL;
     char *command = NULL;
@@ -263 +262 @@
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
-    dev[0] = siz[0] = '\0';
+    mr_free(dev);
     if (find_home_of_exe("cdrecord")) {
         mr_asprintf(cdr_exe, "cdrecord");
@@ -275 +274 @@
     if (atoi(tmp) != 1) {
         log_it("Either too few or too many tape streamers for me to detect...");
-        strcpy(dev, VANILLA_SCSI_TAPE);
+        mr_asprintf(dev, "%s", VANILLA_SCSI_TAPE);
         mr_free(tmp);
         mr_free(cdr_exe);
@@ -298 +297 @@
     mr_free(command);
 
-    strcpy(dev, VANILLA_SCSI_TAPE);
+    mr_asprintf(dev, "%s", VANILLA_SCSI_TAPE);
     dev[strlen(dev) - 1] = '\0';
-    strcat(dev, tmp);           // e.g. '/dev/st0' becomes '/dev/stN'
+    mr_strcat(dev, tmp);            // e.g. '/dev/st0' becomes '/dev/stN'
     mr_free(tmp);
 
     res = 0;
     if (!mt_says_tape_exists(dev)) {
-        strcpy(dev, ALT_TAPE);
+        mr_asprintf(dev, "%s", ALT_TAPE);
         if (!mt_says_tape_exists(dev)) {
             log_it("Cannot openin %s", dev);
-            strcpy(dev, "/dev/st0");
+            mr_asprintf(dev, "%s", "/dev/st0");
             if (!mt_says_tape_exists(dev)) {
                 log_it("Cannot openin %s", dev);
-                strcpy(dev, "/dev/osst0");
+                mr_asprintf(dev, "%s", "/dev/osst0");
                 if (!mt_says_tape_exists(dev)) {
                     res++;
@@ -324 +323 @@
         log_it("At this point, dev = %s and res = %d", dev, res);
     } else {
-        log_it("At this point, dev is NULL and res = %d", dev, res);
-    }
-
-    tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'");
+        log_it("At this point, dev is NULL and res = %d", res);
+    }
 
     if (mt_says_tape_exists(dev)) {
@@ -335 +332 @@
         mr_free(tmp);
         mr_asprintf(tmp, "%s", (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
-        sprintf(dev, "/dev/os%s", tmp);
+        mr_asprintf(dev, "/dev/os%s", tmp);
         log_it("...into %s", dev);
         if (mt_says_tape_exists(dev)) {
@@ -343 +340 @@
         }
     }
-
-    siz[0] = '\0';
     log_it("res=%d; dev=%s", res, dev);
-
-    if (res) {
-        return (res);
-    }
-
-    if (strlen(tmp) < 2) {
-        siz[0] = '\0';
-        log_it("Warning - size of tape unknown");
-    } else {
-        strcpy(siz, tmp);
-    }
-    mr_free(tmp);
-    return (0);
+    return (res);
 }