Changeset 3147 in MondoRescue for branches/3.1/mondo/src/common/libmondo-fork.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/common/libmondo-fork.c (modified) (4 diffs)

branches/3.1/mondo/src/common/libmondo-fork.c

@@ -42 +42 @@
     char *newcall = NULL;
     char *tmp = NULL;
+    char *p;
 
     /*@ pointers **************************************************** */
@@ -258 +259 @@
     FILE *fin;
     char *p;
+    char *q;
 
     /*@ end vars *************************************************** */
@@ -300 +302 @@
     fin = fopen(tmp1, "r");
     if (fin) {
-        for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin); fgets(incoming, MAX_STR_LEN, fin)) {
+        for (q = fgets(incoming, MAX_STR_LEN, fin); !feof(fin) && (q != NULL); q = fgets(incoming, MAX_STR_LEN, fin)) {
             p = incoming;
             while (p && *p) {
@@ -545 +547 @@
                 log_msg(1, "bytes_read_in = %ld", bytes_read_in);
 
-                fwrite(tmp1, 1, bytes_read_in, ftmp);
-                fread(tmp1, 1, tmpcap, fin);
-                log_msg(0, "tmp1 = '%s'", tmp1);
-                fwrite(tmp1, 1, tmpcap, ftmp);
+                if (fwrite(tmp, 1, bytes_read_in, ftmp)) {
+                    fatal_error("Can't fwrite here");
+                }
+
+                sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
+                if (fread(tmp, 1, tmpcap, fin)) {
+                    fatal_error("Can't fread here");
+                }
+                log_msg(0, "tmp = '%s'", tmp);
+                if (fwrite(tmp, 1, tmpcap, ftmp)) {
+                    fatal_error("Can't fwrite there");
+                }
                 fclose(ftmp);
                 mr_free(tmp1);