Fix problem introduced in r382. Pointed out by jlc, thanks!
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Thu, 26 Nov 2009 05:41:19 +0000 (05:41 +0000)
committergraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Thu, 26 Nov 2009 05:41:19 +0000 (05:41 +0000)
git-svn-id: http://opkg.googlecode.com/svn/trunk@386 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

libopkg/file_util.c

index 64e2bd3..e625984 100644 (file)
@@ -66,11 +66,17 @@ file_read_line_alloc(FILE *fp)
        int buf_len;
        char *line = NULL;
        int line_size = 0;
+       int got_nl = 0;
 
        buf[0] = '\0';
 
        while (fgets(buf, BUFSIZ, fp)) {
                buf_len = strlen(buf);
+               if (buf[buf_len - 1] == '\n') {
+                       buf_len--;
+                       buf[buf_len] = '\0';
+                       got_nl = 1;
+               }
                if (line) {
                        line_size += buf_len;
                        line = xrealloc(line, line_size+1);
@@ -79,10 +85,8 @@ file_read_line_alloc(FILE *fp)
                        line_size = buf_len + 1;
                        line = xstrdup(buf);
                }
-               if (buf[buf_len - 1] == '\n') {
-                       buf[buf_len -1] = '\0';
+               if (got_nl)
                        break;
-               }
        }
 
        return line;