Changeset 5f2566b in rtems

Timestamp:

11/02/99 16:27:53 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

3251b55

Parents:

063e4950

Message:

Fixed F_SETFL to properly convert between internal
libio flags and external fcntl.h style flags.

Files:

• c/src/exec/libcsupport/src/fcntl.c (modified) (3 diffs)
• c/src/lib/libc/fcntl.c (modified) (3 diffs)
• cpukit/libcsupport/src/fcntl.c (modified) (3 diffs)

c/src/exec/libcsupport/src/fcntl.c

@@ -31 +31 @@
   int            fd2;
   int            flags;
+  int            mask;
   int            ret = 0;
   
@@ -93 +94 @@
     case F_SETFL:
       flags = rtems_libio_fcntl_flags( va_arg( ap, int ) );
+      mask = LIBIO_FLAGS_NO_DELAY | LIBIO_FLAGS_APPEND;
 
       /*
@@ -98 +100 @@
        */
 
-      iop->flags = (iop->flags & ~(O_APPEND | O_NONBLOCK)) |
-                   (flags & (O_APPEND | O_NONBLOCK));
+      iop->flags = (iop->flags & ~mask) | (flags & mask);
       break;
 

c/src/lib/libc/fcntl.c

@@ -31 +31 @@
   int            fd2;
   int            flags;
+  int            mask;
   int            ret = 0;
   
@@ -93 +94 @@
     case F_SETFL:
       flags = rtems_libio_fcntl_flags( va_arg( ap, int ) );
+      mask = LIBIO_FLAGS_NO_DELAY | LIBIO_FLAGS_APPEND;
 
       /*
@@ -98 +100 @@
        */
 
-      iop->flags = (iop->flags & ~(O_APPEND | O_NONBLOCK)) |
-                   (flags & (O_APPEND | O_NONBLOCK));
+      iop->flags = (iop->flags & ~mask) | (flags & mask);
       break;
 

cpukit/libcsupport/src/fcntl.c

@@ -31 +31 @@
   int            fd2;
   int            flags;
+  int            mask;
   int            ret = 0;
   
@@ -93 +94 @@
     case F_SETFL:
       flags = rtems_libio_fcntl_flags( va_arg( ap, int ) );
+      mask = LIBIO_FLAGS_NO_DELAY | LIBIO_FLAGS_APPEND;
 
       /*
@@ -98 +100 @@
        */
 
-      iop->flags = (iop->flags & ~(O_APPEND | O_NONBLOCK)) |
-                   (flags & (O_APPEND | O_NONBLOCK));
+      iop->flags = (iop->flags & ~mask) | (flags & mask);
       break;