Changeset 3060 in MondoRescue for branches/3.0/mondo/src/common/libmondo-fork.c

Timestamp:

Nov 10, 2012, 5:05:37 AM (11 years ago)

Author:

Bruno Cornec

Message:

r5035@localhost: bruno | 2012-11-09 03:17:01 +0100

• Fix a compilation error and most compilation warnings

File:

• branches/3.0/mondo/src/common/libmondo-fork.c (modified) (5 diffs)

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

@@ -39 +39 @@
     static char result[MAX_STR_LEN];
     char *tmp;
+    char *p;
 
     /*@ pointers **************************************************** */
@@ -52 +53 @@
     assert_string_is_neither_NULL_nor_zerolength(call);
     if ((fin = popen(call, "r"))) {
-        for (fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-             fgets(tmp, MAX_STR_LEN, fin)) {
+        for (p = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (p != NULL);
+             p = fgets(tmp, MAX_STR_LEN, fin)) {
             if (strlen(tmp) > 1) {
                 strcpy(result, tmp);
@@ -267 +268 @@
     FILE *fin;
     char *p;
+    char *q;
 
     /*@ end vars *************************************************** */
@@ -312 +314 @@
     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) {
@@ -562 +564 @@
                 log_msg(1, "bytes_read_in = %ld", bytes_read_in);
 //      if (bytes_read_in!=128+64) { fatal_error("Can't read the terminating block"); }
-                fwrite(tmp, 1, bytes_read_in, 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));
 //    log_msg(0, tmp);
-                fread(tmp, 1, tmpcap, fin);
+                if (fread(tmp, 1, tmpcap, fin)) {
+                    fatal_error("Can't fread here");
+                }
                 log_msg(0, "tmp = '%s'", tmp);
-                fwrite(tmp, 1, tmpcap, ftmp);
+                if (fwrite(tmp, 1, tmpcap, ftmp)) {
+                    fatal_error("Can't fwrite there");
+                }
                 fclose(ftmp);
                 fatal_error("Missing terminating block");