projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
NCR3000 needs explicit include of sys/sockio.h
[unix-history] / usr / src / usr.sbin / kvm_mkdb / nlist.c
diff --git a/usr/src/usr.sbin/kvm_mkdb/nlist.c b/usr/src/usr.sbin/kvm_mkdb/nlist.c
index 4ed6838..51c8828 100644 (file)
--- a/usr/src/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr/src/usr.sbin/kvm_mkdb/nlist.c
@@ -1,52 +1,61 @@
 /*-
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint
  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)nlist.c    5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)nlist.c    8.1 (Berkeley) %G%";
 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <ndbm.h>
+
 #include <a.out.h>
 #include <a.out.h>
+#include <db.h>
+#include <err.h>
 #include <errno.h>
 #include <errno.h>
-#include <unistd.h>
+#include <fcntl.h>
 #include <kvm.h>
 #include <kvm.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "extern.h"
 
 typedef struct nlist NLIST;
 #define        _strx   n_un.n_strx
 #define        _name   n_un.n_name
 
 
 typedef struct nlist NLIST;
 #define        _strx   n_un.n_strx
 #define        _name   n_un.n_name
 
+#define        badfmt(str)     errx(1, "%s: %s: %s", kfile, str, strerror(EFTYPE))
+
+static void badread __P((int, char *));
+
 static char *kfile;
 
 static char *kfile;
 
+void
 create_knlist(name, db)
        char *name;
 create_knlist(name, db)
        char *name;
-       DBM *db;
+       DB *db;
 {
        register int nsyms;
        struct exec ebuf;
        FILE *fp;
        NLIST nbuf;
 {
        register int nsyms;
        struct exec ebuf;
        FILE *fp;
        NLIST nbuf;
-       datum key, data;
+       DBT data, key;
        int fd, nr, strsize;
        char *strtab, buf[1024];
 
        kfile = name;
        if ((fd = open(name, O_RDONLY, 0)) < 0)
        int fd, nr, strsize;
        char *strtab, buf[1024];
 
        kfile = name;
        if ((fd = open(name, O_RDONLY, 0)) < 0)
-               error(name);
+               err(1, "%s", name);
 
        /* Read in exec structure. */
 
        /* Read in exec structure. */
-       nr = read(fd, (char *)&ebuf, sizeof(struct exec));
+       nr = read(fd, &ebuf, sizeof(struct exec));
        if (nr != sizeof(struct exec))
        if (nr != sizeof(struct exec))
-               badfmt(nr, "no exec header");
+               badfmt("no exec header");
 
        /* Check magic number and symbol count. */
        if (N_BADMAG(ebuf))
 
        /* Check magic number and symbol count. */
        if (N_BADMAG(ebuf))
@@ -65,19 +74,19 @@ create_knlist(name, db)
 
        /* Read in the string table. */
        strsize -= sizeof(strsize);
 
        /* Read in the string table. */
        strsize -= sizeof(strsize);
-       if (!(strtab = (char *)malloc(strsize)))
-               error(name);
+       if (!(strtab = malloc(strsize)))
+               err(1, NULL);
        if ((nr = read(fd, strtab, strsize)) != strsize)
                badread(nr, "corrupted symbol table");
 
        /* Seek to symbol table. */
        if (!(fp = fdopen(fd, "r")))
        if ((nr = read(fd, strtab, strsize)) != strsize)
                badread(nr, "corrupted symbol table");
 
        /* Seek to symbol table. */
        if (!(fp = fdopen(fd, "r")))
-               error(name);
+               err(1, "%s", name);
        if (fseek(fp, N_SYMOFF(ebuf), SEEK_SET) == -1)
        if (fseek(fp, N_SYMOFF(ebuf), SEEK_SET) == -1)
-               error(name);
+               err(1, "%s", name);
        
        
-       data.dptr = (char *)&nbuf;
-       data.dsize = sizeof(NLIST);
+       data.data = (u_char *)&nbuf;
+       data.size = sizeof(NLIST);
 
        /* Read each symbol and enter it into the database. */
        nsyms = ebuf.a_syms / sizeof(struct nlist);
 
        /* Read each symbol and enter it into the database. */
        nsyms = ebuf.a_syms / sizeof(struct nlist);
@@ -85,42 +94,34 @@ create_knlist(name, db)
                if (fread((char *)&nbuf, sizeof (NLIST), 1, fp) != 1) {
                        if (feof(fp))
                                badfmt("corrupted symbol table");
                if (fread((char *)&nbuf, sizeof (NLIST), 1, fp) != 1) {
                        if (feof(fp))
                                badfmt("corrupted symbol table");
-                       error(name);
+                       err(1, "%s", name);
                }
                if (!nbuf._strx || nbuf.n_type&N_STAB)
                        continue;
 
                }
                if (!nbuf._strx || nbuf.n_type&N_STAB)
                        continue;
 
