projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enclose definitions in #if for POSIX-draft like API.
[gnulib.git]
/
lib
/
getnline.c
diff --git
a/lib/getnline.c
b/lib/getnline.c
index
7b858e3
..
c53177b
100644
(file)
--- a/
lib/getnline.c
+++ b/
lib/getnline.c
@@
-1,11
+1,11
@@
/* getnline - Read a line from a stream, with bounded memory allocation.
/* getnline - Read a line from a stream, with bounded memory allocation.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003
, 2004, 2006
Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
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.
+ the Free Software Foundation; either version
3 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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,12
+13,9
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "getnline.h"
/* Specification. */
#include "getnline.h"
@@
-26,14
+23,14
@@
#include "getndelim2.h"
ssize_t
#include "getndelim2.h"
ssize_t
-getnline (char **lineptr, size_t *linesize, size_t nmax, FILE *stream)
+getndelim (char **lineptr, size_t *linesize, size_t nmax,
+ int delimiter, FILE *stream)
{
{
- return getndelim2 (lineptr, linesize,
(size_t)(-1), stream, '\n', 0, 0
);
+ return getndelim2 (lineptr, linesize,
0, nmax, delimiter, EOF, stream
);
}
ssize_t
}
ssize_t
-getndelim (char **lineptr, size_t *linesize, size_t nmax,
- int delimiter, FILE *stream)
+getnline (char **lineptr, size_t *linesize, size_t nmax, FILE *stream)
{
{
- return getndelim
2 (lineptr, linesize, (size_t)(-1), stream, delimiter, 0, 0
);
+ return getndelim
(lineptr, linesize, nmax, '\n', stream
);
}
}