Changeset 3060 in MondoRescue for branches/3.0/mondo/src/common/libmondo-files.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-files.c (modified) (19 diffs)

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

@@ -52 +52 @@
     /*@ pointers **************************************************** */
     char *p;
+    char *q;
     FILE *fin;
 
@@ -65 +66 @@
         fin = popen(command, "r");
         if (fin) {
-            (void) fgets(output, MAX_STR_LEN, fin);
-            p = strchr(output, ' ');
+            q = fgets(output, MAX_STR_LEN, fin);
+            if (!q) {
+                // FIXME
+            }
+            q = strchr(output, ' ');
             paranoid_pclose(fin);
         }
@@ -129 +133 @@
     char incoming[MAX_STR_LEN];
     char tmp[MAX_STR_LEN];
+    char *q;
 
     /*@ long ******************************************************** */
@@ -156 +161 @@
             noof_lines = 0;
         } else {
-            (void) fgets(incoming, MAX_STR_LEN - 1, fin);
-            while (strlen(incoming) > 0
+            q = fgets(incoming, MAX_STR_LEN - 1, fin);
+            if (!q) {
+                // FIXME
+            }
+            while (strlen(incoming) > 0 && (q != NULL)
                    && incoming[strlen(incoming) - 1] < 32) {
                 incoming[strlen(incoming) - 1] = '\0';
@@ -211 +219 @@
     char tmp[MAX_STR_LEN];
     char incoming[MAX_STR_LEN];
+    char *q;
 
     /*@ int ********************************************************* */
@@ -234 +243 @@
         return;
     }
-    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)) {
         i = strlen(incoming) - 1;
         if (i >= 0 && incoming[i] < 32) {
@@ -497 +506 @@
     static char command[MAX_STR_LEN * 2];
     static char tmp[MAX_STR_LEN];
+    char *p = NULL;
 
     /*@ pointers **************************************************** */
@@ -512 +522 @@
     sprintf(command, "tail -n1 %s", filename);
     fin = popen(command, "r");
-    (void) fgets(output, MAX_STR_LEN, fin);
+    p = fgets(output, MAX_STR_LEN, fin);
+    if (p == NULL) {
+        // FIXME
+    }
     paranoid_pclose(fin);
     while (strlen(output) > 0 && output[strlen(output) - 1] < 32) {
@@ -568 +581 @@
     char curr_cksum[1000];
     char tmp[1000];
+    char *q;
 
     /*@ long [long] ************************************************* */
@@ -596 +610 @@
         return (1);
     }
-    for (fgets(stub_fname, 999, fin); !feof(fin);
-         fgets(stub_fname, 999, fin)) {
+    for (q = fgets(stub_fname, 999, fin); !feof(fin) && (q != NULL);
+         q = fgets(stub_fname, 999, fin)) {
         if (stub_fname[(i = strlen(stub_fname) - 1)] < 32) {
             stub_fname[i] = '\0';
@@ -700 +714 @@
     /*@ buffers **************************************************** */
     char incoming[MAX_STR_LEN];
+    char *p = NULL;
 
     /*@ end vars *************************************************** */
@@ -710 +725 @@
         return (0);
     }
-    (void) fgets(incoming, MAX_STR_LEN - 1, fin);
-    while (!feof(fin)) {
+    p = fgets(incoming, MAX_STR_LEN - 1, fin);
+    while (!feof(fin) && (p != NULL)) {
         if (strstr(incoming, wildcard)) {
             matches++;
         }
-        (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+        p = fgets(incoming, MAX_STR_LEN - 1, fin);
     }
     paranoid_fclose(fin);
@@ -759 +774 @@
     char *comment;
     char *tmp;
+    char *q;
     char *command;
 
@@ -783 +799 @@
     } else {
         log_msg(4, "Reading it...");
-        for (fgets(fname, MAX_STR_LEN, fin); !feof(fin);
-             fgets(fname, MAX_STR_LEN, fin)) {
+        for (q = fgets(fname, MAX_STR_LEN, fin); !feof(fin) && (q != NULL);
+             q = fgets(fname, MAX_STR_LEN, fin)) {
             if (fname[strlen(fname) - 1] <= 32) {
                 fname[strlen(fname) - 1] = '\0';
@@ -854 +870 @@
       llres = 0;
     } else {
-      (void) fgets(tmp, MAX_STR_LEN, fin);
+      p = fgets(tmp, MAX_STR_LEN, fin);
       paranoid_pclose(fin);
       p = strchr(tmp, '\t');
@@ -991 +1007 @@
         return (1);
     }
-    fscanf(fin, "%s\n", contents);
+    res = fscanf(fin, "%s\n", contents);
     i = strlen(contents);
     if (i > 0 && contents[i - 1] < 32) {
@@ -997 +1013 @@
     }
     paranoid_fclose(fin);
+    res = 0;
     return (res);
 }
@@ -1024 +1041 @@
     char tmp[MAX_STR_LEN];
     char old_pwd[MAX_STR_LEN];
+    int res = 0;
 
     mvaddstr_and_log_it(g_currentY, 0,
@@ -1044 +1062 @@
         log_it("Untarring payload %s to scratchdir %s", tmp,
                bkpinfo->scratchdir);
-        (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-        chdir(bkpinfo->scratchdir);
+        if (getcwd(old_pwd, MAX_STR_LEN - 1)) {
+            // FIXME
+        }
+        if (chdir(bkpinfo->scratchdir)) {
+            // FIXME
+        }
         sprintf(command, "tar -zxvf %s", tmp);
         if (run_program_and_log_output(command, FALSE)) {
             fatal_error("Failed to untar payload");
         }
-        chdir(old_pwd);
+        if (chdir(old_pwd)) {
+            // FIXME
+        }
     }