diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-08-19 06:15:56 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-08-19 06:15:56 +0000 |
| commit | ee4e5a3db1dd65546eaf66eba73c325553015281 (patch) | |
| tree | d38bdd084d86ca3f7099a66e961a0360e0d20121 | |
| parent | fd82139fa58ef52bc23bff26db26d53356230557 (diff) | |
| download | glibc-ee4e5a3db1dd65546eaf66eba73c325553015281.tar.gz glibc-ee4e5a3db1dd65546eaf66eba73c325553015281.tar.xz glibc-ee4e5a3db1dd65546eaf66eba73c325553015281.zip | |
Update.
2003-08-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/shm_open.c (shm_open): Fold EISDIR error into EINVAL.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/shm_open.c | 7 |
3 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index dbd2c35da5..df30329396 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-08-18 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/shm_open.c (shm_open): Fold EISDIR error + into EINVAL. + 2003-08-18 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/ia64/dl-machine.h (elf_machine_rela): Use _dl_reloc_bad_type. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index dcf3815b02..1233a9d44a 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2003-08-18 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/bits/posix_opt.h: Define + _POSIX_THREAD_PRIORITY_SCHEDULING. + * sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Likewise. + 2003-08-07 Jakub Jelinek <jakub@redhat.com> * sysdeps/pthread/bits/libc-lock.h [_LIBC && SHARED] diff --git a/sysdeps/unix/sysv/linux/shm_open.c b/sysdeps/unix/sysv/linux/shm_open.c index b118533dca..73804f5349 100644 --- a/sysdeps/unix/sysv/linux/shm_open.c +++ b/sysdeps/unix/sysv/linux/shm_open.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2002, 2003 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 @@ -181,6 +181,11 @@ shm_open (const char *name, int oflag, mode_t mode) __set_errno (save_errno); } } + else if (__builtin_expect (errno == EISDIR, 0)) + /* It might be better to fold this error with EINVAL since + directory names are just another example for unsuitable shared + object names and the standard does not mention EISDIR. */ + __set_errno (EINVAL); return fd; } |