-               key.dptr = strtab + nbuf._strx - sizeof(long);
-               key.dsize = strlen(key.dptr);
-               if (dbm_store(db, key, data, DBM_INSERT) < 0)
-                       error("dbm_store");
-
-               if (!strncmp(key.dptr, VRS_SYM, sizeof(VRS_SYM) - 1)) {
-                       off_t cur_off, rel_off, vers_off;
+               key.data = (u_char *)strtab + nbuf._strx - sizeof(long);
+               key.size = strlen((char *)key.data);
+               if (db->put(db, &key, &data, 0))
+                       err(1, "record enter");
 
 
-                       /* Offset relative to start of text image in VM. */
-#ifdef hp300
-                       rel_off = nbuf.n_value;
-#endif
-#ifdef tahoe
-                       /*
-                        * On tahoe, first 0x800 is reserved for communication
-                        * with the console processor.
-                        */
-                       rel_off = ((nbuf.n_value & ~KERNBASE) - 0x800);
-#endif
-#ifdef vax
-                       rel_off = nbuf.n_value & ~KERNBASE;
+               if (strcmp((char *)key.data, VRS_SYM) == 0) {
+                       long cur_off, voff;
+#ifndef KERNTEXTOFF
+#define KERNTEXTOFF KERNBASE
 #endif
                        /*
 #endif
                        /*
-                        * When loaded, data is rounded to next page cluster
-                        * after text, but not in file.
+                        * Calculate offset relative to a normal (non-kernel)
+                        * a.out.  KERNTEXTOFF is where the kernel is really
+                        * loaded; N_TXTADDR is where a normal file is loaded.
+                        * From there, locate file offset in text or data.
                         */
                         */
-                       rel_off -= CLBYTES - (ebuf.a_text % CLBYTES);
-                       vers_off = N_TXTOFF(ebuf) + rel_off;
-
+                       voff = nbuf.n_value - KERNTEXTOFF + N_TXTADDR(ebuf);
+                       if ((nbuf.n_type & N_TYPE) == N_TEXT)
+                               voff += N_TXTOFF(ebuf) - N_TXTADDR(ebuf);
+                       else
+                               voff += N_DATOFF(ebuf) - N_DATADDR(ebuf);
                        cur_off = ftell(fp);
                        cur_off = ftell(fp);
-                       if (fseek(fp, vers_off, SEEK_SET) == -1)
+                       if (fseek(fp, voff, SEEK_SET) == -1)
                                badfmt("corrupted string table");
 
                        /*
                                badfmt("corrupted string table");
 
                        /*
@@ -131,16 +132,16 @@ create_knlist(name, db)
                        if (fgets(buf, sizeof(buf), fp) == NULL)
                                badfmt("corrupted string table");
 
                        if (fgets(buf, sizeof(buf), fp) == NULL)
                                badfmt("corrupted string table");
 
-                       key.dptr = VRS_KEY;
-                       key.dsize = sizeof(VRS_KEY) - 1;
-                       data.dptr = buf;
-                       data.dsize = strlen(buf);
-                       if (dbm_store(db, key, data, DBM_INSERT) < 0)
-                               error("dbm_store");
+                       key.data = (u_char *)VRS_KEY;
+                       key.size = sizeof(VRS_KEY) - 1;
+                       data.data = (u_char *)buf;
+                       data.size = strlen(buf);
+                       if (db->put(db, &key, &data, 0))
+                               err(1, "record enter");
 
                        /* Restore to original values. */
 
                        /* Restore to original values. */
-                       data.dptr = (char *)&nbuf;
-                       data.dsize = sizeof(NLIST);
+                       data.data = (u_char *)&nbuf;
+                       data.size = sizeof(NLIST);
                        if (fseek(fp, cur_off, SEEK_SET) == -1)
                                badfmt("corrupted string table");
                }
                        if (fseek(fp, cur_off, SEEK_SET) == -1)
                                badfmt("corrupted string table");
                }
@@ -148,19 +149,12 @@ create_knlist(name, db)
        (void)fclose(fp);
 }
 
        (void)fclose(fp);
 }
 
+static void
 badread(nr, p)
        int nr;
        char *p;
 {
        if (nr < 0)
 badread(nr, p)
        int nr;
        char *p;
 {
        if (nr < 0)
-               error(kfile);
+               err(1, "%s", kfile);
        badfmt(p);
 }
        badfmt(p);
 }
-
-badfmt(p)
-       char *p;
-{
-       (void)fprintf(stderr,
-           "symorder: %s: %s: %s\n", kfile, p, strerror(EFTYPE));
-       exit(1);
-}
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.