From b207ff4bd88564215ef7c68e61ec46aa4cb461c1 Mon Sep 17 00:00:00 2001 From: "Thomas Bushnell, BSG" Date: Tue, 15 Oct 1996 15:07:50 +0000 Subject: Thu Oct 10 17:25:55 1996 Thomas Bushnell, n/BSG * 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. --- hurd/hurdlookup.c | 6 +----- sysdeps/mach/hurd/fcntlbits.h | 10 +++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hurd/hurdlookup.c b/hurd/hurdlookup.c index bfee61444e..98aca55118 100644 --- 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 8a5e4cd52a..eb4dc97130 100644 --- 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', -- cgit v1.2.3