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

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

@@ -429 +429 @@
     char *incoming;
     char *p;
+    char *q;
 
     malloc_string(incoming);
@@ -440 +441 @@
         return (1);
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (q = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (q != NULL);
+         q = fgets(incoming, MAX_STR_LEN - 1, fin)) {
         strip_spaces(incoming);
         p = strchr(incoming, ' ');
@@ -810 +811 @@
     static char *argv[64];
     char **ap;
+    char *q;
     char *line = (char *) malloc(MAX_STR_LEN);
+
     if (!line)
         errx(1,
              "unable to allocate %i bytes of memory for `char *line' at %s:%i",
              MAX_STR_LEN, __FILE__, __LINE__);
-    (void) fgets(line, MAX_STR_LEN, f);
-    if (feof(f)) {
+    q = fgets(line, MAX_STR_LEN, f);
+    if (feof(f) && (q != NULL)) {
         log_it("[GNVCL] Uh... I reached the EOF.");
         return 0;
@@ -1031 +1034 @@
             mr_asprintf(&strtmp,"%s%s", device_prefix, token);
             strncpy(raidlist->el[raidlist->entries].raid_device, strtmp, 63);
-            raidlist->el[raidlist->entries].raid_device[64] = '\0';
+            raidlist->el[raidlist->entries].raid_device[63] = '\0';
             mr_free(strtmp);
             mr_free(token);