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

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

@@ -212 +212 @@
     char *incoming;
     char *tmp = NULL;
+    char *p = NULL;
 
     /*@ pointers *********************************** */
@@ -259 +260 @@
     incoming = malloc(MAX_STR_LEN * 2);
 
-    (void) fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
-    while (!feof(fin)) {
+    p = fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
+    while (!feof(fin) && (p != NULL)) {
         lino++;
         i = strlen(incoming) - 1;
@@ -307 +308 @@
             }
         }
-        (void) fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
+        p = fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
     }
     paranoid_free(incoming);
@@ -417 +418 @@
     FILE *pattr;
     char *tmp;
+    char *p;
+
     pattr = popen(syscall, "r");
     if (!pattr) {
@@ -428 +431 @@
     }
     malloc_string(tmp);
-    for ((void)fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr);
-         (void)fgets(tmp, MAX_STR_LEN, pattr)) {
+    for (p = fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr) && (p != NULL);
+         p = fgets(tmp, MAX_STR_LEN, pattr)) {
         fputs(tmp, pout);
     }
@@ -449 +452 @@
     char *strtmp = NULL;
     char *tmp = NULL;
+    char *p = NULL;
     int i;
 
@@ -465 +469 @@
 
     malloc_string(file_to_analyze);
-    for ((void)fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin);
-         (void)fgets(file_to_analyze, MAX_STR_LEN, fin)) {
+    for (p = fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin) && (p != NULL);
+         p = fgets(file_to_analyze, MAX_STR_LEN, fin)) {
         i = strlen(file_to_analyze);
         if (i > 0 && file_to_analyze[i - 1] < 32) {
@@ -535 +539 @@
     int retval = 0;
     int i;
-    char *p, *q;
+    char *p, *q, *r;
     char *tmp = NULL;
     FILE *pin, *pout, *faclin;
@@ -607 +611 @@
 //  printf("Hi there. Starting the loop\n");
 
-    (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
-    (void)fgets(incoming, MAX_STR_LEN, pin);
-    while (!feof(pin) && !feof(faclin)) {
+    r = fgets(current_subset_file, MAX_STR_LEN, faclin);
+    r = fgets(incoming, MAX_STR_LEN, pin);
+    while (!feof(pin) && !feof(faclin) && (r != NULL)) {
 //      printf("incoming = %s", incoming);
 
@@ -640 +644 @@
         if (i < 0) {            // read another subset file in.
             log_msg(my_depth, "Reading next subset line in\n\n");
-            (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
+            r = fgets(current_subset_file, MAX_STR_LEN, faclin);
             continue;
         }
@@ -647 +651 @@
             fputs(incoming, pout);
         }
-        (void)fgets(incoming, MAX_STR_LEN, pin);
+        r = fgets(incoming, MAX_STR_LEN, pin);
         if (!i) {
             log_msg(my_depth, "Copying master %s", q);
@@ -660 +664 @@
                 fputs(incoming, pout);
             }
-            (void)fgets(incoming, MAX_STR_LEN, pin);
+            r = fgets(incoming, MAX_STR_LEN, pin);
         }
         if (!i) {
-            (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
+            r = fgets(current_subset_file, MAX_STR_LEN, faclin);
         }
     }
     while (!feof(pin)) {
-        (void)fgets(incoming, MAX_STR_LEN, pin);
+        r = fgets(incoming, MAX_STR_LEN, pin);
     }
     fclose(faclin);
@@ -919 +923 @@
 
     open_evalcall_form("Loading filelist from disk");
-    for ((void)fgets(fname, MAX_STR_LEN, pin); !feof(pin);
-         (void)fgets(fname, MAX_STR_LEN, pin)) {
+    for (tmp1 = fgets(fname, MAX_STR_LEN, pin); !feof(pin);
+         tmp1 = fgets(fname, MAX_STR_LEN, pin)) {
         if ((fname[strlen(fname) - 1] == 13
              || fname[strlen(fname) - 1] == 10) && strlen(fname) > 0) {
@@ -1386 +1390 @@
         paranoid_free(find_excludes);
         log_msg(5, "find command = %s", strtmp);
-        (void)system(strtmp);
+        paranoid_system(strtmp);
         paranoid_free(strtmp);
         mr_asprintf(&tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
@@ -1536 +1540 @@
     char *sz_filelist, *tmp;
     char *exclude_paths = NULL;
-    int i;
     FILE *fout;
     char *command = NULL;
@@ -1629 +1632 @@
             fatal_error("Cannot openout to sz_filelist");
         }
-        i = 0;
         if (strlen(include_paths) == 0) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
@@ -1737 +1739 @@
 {
     /*@ int ******************************************************** */
-    int noof_chars;
     static int depth = 0;
     static char original_string[MAX_STR_LEN];
@@ -1755 +1756 @@
     assert(startnode != NULL);
     assert(string_to_find != NULL);
-
-    noof_chars = strlen(string_to_find) + 1;    /* we include the '\0' */
 
     log_msg(7, "starting --- str=%s", string_to_find);
@@ -1825 +1824 @@
 //      fscanf(fin, "%s\n", fname);
         len = MAX_STR_LEN - 1;
-        (void)getline(&fname, &len, fin);   // patch by Scrub
+        if (getline(&fname, &len, fin)) {
+            // FIXME
+        }
         if (!use_star) {
             if (fname[0] == '/') {
@@ -1879 +1880 @@
     FILE *fin;
     char *tmp;
+    char *p;
     struct s_node *nod;
 
@@ -1887 +1889 @@
         return (1);
     }
-    for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-         (void)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 (!tmp[0]) {
             continue;