RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2006-03-07 Till Strauman <strauman@slac.stanford.edu>

Browse Source 
PR 886/filesystem
	* src/libio.c: fcntl(fd,F_GETFL) fails to set O_NONBLOCK if the
	descriptor is in non-blocking mode.
This commit is contained in:
Joel Sherrill
2006-03-07 21:02:00 +00:00
parent ec24e12693
commit 5b78cd6bc9
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/libcsupport/ChangeLog
View File

@@ -1,3 +1,9 @@
2006-03-07 Till Strauman <strauman@slac.stanford.edu>
PR 886/filesystem
* src/libio.c: fcntl(fd,F_GETFL) fails to set O_NONBLOCK if the
descriptor is in non-blocking mode.
2005-08-31 Ralf Corsepius <ralf.corsepius@rtems.org>
PR 819/filesystem

27
cpukit/libcsupport/src/libio.c
View File

@@ -26,16 +26,19 @@
#include <assert.h>
#include <errno.h>
#if ! defined(O_NDELAY)
# if defined(solaris2)
# define O_NDELAY O_NONBLOCK
# elif defined(__CYGWIN__)
# define O_NDELAY _FNBIO
# elif defined(RTEMS_NEWLIB)
# define O_NDELAY _FNBIO
# endif
#endif
/* define this to alias O_NDELAY to O_NONBLOCK, i.e.,
* O_NDELAY is accepted on input but fcntl(F_GETFL) returns
* O_NONBLOCK. This is because rtems has no distinction
* between the two (but some systems have).
* Note that accepting this alias creates a problem:
* an application trying to clear the non-blocking flag
* using a
*
* fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_NDELAY);
*
* does (silently) ignore the operation.
*/
#undef ACCEPT_O_NDELAY_ALIAS
#include <errno.h>
#include <string.h> /* strcmp */
@@ -114,7 +117,9 @@ rtems_assoc_t access_modes_assoc[] = {
};
rtems_assoc_t status_flags_assoc[] = {
#ifdef ACCEPT_O_NDELAY_ALIAS
{ "NO DELAY", LIBIO_FLAGS_NO_DELAY, O_NDELAY },
#endif
{ "NONBLOCK", LIBIO_FLAGS_NO_DELAY, O_NONBLOCK },
{ "APPEND", LIBIO_FLAGS_APPEND, O_APPEND },
{ "CREATE", LIBIO_FLAGS_CREATE, O_CREAT },
@@ -166,7 +171,7 @@ unsigned32 rtems_libio_to_fcntl_flags(
}
if ( (flags & LIBIO_FLAGS_NO_DELAY) == LIBIO_FLAGS_NO_DELAY ) {
fcntl_flags |= O_NDELAY;
fcntl_flags |= O_NONBLOCK;
}
if ( (flags & LIBIO_FLAGS_APPEND) == LIBIO_FLAGS_APPEND ) {