X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetline.c;h=746d708878c84e6f360c05d4ebd42424ac1a8b37;hb=a10e3d19c8c812a60794c247ff6940a04ed51bea;hp=ccc3b4a3954fa11280b7231c851095c7b393e3a2;hpb=ef2f334e88fcd5daffc4c72dfc51794927c75920;p=gnulib.git

diff --git a/lib/getline.c b/lib/getline.c
index ccc3b4a39..746d70887 100644
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -1,7 +1,7 @@
 /* getline.c -- Replacement for GNU C library function getline
 
-   Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003, 2004 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,39 +23,22 @@
 # include <config.h>
 #endif
 
-/* Specification.  */
 #include "getline.h"
 
-/* The `getdelim' function is only declared if the following symbol
-   is defined.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#include <stddef.h>
-#include <stdio.h>
+#if ! (defined __GNU_LIBRARY__ && HAVE_GETDELIM)
 
-#if defined __GNU_LIBRARY__ && HAVE_GETDELIM
+# include "getndelim2.h"
 
-int
-getline (char **lineptr, size_t *n, FILE *stream)
+ssize_t
+getdelim (char **lineptr, size_t *linesize, int delimiter, FILE *stream)
 {
-  return getdelim (lineptr, n, '\n', stream);
-}
-
-#else /* ! have getdelim */
-
-#include "getndelim2.c"
-
-int
-getline (char **lineptr, size_t *n, FILE *stream)
-{
-  return getndelim2 (lineptr, n, (size_t)(-1), stream, '\n', 0, 0);
+  return getndelim2 (lineptr, linesize, 0, GETNLINE_NO_LIMIT, delimiter, EOF,
+                     stream);
 }
+#endif
 
-int
-getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream)
+ssize_t
+getline (char **lineptr, size_t *linesize, FILE *stream)
 {
-  return getndelim2 (lineptr, n, (size_t)(-1), stream, delimiter, 0, 0);
+  return getdelim (lineptr, linesize, '\n', stream);
 }
-#endif