- fix bug #887, in bb_get_chomped_line_from_file(), the last char was removed

  unconditionally, even if it was not a newline.
  This was apparently broken by r14254
- whitespace while at it.


git-svn-id: svn://busybox.net/trunk/busybox@15348 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 14 insertions, 9 deletions

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 44cf44869..68837b20d 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -18,7 +18,7 @@
  * stored and free'ed  by the caller.  If end is null '\n' isn't considered
  * and of line.  If end isn't null, length of the chunk read is stored in it. */
 
-char *bb_get_chunk_from_file(FILE *file, int *end)
+char *bb_get_chunk_from_file(FILE * file, int *end)
 {
         int ch;
         int idx = 0;
@@ -30,10 +30,12 @@ char *bb_get_chunk_from_file(FILE *file, int *end)
                 if (idx > linebufsz - 2) {
                         linebuf = xrealloc(linebuf, linebufsz += 80);
                 }
-                linebuf[idx++] = (char)ch;
-                if (!ch || (end && ch == '\n')) break;
+                linebuf[idx++] = (char) ch;
+                if (!ch || (end && ch == '\n'))
+                        break;
         }
-        if (end) *end = idx;
+        if (end)
+                *end = idx;
         if (linebuf) {
                 if (ferror(file)) {
                         free(linebuf);
@@ -45,18 +47,21 @@ char *bb_get_chunk_from_file(FILE *file, int *end)
 }
 
 /* Get line, including trailing /n if any */
-char *bb_get_line_from_file(FILE *file)
+char *bb_get_line_from_file(FILE * file)
 {
         int i;
+
         return bb_get_chunk_from_file(file, &i);
 }
 
 /* Get line.  Remove trailing /n */
-char *bb_get_chomped_line_from_file(FILE *file)
+char *bb_get_chomped_line_from_file(FILE * file)
 {
         int i;
-        char *c=bb_get_chunk_from_file(file, &i);
-        if(i) c[--i]=0;
-        
+        char *c = bb_get_chunk_from_file(file, &i);
+
+        if (i && c[--i] == '\n')
+                c[i] = 0;
+
         return c;
 }