entered into RCS

diff --git a/sysdeps/unix/bsd/sun/sunos4/fcntlbits.h b/sysdeps/unix/bsd/sun/sunos4/fcntlbits.h
index 7619ea5..2100722 100644 (file)
--- a/sysdeps/unix/bsd/sun/sunos4/fcntlbits.h
+++ b/sysdeps/unix/bsd/sun/sunos4/fcntlbits.h
@@ -43,6 +43,9 @@ Cambridge, MA 02139, USA.  */
 #define        O_APPEND        0x0008  /* Writes append to the file.  */
 #define        O_NONBLOCK      0x4000  /* Non-blocking I/O.  */
 
+/* Sun defines O_NDELAY one way for BSD behavior and another for System V
+   behavior.  In the GNU C library, you get the BSD behavior unless you
+   define _USG_SOURCE without also defining _BSD_SOURCE or _GNU_SOURCE.  */
 #ifdef __USE_BSD
 #define        O_NDELAY        0x0004
 #endif
@@ -69,8 +72,8 @@ Cambridge, MA 02139, USA.  */
 #define FAPPEND                O_APPEND
 #define FNONBLOCK      O_NONBLOCK
 #define FNONBIO                O_NONBLOCK
-#define FNDELAY                0x0004
-#define        FNBIO           0x1000
+#define FNDELAY                0x0004  /* BSD O_NDELAY.  */
+#define        FNBIO           0x1000  /* System V O_NDELAY.  */
 #endif
 
 /* Mask for file access modes.  This is system-dependent in case

diff --git a/sysdeps/unix/bsd/ultrix4/fcntlbits.h b/sysdeps/unix/bsd/ultrix4/fcntlbits.h
new file mode 100644 (file)
index 0000000..bf8e7b2
--- /dev/null
+++ b/sysdeps/unix/bsd/ultrix4/fcntlbits.h
@@ -0,0 +1,125 @@
+/* O_*, F_*, FD_* bit values for Ultrix 4.
+Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#ifndef        _FCNTLBITS_H
+
+#define        _FCNTLBITS_H    1
+
+
+/* File access modes for `open' and `fcntl'.  */
+#define        O_RDONLY        0       /* Open read-only.  */
+#define        O_WRONLY        1       /* Open write-only.  */
+#define        O_RDWR          2       /* Open read/write.  */
+
+
+/* Bits OR'd into the second argument to open.  */
+#define        O_CREAT         0x0200  /* Create file if it doesn't exist.  */
+#define        O_EXCL          0x0800  /* Fail if file already exists.  */
+#define        O_TRUNC         0x0400  /* Truncate file to zero length.  */
+#ifdef __USE_MISC
+#define        O_ASYNC         0x0040  /* Send SIGIO to owner when data is ready.  */
+#define        O_FSYNC         0x8000  /* Synchronous writes.  */
+#define        O_SYNC          O_FSYNC
+#define        O_BLKINUSE      0x1000  /* Block if "in use".  */
+#define        O_BLKANDSET     0x3000  /* Block, test and set "in use" flag.  */
+#define        O_TERMIO        0x40000 /* "termio style program".  */
+#endif
+#define        O_NOCTTY        0x80000 /* Don't assign a controlling terminal.  */
+
+/* File status flags for `open' and `fcntl'.  */
+#define        O_APPEND        0x0008  /* Writes append to the file.  */
+#define        O_NONBLOCK      0x20000 /* Non-blocking I/O.  */
+
+#ifdef __USE_BSD
+#define        O_NDELAY        0x0004
+#endif
+
+#ifdef __USE_BSD
+/* Bits in the file status flags returned by F_GETFL.
+   These are all the O_* flags, plus FREAD and FWRITE, which are
+   independent bits set by which of O_RDONLY, O_WRONLY, and O_RDWR, was
+   given to `open'.  */
+#define FREAD          1
+#define        FWRITE          2
+
+/* Traditional BSD names the O_* bits.  */
+#define FASYNC         O_ASYNC
+#define FCREAT         O_CREAT
+#define FEXCL          O_EXCL
+#define FTRUNC         O_TRUNC
+#define FNOCTTY                O_NOCTTY
+#define FFSYNC         O_FSYNC
+#define FSYNC          O_SYNC
+#define FAPPEND                O_APPEND
+#define FNONBLOCK      O_NONBLOCK
+#define FNDELAY                O_NDELAY
+#define        FNBLOCK         O_NONBLOCK
+#define        FTERMIO         O_TERMIO
+#define        FNOCTTY         O_NOCTTY
+#define        FSYNCRON        O_FSYNC
+#define        FBLKINUSE       O_BLKINUSE
+#define FBLKANDSET     O_BLKANDSET
+#endif
+
+/* Mask for file access modes.  This is system-dependent in case
+   some system ever wants to define some other flavor of access.  */
+#define        O_ACCMODE       (O_RDONLY|O_WRONLY|O_RDWR)
+
+/* Values for the second argument to `fcntl'.  */
+#define        F_DUPFD         0       /* Duplicate file descriptor.  */
+#define        F_GETFD         1       /* Get file descriptor flags.  */
+#define        F_SETFD         2       /* Set file descriptor flags.  */
+#define        F_GETFL         3       /* Get file status flags.  */
+#define        F_SETFL         4       /* Set file status flags.  */
+#ifdef __USE_BSD
+#define        F_GETOWN        5       /* Get owner (receiver of SIGIO).  */
+#define        F_SETOWN        6       /* Set owner (receiver of SIGIO).  */
+#endif
+#define        F_GETLK         7       /* Get record locking info.  */
+#define        F_SETLK         8       /* Set record locking info (non-blocking).  */
+#define        F_SETLKW        9       /* Set record locking info (blocking).  */
+#ifdef __USE_MISC
+#define        F_SETSYN        10      /* Set synchronous writing.  */
+#define        F_CLRSYN        10      /* Clear synchronous writing.  */
+#endif
+
+/* File descriptor flags used with F_GETFD and F_SETFD.  */
+#define        FD_CLOEXEC      1       /* Close on exec.  */
+
+
+#include <gnu/types.h>
+
+/* The structure describing an advisory lock.  This is the type of the third
+   argument to `fcntl' for the F_GETLK, F_SETLK, and F_SETLKW requests.  */
+struct flock
+  {
+    short int l_type;  /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
+    short int l_whence;        /* Where `l_start' is relative to (like `lseek').  */
+    __off_t l_start;   /* Offset where the lock begins.  */
+    __off_t l_len;     /* Size of the locked area; zero means until EOF.  */
+    __pid_t l_pid;     /* Process holding the lock.  */
+  };
+
+/* Values for the `l_type' field of a `struct flock'.  */
+#define        F_RDLCK 1       /* Read lock.  */
+#define        F_WRLCK 2       /* Write lock.  */
+#define        F_UNLCK 3       /* Remove lock.  */
+
+
+#endif /* fcntlbits.h */