- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Fix typo ('1' != 'l')

PR: bin/175975
Submitted by: William Ahern <william@25thandclement.com>
Approved by: cperciva (mentor)

mdoc: fix column names, indentation, column separation within each row, and
quotation. Also make sure we have the same amount of columns in each row as
the number of columns we specify in the head arguments.

Reviewed by: brueffer

mdoc: terminate quoted strings.

Reviewed by: brueffer

Fix decoding of escape sequences in format strings:
- Zero-terminate the resulting string by letting the for-loop copy the
terminating zero.
- Exit the for-loop after handling a backslash at the end of the format
string to fix a buffer overrun.
- Remove some unnecessary comments and blank lines. [1]

Requested by: bde [1]
PR: bin/144722
Approved by: kib (mentor)

- Fix how hexdump parses escape strings
From the NetBSD bug:
The way how hexdump(1) parses escape sequences has some bugs.
It shows up when an escape sequence is used as the non-last character
of a format string.

PR: bin/144722
Submitted by: gcooper
Approved by: rpaulo
Obtained from: NetBSD
MFC after: 1 week

Replace index() and rindex() calls with strchr() and strrchr().

The index() and rindex() functions were marked LEGACY in the 2001
revision of POSIX and were subsequently removed from the 2008 revision.
The strchr() and strrchr() functions are part of the C standard.

This makes the source code a lot more consistent, as most of these C
files also call into other str*() routines. In fact, about a dozen
already perform strchr() calls.

Formatting fixes:

hexdump/od.1:
- Enclose tabbed content in quotes [1]

ar/ar.1:
- Enclose tabbed content in quotes [1]

rctl/rctl.8:
- Enclose tabbed content in quotes [1]
- Start a sentence on a newline [2]

Reported by: manlint [1], igor [2]
MFC after: 1 week
X-MFC-after: 9.0-RELEASE

Correct a logic error in usr.bin/hexdump/conv.c, found by clang.

Whenever the conv_c() function encounters an incomplete multibyte char,
it peeks ahead. It also sets p to peekbuf, to indicate it is still
processing the incomplete character.

However, on the next retry, it compares buf against peekbuf, which
always returns false, since both buf and peekbuf are local char arrays,
whose addresses are never the same.

Fix this by comparing against p instead, which was the intention. Also
turn peekbuf into an array of u_char, to prevent conversion warnings.

MFC after: 1 week

Remove the advertising clause from UCB copyrighted files in usr.bin. This
is in accordance with the information provided at
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

Also add $FreeBSD$ to a few files to keep svn happy.

Discussed with: imp, rwatson

Use same table markup as in hexdump.1

mdoc: order prologue macros consistently by Dd/Dt/Os

Although groff_mdoc(7) gives another impression, this is the ordering
most widely used and also required by mdocml/mandoc.

Reviewed by: ru
Approved by: philip, ed (mentors)

The correct value of DEL is 0x7f, not 0xff. This is purely a documentation
issue - od(1) and hexdump(1) behave as expected.

PR: docs/143869
Submitted by: gcooper
MFC after: 2 weeks

Build usr.bin/ with WARNS=6 by default.

Also add some missing $FreeBSD$ to keep svn happy.

Revert most part of 200420 as requested, as more review and polish is
needed.

Remove unneeded header includes from usr.bin/ except contributed code.

Tested with: make universe

Use strlcpy() instead of explicitly set \0 on the tail of the array.

Document the -d option.

Fix markup.

o Simple strcpy/strcat replacement.

PR: bin/101575
Founded by: Dan Lukes
Obtained from: OpenBSD, rev. 1.11 by deraadt
MFC after: 2 weeks

In 'od -c' mode, deal with printable but zero-width combining
characters correctly. These characters are displayed "combined"
with a space character.

PR: misc/100215
Submitted by: "J.R. Oldroyd" <<fbsd AT opal.com>>
Reviewed by: "J.R. Oldroyd" <<fbsd AT opal.com>> (revised patch)
MFC after: 3 days

Added the EXIT STATUS section where appropriate.

Scheduled mdoc(7) sweep.

In next(), ensure that 'done' is set in the case when a file cannot
be opened, to avoid trying to read standard input after already closing
it, which resulted in EBADF errors.

Do not predeclare __inline functions, this makes no sense and generates
a warning with gcc 3.4.x.

display.c:
- 'savech' is only used if it is set a few lines above where
it is used, initialize it to silence warning.

- 'length' is either -1 or greater than 0, hence it is safe to cast it
to unsigned when comparing it here.

odsyntax.c:
- 'p' is assigned either (*argvp)[0] or (*argvp)[1] which both are
char *. 'num' and 'end' are assigned values based on 'p'.
Hence use char * instead of unsigned char * for these variables.

'&end' as the second argument to strtoll does not need to be casted
to char** any more.

This solves a
'dereferencing type-punned pointer will break strict-aliasing rules'
warning when compiling with -O2.

parse.c:
- 'prec' is only used when sokay == USEPREC and sokay = USEPREC
when 'prec' is assigned. Hence 'prec' is not used uninitialized,
initialize it to silence warning.

- The code involving 'nextpr' is hard to follow, but I belive
'nextpr' will not be used unless it is initialized.
Anyway, IF 'nextpr' is used uninitialized it is better to
get a consistant error (seg fault, when dereferencing a NULL pointer)
than potentially accessing some random memory.

The above changes makes hexdump WARNS=6 clean even when compiled with
-O2. Hence bump WARNS to keep it clean.

Tested by: CFLAGS='-O2 -pipe' make universe

Revert WARNS bump until I figure out why this does not work.

