Libc-997.1.1.tar.gz

[apple/libc.git] / stdio / FreeBSD / flags.c

diff --git a/stdio/FreeBSD/flags.c b/stdio/FreeBSD/flags.c
index cd90f837ab04e56e321edafc71f7d797a603ef64..3b90476c2c24bd323dbac74e0112d254e30e12ef 100644 (file)
--- a/stdio/FreeBSD/flags.c
+++ b/stdio/FreeBSD/flags.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -38,7 +34,7 @@
 static char sccsid[] = "@(#)flags.c    8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/flags.c,v 1.9 2002/03/22 21:53:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/flags.c,v 1.10 2007/01/09 00:28:06 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
@@ -85,10 +81,17 @@ __sflags(mode, optr)
        }
 
        /* [rwa]\+ or [rwa]b\+ means read and write */
-       if (*mode == '+' || (*mode == 'b' && mode[1] == '+')) {
+       if (*mode == 'b')
+               mode++;
+       if (*mode == '+') {
                ret = __SRW;
                m = O_RDWR;
+               mode++;
+               if (*mode == 'b')
+                       mode++;
        }
+       if (*mode == 'x')
+               o |= O_EXCL;
        *optr = m | o;
        return (ret);
 }