===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/hexdump/hexdump.1,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/hexdump/hexdump.1	1999/07/21 12:43:26	1.9
--- src/usr.bin/hexdump/hexdump.1	2000/03/07 21:11:10	1.10
***************
*** 1,4 ****
! .\"	$OpenBSD: hexdump.1,v 1.9 1999/07/21 12:43:26 aaron Exp $
  .\" Copyright (c) 1989, 1990 The Regents of the University of California.
  .\" All rights reserved.
  .\"
--- 1,4 ----
! .\"	$OpenBSD: hexdump.1,v 1.10 2000/03/07 21:11:10 aaron Exp $
  .\" Copyright (c) 1989, 1990 The Regents of the University of California.
  .\" All rights reserved.
  .\"
***************
*** 77,83 ****
  .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
! .Pq Dq \&#
  are ignored.
  .It Fl n Ar length
  Interpret only
--- 77,83 ----
  .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
! .Pq Ql #
  are ignored.
  .It Fl n Ar length
  Interpret only
***************
*** 127,133 ****
  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
--- 127,134 ----
  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
! .Pq Ql * .
  .It Fl x
  .Em Two-byte hexadecimal display .
  Display the input offset in hexadecimal, followed by eight, space
***************
*** 158,169 ****
  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 an fprintf-style format string (see
  .Xr fprintf 3 ) ,
  with the
--- 159,172 ----
  each iteration of the format.
  .Pp
  If an iteration count and/or a byte count is specified, a single slash
+ .Pq Sq /
  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
! .Pq \&"\& \&"
! marks.
  It is interpreted as an fprintf-style format string (see
  .Xr fprintf 3 ) ,
  with the
***************
*** 174,186 ****
  .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'', ``n'', and ``p'' are not
! supported.
  .It
  The single character escape sequences
  described in the C standard are supported:
--- 177,194 ----
  .It
  A byte count or field precision
  .Em is
! required for each
! .Sq s
! conversion character (unlike the
  .Xr fprintf 3
  default which prints the entire string if the precision is unspecified).
  .It
! The conversion characters
! .Sq h ,
! .Sq n ,
! and
! .Sq p
! are not supported.
  .It
  The single character escape sequences
  described in the C standard are supported:
***************
*** 224,231 ****
  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.
--- 232,239 ----
  which are displayed as two character strings.
  .It Cm _p
  Output characters in the default character set.
! Nonprinting characters are displayed as a single dot
! .Ql \&. .
  .It Cm _u
  Output US ASCII characters, with the exception that control characters are
  displayed using the following, lower-case, names.
***************
*** 263,269 ****
  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
--- 271,279 ----
  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
! .Dq 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
***************
*** 298,306 ****
  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
--- 308,316 ----
  conversion character with the same field width
  and precision as the original conversion character or conversion
  string but with any
! .Ql + ,
! .Ql \&\ \& ,
! .Ql #
  conversion flag characters
  removed, and referencing a NULL string.
  .Pp
***************
*** 324,329 ****
--- 334,341 ----
  "%07.7_Ax\en"
  "%07.7_ax  " 8/2 "%04x " "\en"
  .Ed
+ .Sh SEE ALSO
+ .Xr od 1
  .Sh STANDARDS
  The
  .Nm