projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gettimeofday: port recent C++ fix to Emacs
[gnulib.git]
/
tests
/
test-getdelim.c
diff --git
a/tests/test-getdelim.c
b/tests/test-getdelim.c
index
aca6d60
..
6e95918
100644
(file)
--- a/
tests/test-getdelim.c
+++ b/
tests/test-getdelim.c
@@
-1,5
+1,5
@@
/* Test of getdelim() function.
/* Test of getdelim() function.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
-2013
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
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
@@
-12,39
+12,33
@@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* Written by Eric Blake <ebb9@byu.net>, 2007. */
#include <config.h>
#include <stdio.h>
/* Written by Eric Blake <ebb9@byu.net>, 2007. */
#include <config.h>
#include <stdio.h>
+
+#include "signature.h"
+SIGNATURE_CHECK (getdelim, ssize_t, (char **, size_t *, int, FILE *));
+
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#define ASSERT(expr) \
- do \
- { \
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
- abort (); \
- } \
- } \
- while (0)
+#include "macros.h"
int
int
-main (
int argc, char **argv
)
+main (
void
)
{
FILE *f;
{
FILE *f;
- char *line
= NULL
;
- size_t len
= 0
;
+ char *line;
+ size_t len;
ssize_t result;
/* Create test file. */
f = fopen ("test-getdelim.txt", "wb");
ssize_t result;
/* Create test file. */
f = fopen ("test-getdelim.txt", "wb");
- if (!f || fwrite ("an
bcnd\0f", 1, 8, f) != 8
|| fclose (f) != 0)
+ if (!f || fwrite ("an
Anbcnd\0f", 1, 10, f) != 10
|| fclose (f) != 0)
{
fputs ("Failed to create sample file.\n", stderr);
remove ("test-getdelim.txt");
{
fputs ("Failed to create sample file.\n", stderr);
remove ("test-getdelim.txt");
@@
-59,13
+53,24
@@
main (int argc, char **argv)
}
/* Test initial allocation, which must include trailing NUL. */
}
/* Test initial allocation, which must include trailing NUL. */
+ line = NULL;
+ len = 0;
result = getdelim (&line, &len, 'n', f);
ASSERT (result == 2);
ASSERT (strcmp (line, "an") == 0);
ASSERT (2 < len);
result = getdelim (&line, &len, 'n', f);
ASSERT (result == 2);
ASSERT (strcmp (line, "an") == 0);
ASSERT (2 < len);
+ free (line);
- /* Test growth of buffer. */
+ /* Test initial allocation again, with line = NULL and len != 0. */
+ line = NULL;
+ len = (size_t)(~0) / 4;
+ result = getdelim (&line, &len, 'n', f);
+ ASSERT (result == 2);
+ ASSERT (strcmp (line, "An") == 0);
+ ASSERT (2 < len);
free (line);
free (line);
+
+ /* Test growth of buffer. */
line = malloc (1);
len = 1;
result = getdelim (&line, &len, 'n', f);
line = malloc (1);
len = 1;
result = getdelim (&line, &len, 'n', f);