Changeset 2303 in MondoRescue

Timestamp:

Jul 24, 2009, 9:19:38 PM (15 years ago)

Author:

Bruno Cornec

Message:

find_tape_device_and_size => mr_find_tape_device which allocates 1 string to be freed by caller

Location:

branches/2.2.10/mondo/src/common

Files:

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

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

@@ -1213 +1213 @@
     mr_asprintf(&data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
 
-    mr_sprintf(&g_serial_string, "%s", call_program_and_get_last_line_of_output("dd if=/dev/urandom bs=16 count=1 2> /dev/null | hexdump | tr -s ' ' '0' | head -n1"));
+    mr_asprintf(&g_serial_string, "%s", call_program_and_get_last_line_of_output("dd if=/dev/urandom bs=16 count=1 2> /dev/null | hexdump | tr -s ' ' '0' | head -n1"));
     strip_spaces(g_serial_string);
     mr_strcat(g_serial_string, "...word.");

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

@@ -896 +896 @@
     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)) {
-            fatal_error
-                ("Tape device not specified. I couldn't find it either.");
+        p = mr_find_tape_device();
+        if (!p) {
+            fatal_error("Tape device not specified. I couldn't find it either.");
         }
         flag_set['d'] = TRUE;
+        strcpy(flag_val['d'], p);
+        mr_free(p);
         mr_asprintf(&tmp1, "You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
         log_to_screen(tmp1);

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

@@ -1636 +1636 @@
     case tape:
 
-        if ((!bkpinfo->restore_mode) && (find_tape_device_and_size(bkpinfo->media_device, sz_size))) {
+        if ((!bkpinfo->restore_mode) && (!mr_find_tape_device())) {
             log_msg(3, "Ok, using vanilla scsi tape.");
             strcpy(bkpinfo->media_device, VANILLA_SCSI_TAPE);

branches/2.2.10/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 char *mr_find_tape_device(void);
 extern void insist_on_this_tape_number(int tapeno);
 extern void log_tape_pos(void);

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

@@ -250 +250 @@
 
 /**
- * Determine the name and size of the tape device. Tries the SCSI tape for
+ * Determine the name 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 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)
-{
-    char tmp[MAX_STR_LEN];
+ * @return the allocated tape string if success, NULL if failure
+ */
+char *mr_find_tape_device(void)
+{
+    char *tmp = NULL;
     char *command = NULL;
-    char cdr_exe[MAX_STR_LEN];
+    char *cdr_exe = NULL;
+    char *dev = NULL;
     int res;
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
-    dev[0] = '\0';
-    if (siz != NULL) {
-        siz[0] = '\0';
-    }
     if (find_home_of_exe("cdrecord")) {
-        strcpy(cdr_exe, "cdrecord");
-    } else {
-        strcpy(cdr_exe, "dvdrecord");
+        mr_asprintf(&cdr_exe, "cdrecord");
+    } else {
+        mr_asprintf(&cdr_exe, "dvdrecord");
     }
     mr_asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l", cdr_exe);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     if (atoi(tmp) != 1) {
-        log_it
-            ("Either too few or too many tape streamers for me to detect...");
-        strcpy(dev, VANILLA_SCSI_TAPE);
-        return 1;
-    }
+        log_it("Either too few or too many tape streamers for me to detect...");
+        mr_asprintf(&dev, "%s", VANILLA_SCSI_TAPE);
+        mr_free(tmp);
+        return(dev);
+    }
+    mr_free(tmp);
+
     mr_asprintf(&command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1", cdr_exe);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     if (strlen(tmp) < 2) {
         log_it("Could not find tape device");
-        return 1;
-    }
+        mr_free(tmp);
+        return(dev);
+    }
+    mr_free(tmp);
     mr_asprintf(&command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1", cdr_exe);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(cdr_exe);
+
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
     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_free(dev);
+        mr_asprintf(&dev, "%s", ALT_TAPE);
         if (!mt_says_tape_exists(dev)) {
             log_it("Cannot openin %s", dev);
-            strcpy(dev, "/dev/st0");
+            mr_free(dev);
+            mr_asprintf(&dev, "/dev/st0");
             if (!mt_says_tape_exists(dev)) {
                 log_it("Cannot openin %s", dev);
-                strcpy(dev, "/dev/osst0");
+                mr_free(dev);
+                mr_asprintf(&dev, "/dev/osst0");
                 if (!mt_says_tape_exists(dev)) {
                     res++;
@@ -318 +324 @@
     log_it("At this point, dev = %s and res = %d", dev, res);
 
-    strcpy(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;};};};'"));
+    mr_asprintf(&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;};};};'"));
 
     if (mt_says_tape_exists(dev)) {
@@ -327 +330 @@
     } else {
         log_it("Turning %s", dev);
-        strcpy(tmp, (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
-        sprintf(dev, "/dev/os%s", tmp);
+        mr_free(tmp);
+        mr_asprintf(&tmp, (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
+        mr_free(dev);
+        mr_asprintf(&dev, "/dev/os%s", tmp);
         log_it("...into %s", dev);
         if (mt_says_tape_exists(dev)) {
@@ -340 +345 @@
 
     if (res) {
-        return (res);
+        mr_free(tmp);
+        return (dev);
     }
 
     if (strlen(tmp) < 2) {
         log_it("Warning - size of tape unknown");
-        return (0);
-    } else {
-        if (siz != NULL) {
-            strcpy(siz, tmp);
-        }
-        return (0);
-    }
-}
-
-
-
-
+    }
+    mr_free(tmp);
+    return (NULL);
+}
 
 

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

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