Libc-1353.11.2.tar.gz

[apple/libc.git] / gen / devname.c

diff --git a/gen/devname.c b/gen/devname.c
index 3edcabdcd84ac1c3c31db70e4644ca35c9004661..7774a82535421fa4846d58dc830fc2299dc2e133 100644 (file)
--- a/gen/devname.c
+++ b/gen/devname.c
@@ -1,10 +1,8 @@
 /*
 /*

- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999, 2004 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * 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
  * 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


@@ -70,37 +68,47 @@
 #include <stdlib.h>
 
 char *
 #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;
 {
        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)) ) {
 
        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);
                    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;
                        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);
                (void)closedir(dp);

-               return (buf + sizeof(_PATH_DEV) - 1);
+               return (buf);

        }
        (void)closedir(dp);
        return (NULL);
 }
        }
        (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));
+}