Changeset 2421 in MondoRescue for branches/2.2.10/mondo/src/lib/mr_mem.c

Timestamp:

Sep 24, 2009, 3:50:38 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Remove some compiler warnings on main
• Adds function mr_chomp and mr_strip_char and use them in mr_date and call_program_and_get_last_line_of_output
• Fix call_program_and_get_last_line_of_output to return the right result using a temp file instead of popen
• Fix an issue in mr_getline_int in case of eof (returns now an empty string)
• Sequencing of Init of bkpinfo reviewed

File:

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

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

@@ -53 +53 @@
 }
 
-/* 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");
-    }
-}
-
 /* encapsulation function for asprintf */
 void mr_asprintf_int(char **strp, int line, const char *file, const char *fmt, ...) {
@@ -79 +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, "");
+    }
 }