projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypto/gc-des: Fix recent regression.
[gnulib.git]
/
tests
/
test-fflush.c
diff --git
a/tests/test-fflush.c
b/tests/test-fflush.c
index
8dd0f11
..
a6c0e18
100644
(file)
--- a/
tests/test-fflush.c
+++ b/
tests/test-fflush.c
@@
-1,10
+1,10
@@
/* Test of POSIX compatible fflush() function.
/* Test of POSIX compatible fflush() function.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
, 2009-2011
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
@@
-12,18
+12,24
@@
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, 2007. */
#include <config.h>
/* Written by Eric Blake, 2007. */
#include <config.h>
+/* None of the files accessed by this test are large, so disable the
+ ftell link warning if we are not using the gnulib ftell module. */
+#define _GL_NO_LARGE_FILES
#include <stdio.h>
#include <stdio.h>
+
+#include "signature.h"
+SIGNATURE_CHECK (fflush, int, (FILE *));
+
#include <unistd.h>
int
#include <unistd.h>
int
-main (
int argc, char *argv[]
)
+main (
void
)
{
FILE *f;
char buffer[10];
{
FILE *f;
char buffer[10];
@@
-44,7
+50,8
@@
main (int argc, char *argv[])
if (!f || 0 > fd || fread (buffer, 1, 5, f) != 5)
{
fputs ("Failed initial read of sample file.\n", stderr);
if (!f || 0 > fd || fread (buffer, 1, 5, f) != 5)
{
fputs ("Failed initial read of sample file.\n", stderr);
- fclose (f);
+ if (f)
+ fclose (f);
unlink ("test-fflush.txt");
return 1;
}
unlink ("test-fflush.txt");
return 1;
}
@@
-60,7
+67,7
@@
main (int argc, char *argv[])
}
#endif
/* POSIX requires fflush-fseek to set file offset of fd. */
}
#endif
/* POSIX requires fflush-fseek to set file offset of fd. */
- if (fflush (f) != 0 || fseek (f, 0, SEEK_CUR) != 0)
+ if (fflush (f) != 0 || fseek
o
(f, 0, SEEK_CUR) != 0)
{
fputs ("Failed to flush-fseek sample file.\n", stderr);
fclose (f);
{
fputs ("Failed to flush-fseek sample file.\n", stderr);
fclose (f);
@@
-71,7
+78,7
@@
main (int argc, char *argv[])
if (lseek (fd, 0, SEEK_CUR) != 5)
{
fprintf (stderr, "File offset is wrong after fseek: %ld.\n",
if (lseek (fd, 0, SEEK_CUR) != 5)
{
fprintf (stderr, "File offset is wrong after fseek: %ld.\n",
- (long) lseek (fd, 0, SEEK_CUR));
+
(long) lseek (fd, 0, SEEK_CUR));
fclose (f);
unlink ("test-fflush.txt");
return 1;
fclose (f);
unlink ("test-fflush.txt");
return 1;
@@
-79,7
+86,7
@@
main (int argc, char *argv[])
if (ftell (f) != 5)
{
fprintf (stderr, "ftell result is wrong after fseek: %ld.\n",
if (ftell (f) != 5)
{
fprintf (stderr, "ftell result is wrong after fseek: %ld.\n",
- (long) ftell (f));
+
(long) ftell (f));
fclose (f);
unlink ("test-fflush.txt");
return 1;
fclose (f);
unlink ("test-fflush.txt");
return 1;
@@
-112,7
+119,7
@@
main (int argc, char *argv[])
if (lseek (fd, 0, SEEK_CUR) != 6)
{
fprintf (stderr, "File offset is wrong after fseeko: %ld.\n",
if (lseek (fd, 0, SEEK_CUR) != 6)
{
fprintf (stderr, "File offset is wrong after fseeko: %ld.\n",
- (long) lseek (fd, 0, SEEK_CUR));
+
(long) lseek (fd, 0, SEEK_CUR));
fclose (f);
unlink ("test-fflush.txt");
return 1;
fclose (f);
unlink ("test-fflush.txt");
return 1;
@@
-120,7
+127,7
@@
main (int argc, char *argv[])
if (ftell (f) != 6)
{
fprintf (stderr, "ftell result is wrong after fseeko: %ld.\n",
if (ftell (f) != 6)
{
fprintf (stderr, "ftell result is wrong after fseeko: %ld.\n",
- (long) ftell (f));
+
(long) ftell (f));
fclose (f);
unlink ("test-fflush.txt");
return 1;
fclose (f);
unlink ("test-fflush.txt");
return 1;