 @@ -1,49 +1,55 @@
-.\"	$NetBSD: dbsym.8,v 1.3 2012/03/19 09:13:33 wiz Exp $
+.\"	$NetBSD: dbsym.8,v 1.4 2014/08/17 19:12:59 joerg Exp $
 .\"
-.Dd March 19, 2012
+.Dd August 14, 2014
 .Dt DBSYM 8
 .Os
 .Sh NAME
 .Nm dbsym
 .Nd copy kernel symbol table into db_symtab space
 .Sh SYNOPSIS
 .Nm
-.Op Fl pv
+.Op Fl Ppv
 .Op Fl b Ar bfdname
 .Ar kernel
 .Sh DESCRIPTION
 .Nm
 is used to copy the symbol table in a newly linked kernel into the
 .Va db_symtab
 array (in the data section) so that the
 .Xr ddb 4
 kernel debugger can find the symbols.
 This program is only used
 on systems for which the boot program does not load the symbol table
 into memory with the kernel.
 The space for these symbols is
 reserved in the data segment using a config option like:
 .Dl options		SYMTAB_SPACE=72000
 The size of the db_symtab array (the value of SYMTAB_SPACE) must be
 at least as large as the kernel symbol table.
 If insufficient space
 is reserved, dbsym will refuse to copy the symbol table.
 .Pp
 To recognize kernel executable format, the
 .Fl b
 flag specifies BFD name of kernel.
 .Pp
 If the
 .Fl P
 flag is given,
 .Nm
 will report the size of the kernel symbol table.
 .Pp
 If the
 .Fl p
 flag is given,
 .Nm
 will report the size of the kernel symbol table and the size of the
 db_symtab space.
 Two values are printed out in a line separated by a space.
 .Pp
 If the
 .Fl v
 flag is given,
 .Nm
 will print out status information as
 it is copying the symbol table.

 @@ -1,14 +1,14 @@
-/* $NetBSD: dbsym.c,v 1.3 2012/03/19 09:14:15 wiz Exp $ */
+/* $NetBSD: dbsym.c,v 1.4 2014/08/17 19:12:59 joerg Exp $ */
 /*
  * Copyright (c) 2001 Simon Burge (for Wasabi Systems)
  * Copyright (c) 1996 Christopher G. Demetriou
  * All rights reserved.
+ *
  * 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
 @@ -29,27 +29,27 @@
+ *
  * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1996 Christopher G. Demetriou.\
   Copyright 2001 Simon Burge.\
   All rights reserved.");
-__RCSID("$NetBSD: dbsym.c,v 1.3 2012/03/19 09:14:15 wiz Exp $");
+__RCSID("$NetBSD: dbsym.c,v 1.4 2014/08/17 19:12:59 joerg Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <bfd.h>
 #include <err.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 @@ -66,52 +66,56 @@ struct symbols {
 	{ "_db_symtab", 0 },
 #define	X_DB_SYMTABSIZE	1
 	{ "_db_symtabsize", 0 },
 	{ NULL, 0 }
 };
 int	main(int, char **);
 void	usage(void) __attribute__((noreturn));
 int	find_symtab(bfd *, struct symbols *);
 int	load_symtab(bfd *, int fd, char **, u_int32_t *);
 int	verbose;
 int	printsize;
 int	printsize2;
 int
 main(int argc, char **argv)
+{
 	int ch, kfd;
 	struct stat ksb;
 	size_t symtab_offset;
 	u_int32_t symtab_space, symtabsize;
 	const char *kfile;
 	char *bfdname, *mappedkfile, *symtab;
 	bfd *abfd;
 	setprogname(argv[0]);
 	bfdname = NULL;
-	while ((ch = getopt(argc, argv, "b:pv")) != -1)
+	while ((ch = getopt(argc, argv, "b:Ppv")) != -1)
 		switch (ch) {
 		case 'b':
 			bfdname = optarg;
 			break;
 		case 'v':
 			verbose = 1;
 			break;
 		case 'p':
 			printsize = 1;
 			break;
 		case 'P':
 			printsize2 = 1;
 			break;
 		case '?':
 		default:
 			usage();
+	}
 	argc -= optind;
 	argv += optind;
 	if (argc != 1)
 		usage();
 	kfile = argv[0];
 	if ((kfd = open(kfile, O_RDWR, 0))  == -1)
 		err(1, "open %s", kfile);
 @@ -148,26 +152,30 @@ main(int argc, char **argv)
 	    MAP_FILE | MAP_SHARED, kfd, 0)) == (caddr_t)-1)
 		err(1, "mmap %s", kfile);
 	if (verbose)
 		fprintf(stderr, "mapped %s\n", kfile);
 	symtab_offset = db_symtab_symbols[X_DB_SYMTAB].offset;
 	symtab_space = bfd_get_32(abfd,
 	    &mappedkfile[db_symtab_symbols[X_DB_SYMTABSIZE].offset]);
 	if (printsize) {
 		printf("%d %d\n", symtabsize, symtab_space);
 		goto done;
+	}
 	if (printsize2) {
 		printf("%d\n", symtabsize);
 		goto done;
+	}
 	if (symtabsize > symtab_space)
 		errx(1, "symbol table (%u bytes) too big for buffer (%u bytes)\n"
 		    "Increase options SYMTAB_SPACE in your kernel config",
 		    symtabsize, symtab_space);
 	if (verbose)
 		fprintf(stderr, "symtab size %d, space available %d\n",
 		    symtabsize, symtab_space);
 	memcpy(mappedkfile + symtab_offset, symtab, symtabsize);
 	if (verbose)
 @@ -184,27 +192,27 @@ done:
 	if (verbose)
 		fprintf(stderr, "exiting\n");
 	bfd_close_all_done(abfd);
 	exit(0);
+}
 void
 usage(void)
+{
 	const char **list;
 	fprintf(stderr,
-	    "usage: %s [-pv] [-b bfdname] kernel\n",
+	    "usage: %s [-Ppv] [-b bfdname] kernel\n",
 	    getprogname());
 	fprintf(stderr, "supported targets:");
 	for (list = bfd_target_list(); *list != NULL; list++)
 		fprintf(stderr, " %s", *list);
 	fprintf(stderr, "\n");
 	exit(1);
+}
 int
 find_symtab(bfd *abfd, struct symbols *symbols)
+{
 	long i;
 	long storage_needed;