X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetline.c;h=0528db172ff850e1d61a70f8ecea4a42d070fff3;hb=47348404e40e1706a251892868b09e0c67211b19;hp=5a7980ec9df3a0367e3e62216f06fc93415f3f74;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git

diff --git a/lib/getline.c b/lib/getline.c
index 5a7980ec9..0528db172 100644
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -1,44 +1,29 @@
-/* getline.c -- Replacement for GNU C library function getline
+/* getline.c --- Implementation of replacement getline function.
+   Copyright (C) 2005-2007, 2009-2011 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 the Free Software Foundation; either version 2, or (at
+   your option) any later version.
 
-   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "getline.h"
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
-#if ! (defined __GNU_LIBRARY__ && HAVE_GETDELIM)
+/* Written by Simon Josefsson. */
 
-# include "getndelim2.h"
+#include <config.h>
 
-ssize_t
-getdelim (char **lineptr, size_t *linesize, int delimiter, FILE *stream)
-{
-  return getndelim2 (lineptr, linesize, 0, GETNLINE_NO_LIMIT, delimiter, EOF,
-                     stream);
-}
-#endif
+#include <stdio.h>
 
 ssize_t
-getline (char **lineptr, size_t *linesize, FILE *stream)
+getline (char **lineptr, size_t *n, FILE *stream)
 {
-  return getdelim (lineptr, linesize, '\n', stream);
+  return getdelim (lineptr, n, '\n', stream);
 }