Changeset 3127 in MondoRescue

Timestamp:

May 28, 2013, 6:54:03 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Backport mr_getline from branch 3.1

File:

• branches/3.0/mondo/src/lib/mr_mem.c (modified) (2 diffs)

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

@@ -53 +53 @@
 }
 
-/* encapsulation function for getline */
-void mr_getline_int(char **lineptr, size_t *n, FILE *fd, int line, const char *file) {
-    
-    ssize_t ret;
-
-    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");
-    }
-}
-
 /* encapsulation function for asprintf */
 void mr_asprintf_int(char **strp, int line, const char *file, const char *fmt, ...) {
@@ -78 +66 @@
     }
     va_end(args);
+}
+
+/* encapsulation function for getline */
+void mr_getline_int(char **lineptr, FILE *fd, int line, const char *file) {
+    
+    ssize_t ret;
+    size_t n = 0;
+
+    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");
+    }
+    /*  We reached end of file, allocating empty string */
+    if (ret == -1) {
+        mr_asprintf_int(lineptr, line, file, "");
+    }
 }