Changeset 2332 in MondoRescue for branches/2.2.10/mondo/src/common

Timestamp:

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

Author:

Bruno Cornec

Message:

 

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-cli.c (modified) (3 diffs)
• libmondo-devices.c (modified) (1 diff)
• libmondo-fifo.c (modified) (1 diff)
• libmondo-files.c (modified) (2 diffs)
• libmondo-stream.c (modified) (7 diffs)
• libmondo-tools.c (modified) (2 diffs)

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

@@ -893 +893 @@
         flag_set['d'] = TRUE;
         strcpy(flag_val['d'], p);
+        mr_free(p);
         log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
         percent = 0;
@@ -1551 +1552 @@
     case SIGKILL:
         mr_asprintf(tmp, "SIGKILL");
-        mr_asprintf(tmp2, "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
+        mr_asprintf(tmp2,
+               "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
         break;
     case SIGTERM:
@@ -1563 +1565 @@
     case SIGSEGV:
         mr_asprintf(tmp, "SIGSEGV");
-        mr_asprintf(tmp2, "Internal programming error. Please send a backtrace as well as your log.");
+        mr_asprintf(tmp2,
+               "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE:

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

@@ -1413 +1413 @@
     char *tmp = NULL;
     char *p = NULL;
+    char *tmp1 = NULL;
     char *mds = NULL;
     char *sz_size = NULL;

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

@@ -88 +88 @@
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
-        mr_asprintf(tmp, "dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c", internal_tape_block_size, bufsize, 'm');
+        mr_asprintf(tmp,"dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c", internal_tape_block_size, bufsize, 'm');
         res = run_program_and_log_output(tmp, 2);
         mr_free(tmp);

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

@@ -1103 +1103 @@
     }
     *(p++) = '\0';
-    mr_asprintf(nfs_server_ipaddr, "%s", tmp);
-    mr_asprintf(nfs_mount, "%s", p);
+    mr_asprintf(nfs_server_ipaddr, tmp);
+    mr_asprintf(nfs_mount, p);
     mr_free(tmp);
 
@@ -1151 +1151 @@
         mr_free(nfs_dev);
 
-        mr_asprintf(nfs_dev, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(nfs_dev, call_program_and_get_last_line_of_output(command));
         mr_free(command);
 

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

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

@@ -956 +956 @@
             ("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
     }
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output ("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
     if (atol(tmp) < 35000) {
         retval++;
@@ -1112 +1112 @@
         log_to_screen("(read_cfg_var) Cannot find %s config file", config_file);
         return (NULL);
-        /* BERLIOS: not sure the sage of this one ?
+        /* BERLIOS: not sure the usage of this one ?
     } else if ((value != NULL) && (strstr(value, "/dev/") && strstr(value, "t0") && !strcmp(label, "media-dev"))) {
         log_msg(2, "FYI, I can't read new value for %s - already got %s", label, value);