BSD 4.4 Lite Usr.bin Sources

10 files changed, 2022 insertions, 0 deletions

diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile
new file mode 100644
index 0000000..5a9e87a
--- /dev/null
+++ b/usr.bin/hexdump/Makefile
@@ -0,0 +1,8 @@
+#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+
+PROG=	hexdump
+SRCS=	conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c
+MAN1=	hexdump.0 od.0
+LINKS=	${BINDIR}/hexdump ${BINDIR}/od
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
new file mode 100644
index 0000000..daae174
--- /dev/null
+++ b/usr.bin/hexdump/conv.c
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  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
+ *    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
+static char sccsid[] = "@(#)conv.c	8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <ctype.h>
+#include "hexdump.h"
+
+void
+conv_c(pr, p)
+	PR *pr;
+	u_char *p;
+{
+	extern int deprecated;
+	char buf[10], *str;
+
+	switch(*p) {
+	case '\0':
+		str = "\\0";
+		goto strpr;
+	/* case '\a': */
+	case '\007':
+		if (deprecated)		/* od didn't know about \a */
+			break;
+		str = "\\a";
+		goto strpr;
+	case '\b':
+		str = "\\b";
+		goto strpr;
+	case '\f':
+		str = "\\f";
+		goto strpr;
+	case '\n':
+		str = "\\n";
+		goto strpr;
+	case '\r':
+		str = "\\r";
+		goto strpr;
+	case '\t':
+		str = "\\t";
+		goto strpr;
+	case '\v':
+		if (deprecated)
+			break;
+		str = "\\v";
+		goto strpr;
+	default:
+		break;
+	}
+	if (isprint(*p)) {
+		*pr->cchar = 'c';
+		(void)printf(pr->fmt, *p);
+	} else {
+		(void)sprintf(str = buf, "%03o", (int)*p);
+strpr:		*pr->cchar = 's';
+		(void)printf(pr->fmt, str);
+	}
+}
+
+void
+conv_u(pr, p)
+	PR *pr;
+	u_char *p;
+{
+	extern int deprecated;
+	static char *list[] = {
+		"nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel",
+		 "bs",  "ht",  "lf",  "vt",  "ff",  "cr",  "so",  "si",
+		"dle", "dcl", "dc2", "dc3", "dc4", "nak", "syn", "etb",
+		"can",  "em", "sub", "esc",  "fs",  "gs",  "rs",  "us",
+	};
+
+						/* od used nl, not lf */
+	if (*p <= 0x1f) {
+		*pr->cchar = 's';
+		if (deprecated && *p == 0x0a)
+			(void)printf(pr->fmt, "nl");
+		else
+			(void)printf(pr->fmt, list[*p]);
+	} else if (*p == 0x7f) {
+		*pr->cchar = 's';
+		(void)printf(pr->fmt, "del");
+	} else if (deprecated && *p == 0x20) {	/* od replaced space with sp */
+		*pr->cchar = 's';
+		(void)printf(pr->fmt, " sp");
+	} else if (isprint(*p)) {
+		*pr->cchar = 'c';
+		(void)printf(pr->fmt, *p);
+	} else {
+		*pr->cchar = 'x';
+		(void)printf(pr->fmt, (int)*p);
+	}
+}
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
new file mode 100644
index 0000000..8078e71
--- /dev/null
+++ b/usr.bin/hexdump/display.c
@@ -0,0 +1,379 @@
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  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
+ *    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
+static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#include <unistd.h>
+#include <errno.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "hexdump.h"
+
+enum _vflag vflag = FIRST;
+
+static off_t address;			/* address/offset in stream */
+static off_t eaddress;			/* end address */
+
+static inline void print __P((PR *, u_char *));
+
+void
+display()
+{
+	extern FU *endfu;
+	register FS *fs;
+	register FU *fu;
+	register PR *pr;
+	register int cnt;
+	register u_char *bp;
+	off_t saveaddress;
+	u_char savech, *savebp;
+
+	while (bp = get())
+	    for (fs = fshead, savebp = bp, saveaddress = address; fs;
+		fs = fs->nextfs, bp = savebp, address = saveaddress)
+		    for (fu = fs->nextfu; fu; fu = fu->nextfu) {
+			if (fu->flags&F_IGNORE)
+				break;
+			for (cnt = fu->reps; cnt; --cnt)
+			    for (pr = fu->nextpr; pr; address += pr->bcnt,
+				bp += pr->bcnt, pr = pr->nextpr) {
+				    if (eaddress && address >= eaddress &&
+					!(pr->flags & (F_TEXT|F_BPAD)))
+					    bpad(pr);
+				    if (cnt == 1 && pr->nospace) {
+					savech = *pr->nospace;
+					*pr->nospace = '\0';
+				    }
+				    print(pr, bp);
+				    if (cnt == 1 && pr->nospace)
+					*pr->nospace = savech;
+			    }
+		    }
+	if (endfu) {
+		/*
+		 * If eaddress not set, error or file size was multiple of
+		 * blocksize, and no partial block ever found.
+		 */
+		if (!eaddress) {
+			if (!address)
+				return;
+			eaddress = address;
+		}
+		for (pr = endfu->nextpr; pr; pr = pr->nextpr)
+			switch(pr->flags) {
+			case F_ADDRESS:
+				(void)printf(pr->fmt, (quad_t)eaddress);
+				break;
+			case F_TEXT:
+				(void)printf(pr->fmt);
+				break;
+			}
+	}
+}
+
+static inline void
+print(pr, bp)
+	PR *pr;
+	u_char *bp;
+{
+	   double f8;
+	    float f4;
+	  int16_t s2;
+	   int8_t s8;
+	  int32_t s4;
+	u_int16_t u2;
+	u_int32_t u4;
+	u_int64_t u8;
+
+	switch(pr->flags) {
+	case F_ADDRESS:
+		(void)printf(pr->fmt, (quad_t)address);
+		break;
+	case F_BPAD:
+		(void)printf(pr->fmt, "");
+		break;
+	case F_C:
+		conv_c(pr, bp);
+		break;
+	case F_CHAR:
+		(void)printf(pr->fmt, *bp);
+		break;
+	case F_DBL:
+		switch(pr->bcnt) {
+		case 4:
+			bcopy(bp, &f4, sizeof(f4));
+			(void)printf(pr->fmt, f4);
+			break;
+		case 8:
+			bcopy(bp, &f8, sizeof(f8));
+			(void)printf(pr->fmt, f8);
+			break;
+		}
+		break;
+	case F_INT:
+		switch(pr->bcnt) {
+		case 1:
+			(void)printf(pr->fmt, (quad_t)*bp);
+			break;
+		case 2:
+			bcopy(bp, &s2, sizeof(s2));
+			(void)printf(pr->fmt, (quad_t)s2);
+			break;
+		case 4:
+			bcopy(bp, &s4, sizeof(s4));
+			(void)printf(pr->fmt, (quad_t)s4);
+			break;
+		case 8:
+			bcopy(bp, &s8, sizeof(s8));
+			(void)printf(pr->fmt, s8);
+			break;
+		}
+		break;
+	case F_P:
+		(void)printf(pr->fmt, isprint(*bp) ? *bp : '.');
+		break;
+	case F_STR:
+		(void)printf(pr->fmt, (char *)bp);
+		break;
+	case F_TEXT:
+		(void)printf(pr->fmt);
+		break;
+	case F_U:
+		conv_u(pr, bp);
+		break;
+	case F_UINT:
+		switch(pr->bcnt) {
+		case 1:
+			(void)printf(pr->fmt, (u_quad_t)*bp);
+			break;
+		case 2:
+			bcopy(bp, &u2, sizeof(u2));
+			(void)printf(pr->fmt, (u_quad_t)u2);
+			break;
+		case 4:
+			bcopy(bp, &u4, sizeof(u4));
+			(void)printf(pr->fmt, (u_quad_t)u4);
+			break;
+		case 8:
+			bcopy(bp, &u8, sizeof(u8));
+			(void)printf(pr->fmt, u8);
+			break;
+		}
+		break;
+	}
+}
+
+void
+bpad(pr)
+	PR *pr;
+{
+	static char *spec = " -0+#";
+	register char *p1, *p2;
+
+	/*
+	 * Remove all conversion flags; '-' is the only one valid
+	 * with %s, and it's not useful here.
+	 */
+	pr->flags = F_BPAD;
+	pr->cchar[0] = 's';
+	pr->cchar[1] = '\0';
+	for (p1 = pr->fmt; *p1 != '%'; ++p1);
+	for (p2 = ++p1; *p1 && index(spec, *p1); ++p1);
+	while (*p2++ = *p1++);
+}
+
+static char **_argv;
+
+u_char *
+get()
+{
+	extern enum _vflag vflag;
+	extern int length;
+	static int ateof = 1;
+	static u_char *curp, *savp;
+	register int n;
+	int need, nread;
+	u_char *tmpp;
+
+	if (!curp) {
+		curp = emalloc(blocksize);
+		savp = emalloc(blocksize);
+	} else {
+		tmpp = curp;
+		curp = savp;
+		savp = tmpp;
+		address += blocksize;
+	}
+	for (need = blocksize, nread = 0;;) {
+		/*
+		 * if read the right number of bytes, or at EOF for one file,
+		 * and no other files are available, zero-pad the rest of the
+		 * block and set the end flag.
+		 */
+		if (!length || ateof && !next((char **)NULL)) {
+			if (need == blocksize)
+				return((u_char *)NULL);
+			if (vflag != ALL && !bcmp(curp, savp, nread)) {
+				if (vflag != DUP)
+					(void)printf("*\n");
+				return((u_char *)NULL);
+			}
+			bzero((char *)curp + nread, need);
+			eaddress = address + nread;
+			return(curp);
+		}
+		n = fread((char *)curp + nread, sizeof(u_char),
+		    length == -1 ? need : MIN(length, need), stdin);
+		if (!n) {
+			if (ferror(stdin))
+				(void)fprintf(stderr, "hexdump: %s: %s\n",
+				    _argv[-1], strerror(errno));
+			ateof = 1;
+			continue;
+		}
+		ateof = 0;
+		if (length != -1)
+			length -= n;
+		if (!(need -= n)) {
+			if (vflag == ALL || vflag == FIRST ||
+			    bcmp(curp, savp, blocksize)) {
+				if (vflag == DUP || vflag == FIRST)
+					vflag = WAIT;
+				return(curp);
+			}
+			if (vflag == WAIT)
+				(void)printf("*\n");
+			vflag = DUP;
+			address += blocksize;
+			need = blocksize;
+			nread = 0;
+		}
+		else
+			nread += n;
+	}
+}
+
+extern off_t skip;			/* bytes to skip */
+
+int
+next(argv)
+	char **argv;
+{
+	extern int exitval;
+	static int done;
+	int statok;
+
+	if (argv) {
+		_argv = argv;
+		return(1);
+	}
+	for (;;) {
+		if (*_argv) {
+			if (!(freopen(*_argv, "r", stdin))) {
+				(void)fprintf(stderr, "hexdump: %s: %s\n",
+				    *_argv, strerror(errno));
+				exitval = 1;
+				++_argv;
+				continue;
+			}
+			statok = done = 1;
+		} else {
+			if (done++)
+				return(0);
+			statok = 0;
+		}
+		if (skip)
+			doskip(statok ? *_argv : "stdin", statok);
+		if (*_argv)
+			++_argv;
+		if (!skip)
+			return(1);
+	}
+	/* NOTREACHED */
+}
+
+void
+doskip(fname, statok)
+	char *fname;
+	int statok;
+{
+	register int cnt;
+	struct stat sb;
+
+	if (statok) {
+		if (fstat(fileno(stdin), &sb))
+			err("%s: %s", fname, strerror(errno));
+		if (S_ISREG(sb.st_mode) && skip >= sb.st_size) {
+			address += sb.st_size;
+			skip -= sb.st_size;
+			return;
+		}
+	}
+	if (S_ISREG(sb.st_mode)) {
+		if (fseek(stdin, skip, SEEK_SET))
+			err("%s: %s", fname, strerror(errno));
+		address += skip;
+		skip = 0;
+	} else {
+		for (cnt = 0; cnt < skip; ++cnt)
+			if (getchar() == EOF)
+				break;
+		address += cnt;
+		skip -= cnt;
+	}
+}
+
+void *
+emalloc(size)
+	int size;
+{
+	void *p;
+
+	if ((p = malloc((u_int)size)) == NULL)
+		nomem();
+	bzero(p, size);
+	return(p);
+}
+
+void
+nomem()
+{
+	err("%s", strerror(errno));
+}
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
new file mode 100644
index 0000000..7161beb
--- /dev/null
+++ b/usr.bin/hexdump/hexdump.1
@@ -0,0 +1,324 @@
+.\" Copyright (c) 1989, 1990, 1993
+.\"	The Regents of the University of California.  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
+.\"    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.
+.\"
+.\"	@(#)hexdump.1	8.2 (Berkeley) 4/18/94
+.\"
+.Dd April 18, 1994
+.Dt HEXDUMP 1
+.Os
+.Sh NAME
+.Nm hexdump
+.Nd ascii, decimal, hexadecimal, octal dump
+.Sh SYNOPSIS
+.Nm hexdump
+.Op Fl bcdovx
+.Op Fl e Ar format_string
+.Op Fl f Ar format_file
+.Op Fl n Ar length
+.Bk -words
+.Op Fl s Ar skip
+.Ek
+.Ar file  ...
+.Sh DESCRIPTION
+The hexdump utility is a filter which displays the specified files, or
+the standard input, if no files are specified, in a user specified
+format.
+.Pp
+The options are as follows:
+.Bl -tag -width Fl
+.It Fl b
+.Em One-byte octal display .
+Display the input offset in hexadecimal, followed by sixteen
+space-separated, three column, zero-filled, bytes of input data,
+in octal, per line.
+.It Fl c
+.Em One-byte character display .
+Display the input offset in hexadecimal, followed by sixteen
+space-separated, three column, space-filled, characters of input
+data per line.
+.It Fl d
+.Em Two-byte decimal display.
+Display the input offset in hexadecimal, followed by eight
+space-separated, five column, zero-filled, two-byte units
+of input data, in unsigned decimal, per line.
+.It Fl e Ar format_string 
+Specify a format string to be used for displaying data.
+.It Fl f Ar format_file 
+Specify a file that contains one or more newline separated format strings.
+Empty lines and lines whose first non-blank character is a hash mark
+.Pf ( Cm \&# )
+are ignored.
+.It Fl n Ar length 
+Interpret only
+.Ar length
+bytes of input.
+.It Fl o
+.Em Two-byte octal display.
+Display the input offset in hexadecimal, followed by eight
+space-separated, six column, zero-filled, two byte quantities of
+input data, in octal, per line.
+.It Fl s Ar offset 
+Skip
+.Ar offset
+bytes from the beginning of the input.
+By default,
+.Ar offset
+is interpreted as a decimal number.
+With a leading
+.Cm 0x
+or
+.Cm 0X ,
+.Ar offset
+is interpreted as a hexadecimal number,
+otherwise, with a leading
+.Cm 0 ,
+.Ar offset
+is interpreted as an octal number.
+Appending the character
+.Cm b ,
+.Cm k ,
+or
+.Cm m
+to
+.Ar offset
+causes it to be interpreted as a multiple of
+.Li 512 ,
+.Li 1024 ,
+or
+.Li 1048576 ,
+respectively.
+.It Fl v
+The
+.Fl v
+option causes hexdump to display all input data.
+Without the
+.Fl v
+option, any number of groups of output lines, which would be
+identical to the immediately preceding group of output lines (except
+for the input offsets), are replaced with a line comprised of a
+single asterisk.
+.It Fl x
+.Em Two-byte hexadecimal display.
+Display the input offset in hexadecimal, followed by eight, space
+separated, four column, zero-filled, two-byte quantities of input
+data, in hexadecimal, per line.
+.El
+.Pp
+For each input file,
+.Nm hexdump
+sequentially copies the input to standard output, transforming the
+data according to the format strings specified by the
+.Fl e
+and
+.Fl f
+options, in the order that they were specified.
+.Ss Formats
+A format string contains any number of format units, separated by
+whitespace.
+A format unit contains up to three items: an iteration count, a byte
+count, and a format.
+.Pp
+The iteration count is an optional positive integer, which defaults to
+one.
+Each format is applied iteration count times.
+.Pp
+The byte count is an optional positive integer.
+If specified it defines the number of bytes to be interpreted by
+each iteration of the format.
+.Pp
+If an iteration count and/or a byte count is specified, a single slash
+must be placed after the iteration count and/or before the byte count
+to disambiguate them.
+Any whitespace before or after the slash is ignored.
+.Pp
+The format is required and must be surrounded by double quote
+(" ") marks.
+It is interpreted as a fprintf-style format string (see
+.Xr fprintf 3 ) ,
+with the
+following exceptions:
+.Bl -bullet -offset indent
+.It
+An asterisk (*) may not be used as a field width or precision.
+.It
+A byte count or field precision
+.Em is
+required for each ``s'' conversion
+character (unlike the
+.Xr fprintf 3
+default which prints the entire string if the precision is unspecified).
+.It
+The conversion characters ``h'', ``l'', ``n'', ``p'' and ``q'' are
+not supported.
+.It
+The single character escape sequences
+described in the C standard are supported:
+.Bd -ragged -offset indent -compact
+.Bl -column <alert_character>
+.It NUL	\e0
+.It <alert character>	\ea
+.It <backspace>	\eb
+.It <form-feed>	\ef
+.It <newline>	\en
+.It <carriage return>	\er
+.It <tab>	\et
+.It <vertical tab>	\ev
+.El
+.Ed
+.El
+.Pp
+Hexdump also supports the the following additional conversion strings:
+.Bl -tag -width Fl
+.It Cm \&_a Ns Op Cm dox 
+Display the input offset, cumulative across input files, of the
+next byte to be displayed.
+The appended characters
+.Cm d ,
+.Cm o ,
+and
+.Cm x
+specify the display base
+as decimal, octal or hexadecimal respectively.
+.It Cm \&_A Ns Op Cm dox 
+Identical to the
+.Cm \&_a
+conversion string except that it is only performed
+once, when all of the input data has been processed.
+.It Cm \&_c
+Output characters in the default character set.
+Nonprinting characters are displayed in three character, zero-padded
+octal, except for those representable by standard escape notation
+(see above),
+which are displayed as two character strings.
+.It Cm _p
+Output characters in the default character set.
+Nonprinting characters are displayed as a single
+.Dq Cm \&. .
+.It Cm _u
+Output US ASCII characters, with the exception that control characters are
+displayed using the following, lower-case, names.
+Characters greater than 0xff, hexadecimal, are displayed as hexadecimal
+strings.
+.Bl -column \&000_nu \&001_so \&002_st \&003_et \&004_eo
+.It \&000\ nul\t001\ soh\t002\ stx\t003\ etx\t004\ eot\t005\ enq
+.It \&006\ ack\t007\ bel\t008\ bs\t009\ ht\t00A\ lf\t00B\ vt
+.It \&00C\ ff\t00D\ cr\t00E\ so\t00F\ si\t010\ dle\t011\ dc1
+.It \&012\ dc2\t013\ dc3\t014\ dc4\t015\ nak\t016\ syn\t017\ etb
+.It \&018\ can\t019\ em\t01A\ sub\t01B\ esc\t01C\ fs\t01D\ gs
+.It \&01E\ rs\t01F\ us\t0FF\ del
+.El
+.El
+.Pp
+The default and supported byte counts for the conversion characters
+are as follows:
+.Bl -tag -width  "Xc,_Xc,_Xc,_Xc,_Xc,_Xc" -offset indent
+.It Li \&%_c , \&%_p , \&%_u , \&%c
+One byte counts only.
+.It Xo
+.Li \&%d , \&%i , \&%o ,
+.Li \&%u , \&%X , \&%x 
+.Xc
+Four byte default, one, two and four byte counts supported.
+.It Xo
+.Li \&%E , \&%e , \&%f ,
+.Li \&%G , \&%g 
+.Xc
+Eight byte default, four byte counts supported.
+.El
+.Pp
+The amount of data interpreted by each format string is the sum of the
+data required by each format unit, which is the iteration count times the
+byte count, or the iteration count times the number of bytes required by
+the format if the byte count is not specified.
+.Pp
+The input is manipulated in ``blocks'', where a block is defined as the
+largest amount of data specified by any format string.
+Format strings interpreting less than an input block's worth of data,
+whose last format unit both interprets some number of bytes and does
+not have a specified iteration count, have the iteration count
+incremented until the entire input block has been processed or there
+is not enough data remaining in the block to satisfy the format string.
+.Pp
+If, either as a result of user specification or hexdump modifying
+the iteration count as described above, an iteration count is
+greater than one, no trailing whitespace characters are output
+during the last iteration.
+.Pp
+It is an error to specify a byte count as well as multiple conversion
+characters or strings unless all but one of the conversion characters
+or strings is
+.Cm \&_a
+or
+.Cm \&_A .
+.Pp
+If, as a result of the specification of the
+.Fl n
+option or end-of-file being reached, input data only partially
+satisfies a format string, the input block is zero-padded sufficiently
+to display all available data (i.e. any format units overlapping the
+end of data will display some number of the zero bytes).
+.Pp
+Further output by such format strings is replaced by an equivalent
+number of spaces.
+An equivalent number of spaces is defined as the number of spaces
+output by an
+.Cm s
+conversion character with the same field width
+and precision as the original conversion character or conversion
+string but with any
+.Dq Li \&+ ,
+.Dq \&\ \& ,
+.Dq Li \&#
+conversion flag characters
+removed, and referencing a NULL string.
+.Pp
+If no format strings are specified, the default display is equivalent
+to specifying the
+.Fl x
+option.
+.Pp
+.Nm hexdump
+exits 0 on success and >0 if an error occurred.
+.Sh EXAMPLES
+Display the input in perusal format:
+.Bd -literal -offset indent
+"%06.6_ao "  12/1 "%3_u "
+"\et\et" "%_p "
+"\en"
+.Ed
+.Pp
+Implement the \-x option:
+.Bd -literal -offset indent
+"%07.7_Ax\en"
+"%07.7_ax  " 8/2 "%04x " "\en"
+.Ed
+.Sh SEE ALSO
+.Xr adb 1
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
new file mode 100644
index 0000000..fec0b10
--- /dev/null
+++ b/usr.bin/hexdump/hexdump.c
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  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
+ *    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
+static char copyright[] =
+"@(#) Copyright (c) 1989, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)hexdump.c	8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "hexdump.h"
+
+FS *fshead;				/* head of format strings */
+int blocksize;				/* data block size */
+int exitval;				/* final exit value */
+int length = -1;			/* max bytes to read */
+
+int
+main(argc, argv)
+	int argc;
+	char *argv[];
+{
+	register FS *tfs;
+	char *p;
+
+	if (!(p = rindex(argv[0], 'o')) || strcmp(p, "od"))
+		newsyntax(argc, &argv);
+	else
+		oldsyntax(argc, &argv);
+
+	/* figure out the data block size */
+	for (blocksize = 0, tfs = fshead; tfs; tfs = tfs->nextfs) {
+		tfs->bcnt = size(tfs);
+		if (blocksize < tfs->bcnt)
+			blocksize = tfs->bcnt;
+	}
+	/* rewrite the rules, do syntax checking */
+	for (tfs = fshead; tfs; tfs = tfs->nextfs)
+		rewrite(tfs);
+
+	(void)next(argv);
+	display();
+	exit(exitval);
+}
+
+#if __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+void
+#if __STDC__
+err(const char *fmt, ...)
+#else
+err(fmt, va_alist)
+	char *fmt;
+        va_dcl
+#endif
+{
+	va_list ap;
+#if __STDC__
+	va_start(ap, fmt);
+#else
+	va_start(ap);
+#endif
+	(void)fprintf(stderr, "hexdump: ");
+	(void)vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	(void)fprintf(stderr, "\n");
+	exit(1);
+	/* NOTREACHED */
+}
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
new file mode 100644
index 0000000..82ec51d
--- /dev/null
+++ b/usr.bin/hexdump/hexdump.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  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
+ *    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.
+ *
+ *	@(#)hexdump.h	8.1 (Berkeley) 6/6/93
+ */
+
+typedef struct _pr {
+	struct _pr *nextpr;		/* next print unit */
+#define	F_ADDRESS	0x001		/* print offset */
+#define	F_BPAD		0x002		/* blank pad */
+#define	F_C		0x004		/* %_c */
+#define	F_CHAR		0x008		/* %c */
+#define	F_DBL		0x010		/* %[EefGf] */
+#define	F_INT		0x020		/* %[di] */
+#define	F_P		0x040		/* %_p */
+#define	F_STR		0x080		/* %s */
+#define	F_U		0x100		/* %_u */
+#define	F_UINT		0x200		/* %[ouXx] */
+#define	F_TEXT		0x400		/* no conversions */
+	u_int flags;			/* flag values */
+	int bcnt;			/* byte count */
+	char *cchar;			/* conversion character */
+	char *fmt;			/* printf format */
+	char *nospace;			/* no whitespace version */
+} PR;
+
+typedef struct _fu {
+	struct _fu *nextfu;		/* next format unit */
+	struct _pr *nextpr;		/* next print unit */
+#define	F_IGNORE	0x01		/* %_A */
+#define	F_SETREP	0x02		/* rep count set, not default */
+	u_int flags;			/* flag values */
+	int reps;			/* repetition count */
+	int bcnt;			/* byte count */
+	char *fmt;			/* format string */
+} FU;
+
+typedef struct _fs {			/* format strings */
+	struct _fs *nextfs;		/* linked list of format strings */
+	struct _fu *nextfu;		/* linked list of format units */
+	int bcnt;
+} FS;
+
+extern FS *fshead;			/* head of format strings list */
+extern int blocksize;			/* data block size */
+enum _vflag { ALL, DUP, FIRST, WAIT };	/* -v values */
+
+void	 add __P((char *));
+void	 addfile __P((char *));
+void	 badcnt __P((char *));
+void	 badconv __P((char *));
+void	 badfmt __P((char *));
+void	 badsfmt __P((void));
+void	 bpad __P((PR *));
+void	 conv_c __P((PR *, u_char *));
+void	 conv_u __P((PR *, u_char *));
+void	 display __P((void));
+void	 doskip __P((char *, int));
+void	 err __P((const char *, ...));
+void	*emalloc __P((int));
+void	 escape __P((char *));
+u_char	*get __P((void));
+void	 newsyntax __P((int, char ***));
+int	 next __P((char **));
+void	 nomem __P((void));
+void	 oldsyntax __P((int, char ***));
+void	 rewrite __P((FS *));
+int	 size __P((FS *));
+void	 usage __P((void));
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
new file mode 100644
index 0000000..68abbe6
--- /dev/null
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -0,0 +1,127 @@
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  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
+ *    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
+static char sccsid[] = "@(#)hexsyntax.c	8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "hexdump.h"
+
+off_t skip;				/* bytes to skip */
+
+void
+newsyntax(argc, argvp)
+	int argc;
+	char ***argvp;
+{
+	extern enum _vflag vflag;
+	extern FS *fshead;
+	extern int length;
+	int ch;
+	char *p, **argv;
+
+	argv = *argvp;
+	while ((ch = getopt(argc, argv, "bcde:f:n:os:vx")) != EOF)
+		switch (ch) {
+		case 'b':
+			add("\"%07.7_Ax\n\"");
+			add("\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"");
+			break;
+		case 'c':
+			add("\"%07.7_Ax\n\"");
+			add("\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"");
+			break;
+		case 'd':
+			add("\"%07.7_Ax\n\"");
+			add("\"%07.7_ax \" 8/2 \"  %05u \" \"\\n\"");
+			break;
+		case 'e':
+			add(optarg);
+			break;
+		case 'f':
+			addfile(optarg);
+			break;
+		case 'n':
+			if ((length = atoi(optarg)) < 0)
+				err("%s: bad length value", optarg);
+			break;
+		case 'o':
+			add("\"%07.7_Ax\n\"");
+			add("\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"");
+			break;
+		case 's':
+			if ((skip = strtol(optarg, &p, 0)) < 0)
+				err("%s: bad skip value", optarg);
+			switch(*p) {
+			case 'b':
+				skip *= 512;
+				break;
+			case 'k':
+				skip *= 1024;
+				break;
+			case 'm':
+				skip *= 1048576;
+				break;
+			}
+			break;
+		case 'v':
+			vflag = ALL;
+			break;
+		case 'x':
+			add("\"%07.7_Ax\n\"");
+			add("\"%07.7_ax \" 8/2 \"   %04x \" \"\\n\"");
+			break;
+		case '?':
+			usage();
+		}
+
+	if (!fshead) {
+		add("\"%07.7_Ax\n\"");
+		add("\"%07.7_ax \" 8/2 \"%04x \" \"\\n\"");
+	}
+
+	*argvp += optind;
+}
+
+void
+usage()
+{
+	(void)fprintf(stderr,
+"hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n");
+	exit(1);
+}
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
new file mode 100644
index 0000000..dab6da7
--- /dev/null
+++ b/usr.bin/hexdump/od.1
@@ -0,0 +1,76 @@
+.\" Copyright (c) 1990, 1993
+.\"	The Regents of the University of California.  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
+.\"    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.
+.\"
+.\"	@(#)od.1	8.1 (Berkeley) 6/6/93
+.\"
+.Dd %Q
+.Os
+.Dt OD 1
+.Sh NAME
+.Nm od
+.Nd octal, decimal, hex, ascii dump
+.Sh SYNOPSIS
+.Nm od
+.Op Fl aBbcDdeFfHhIiLlOovXx
+.Sm off
+.Oo
+.Op Cm \&+
+.Li offset
+.Op Cm \&.
+.Op Cm Bb
+.Oc
+.Ar file
+.Sh DESCRIPTION
+.Nm Od
+has been deprecated in favor of
+.Xr hexdump 1 .
+.Pp
+.Xr Hexdump ,
+if called as
+.Nm od ,
+provides compatibility for the options listed above.
+.Pp
+It does not provide compatibility for the
+.Fl s
+option (see
+.Xr strings 1 )
+or the
+.Fl P ,
+.Fl p ,
+or
+.Fl w
+options, nor is compatibility provided for the ``label'' component
+of the offset syntax.
+.Sh SEE ALSO
+.Xr hexdump 1 ,
+.Xr strings 1
+.Sh BUGS
+Quite a few.
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
new file mode 100644
index 0000000..1a4011f
--- /dev/null
+++ b/usr.bin/hexdump/odsyntax.c
@@ -0,0 +1,263 @@
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  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
+ *    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
+static char sccsid[] = "@(#)odsyntax.c	8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+
+#include <sys/types.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include "hexdump.h"
+
+int deprecated;
+
+static void odoffset __P((int, char ***));
+static void odprecede __P((void));
+
+void
+oldsyntax(argc, argvp)
+	int argc;
+	char ***argvp;
+{
+	extern enum _vflag vflag;
+	extern FS *fshead;
+	int ch;
+	char **argv;
+
+	deprecated = 1;
+	argv = *argvp;
+	while ((ch = getopt(argc, argv, "aBbcDdeFfHhIiLlOoPpswvXx")) != EOF)
+		switch (ch) {
+		case 'a':
+			odprecede();
+			add("16/1 \"%3_u \" \"\\n\"");
+			break;
+		case 'B':
+		case 'o':
+			odprecede();
+			add("8/2 \" %06o \" \"\\n\"");
+			break;
+		case 'b':
+			odprecede();
+			add("16/1 \"%03o \" \"\\n\"");
+			break;
+		case 'c':
+			odprecede();
+			add("16/1 \"%3_c \" \"\\n\"");
+			break;
+		case 'd':
+			odprecede();
+			add("8/2 \"  %05u \" \"\\n\"");
+			break;
+		case 'D':
+			odprecede();
+			add("4/4 \"     %010u \" \"\\n\"");
+			break;
+		case 'e':		/* undocumented in od */
+		case 'F':
+			odprecede();
+			add("2/8 \"          %21.14e \" \"\\n\"");
+			break;
+			
+		case 'f':
+			odprecede();
+			add("4/4 \" %14.7e \" \"\\n\"");
+			break;
+		case 'H':
+		case 'X':
+			odprecede();
+			add("4/4 \"       %08x \" \"\\n\"");
+			break;
+		case 'h':
+		case 'x':
+			odprecede();
+			add("8/2 \"   %04x \" \"\\n\"");
+			break;
+		case 'I':
+		case 'L':
+		case 'l':
+			odprecede();
+			add("4/4 \"    %11d \" \"\\n\"");
+			break;
+		case 'i':
+			odprecede();
+			add("8/2 \" %6d \" \"\\n\"");
+			break;
+		case 'O':
+			odprecede();
+			add("4/4 \"    %011o \" \"\\n\"");
+			break;
+		case 'v':
+			vflag = ALL;
+			break;
+		case 'P':
+		case 'p':
+		case 's':
+		case 'w':
+		case '?':
+		default:
+			(void)fprintf(stderr,
+			    "od: od(1) has been deprecated for hexdump(1).\n");
+			if (ch != '?')
+				(void)fprintf(stderr,
+"od: hexdump(1) compatibility doesn't support the -%c option%s\n",
+				    ch, ch == 's' ? "; see strings(1)." : ".");
+			usage();
+		}
+
+	if (!fshead) {
+		add("\"%07.7_Ao\n\"");
+		add("\"%07.7_ao  \" 8/2 \"%06o \" \"\\n\"");
+	}
+
+	argc -= optind;
+	*argvp += optind;
+
+	if (argc)
+		odoffset(argc, argvp);
+}
+
+static void
+odoffset(argc, argvp)
+	int argc;
+	char ***argvp;
+{
+	extern off_t skip;
+	register char *num, *p;
+	int base;
+	char *end;
+
+	/*
+	 * The offset syntax of od(1) was genuinely bizarre.  First, if
+	 * it started with a plus it had to be an offset.  Otherwise, if
+	 * there were at least two arguments, a number or lower-case 'x'
+	 * followed by a number makes it an offset.  By default it was
+	 * octal; if it started with 'x' or '0x' it was hex.  If it ended
+	 * in a '.', it was decimal.  If a 'b' or 'B' was appended, it
+	 * multiplied the number by 512 or 1024 byte units.  There was
+	 * no way to assign a block count to a hex offset.
+	 *
+	 * We assume it's a file if the offset is bad.
+	 */
+	p = argc == 1 ? (*argvp)[0] : (*argvp)[1];
+
+	if (*p != '+' && (argc < 2 ||
+	    (!isdigit(p[0]) && (p[0] != 'x' || !isxdigit(p[1])))))
+		return;
+
+	base = 0;
+	/*
+	 * skip over leading '+', 'x[0-9a-fA-f]' or '0x', and
+	 * set base.
+	 */
+	if (p[0] == '+')
+		++p;
+	if (p[0] == 'x' && isxdigit(p[1])) {
+		++p;
+		base = 16;
+	} else if (p[0] == '0' && p[1] == 'x') {
+		p += 2;
+		base = 16;
+	}
+
+	/* skip over the number */
+	if (base == 16)
+		for (num = p; isxdigit(*p); ++p);
+	else
+		for (num = p; isdigit(*p); ++p);
+
+	/* check for no number */
+	if (num == p)
+		return;
+
+	/* if terminates with a '.', base is decimal */
+	if (*p == '.') {
+		if (base)
+			return;
+		base = 10;
+	}
+
+	skip = strtol(num, &end, base ? base : 8);
+
+	/* if end isn't the same as p, we got a non-octal digit */
+	if (end != p) {
+		skip = 0;
+		return;
+	}
+
+	if (*p)
+		if (*p == 'B') {
+			skip *= 1024;
+			++p;
+		} else if (*p == 'b') {
+			skip *= 512;
+			++p;
+		}
+
+	if (*p) {
+		skip = 0;
+		return;
+	}
+
+	/*
+	 * If the offset uses a non-octal base, the base of the offset
+	 * is changed as well.  This isn't pretty, but it's easy.
+	 */
+#define	TYPE_OFFSET	7
+	if (base == 16) {
+		fshead->nextfu->fmt[TYPE_OFFSET] = 'x';
+		fshead->nextfs->nextfu->fmt[TYPE_OFFSET] = 'x';
+	} else if (base == 10) {
+		fshead->nextfu->fmt[TYPE_OFFSET] = 'd';
+		fshead->nextfs->nextfu->fmt[TYPE_OFFSET] = 'd';
+	}
+
+	/* Terminate file list. */
+	(*argvp)[1] = NULL;
+}
+
+static void
+odprecede()
+{
+	static int first = 1;
+
+	if (first) {
+		first = 0;
+		add("\"%07.7_Ao\n\"");
+		add("\"%07.7_ao  \"");
+	} else
+		add("\"         \"");
+}
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
new file mode 100644
index 0000000..99c207a
--- /dev/null
+++ b/usr.bin/hexdump/parse.c
@@ -0,0 +1,507 @@
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  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
+ *    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
+static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include "hexdump.h"
+
+FU *endfu;					/* format at end-of-data */
+
+void
+addfile(name)
+	char *name;
+{
+	register char *p;
+	FILE *fp;
+	int ch;
+	char buf[2048 + 1];
+
+	if ((fp = fopen(name, "r")) == NULL)
+		err("%s: %s\n", name, strerror(errno));
+	while (fgets(buf, sizeof(buf), fp)) {
+		if (!(p = index(buf, '\n'))) {
+			(void)fprintf(stderr, "hexdump: line too long.\n");
+			while ((ch = getchar()) != '\n' && ch != EOF);
+			continue;
+		}
+		*p = '\0';
+		for (p = buf; *p && isspace(*p); ++p);
+		if (!*p || *p == '#')
+			continue;
+		add(p);
+	}
+	(void)fclose(fp);
+}
+
+void
+add(fmt)
+	char *fmt;
+{
+	register char *p;
+	static FS **nextfs;
+	FS *tfs;
+	FU *tfu, **nextfu;
+	char *savep;
+
+	/* start new linked list of format units */
+	tfs = emalloc(sizeof(FS));
+	if (!fshead)
+		fshead = tfs;
+	else
+		*nextfs = tfs;
+	nextfs = &tfs->nextfs;
+	nextfu = &tfs->nextfu;
+
+	/* take the format string and break it up into format units */
+	for (p = fmt;;) {
+		/* skip leading white space */
+		for (; isspace(*p); ++p);
+		if (!*p)
+			break;
+
+		/* allocate a new format unit and link it in */
+		tfu = emalloc(sizeof(FU));
+		*nextfu = tfu;
+		nextfu = &tfu->nextfu;
+		tfu->reps = 1;
+
+		/* if leading digit, repetition count */
+		if (isdigit(*p)) {
+			for (savep = p; isdigit(*p); ++p);
+			if (!isspace(*p) && *p != '/')
+				badfmt(fmt);
+			/* may overwrite either white space or slash */
+			tfu->reps = atoi(savep);
+			tfu->flags = F_SETREP;
+			/* skip trailing white space */
+			for (++p; isspace(*p); ++p);
+		}
+
+		/* skip slash and trailing white space */
+		if (*p == '/')
+			while (isspace(*++p));
+
+		/* byte count */
+		if (isdigit(*p)) {
+			for (savep = p; isdigit(*p); ++p);
+			if (!isspace(*p))
+				badfmt(fmt);
+			tfu->bcnt = atoi(savep);
+			/* skip trailing white space */
+			for (++p; isspace(*p); ++p);
+		}
+
+		/* format */
+		if (*p != '"')
+			badfmt(fmt);
+		for (savep = ++p; *p != '"';)
+			if (*p++ == 0)
+				badfmt(fmt);
+		if (!(tfu->fmt = malloc(p - savep + 1)))
+			nomem();
+		(void) strncpy(tfu->fmt, savep, p - savep);
+		tfu->fmt[p - savep] = '\0';
+		escape(tfu->fmt);
+		p++;
+	}
+}
+
+static char *spec = ".#-+ 0123456789";
+
+int
+size(fs)
+	FS *fs;
+{
+	register FU *fu;
+	register int bcnt, cursize;
+	register char *fmt;
+	int prec;
+
+	/* figure out the data block size needed for each format unit */
+	for (cursize = 0, fu = fs->nextfu; fu; fu = fu->nextfu) {
+		if (fu->bcnt) {
+			cursize += fu->bcnt * fu->reps;
+			continue;
+		}
+		for (bcnt = prec = 0, fmt = fu->fmt; *fmt; ++fmt) {
+			if (*fmt != '%')
+				continue;
+			/*
+			 * skip any special chars -- save precision in
+			 * case it's a %s format.
+			 */
+			while (index(spec + 1, *++fmt));
+			if (*fmt == '.' && isdigit(*++fmt)) {
+				prec = atoi(fmt);
+				while (isdigit(*++fmt));
+			}
+			switch(*fmt) {
+			case 'c':
+				bcnt += 1;
+				break;
+			case 'd': case 'i': case 'o': case 'u':
+			case 'x': case 'X':
+				bcnt += 4;
+				break;
+			case 'e': case 'E': case 'f': case 'g': case 'G':
+				bcnt += 8;
+				break;
+			case 's':
+				bcnt += prec;
+				break;
+			case '_':
+				switch(*++fmt) {
+				case 'c': case 'p': case 'u':
+					bcnt += 1;
+					break;
+				}
+			}
+		}
+		cursize += bcnt * fu->reps;
+	}
+	return (cursize);
+}
+
+void
+rewrite(fs)
+	FS *fs;
+{
+	enum { NOTOKAY, USEBCNT, USEPREC } sokay;
+	register PR *pr, **nextpr;
+	register FU *fu;
+	register char *p1, *p2;
+	char savech, *fmtp, cs[3];
+	int nconv, prec;
+
+	for (fu = fs->nextfu; fu; fu = fu->nextfu) {
+		/*
+		 * Break each format unit into print units; each conversion
+		 * character gets its own.
+		 */
+		for (nconv = 0, fmtp = fu->fmt; *fmtp; nextpr = &pr->nextpr) {
+			pr = emalloc(sizeof(PR));
+			if (!fu->nextpr)
+				fu->nextpr = pr;
+			else
+				*nextpr = pr;
+
+			/* Skip preceding text and up to the next % sign. */
+			for (p1 = fmtp; *p1 && *p1 != '%'; ++p1);
+
+			/* Only text in the string. */
+			if (!*p1) {
+				pr->fmt = fmtp;
+				pr->flags = F_TEXT;
+				break;
+			}
+
+			/*
+			 * Get precision for %s -- if have a byte count, don't
+			 * need it.
+			 */
+			if (fu->bcnt) {
+				sokay = USEBCNT;
+				/* Skip to conversion character. */
+				for (++p1; index(spec, *p1); ++p1);
+			} else {
+				/* Skip any special chars, field width. */
+				while (index(spec + 1, *++p1));
+				if (*p1 == '.' && isdigit(*++p1)) {
+					sokay = USEPREC;
+					prec = atoi(p1);
+					while (isdigit(*++p1));
+				} else
+					sokay = NOTOKAY;
+			}
+
+			p2 = p1 + 1;		/* Set end pointer. */
+			cs[0] = *p1;		/* Set conversion string. */
+			cs[1] = '\0';
+
+			/*
+			 * Figure out the byte count for each conversion;
+			 * rewrite the format as necessary, set up blank-
+			 * padding for end of data.
+			 */
+			switch(cs[0]) {
+			case 'c':
+				pr->flags = F_CHAR;
+				switch(fu->bcnt) {
+				case 0: case 1:
+					pr->bcnt = 1;
+					break;
+				default:
+					p1[1] = '\0';
+					badcnt(p1);
+				}
+				break;
+			case 'd': case 'i':
+				pr->flags = F_INT;
+				goto isint;
+			case 'o': case 'u': case 'x': case 'X':
+				pr->flags = F_UINT;
+isint:				cs[2] = '\0';
+				cs[1] = cs[0];
+				cs[0] = 'q';
+				switch(fu->bcnt) {
+				case 0: case 4:
+					pr->bcnt = 4;
+					break;
+				case 1:
+					pr->bcnt = 1;
+					break;
+				case 2:
+					pr->bcnt = 2;
+					break;
+				default:
+					p1[1] = '\0';
+					badcnt(p1);
+				}
+				break;
+			case 'e': case 'E': case 'f': case 'g': case 'G':
+				pr->flags = F_DBL;
+				switch(fu->bcnt) {
+				case 0: case 8:
+					pr->bcnt = 8;
+					break;
+				case 4:
+					pr->bcnt = 4;
+					break;
+				default:
+					p1[1] = '\0';
+					badcnt(p1);
+				}
+				break;
+			case 's':
+				pr->flags = F_STR;
+				switch(sokay) {
+				case NOTOKAY:
+					badsfmt();
+				case USEBCNT:
+					pr->bcnt = fu->bcnt;
+					break;
+				case USEPREC:
+					pr->bcnt = prec;
+					break;
+				}
+				break;
+			case '_':
+				++p2;
+				switch(p1[1]) {
+				case 'A':
+					endfu = fu;
+					fu->flags |= F_IGNORE;
+					/* FALLTHROUGH */
+				case 'a':
+					pr->flags = F_ADDRESS;
+					++p2;
+					switch(p1[2]) {
+					case 'd': case 'o': case'x':
+						cs[0] = 'q';
+						cs[1] = p1[2];
+						cs[2] = '\0';
+						break;
+					default:
+						p1[3] = '\0';
+						badconv(p1);
+					}
+					break;
+				case 'c':
+					pr->flags = F_C;
+					/* cs[0] = 'c';	set in conv_c */
+					goto isint2;
+				case 'p':
+					pr->flags = F_P;
+					cs[0] = 'c';
+					goto isint2;
+				case 'u':
+					pr->flags = F_U;
+					/* cs[0] = 'c';	set in conv_u */
+isint2:					switch(fu->bcnt) {
+					case 0: case 1:
+						pr->bcnt = 1;
+						break;
+					default:
+						p1[2] = '\0';
+						badcnt(p1);
+					}
+					break;
+				default:
+					p1[2] = '\0';
+					badconv(p1);
+				}
+				break;
+			default:
+				p1[1] = '\0';
+				badconv(p1);
+			}
+
+			/*
+			 * Copy to PR format string, set conversion character
+			 * pointer, update original.
+			 */
+			savech = *p2;
+			p1[0] = '\0';
+			pr->fmt = emalloc(strlen(fmtp) + 2);
+			(void)strcpy(pr->fmt, fmtp);
+			(void)strcat(pr->fmt, cs);
+			*p2 = savech;
+			pr->cchar = pr->fmt + (p1 - fmtp);
+			fmtp = p2;
+
+			/* Only one conversion character if byte count. */
+			if (!(pr->flags&F_ADDRESS) && fu->bcnt && nconv++)
+	    err("byte count with multiple conversion characters");
+		}
+		/*
+		 * If format unit byte count not specified, figure it out
+		 * so can adjust rep count later.
+		 */
+		if (!fu->bcnt)
+			for (pr = fu->nextpr; pr; pr = pr->nextpr)
+				fu->bcnt += pr->bcnt;
+	}
+	/*
+	 * If the format string interprets any data at all, and it's
+	 * not the same as the blocksize, and its last format unit
+	 * interprets any data at all, and has no iteration count,
+	 * repeat it as necessary.
+	 *
+	 * If, rep count is greater than 1, no trailing whitespace
+	 * gets output from the last iteration of the format unit.
+	 */
+	for (fu = fs->nextfu;; fu = fu->nextfu) {
+		if (!fu->nextfu && fs->bcnt < blocksize &&
+		    !(fu->flags&F_SETREP) && fu->bcnt)
+			fu->reps += (blocksize - fs->bcnt) / fu->bcnt;
+		if (fu->reps > 1) {
+			for (pr = fu->nextpr;; pr = pr->nextpr)
+				if (!pr->nextpr)
+					break;
+			for (p1 = pr->fmt, p2 = NULL; *p1; ++p1)
+				p2 = isspace(*p1) ? p1 : NULL;
+			if (p2)
+				pr->nospace = p2;
+		}
+		if (!fu->nextfu)
+			break;
+	}
+#ifdef DEBUG
+	for (fu = fs->nextfu; fu; fu = fu->nextfu) {
+		(void)printf("fmt:");
+		for (pr = fu->nextpr; pr; pr = pr->nextpr)
+			(void)printf(" {%s}", pr->fmt);
+		(void)printf("\n");
+	}
+#endif
+}
+
+void
+escape(p1)
+	register char *p1;
+{
+	register char *p2;
+
+	/* alphabetic escape sequences have to be done in place */
+	for (p2 = p1;; ++p1, ++p2) {
+		if (!*p1) {
+			*p2 = *p1;
+			break;
+		}
+		if (*p1 == '\\')
+			switch(*++p1) {
+			case 'a':
+			     /* *p2 = '\a'; */
+				*p2 = '\007';
+				break;
+			case 'b':
+				*p2 = '\b';
+				break;
+			case 'f':
+				*p2 = '\f';
+				break;
+			case 'n':
+				*p2 = '\n';
+				break;
+			case 'r':
+				*p2 = '\r';
+				break;
+			case 't':
+				*p2 = '\t';
+				break;
+			case 'v':
+				*p2 = '\v';
+				break;
+			default:
+				*p2 = *p1;
+				break;
+			}
+	}
+}
+
+void
+badcnt(s)
+	char *s;
+{
+	err("%s: bad byte count", s);
+}
+
+void
+badsfmt()
+{
+	err("%%s: requires a precision or a byte count\n");
+}
+
+void
+badfmt(fmt)
+	char *fmt;
+{
+	err("\"%s\": bad format\n", fmt);
+}
+
+void
+badconv(ch)
+	char *ch;
+{
+	err("%%%s: bad conversion character\n", ch);
+}