--- Libc/Libc-262/gen/devname.c
+++ Libc/Libc-391/gen/devname.c
@@ -1,21 +1,22 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999, 2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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@
  */
@@ -64,39 +65,50 @@
 #include <paths.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 char *
-devname(dev, type)
-	dev_t dev;
-	mode_t type;
+devname_r(dev_t dev, mode_t type, char *buf, int len)
 {
 	register DIR *dp;
 	register struct dirent *dirp;
 	struct stat sb;
-	static char *buf = NULL;
+	char _buf[sizeof(_PATH_DEV) + MAXNAMLEN];
 
-	if( buf == NULL ) {
-		buf = malloc(sizeof(_PATH_DEV) + MAXNAMLEN);
-		if( buf == NULL )
-			return NULL;
-		strcpy(buf, _PATH_DEV);
-	}
+	strcpy(_buf, _PATH_DEV);
 
 	if ((dp = opendir(_PATH_DEV)) == NULL) 
 		return (NULL);
 
 	while ( (dirp = readdir(dp)) ) {
-		bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1,
+		bcopy(dirp->d_name, _buf + sizeof(_PATH_DEV) - 1,
 		    dirp->d_namlen + 1);
-		if (stat(buf, &sb))
+		if (lstat(_buf, &sb))
 			continue;
 		if (dev != sb.st_rdev)
 			continue;
 		if (type != (sb.st_mode & S_IFMT))
 			continue;
+		if (dirp->d_namlen + 1 > len)
+			break;
+		strcpy(buf, dirp->d_name);
 		(void)closedir(dp);
-		return (buf + sizeof(_PATH_DEV) - 1);
+		return (buf);
 	}
 	(void)closedir(dp);
 	return (NULL);
 }
+
+char *
+devname(dev_t dev, mode_t type)
+{
+	static char *buf = NULL;
+
+	if( buf == NULL ) {
+		buf = malloc(MAXNAMLEN);
+		if( buf == NULL )
+			return NULL;
+	}
+
+	return (devname_r(dev, type, buf, MAXNAMLEN));
+}