Yanked out the cstring_alloc() and cstring_lineFromFile() functions from

utility.c and replaced them with get_line_from_file() from the new grep.c.
Also changed declaration in internal.h and replaced instances of
cstring_lineFromFile() in dc.c and sort.c with get_line_from_file(). Tested
them and they worked fine.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/coreutils/sort.c b/coreutils/sort.c
index 93062faa4..a28122d51 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -84,7 +84,7 @@ static Line *line_newFromFile(FILE * src)
         Line *self;
         char *cstring = NULL;
 
-        if ((cstring = cstring_lineFromFile(src))) {
+        if ((cstring = get_line_from_file(src))) {
                 self = line_alloc();
                 if (self == NULL) {
                         return NULL;
@@ -304,4 +304,4 @@ int sort_main(int argc, char **argv)
         return(0);
 }
 
-/* $Id: sort.c,v 1.17 2000/06/19 17:25:40 andersen Exp $ */
+/* $Id: sort.c,v 1.18 2000/06/28 22:15:26 markw Exp $ */