Changeset 3857 in MondoRescue for branches/3.3/mondo/src

Timestamp:

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

Author:

Bruno Cornec

Message:

find_tape_device_and_size => find_tape_device as size unused

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-cli.c (modified) (2 diffs)
• libmondo-devices.c (modified) (1 diff)
• libmondo-stream-EXT.h (modified) (1 diff)
• libmondo-stream.c (modified) (7 diffs)
• libmondo-stream.h (modified) (1 diff)

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

@@ -331 +331 @@
     if ((flag_set['t'] && !flag_set['d']) && (! bkpinfo->restore_data)) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
-        if (find_tape_device_and_size(flag_val['d'], tmp)) {
+        if (find_tape_device(flag_val['d'])) {
             fatal_error("Tape device not specified. I couldn't find it either.");
         }
@@ -686 +686 @@
         if (flag_set['i']) {
             mr_asprintf(bkpinfo->isodir, "%s", flag_val['d']);
-            sprintf(tmp, "ls -l %s", bkpinfo->isodir);
-            if (run_program_and_log_output(tmp, 2)) {
+            mr_asprintf(tmp1, "ls -l %s", bkpinfo->isodir);
+            if (run_program_and_log_output(tmp1, 2)) {
+                mr_free(tmp1);
                 fatal_error("output folder does not exist - please create it");
             }
+            mr_free(tmp1);
         } else if (flag_set['n']) {
             mr_free(bkpinfo->netfs_remote_dir);

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

@@ -2360 +2360 @@
     case tape:
 
-        if ((!bkpinfo->restore_mode) && (find_tape_device_and_size(bkpinfo->media_device, sz_size))) {
+        if ((!bkpinfo->restore_mode) && (find_tape_device(bkpinfo->media_device))) {
             log_msg(3, "Ok, using vanilla scsi tape.");
             mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_TAPE);

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

@@ -5 +5 @@
 extern int closein_tape();
 extern int closeout_tape();
-extern int find_tape_device_and_size(char *dev, char *siz);
+extern int find_tape_device(char *dev);
 extern void insist_on_this_tape_number(int tapeno);
 extern void log_tape_pos(void);

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);
 }
 

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

@@ -7 +7 @@
 int closein_tape();
 int closeout_tape();
-int find_tape_device_and_size(char *dev, char *siz);
+int find_tape_device(char *dev);
 void insist_on_this_tape_number(int tapeno);
 void log_tape_pos(void);