Sort rewrite to be SUSv3 compliant. New config option, updated help, and

a couple of infrastructure bits.


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

1 files changed, 7 insertions, 1 deletions

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 6d12b21c4..a27edc3bd 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -44,7 +44,8 @@ static char *private_get_line_from_file(FILE *file, int c)
                         linebuf = xrealloc(linebuf, linebufsz += GROWBY);
                 }
                 linebuf[idx++] = (char)ch;
-                if (ch == '\n' || ch == '\0') {
+                if (!ch) return linebuf;
+                if (c<2 && ch == '\n') {
                         if (c) {
                                 --idx;
                         }
@@ -71,6 +72,11 @@ extern char *bb_get_chomped_line_from_file(FILE *file)
         return private_get_line_from_file(file, 1);
 }
 
+extern char *bb_get_chunk_from_file(FILE *file)
+{
+        return private_get_line_from_file(file, 2);
+}
+
 
 /* END CODE */
 /*