Changeset 1138 in MondoRescue for branches/stable/mondo/src/lib

Timestamp:

Feb 11, 2007, 3:08:34 PM (17 years ago)

Author:

Bruno Cornec

Message:

mr_getline should test for feof as getline returns also -1 in that case.

File:

• branches/stable/mondo/src/lib/mr_mem.c (modified) (1 diff)

branches/stable/mondo/src/lib/mr_mem.c

@@ -54 +54 @@
 
 /* encapsulation function for getline */
-void mr_getline_int(char **lineptr, size_t *n, FILE *stream, int line, const char *file) {
+void mr_getline_int(char **lineptr, size_t *n, FILE *fd, int line, const char *file) {
     
     ssize_t ret;
 
-    ret = getline(lineptr,n,stream);
-    if (ret == -1) {
+    ret = getline(lineptr,n,fd);
+    if ((ret == -1) && (! feof(fd))) {
         mr_msg_int(1,line,file,"Unable to alloc memory in mr_getline\nExiting...");
         mr_exit(-1,"Unable to alloc memory in mr_getline");