Changeset 2332 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-stream.c

Timestamp:

Aug 18, 2009, 3:33:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

 

File:

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

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

@@ -246 +246 @@
  * @return the allocated tape string if success, NULL if failure
  */
-char *mr_find_tape_device(void)
-{
+char *mr_find_tape_device(void) {
+
     char *tmp = NULL;
     char *command = NULL;
@@ -256 +256 @@
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
+
     tmp = find_home_of_exe("cdrecord");
     if (tmp) {
         mr_asprintf(cdr_exe, "cdrecord");
+
     } else {
         mr_asprintf(cdr_exe, "dvdrecord");
@@ -270 +272 @@
     if (atoi(tmp) != 1) {
         log_it("Either too few or too many tape streamers for me to detect...");
-        mr_asprintf(&dev, "%s", VANILLA_SCSI_TAPE);
+        mr_asprintf(dev, "%s", VANILLA_SCSI_TAPE);
         mr_free(tmp);
         mr_free(tmp);
@@ -290 +292 @@
     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);
     mr_free(cdr_exe);
-
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -301 +302 @@
     if (!mt_says_tape_exists(dev)) {
         mr_free(dev);
-        mr_asprintf(&dev, "%s", ALT_TAPE);
+        mr_asprintf(dev, "%s", ALT_TAPE);
         if (!mt_says_tape_exists(dev)) {
             log_it("Cannot openin %s", dev);
             mr_free(dev);
-            mr_asprintf(&dev, "/dev/st0");
+            mr_asprintf(dev, "/dev/st0");
             if (!mt_says_tape_exists(dev)) {
                 log_it("Cannot openin %s", dev);
                 mr_free(dev);
-                mr_asprintf(&dev, "/dev/osst0");
+                mr_asprintf(dev, "/dev/osst0");
                 if (!mt_says_tape_exists(dev)) {
                     mr_free(dev);
@@ -335 +336 @@
         mr_asprintf(tmp, "%s", (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
         mr_free(dev);
-        mr_asprintf(&dev, "/dev/os%s", tmp);
+        mr_asprintf(dev, "/dev/os%s", tmp);
         log_it("...into %s", dev);
         if (mt_says_tape_exists(dev)) {
@@ -345 +346 @@
     }
 
-    log_it("res=%d; dev=%s", res, dev);
-
     if (dev) {
         log_it("At this new point, dev = %s and res = %d", dev, res);
     } else {
-        log_it("At this new point, dev is NULL and res = %d", dev, res);
+        log_it("At this new point, dev is NULL and res = %d", res);
         mr_free(tmp);
-        return(NULL);
     }