libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-01-20 05:19:21 +08:00
Code Issues Projects Releases Wiki Activity

2006-01-09 Eric Blake <ebb9@byu.net>

Browse Source 
* libc/stdio/freopen.c (_freopen_r): Accept NULL filename.
        * libc/stdio64/freopen64.c (_freopen64_r): Likewise.
This commit is contained in:
Jeff Johnston 2006-01-09 17:51:01 +00:00
parent fd50e04bf1
commit 0da7297ef1
3 changed files with 115 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2006-01-09 Eric Blake <ebb9@byu.net>
* libc/stdio/freopen.c (_freopen_r): Accept NULL filename.
* libc/stdio64/freopen64.c (_freopen64_r): Likewise.
2006-01-06 Jeff Johnston <jjohnstn@redhat.com> 2006-01-06 Jeff Johnston <jjohnstn@redhat.com>
* libc/sys/linux/include/getopt.h: Add macros needed by * libc/sys/linux/include/getopt.h: Add macros needed by

62
newlib/libc/stdio/freopen.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990, 2006 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms are permitted * Redistribution and use in source and binary forms are permitted
@ -55,6 +55,12 @@ it).
<[file]> and <[mode]> are used just as in <<fopen>>. <[file]> and <[mode]> are used just as in <<fopen>>.
If <[file]> is <<NULL>>, the underlying stream is modified rather than
closed. The file cannot change access mode (for example, if it was
previously read-only, <[mode]> must be "r", "rb", or "rt"), but can
change status such as append or binary mode. If modification is not
possible, failure occurs.
RETURNS RETURNS
If successful, the result is the same as the argument <[fp]>. If the If successful, the result is the same as the argument <[fp]>. If the
file cannot be opened as specified, the result is <<NULL>>. file cannot be opened as specified, the result is <<NULL>>.
@ -70,6 +76,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <reent.h> #include <reent.h>
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/lock.h> #include <sys/lock.h>
@ -87,7 +94,8 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
register FILE *fp) register FILE *fp)
{ {
register int f; register int f;
int flags, oflags, e; int flags, oflags;
int e = 0;
__sfp_lock_acquire (); __sfp_lock_acquire ();
@ -117,17 +125,57 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
{ {
if (fp->_flags & __SWR) if (fp->_flags & __SWR)
_CAST_VOID fflush (fp); _CAST_VOID fflush (fp);
/* if close is NULL, closing is a no-op, hence pointless */ /*
if (fp->_close != NULL) * If close is NULL, closing is a no-op, hence pointless.
* If file is NULL, the file should not be closed.
*/
if (fp->_close != NULL && file != NULL)
_CAST_VOID (*fp->_close) (fp->_cookie); _CAST_VOID (*fp->_close) (fp->_cookie);
} }
/* /*
* Now get a new descriptor to refer to the new file. * Now get a new descriptor to refer to the new file, or reuse the
* existing file descriptor if file is NULL.
*/ */
f = _open_r (ptr, (char *) file, oflags, 0666); if (file != NULL)
e = ptr->_errno; {
f = _open_r (ptr, (char *) file, oflags, 0666);
e = ptr->_errno;
}
else
{
#ifdef HAVE_FCNTL
/*
* Reuse the file descriptor, but only if the access mode is
* unchanged. F_SETFL correctly ignores creation flags.
*/
f = fp->_file;
if ((oflags = _fcntl_r (ptr, f, F_GETFL, 0)) == -1
|| ((oflags ^ flags) & O_ACCMODE) != 0
|| _fcntl_r (ptr, f, F_SETFL, flags) == -1)
f = -1;
#else
/* We cannot modify without fcntl support. */
f = -1;
#endif
#ifdef __SCLE
/*
* F_SETFL doesn't change textmode. Don't mess with modes of ttys.
*/
if (0 <= f && ! _isatty (f)
&& setmode (f, flags & (O_BINARY | O_TEXT)) == -1)
f = -1;
#endif
if (f < 0)
{
e = EBADF;
if (fp->_close != NULL)
_CAST_VOID (*fp->_close) (fp->_cookie);
}
}
/* /*
* Finish closing fp. Even if the open succeeded above, * Finish closing fp. Even if the open succeeded above,

62
newlib/libc/stdio64/freopen64.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990, 2006 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms are permitted * Redistribution and use in source and binary forms are permitted
@ -55,6 +55,12 @@ it).
<[file]> and <[mode]> are used just as in <<fopen>>. <[file]> and <[mode]> are used just as in <<fopen>>.
If <[file]> is <<NULL>>, the underlying stream is modified rather than
closed. The file cannot change access mode (for example, if it was
previously read-only, <[mode]> must be "r", "rb", or "rt"), but can
change status such as append or binary mode. If modification is not
possible, failure occurs.
RETURNS RETURNS
If successful, the result is the same as the argument <[fp]>. If the If successful, the result is the same as the argument <[fp]>. If the
file cannot be opened as specified, the result is <<NULL>>. file cannot be opened as specified, the result is <<NULL>>.
@ -68,6 +74,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/lock.h> #include <sys/lock.h>
@ -87,7 +94,8 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
register FILE *fp) register FILE *fp)
{ {
register int f; register int f;
int flags, oflags, e; int flags, oflags;
int e = 0;
__sfp_lock_acquire (); __sfp_lock_acquire ();
@ -117,17 +125,57 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
{ {
if (fp->_flags & __SWR) if (fp->_flags & __SWR)
(void) fflush (fp); (void) fflush (fp);
/* if close is NULL, closing is a no-op, hence pointless */ /*
if (fp->_close != NULL) * If close is NULL, closing is a no-op, hence pointless.
* If file is NULL, the file should not be closed.
*/
if (fp->_close != NULL && file != NULL)
(void) (*fp->_close) (fp->_cookie); (void) (*fp->_close) (fp->_cookie);
} }
/* /*
* Now get a new descriptor to refer to the new file. * Now get a new descriptor to refer to the new file, or reuse the
* existing file descriptor if file is NULL.
*/ */
f = _open64_r (ptr, (char *) file, oflags, 0666); if (file != NULL)
e = ptr->_errno; {
f = _open64_r (ptr, (char *) file, oflags, 0666);
e = ptr->_errno;
}
else
{
#ifdef HAVE_FCNTL
/*
* Reuse the file descriptor, but only if the access mode is
* unchanged. F_SETFL correctly ignores creation flags.
*/
f = fp->_file;
if ((oflags = _fcntl_r (ptr, f, F_GETFL, 0)) == -1
|| ((oflags ^ flags) & O_ACCMODE) != 0
|| _fcntl_r (ptr, f, F_SETFL, flags) == -1)
f = -1;
#else
/* We cannot modify without fcntl support. */
f = -1;
#endif
#ifdef __SCLE
/*
* F_SETFL doesn't change textmode. Don't mess with modes of ttys.
*/
if (0 <= f && ! _isatty (f)
&& setmode (f, flags & (O_BINARY | O_TEXT)) == -1)
f = -1;
#endif
if (f < 0)
{
e = EBADF;
if (fp->_close != NULL)
(void) (*fp->_close) (fp->_cookie);
}
}
/* /*
* Finish closing fp. Even if the open succeeded above, * Finish closing fp. Even if the open succeeded above,