Include <string.h> to get memset and strcmp prototype.

Sort includes.

This is now WARNS=2 clean, bump WARNS to keep it clean.

Add POSIX-style support for multibyte characters to od(1): the 'c'
conversion interprets input bytes as multibyte sequences and displays
printable characters in the area corresponding to their first byte.
The remaining bytes are shown as "**".

Add a reference to od(1).

Document missing multibyte character support in utilities specified
by POSIX.

Mechanically kill hard sentence breaks.

Capitalize ASCII code names.

Approved by: re

ANSIify function definitions.
Add some constness to avoid some warnings.
Remove use register keyword.
Deal with missing/unneeded extern/prototypes.
Some minor type changes/casts to avoid warnings.

Reviewed by: md5

s/inline/__inline/

Consistently use FBSDID

mdoc(7) police: tidy up the markup.

From NetBSD:
Revision 1.10 Sat Oct 14 17:41:55 2000 UTC by bjh21
Don't core dump with an empty format string. Fixes PR#11218.
Patch supplied by Launey Thomas.

Obtained from: NetBSD

Make the output tidier when multiple integer formats are requested by
attempting to line up values into columns.

Obtained from: NetBSD (idea)

Overhaul hexdump's od syntax code to handle the -s -A -j -N -t options that
SUSv3 requires and give od a proper manual page.

PR: 36783

Declare variables that were extern'd in multiple places in hexdump.h.

PR: 36783

Add support for printing long doubles.

PR: 36783

Print signed single-byte decimal integers correctly instead of implicitly
converting them to unsigned bytes.

PR: 36783

Un-deprecate od(1): rename the `deprecated' variable to `odmode', remove the
deprecation warning from the utility and manual page. Since this utility
is required by POSIX, it's not likely to be removed any time soon.

This is leading up to the addition of the P1003.1-2001 -s -A -j -N -t options.

PR: 36783

Use `The .Nm utility'

remove __P

Slightly more efficient version of rev 1.6.

A less intrusive version of rev 1.2.

Slightly more efficient fix to the const problem.

Remove leaf node WARNS?=2 (that mainly I added). This should
help the GCC3 transition and CURRENT in general.

WARNS=2 fixups.

mdoc(7) police: Fixed the .Ex calls in manpages that describe more
than one utility.

PR: docs/30437
Submitted by: SUZUKI Koichi <koich@cac.co.jp>

File positions are off_t nowdays, not long, so:
strtol -> strtoll
fseek -> fseeko

NOTE: that fseek not works for >long offsets files per POSIX:

[EOVERFLOW] For fseek( ), the resulting file offset would be a value which
cannot be represented correctly in an object of type long.

mdoc(7) police: utilize the new .Ex macro.

Remove the misnamed `emalloc' and replace its uses with the calloc (along
with error checking) that it actually was.

Remove whitespace at EOL.

MAN[1-9] -> MAN.

mdoc(7) police: use the default ``file ...'' feature of the .Ar macro.

Change localizing to LC_ALL

mdoc(7) police: split punctuation characters + misc fixes.

Prepare for mdoc(7)NG.

Prepare for mdoc(7)NG.

mdoc(7) police: use the new features of the Nm macro.

Oops, missed another printf() invocation with no format string.

Don't call printf() with no format string.

Correct spelling : ascii -> ASCII

PR: docs/13702
Submitted by: Stephen J. Roznowski <sjr@home.com>
Reviewed by: mpp

$Id$ -> $FreeBSD$

Clean up some ambiguous nested if/elses.

PR: bin/9016

Fix bug with od/hd/hexdump. "*" lines are supposed to indicate one or
duplicates of the previous line, but a small file with less then 16
characters of zeros in it will be falsy identified as a repeat of
the (non-existant) previous line. i.e. the first line of output winds
up being a "*". Added a bit of code to handle the degenerate 'there is
no previous line' case for the first line.

Localize it

Use err(3) instead of local redefinition, incorporate `hd' in usage str.

Fix a minor nit in the .Dd macro invocation so that
the revision date is displayed correctly.

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Merge from Lite2

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

delete doubled words, e.g.: "the the" -> "the"

Fix the previous commit. The second of the 8-character columns was
a duplicate of the first column of 8...

Now that we've already got "hexdump -C", make calling the command "hd"
having the same effect, and install a link for this. There is
historic precedence for the command hd(1) (with roughly that output
format) in Xenix, SCO, and a few SysV's that tooks the idea.

Also, added a couple of spaces to the -C format to make the output
better readable.

Ok'ed by: phk

Add '-C' "Canonical" format to hexdump:

$ hexdump -C /etc/resolv.conf
00000000 64 6f 6d 61 69 6e 20 64 6b 2e 74 66 73 2e 63 6f |domain dk.tfs.co|
00000010 6d 0a 6e 61 6d 65 73 65 72 76 65 72 20 31 34 30 |m.nameserver 140|
00000020 2e 31 34 35 2e 32 33 30 2e 31 30 0a |.145.230.10.|

[HISTORY] command appeared in Version 1 AT&T UNIX
Obtained from: A Quarter Century of UNIX, Peter H. Salus, page 41

Correct some cross references and some path names.

Correct some manual page cross reference errors. E.g. su is a section
one man page, not section eight. This is the first round of such changes
and only fixes man pages in manual section one.

Remove trailing whitespace.

Change .0 man extents to .1, as reported by Julian Elischer. Whoops,
thought I'd gotten this one the first time around.
Reviewed by:
Submitted by:

This commit was generated by cvs2svn to compensate for changes in r1590,
which included commits to RCS files with non-trunk default branches.