mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
* stdio-common/Makefile (tests): Add tst-put-error.
* stdio-common/tst-put-error.c: New file. * libio/fileops.c (_IO_new_file_xsputn): If overflow fails and no more data would have to be written signal error. * libio/oldfileops.c (_IO_old_file_xsputn): Likewise. * libio/fileops.c (_IO_new_file_overflow): Use NULL not 0.
This commit is contained in:
parent
f2cd432663
commit
34c5e4a1f1
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2005-09-04 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* stdio-common/Makefile (tests): Add tst-put-error.
|
||||
* stdio-common/tst-put-error.c: New file.
|
||||
* libio/fileops.c (_IO_new_file_xsputn): If overflow fails and no more
|
||||
data would have to be written signal error.
|
||||
* libio/oldfileops.c (_IO_old_file_xsputn): Likewise.
|
||||
|
||||
* libio/fileops.c (_IO_new_file_overflow): Use NULL not 0.
|
||||
|
||||
2005-09-02 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* elf/dl-load.c (_dl_map_object_from_fd): No need to change
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1993, 1995, 1997-2003, 2004 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1993, 1995, 1997-2004, 2005 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Written by Per Bothner <bothner@cygnus.com>.
|
||||
|
||||
@ -826,10 +826,10 @@ _IO_new_file_overflow (f, ch)
|
||||
return EOF;
|
||||
}
|
||||
/* If currently reading or no buffer allocated. */
|
||||
if ((f->_flags & _IO_CURRENTLY_PUTTING) == 0 || f->_IO_write_base == 0)
|
||||
if ((f->_flags & _IO_CURRENTLY_PUTTING) == 0 || f->_IO_write_base == NULL)
|
||||
{
|
||||
/* Allocate a buffer if needed. */
|
||||
if (f->_IO_write_base == 0)
|
||||
if (f->_IO_write_base == NULL)
|
||||
{
|
||||
INTUSE(_IO_doallocbuf) (f);
|
||||
_IO_setg (f, f->_IO_buf_base, f->_IO_buf_base, f->_IO_buf_base);
|
||||
@ -1338,7 +1338,9 @@ _IO_new_file_xsputn (f, data, n)
|
||||
_IO_size_t block_size, do_write;
|
||||
/* Next flush the (full) buffer. */
|
||||
if (_IO_OVERFLOW (f, EOF) == EOF)
|
||||
return n - to_do;
|
||||
/* If nothing else has to be written we must not signal the
|
||||
caller that everything has been written. */
|
||||
return to_do == 0 ? EOF : n - to_do;
|
||||
|
||||
/* Try to maintain alignment: write a whole number of blocks.
|
||||
dont_write is what gets left over. */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1993, 1995, 1997-2003, 2004 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1993, 1995, 1997-2004, 2005 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Written by Per Bothner <bothner@cygnus.com>.
|
||||
|
||||
@ -752,7 +752,7 @@ _IO_old_file_xsputn (f, data, n)
|
||||
_IO_size_t block_size, do_write;
|
||||
/* Next flush the (full) buffer. */
|
||||
if (__overflow (f, EOF) == EOF)
|
||||
return n - to_do;
|
||||
return to_do == 0 ? 0 : n - to_do;
|
||||
|
||||
/* Try to maintain alignment: write a whole number of blocks.
|
||||
dont_write is what gets left over. */
|
||||
|
@ -53,7 +53,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
|
||||
scanf11 scanf12 tst-tmpnam tst-cookie tst-obprintf tst-sscanf \
|
||||
tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \
|
||||
tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 \
|
||||
tst-popen tst-unlockedio tst-fmemopen2
|
||||
tst-popen tst-unlockedio tst-fmemopen2 tst-put-error
|
||||
|
||||
test-srcs = tst-unbputc tst-printf
|
||||
|
||||
|
33
stdio-common/tst-put-error.c
Normal file
33
stdio-common/tst-put-error.c
Normal file
@ -0,0 +1,33 @@
|
||||
#include <errno.h>
|
||||
#include <error.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
char tmpl[] = "/tmp/tst-put-error.XXXXXX";
|
||||
int fd = mkstemp (tmpl);
|
||||
if (fd == -1)
|
||||
error (EXIT_FAILURE, errno, "cannot create temporary file");
|
||||
FILE *fp = fdopen (fd, "w");
|
||||
if (fp == NULL)
|
||||
error (EXIT_FAILURE, errno, "fdopen");
|
||||
setlinebuf (fp);
|
||||
close (fd);
|
||||
unlink ("aaa");
|
||||
int n = fprintf (fp, "hello world\n");
|
||||
printf ("fprintf = %d\n", n);
|
||||
if (n >= 0)
|
||||
error (EXIT_FAILURE, 0, "first fprintf succeeded");
|
||||
n = fprintf (fp, "hello world\n");
|
||||
printf ("fprintf = %d\n", n);
|
||||
if (n >= 0)
|
||||
error (EXIT_FAILURE, 0, "second fprintf succeeded");
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define TEST_FUNCTION do_test ()
|
||||
#include "../test-skeleton.c"
|
Loading…
Reference in New Issue
Block a user