 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread.c,v 1.129 2012/03/09 12:06:44 drochner Exp $	*/
+/*	$NetBSD: pthread.c,v 1.130 2012/03/10 18:01:10 joerg Exp $	*/
 /*-
  * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nathan J. Williams and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread.c,v 1.129 2012/03/09 12:06:44 drochner Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.130 2012/03/10 18:01:10 joerg Exp $");
 #define	__EXPOSE_STACK	1
 #include <sys/param.h>
 #include <sys/exec_elf.h>
 #include <sys/mman.h>
 #include <sys/sysctl.h>
 #include <sys/lwpctl.h>
 #include <sys/tls.h>
 #include <assert.h>
 #include <dlfcn.h>
 #include <err.h>
 @@ -329,27 +329,27 @@ pthread__newstack(pthread_t newthread, c
 		stackbase = NULL;
 		stacksize = 0;
+	}
 	if (stacksize == 0)
 		stacksize = pthread__stacksize;
 	if (stackbase == NULL) {
 		stackbase = mmap(NULL, stacksize,
 		    PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, (off_t)0);
 		if (stackbase == MAP_FAILED)
 			return ENOMEM;
 		mapped_stack = true;
+	}
-	newthread->pt_stack.ss_size = pthread__stacksize - pthread__pagesize;
+	newthread->pt_stack.ss_size = stacksize - pthread__pagesize;
 	newthread->pt_stack.ss_sp = stackbase;
 #ifdef __MACHINE_STACK_GROWS_UP
 	redzone = (char *)stackbase + newthread->pt_stack.ss_size;
 #else
 	redzone = (char *)stackbase;
 #endif
 	if (mprotect(redzone, pthread__pagesize, PROT_NONE) == -1) {
 		if (mapped_stack)
 			munmap(stackbase, pthread__stacksize);
 		return EPERM;
+	}
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sem.c,v 1.23 2012/03/08 21:59:28 joerg Exp $	*/
+/*	$NetBSD: sem.c,v 1.24 2012/03/10 18:01:10 joerg Exp $	*/
 /*-
  * Copyright (c) 2003, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -49,27 +49,27 @@
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
  * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: sem.c,v 1.23 2012/03/08 21:59:28 joerg Exp $");
+__RCSID("$NetBSD: sem.c,v 1.24 2012/03/10 18:01:10 joerg Exp $");
 #include <sys/types.h>
 #include <sys/ksem.h>
 #include <sys/queue.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <semaphore.h>
 #include <stdarg.h>
 #include "pthread.h"
 struct _sem_st {
 @@ -125,40 +125,41 @@ sem_init(sem_t *sem, int pshared, unsign
 	if ((error = sem_alloc(value, semid, sem)) != 0) {
 		_ksem_destroy(semid);
 		errno = error;
 		return (-1);
+	}
 	return (0);
+}
 int
 sem_destroy(sem_t *sem)
+{
 	int error, save_errno;
 #ifdef ERRORCHECK
 	if (sem == NULL || *sem == NULL || (*sem)->ksem_magic != KSEM_MAGIC) {
 		errno = EINVAL;
 		return (-1);
+	}
 #endif
-	if (_ksem_destroy((*sem)->ksem_semid) == -1)
+	error = _ksem_destroy((*sem)->ksem_semid);
-		return (-1);
+	save_errno = errno;
 	sem_free(*sem);
 	errno = save_errno;
-	return (0);
+	return error;
+}
 sem_t *
 sem_open(const char *name, int oflag, ...)
+{
 	sem_t *sem, s;
 	intptr_t semid;
 	mode_t mode;
 	unsigned int value;
 	int error;
 	va_list ap;
 	mode = 0;
 @@ -208,45 +209,44 @@ sem_open(const char *name, int oflag, ..
 	_ksem_close(semid);
 	if (sem != NULL) {
 		if (*sem != NULL)
 			sem_free(*sem);
 		free(sem);
+	}
 	errno = error;
 	return (SEM_FAILED);
+}
 int
 sem_close(sem_t *sem)
+{
 	int error, save_errno;
 #ifdef ERRORCHECK
 	if (sem == NULL || *sem == NULL || (*sem)->ksem_magic != KSEM_MAGIC) {
 		errno = EINVAL;
 		return (-1);
+	}
 #endif
 	pthread_mutex_lock(&named_sems_mtx);
-	if (_ksem_close((*sem)->ksem_semid) == -1) {
+	error = _ksem_close((*sem)->ksem_semid);
 		pthread_mutex_unlock(&named_sems_mtx);
 		return (-1);
 	LIST_REMOVE((*sem), ksem_list);
 	save_errno = errno;
 	pthread_mutex_unlock(&named_sems_mtx);
 	sem_free(*sem);
 	free(sem);
-	return (0);
+	errno = save_errno;
 	return error;
+}
 int
 sem_unlink(const char *name)
+{
 	return (_ksem_unlink(name));
+}
 int
 sem_wait(sem_t *sem)
+{