rbb 99/04/09 11:09:27
Modified: apr/file_io/unix open.c
apr/test testfile.c
docs fileio.txt
include apr_file_io.h
Log:
Removed the NONBLOCKING flag for file I/O. Too many OS's don't support this
option, so it's not portable, and it goes away.
Revision Changes Path
1.12 +0 -6 apache-apr/apr/file_io/unix/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/file_io/unix/open.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- open.c 1999/04/09 15:05:15 1.11
+++ open.c 1999/04/09 18:09:25 1.12
@@ -102,12 +102,6 @@
if (flag & APR_TRUNCATE) {
oflags |= O_TRUNC;
}
- if (flag & APR_NONBLOCK) {
- oflags |= O_NONBLOCK;
- }
- else {
- oflags |= O_SYNC;
- }
dafile->filedes = open(fname, oflags, mode);
1.10 +1 -1 apache-apr/apr/test/testfile.c
Index: testfile.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/test/testfile.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- testfile.c 1999/04/09 18:02:52 1.9
+++ testfile.c 1999/04/09 18:09:25 1.10
@@ -69,7 +69,7 @@
{
apr_file_t *thefile = NULL;
apr_status_t status = 0;
- apr_int32_t flag = APR_READ | APR_WRITE | APR_CREATE | APR_NONBLOCK;
+ apr_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
apr_uint64_t rv = 0;
apr_uint64_t nbytes = 0;
char buf;
1.11 +0 -1 apache-apr/docs/fileio.txt
Index: fileio.txt
===================================================================
RCS file: /home/cvs/apache-apr/docs/fileio.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fileio.txt 1999/04/09 18:02:55 1.10
+++ fileio.txt 1999/04/09 18:09:26 1.11
@@ -19,7 +19,6 @@
non-buffered
APR_EXCL return error if APR_CREATE and file
exists.
- APR_NONBLOCK don't block on read or write.
arg 3) Access permissions to set for the file if it is created with
APR_CREATE. We haven't decided how exactly we want this to
work, but it will support the set of Unix permissions at
1.13 +0 -1 apache-apr/include/apr_file_io.h
Index: apr_file_io.h
===================================================================
RCS file: /home/cvs/apache-apr/include/apr_file_io.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apr_file_io.h 1999/04/09 18:02:58 1.12
+++ apr_file_io.h 1999/04/09 18:09:27 1.13
@@ -75,7 +75,6 @@
#define APR_BUFFERED 64 /* Buffer the data when reading or writing
*/
#define APR_EXCL 128 /* Open should fail if APR_CREATE and file
exists. */
-#define APR_NONBLOCK 256 /* Don't block when reading or writing */
/* flags for apr_seek */
#define APR_SET SEEK_SET
