Changeset 1176 in MondoRescue for trunk/mondo/src/common/libmondo-fork.c

Timestamp:

Feb 16, 2007, 2:16:14 PM (17 years ago)

Author:

Bruno Cornec

Message:

Some merges from stable (synchro for mem. mngt)

File:

• trunk/mondo/src/common/libmondo-fork.c (modified) (14 diffs)

trunk/mondo/src/common/libmondo-fork.c

@@ -4 +4 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
+#include "mr_str.h"
+
 #include "mondostructures.h"
 #include "libmondo-fork.h"
@@ -10 +13 @@
 #include "libmondo-files-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "mr_mem.h"
 
 extern bool g_text_mode;
@@ -164 +166 @@
 
     /*@ pointers *************************************************** */
-    FILE *fin;
-    char *p;
+    FILE *fin = NULL;
+    char *p = NULL;
 
     /*@ end vars *************************************************** */
@@ -188 +190 @@
         *p = ' ';
     }                           /* single '=' is intentional */
-
 
     res = system(callstr);
@@ -208 +209 @@
     fin = fopen("/tmp/mondo-run-prog-thing.tmp", "r");
     if (fin) {
-        for (mr_getline(&incoming, &n, fin); !feof(fin);
-             mr_getline(&incoming, &n, fin)) {
+        for (mr_getline(&incoming, &n, fin); !feof(fin); mr_getline(&incoming, &n, fin)) {
             /* patch by Heiko Schlittermann */
             p = incoming;
@@ -219 +219 @@
             }
             /* end of patch */
-            strip_spaces(incoming);
+            mr_strip_spaces(incoming);
             if ((res == 0 && log_if_success)
                 || (res != 0 && log_if_failure)) {
@@ -238 +238 @@
         }
     }
-//  else
-//    { mr_msg (0, "-------------------------------ran w/ res=%d------------------------------", res); }
     return (res);
 }
@@ -339 +337 @@
 // if dir=='r' then copy from archived to orig
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *buf = NULL;
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
@@ -354 +353 @@
         fin = f_orig;
         fout = f_archived;
-        mr_asprintf(&tmp, "%-64s", PIMP_START_SZ);
-        if (fwrite(tmp, 1, 64, fout) != 64) {
+        mr_asprintf(&tmp1, "%-64s", PIMP_START_SZ);
+        if (fwrite(tmp1, 1, 64, fout) != 64) {
             fatal_error("Can't write the introductory block");
         }
-        mr_free(tmp);
+        mr_free(tmp1);
 
         while (1) {
@@ -365 +364 @@
                 break;
             }
-            mr_asprintf(&tmp, "%-64ld", bytes_read_in);
-            if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_asprintf(&tmp1, "%-64ld", bytes_read_in);
+            if (fwrite(tmp1, 1, 64, fout) != 64) {
                 fatal_error("Cannot write introductory block");
             }
-            mr_free(tmp);
+            mr_free(tmp1);
 
             mr_msg(7,
@@ -375 +374 @@
                     subsliceno, bytes_read_in, bytes_to_be_read);
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            mr_asprintf(&tmp, "%-64ld", subsliceno);
-            if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_asprintf(&tmp1, "%-64ld", subsliceno);
+            if (fwrite(tmp1, 1, 64, fout) != 64) {
                 fatal_error("Cannot write post-thingy block");
             }
-            mr_free(tmp);
+            mr_free(tmp1);
 
             mr_msg(7, "Subslice #%d written OK", subsliceno);
@@ -391 +390 @@
         fin = f_archived;
         fout = f_orig;
-        if (!(tmp = malloc(64L))) {
-            fatal_error("Failed to malloc() tmp");
-        }
+        tmp = mr_malloc(64L);
         if (fread(tmp, 1, 64L, fin) != 64L) {
             fatal_error("Cannot read the introductory block");
@@ -433 +430 @@
 
     if (direction == 'w') {
-        mr_free(tmp);
-        mr_asprintf(&tmp, "%-64s", PIMP_END_SZ);
-        if (fwrite(tmp, 1, 64L, fout) != 64L) {
+        mr_asprintf(&tmp1, "%-64s", PIMP_END_SZ);
+        if (fwrite(tmp1, 1, 64L, fout) != 64L) {
             fatal_error("Can't write the final block");
         }
-        mr_free(tmp);
+        mr_free(tmp1);
     } else {
         mr_msg(1, "tmpA is %s", tmp);
@@ -468 +464 @@
             }
         }
-        mr_free(tmp);
     }
 
     mr_free(buf);
+    mr_free(tmp);
     mr_msg(3, "Successfully copied %ld bytes", bytes_written_out);
     return (retval);