X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgetline.c;h=5d6aee8d32061c30dbb1fb69ada1f37c590394b5;hb=96f023c5e537dd4afbdb294de7065f65effe3eb2;hp=a4d09ea6b08ab3b698c8058b89614501bb45bb80;hpb=572ca05661319aeaef3de1afa9ec1e8c91e6acd4;p=gnulib.git
diff --git a/lib/getline.c b/lib/getline.c
index a4d09ea6b..5d6aee8d3 100644
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -1,58 +1,27 @@
-/* getline.c -- Replacement for GNU C library function getline
+/* getline.c --- Implementation of replacement getline function.
+ Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc.
- Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/* Written by Jan Brittenson, bson@gnu.ai.mit.edu. */
+ along with this program; if not, see . */
-#if HAVE_CONFIG_H
-# include
-#endif
+/* Written by Simon Josefsson. */
-/* Specification. */
-#include "getline.h"
+#include
-#include
#include
-/* Get ssize_t. */
-#include
-
-#if defined __GNU_LIBRARY__ && HAVE_GETDELIM
-
-ssize_t
-getline (char **lineptr, size_t *linesize, FILE *stream)
-{
- return getdelim (lineptr, linesize, '\n', stream);
-}
-
-#else /* ! have getdelim */
-
-#include "getndelim2.h"
-
-ssize_t
-getline (char **lineptr, size_t *linesize, FILE *stream)
-{
- return getndelim2 (lineptr, linesize, (size_t)(-1), stream, '\n', 0, 0);
-}
-
ssize_t
-getdelim (char **lineptr, size_t *linesize, int delimiter, FILE *stream)
+getline (char **lineptr, size_t *n, FILE *stream)
{
- return getndelim2 (lineptr, linesize, (size_t)(-1), stream, delimiter, 0, 0);
+ return getdelim (lineptr, n, '\n', stream);
}
-#endif