BSD 4_3_Net_2 release

[unix-history] / usr / src / bin / ps / devname.c

diff --git a/usr/src/bin/ps/devname.c b/usr/src/bin/ps/devname.c
index 6b5401e..c9c2d81 100644 (file)
--- a/usr/src/bin/ps/devname.c
+++ b/usr/src/bin/ps/devname.c
@@ -2,102 +2,74 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS 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.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)devname.c  5.5 (Berkeley) 5/31/90";
+static char sccsid[] = "@(#)devname.c  5.14 (Berkeley) 5/6/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>

-#include <sys/stat.h>
-#include <sys/file.h>
-#include <dirent.h>
+#include <fcntl.h>
+#include <db.h>
+#include <stdio.h>

 #include <paths.h>
 
 #include <paths.h>
 

-static struct devs {
-       struct  devs *next;
-       dev_t   dev;
-       char    name[MAXNAMLEN+1];
-       mode_t  type;
-};
-
-#define        hash(x) ((x)&0xff)
-static struct devs *devhash[0xff];
-
-static int devinit;
-

 char *
 devname(dev, type)
        dev_t dev;
        mode_t type;
 {
 char *
 devname(dev, type)
        dev_t dev;
        mode_t type;
 {

-       struct devs *devp;
+       struct {
+               mode_t type;
+               dev_t dev;
+       } bkey;
+       static DB *db;
+       static int failure;
+       DBT data, key;

 
 

-       if (devinit == 0) {
-               register struct devs *devpp;
-               register struct dirent *entry;
-               struct stat sb;
-               DIR *dp = opendir(_PATH_DEV);
-               int savewd = open(".", O_RDONLY, 0);
-               mode_t specialtype;
-
-               if (savewd == -1 || dp == NULL || chdir(_PATH_DEV) == -1)
-                       return (NULL);
-               while ((entry = readdir(dp)) != NULL) {
-                       if (stat(entry->d_name, &sb) == -1)
-                               continue;
-                       switch(sb.st_mode&S_IFMT) {
-                       case S_IFCHR:
-                               specialtype = S_IFCHR;
-                               break;
-                       case S_IFBLK:
-                               specialtype = S_IFBLK;
-                               break;
-                       default:
-                               continue;
-                       }
-                       devp = (struct devs *)malloc(sizeof (struct devs));
-                       if (devp == NULL)
-                               return (NULL);
-                       devp->type = specialtype;
-                       devp->dev = sb.st_rdev;
-                       strcpy(devp->name, entry->d_name);
-                       devp->next = NULL;
-                       if ((devpp = devhash[hash(sb.st_rdev)]) == NULL)
-                               devhash[hash(sb.st_rdev)] = devp;
-                       else {
-                               for (;devpp->next != NULL; devpp = devpp->next)
-                                       ;
-                               devpp->next = devp;
-                       }
-               }
-               fchdir(savewd);
-               close(savewd);
-               closedir(dp);
-               devinit = 1;
+       if (!db && !failure &&
+           !(db = hash_open(_PATH_DEVDB, O_RDONLY, 0, NULL))) {
+               (void)fprintf(stderr,
+                   "warning: no device database %s\n", _PATH_DEVDB);
+               failure = 1;

        }
        }

-       for (devp = devhash[hash(dev)]; devp != NULL; devp = devp->next)
-               if (dev == devp->dev && type == devp->type)
-                       return(devp->name);
-
-       return (NULL);
-}
+       if (failure)
+               return("??");

 
 

-#ifdef TEST
-main() {
-       printf(" %s \n", devname(0));
+       /*
+        * Keys are a mode_t followed by a dev_t.  The former is the type of
+        * the file (mode & S_IFMT), the latter is the st_rdev field.
+        */
+       bkey.dev = dev;
+       bkey.type = type;
+       key.data = &bkey;
+       key.size = sizeof(bkey);
+       return((db->get)(db, &key, &data, 0L) ? "??" : (char *)data.data);

 }
 }

-#endif