Thu Oct 10 17:25:55 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>

	* sysdeps/mach/hurd/fcntlbits.h (O_SHLOCK, O_EXLOCK): Redesignate
	as file name translation flags.
	* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): Don't pretend
	to do anything for O_SHLOCK or O_EXLOCK.  Those are now file name
	translation flags.

diff --git a/hurd/hurdlookup.c b/hurd/hurdlookup.c
index bfee614..98aca55 100644 (file)
--- a/hurd/hurdlookup.c
+++ b/hurd/hurdlookup.c
@@ -154,11 +154,7 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
            {
              /* We got a successful translation.  Now apply any open-time
                 action flags we were passed.  */
-             if (flags & O_EXLOCK)
-               ;               /* XXX */
-             if (!err && (flags & O_SHLOCK))
-               ;               /* XXX */
-             if (!err && (flags & O_TRUNC))
+             if (flags & O_TRUNC)
                err = __file_set_size (*result, 0);
 
              if (err)

diff --git a/sysdeps/mach/hurd/fcntlbits.h b/sysdeps/mach/hurd/fcntlbits.h
index 8a5e4cd..eb4dc97 100644 (file)
--- a/sysdeps/mach/hurd/fcntlbits.h
+++ b/sysdeps/mach/hurd/fcntlbits.h
@@ -1,5 +1,5 @@
 /* O_*, F_*, FD_* bit values for GNU.
-Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+Copyright (C) 1993, 1994, 1996 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
@@ -69,6 +69,10 @@ Cambridge, MA 02139, USA.  */
 #ifdef __USE_GNU
 #define        O_NOATIME       0x0800  /* Don't set access time on read (owner).  */
 #endif
+#ifdef __USE_MISC
+#define        O_SHLOCK        0x00020000 /* Open with shared file lock.  */
+#define        O_EXLOCK        0x00040000 /* Open with exclusive file lock.  */
+#endif
 
 
 /* The name O_NONBLOCK is unfortunately overloaded; it is both a file name
@@ -103,10 +107,6 @@ Cambridge, MA 02139, USA.  */
    once the file has been opened.  */
 
 #define        O_TRUNC         0x00010000 /* Truncate file to zero length.  */
-#ifdef __USE_MISC
-#define        O_SHLOCK        0x00020000 /* Open with shared file lock.  */
-#define        O_EXLOCK        0x00040000 /* Open with exclusive file lock.  */
-#endif
 
 
 /* Controlling terminal flags.  These are understood only by `open',