From a8d87c92cd0f6705c4adb5b8ab786aed249380c6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 15 Jan 2003 07:15:24 +0000 Subject: Update. 2003-01-14 Ulrich Drepper * manual/install.texi: Correct description of header preparation for Linux build. Patch by mhwood@Ameritech.Net [PR libc/4941]. --- nptl/Banner | 2 +- nptl/ChangeLog | 4 ++++ nptl/sem_open.c | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'nptl') diff --git a/nptl/Banner b/nptl/Banner index aaca2401a2..9a3a874c34 100644 --- a/nptl/Banner +++ b/nptl/Banner @@ -1 +1 @@ -NPTL 0.16 by Ulrich Drepper +NPTL 0.17 by Ulrich Drepper diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0d7a57b403..4d1f8ccfde 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,9 @@ 2003-01-14 Ulrich Drepper + * sem_open.c (sem_open): Return SEM_FAILED if existing semaphore + must be used and mapping failed. + Reported by Luke Elliott . + * Makefile (CFLAGS-pthread_self.os): Define this, not CFLAGS-pthread_self.c. diff --git a/nptl/sem_open.c b/nptl/sem_open.c index e8ef8f5f77..0ed8001204 100644 --- a/nptl/sem_open.c +++ b/nptl/sem_open.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -169,6 +169,8 @@ sem_open (const char *name, int oflag, ...) /* Map the sem_t structure from the file. */ result = (sem_t *) mmap (NULL, sizeof (sem_t), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (MAP_FAILED != (void *) SEM_FAILED && result == MAP_FAILED) + result = SEM_FAILED; } else { -- cgit v1.2.3