--- Libc/Libc-391/pthreads/pthread_tsd.c
+++ Libc/Libc-262/pthreads/pthread_tsd.c
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc. 1997 1996 1995 1994 1993 1992 1991  
  *              All Rights Reserved 
@@ -48,7 +26,6 @@
 /*
  * POSIX Pthread Library
  *   Thread Specific Data support
- *   NB: pthread_getspecific() is in a separate assembly file
  */
 
 #include "pthread_internals.h"
@@ -70,14 +47,13 @@
 	int res, i;
 	LOCK(tds_lock);
 	res = ENOMEM;  /* No 'free' keys */
-	/* The first slot is reserved for pthread_self() */
-	for (i = 1;  i < _POSIX_THREAD_KEYS_MAX;  i++)
+	for (i = 0;  i < _POSIX_THREAD_KEYS_MAX;  i++)
 	{
 		if (_pthread_keys[i].created == FALSE)
 		{
 			_pthread_keys[i].created = TRUE;
 			_pthread_keys[i].destructor = destructor;
-			*key = i;
+			*key = i+1;
 			res = ESUCCESS;
 			break;
 		}
@@ -94,20 +70,11 @@
 {
 	int res;
 	LOCK(tds_lock);
-	/* The first slot is reserved for pthread_self() */
-	if ((key > 0) && (key < _POSIX_THREAD_KEYS_MAX))
+	if ((key >= 1) && (key <= _POSIX_THREAD_KEYS_MAX))
 	{
-		if (_pthread_keys[key].created)
+		if (_pthread_keys[key-1].created)
 		{
-			struct _pthread * p;
-
-			_pthread_keys[key].created = FALSE;
-			LOCK(_pthread_list_lock);
-			LIST_FOREACH(p, &__pthread_head, plist) {
-				/* It is  an 32bit value no lock needed */
-				p->tsd[key] = 0;
-			}
-			UNLOCK(_pthread_list_lock);	
+			_pthread_keys[key-1].created = FALSE;
 			res = ESUCCESS;
 		} else
 		{
@@ -136,13 +103,12 @@
 {
 	int res;
 	pthread_t self;
-	/* The first slot is reserved for pthread_self() */
-	if ((key > 0) && (key < _POSIX_THREAD_KEYS_MAX))
+	if ((key >= 1) && (key <= _POSIX_THREAD_KEYS_MAX))
 	{
-		if (_pthread_keys[key].created)
+		if (_pthread_keys[key-1].created)
 		{
 			self = pthread_self();
-			self->tsd[key] = (void *) value;
+			self->tsd[key-1] = (void *) value;
 			res = ESUCCESS;
 		} else
 		{
@@ -156,6 +122,27 @@
 }
 
 /*
+ * Fetch the thread private value for a given key.
+ * This is potentially a very heavily-used operation so we do only
+ * a minimum of checks.
+ */
+void *
+pthread_getspecific(pthread_key_t key)
+{
+	pthread_t self;
+	void *res;
+        if ((key >= 1) && (key <= _POSIX_THREAD_KEYS_MAX))
+	{
+		self = pthread_self();
+		res = self->tsd[key-1];
+	} else
+	{ /* Invalid key - no error, just NULL */
+		res = (void *)NULL;
+	}
+	return (res);
+}
+
+/*
  * Clean up thread specific data as thread 'dies'
  */
 void
@@ -165,8 +152,7 @@
 	void *param;
 	for (j = 0;  j < PTHREAD_DESTRUCTOR_ITERATIONS;  j++)
 	{
-		/* The first slot is reserved for pthread_self() */
-		for (i = 1;  i < _POSIX_THREAD_KEYS_MAX;  i++)
+		for (i = 0;  i < _POSIX_THREAD_KEYS_MAX;  i++)
 		{
 			if (_pthread_keys[i].created && (param = self->tsd[i]))
 			{