X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetline.c;h=5d6aee8d32061c30dbb1fb69ada1f37c590394b5;hb=96f023c5e537dd4afbdb294de7065f65effe3eb2;hp=657ff32ee530a560477011395dc4e1a7f7c04cb6;hpb=831a09ffa54309997e41502dd5e5b30e30319a70;p=gnulib.git
diff --git a/lib/getline.c b/lib/getline.c
index 657ff32ee..5d6aee8d3 100644
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -1,57 +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 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 of the
-License, 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, see . */
-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 Simon Josefsson. */
-/* Written by Jan Brittenson, bson@gnu.ai.mit.edu. */
-
-#if HAVE_CONFIG_H
-# include
-#endif
-
-/* The `getdelim' function is only declared if the following symbol
- is defined. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
+#include
#include
-#include
-
-#if defined __GNU_LIBRARY__ && HAVE_GETDELIM
-int
+ssize_t
getline (char **lineptr, size_t *n, FILE *stream)
{
return getdelim (lineptr, n, '\n', stream);
}
-
-#else /* ! have getdelim */
-
-# include "getstr.h"
-
-int
-getline (char **lineptr, size_t *n, FILE *stream)
-{
- return getstr (lineptr, n, stream, '\n', 0, 0);
-}
-
-int
-getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream)
-{
- return getstr (lineptr, n, stream, delimiter, 0, 0);
-}
-#endif