BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / dev_mkdb / dev_mkdb.c

diff --git a/usr/src/usr.sbin/dev_mkdb/dev_mkdb.c b/usr/src/usr.sbin/dev_mkdb/dev_mkdb.c
index 8bce8bd..3e98ea3 100644 (file)
--- a/usr/src/usr.sbin/dev_mkdb/dev_mkdb.c
+++ b/usr/src/usr.sbin/dev_mkdb/dev_mkdb.c
@@ -2,7 +2,33 @@
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -12,20 +38,26 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)dev_mkdb.c 5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)dev_mkdb.c 5.9 (Berkeley) 5/17/91";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <fcntl.h>

+#undef DIRBLKSIZ

 #include <dirent.h>
 #include <dirent.h>

-#include <ndbm.h>
+#include <nlist.h>

 #include <kvm.h>
 #include <kvm.h>

+#include <db.h>

 #include <errno.h>
 #include <errno.h>

+#include <unistd.h>

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

+#include <stdlib.h>

 #include <string.h>
 
 #include <string.h>
 

+void error(), usage();
+

 main(argc, argv)
        int argc;
        char **argv;
 main(argc, argv)
        int argc;
        char **argv;


@@ -34,10 +66,15 @@ main(argc, argv)
        register DIR *dirp;
        register struct dirent *dp;
        struct stat sb;
        register DIR *dirp;
        register struct dirent *dp;
        struct stat sb;

-       DBM *db;
-       datum key, data;
+       struct {
+               mode_t type;
+               dev_t dev;
+       } bkey;
+       DB *db;
+       DBT data, key;

        int ch;
        int ch;

-       char buf[MAXNAMLEN + 1], dbtmp[MAXPATHLEN + 1], dbname[MAXPATHLEN + 1];
+       u_char buf[MAXNAMLEN + 1];
+       char dbtmp[MAXPATHLEN + 1], dbname[MAXPATHLEN + 1];

 
        while ((ch = getopt(argc, argv, "")) != EOF)
                switch((char)ch) {
 
        while ((ch = getopt(argc, argv, "")) != EOF)
                switch((char)ch) {


@@ -53,30 +90,47 @@ main(argc, argv)
 
        dirp = opendir(".");
 
 
        dirp = opendir(".");
 

-       (void)sprintf(dbtmp, "%s/dev.tmp", _PATH_VARRUN);
-       (void)sprintf(dbname, "%s/dev.db", _PATH_VARRUN);
-       if ((db = dbm_open(dbtmp, O_CREAT|O_WRONLY|O_EXCL,
-           S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) == NULL)
+       (void)snprintf(dbtmp, sizeof(dbtmp), "%s/dev.tmp", _PATH_VARRUN);
+       (void)snprintf(dbname, sizeof(dbtmp), "%s/dev.db", _PATH_VARRUN);
+       db = hash_open(dbtmp, O_CREAT|O_WRONLY|O_EXCL, DEFFILEMODE,
+           (HASHINFO *)NULL);
+       if (!db)

                error(dbtmp);
 
                error(dbtmp);
 

-       key.dptr = (char *)&sb.st_rdev;
-       key.dsize = sizeof(sb.st_rdev);
-       data.dptr = buf;
+       /*
+        * 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.
+        */
+       key.data = &bkey;
+       key.size = sizeof(bkey);
+       data.data = buf;

        while (dp = readdir(dirp)) {
        while (dp = readdir(dirp)) {

-               if (stat(dp->d_name, &sb))
-                       error(dp->d_name);
-               if (!S_ISCHR(sb.st_mode))
+               if (stat(dp->d_name, &sb)) {
+                       (void)fprintf(stderr, "dev_mkdb: can't stat %s\n",
+                               dp->d_name);
+                       continue;
+               }
+
+               /* Create the key. */
+               if (S_ISCHR(sb.st_mode))
+                       bkey.type = S_IFCHR;
+               else if (S_ISBLK(sb.st_mode))
+                       bkey.type = S_IFBLK;
+               else

                        continue;
                        continue;

+               bkey.dev = sb.st_rdev;

 
 

-               /* Nul terminate the name so ps doesn't have to. */
+               /*
+                * Create the data; nul terminate the name so caller doesn't
+                * have to.
+                */

                bcopy(dp->d_name, buf, dp->d_namlen);
                buf[dp->d_namlen] = '\0';
                bcopy(dp->d_name, buf, dp->d_namlen);
                buf[dp->d_namlen] = '\0';

-               data.dsize = dp->d_namlen + 1;
-               if (dbm_store(db, key, data, DBM_INSERT) < 0)
-                       error("dbm_store");
+               data.size = dp->d_namlen + 1;
+               if ((db->put)(db, &key, &data, 0))
+                       error(dbtmp);

        }
        }

-       (void)dbm_close(db);
-       (void)strcat(dbtmp, DBM_SUFFIX);
+       (void)(db->close)(db);

        if (rename(dbtmp, dbname)) {
                (void)fprintf(stderr, "dev_mkdb: %s to %s: %s.\n",
                    dbtmp, dbname, strerror(errno));
        if (rename(dbtmp, dbname)) {
                (void)fprintf(stderr, "dev_mkdb: %s to %s: %s.\n",
                    dbtmp, dbname, strerror(errno));


@@ -85,13 +139,15 @@ main(argc, argv)
        exit(0);
 }
 
        exit(0);
 }
 

+void

 error(n)
        char *n;
 {
 error(n)
        char *n;
 {

-       (void)fprintf(stderr, "kvm_mkdb: %s: %s\n", n, strerror(errno));
+       (void)fprintf(stderr, "dev_mkdb: %s: %s\n", n, strerror(errno));

        exit(1);
 }
 
        exit(1);
 }
 

+void

 usage()
 {
        (void)fprintf(stderr, "usage: dev_mkdb\n");
 usage()
 {
        (void)fprintf(stderr, "usage: dev_mkdb\n");