Remove svn:mergeinfo carried over from stable/9.

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

Copy stable/9 to releng/9.3 as part of the 9.3-RELEASE cycle.

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

MFC r263289: Update NetBSD Foundation copyrights to 2-clause BSD

The NetBSD Foundation states "Third parties are encouraged to change the
license on any files which have a 4-clause license contributed to the
NetBSD Foundation to a 2-clause license."

This change removes clauses 3 and 4 from copyright / license blocks that
list The NetBSD Foundation as the only copyright holder.

Sponsored by: The FreeBSD Foundation

MFC r255891:

Import NetBSD readline.c,v 1.104: do not crash with add_history(NULL).

MFC r244941:

libedit: bind the correct command when using "bind -k".

"ed-argument-digit" (i. e. command 0) was incorrectly used
instead.
This bug comes from the original sources imported in 1994
and has been confirmed in upstream NetBSD.

Reported by: Yamagi Burmeister
Submitted by: Christoph Mallon

MFC r240982:
Initialize the num variable to avoid uninitialized data.
This fixes the bug introduced by r238378.

Reviewed by: pfg

MFC r238178, 238624, 238810:

Re-merge a couple of changes from NetBSD libedit.

bin/sh has been taught about el_gets setting the count to -1
on error, so now we can partially revert r238173 to reduce
differences with NetBSD's implementation.

Also fix some warnings to be more in sync with NetBSD.

Obtained from: NetBSD

MFC r238173:

Fix issue resizing bin/sh

This partially reverts some changes from r237448 that are causing
breakage when resizing under bin/sh .

Reverted changes from NetBSD are:

Mar 10 20:46:15 2009 - editline.3 read.c
make el_gets set the count to -1 on error to distinguish between EOF and
error.

Feb 19 15:20:22 2009 - read.c sig.c sig.h
reset and redraw on sigcont. From Anon Ymous.

Feb 15 21:24:13 2009
don't restart on EINTR, instead return NULL immediately. From Anon Ymous

PR: 169603
Reported by: Peter Jeremy, David Shao
MFC after: 3 days
Approved by: re

MFC: r228114 r228116 r234690: install a readline/tilde.h

MFC r237448:

Merge changes from upstream libedit.

Here we update most of the files to at least match the
version available in NetBSD's snapshot of 20091228. This
version was chosen because it still doesn't include wide
character support (UTF-8), which involves many changes and
new files.

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by: re (implicit)

Add $FreeBSD$'s.

* Add the readline(3) API to libedit. The libedit versions of
{readline,history}.h are in /usr/include/edit so as to not conflict with
the GNU libreadline versions. To use the libedit readline(3) one should
add "-I/usr/include/edit" to their Makefile
(spelled "-I${DESTDIR}/${INCLUDEDIR}/edit" within the FreeBSD source tree).

* Enable its use in the BSD licensed utilities that support readline(3).

* To make it easier to sync libedit development with NetBSD, histedit.h
is moved into libedit's directory as history shows shown we keep merging
it into that location.

Obtained from: NetBSD
Sponsored by: Juniper Networks

libedit: Try to map <Delete> to ed-delete-next-char.

This adds a new "arrow" key "delete" corresponding to the kD termcap value.
It only works if that is a sequence such as "\033[3~"; if it is "\177", the
em-delete-prev-char or ed-delete-prev-char from the single-character
mappings remains. It turns out that most terminals (xterm and alikes,
syscons in xterm mode) produce "\033[3~" by default so <Delete> has the
expected effect.

This also means that things need to be considerably misconfigured for
<Backspace> to perform a <Delete> action.

libedit: Do not move the cursor for ed-delete-next-char in emacs mode.

This makes ed-delete-next-char suitable for mapping to the <Delete> key.

Behaviour in vi mode is unchanged (for 'x').

Fix typos, spelling, formatting and mdoc mistakes found by Nobuyuki while
translating these manual pages. Minor corrections by me.

Submitted by: Nobuyuki Koganemaru <n-kogane@syd.odn.ne.jp>

libedit: Reduce surprising behaviour with filename completion some more:
* Quote '*', '?' and '['. While it may be more useful to expand them to
matching pathnames, this at least matches with the completion we do.
* '@' is a regular character for filenames. Some other shells do
@<hostname> completion but we do not.
* Prefix names starting with '-' and '+' with './' so they are not seen as
options.

libedit: Allow simple quoting in filename completion.

The completer recognizes characters escaped with backslashes as being
literal parts of a word, and adds backslashes to avoid almost all
misinterpretation. In particular, filenames containing spaces can be
completed correctly.

For bug compatibility with the NetBSD version, the improved completion
function has a new name, _el_fn_sh_complete, and _el_fn_complete is
unchanged.

Submitted by: Guy Yur

libedit: Fix a bug that could make completion listings incomplete.

The element matches[0] is the common prefix and is not counted in len, so
subtracting 1 is not needed. A counter for the number of matches per line
was incremented twice.

Submitted by: Guy Yur

libedit: Add basic filename completion code from NetBSD.

This will be used to provide filename completion in sh(1).

Changes from the NetBSD code:
* wide character support disabled, as in the rest of libedit
* config.h and related portability stuff reduced/disabled, as in the rest
of libedit

Submitted by: Guy Yur
Obtained from: NetBSD

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 NetBSD Foundation has granted permission to remove clause 3 and 4 from
their software.

Obtained from: NetBSD

Build lib/ with WARNS=6 by default.

Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
lower it when needed.

I'm setting WARNS?=0 for secure/. It seems secure/ includes the
Makefile.inc provided by lib/. I'm not going to touch that directory.
Most of the code there is contributed anyway.

Bump the version of all non-symbol-versioned shared libraries in
preparation for 8.0-RELEASE. Add the previous version of those
libraries to ObsoleteFiles.inc and bump __FreeBSD_Version.

Reviewed by: kib
Approved by: re (rwatson)

Merge NetBSD changes, among them:

el.c 1.44, el.h 1.17, editline.3 1.53, histedit.h 1.31:
# add EL_GETFP, and EL_SETFP.

el.c 1.42, term.c 1.46, term.h 1.18, editline.3 1.52, histedit.h 1.29:
# - Add more readline functions, enough for gdb-6.5
# - Make el_get varyadic, and implement EL_GETTC.
# - XXX: the EL_SETTC api will change in the future.

Note: The latter change breaks the ABI of the el_get() function.

Approved by: re (kensmith)

Bump library versions in preparation for 7.0.

Ok'd by: kan

Merge the following changes from NetBSD:

history.c 1.32:
# Fix memory leak found by valgrind (Julien Torres)
map.c 1.24:
# fix debugging printf format.
read.c 1.40:
# Fix bug with multiple pending el_pushes. Reported by Julien Torres.
tty.c 1.24:
# Coverity CID 1216: Prevent negative index use.

MFC after: 3 weeks

Merge the following changes from NetBSD:

chared.h 1.17, common.c 1.19, emacs.c 1.21, key.c 1.18, key.h 1.9, map.c 1.23,
term.c 1.42, term.h 1.17, vi.c 1.25:
# Print the actual eofc, instead of ^D\b\b.
# Change internal character decoding to prevent buffer oveflows.
key.c 1.19, key.h 1.10:
# move declaration to header file.
term.c 1.43:
# Coverity CID 806: Prevent NULL deref
term.c 1.44:
# Coverity CID 1668: Plug memory leak.
term.c 1.45:
# Fix compilation.

MFC after: 3 weeks

Merge changes to the NetBSD copyright (advertising clause removal).

Merge NetBSD's revision 1.27. This bug can be observed eg. when browsing
through the history in sh.

| Refresh bug reported by Julien Torres:
|
| going from:
| activate -verbose
| to:
| reset -activation
| results in:
| reset -activationverbose"
| instead of:
| reset -activation
|
| This is because we choose to insert "reset -" before the current line,
| and the delete "e -" and insert "ion" in the appropriate place. The
| cleareol code did not handle this case properly; we now cleareol to
| the maximum number of characters of the first difference, the second
| difference and the difference in line length.

Fix prototype.

-mdoc sweep.

Add el_get to the NAME section.

Obtained from: OpenBSD (via NetBSD)

Merge makelist rev 1.10 and map.c rev 1.22 from NetBSD. They just patch the
bug fixed in the last commit to map.c in a different way. Follow NetBSD to
facilitate future merges.

Merge NetBSD's rev. 1.49:

Fix double if (from Alexey E. Suslikov via jmc@openbsd).
While here, re-word both H_[GS]ETUNIQUE descriptions so they make
more sense. Bump date.

Merge NetBSD's rev. 1.41:

PR/31012: Barry Naujok: libedit el_get with EL_EDITOR op does not work
Fixed as suggested.

Move <sys/cdefs.h> up to reduce diff to NetBSD.

Submitted to and merged from NetBSD (rev. 1.23 and 1.24):
- Don't delete the current line when typing `yy'.
- Don't use a possibly stale pointer in cv_paste().
-

NetBSD merged our typo fixes, update $NetBSD$.

Merge a change I missed in the last commit.

Merge NetBSD's 1.25 which fixes a small bug introduced in 1.24.

Include <term.h> before #undef'ing key_clear.

Fix a few typos.

Don't forget to copy the sentinel into the `help' array. It's expected to
be there.

Submitted by: Björn König
PR: 82381

Sync libedit with recent NetBSD developments. Including improvements to the
vi-mode, removal of clause 3, cleanups and the export of the tokenization
functions.

Not included: config.h, filecomplete.{c,h}

Revert the replacement of realloc() with reallocf() (el.h:1.2, map.c:1.5 and
tokenizer.c:1.3). Contrary to the commit log there were no memory leaks,
but the change introduced a bug because the free'd pointer was not zeroed
and calling the appropriate _end() function would call free() a second time.

Bump the shared library version number of all libraries that have not
been bumped since RELENG_5.

Reviewed by: ru
Approved by: re (not needed for commit check but in principle...)

Expand contractions.

Expand *n't contractions.

mdoc(7): Use the new feature of the .In macro.

style.Makefile(5)

Stage 3 of dynamic root support. Make all the libraries needed to run
binaries in /bin and /sbin installed in /lib. Only the versioned files
reside in /lib, the .so symlink continues to live /usr/lib so the
toolchain doesn't need to be modified.

LANG->LC_ALL

Pointed by: ru

Fix problem differently, use
LANG=C tr 'a-z' 'A-Z'
for hypotetical case that script may generate non-ascii characters

Fix double-wrong tr usage: tr '[a-z]' '[A-Z]'

First of all, it should be written as: tr 'a-z' 'A-Z'
ranges not encolosed in [] according to POSIX, so [] just included
in the replacement.
Second, it should be written: tr '[:lower:]' '[:upper:]'
since a-z and A-Z may have different length in some locales.

The .Fn function

Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.

Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/
Add FreeBSD Id tag where missing.

english(4) police.

Write the strvis()'d string out to the history file in history_save(),
not the original string. Fixes the bug where every second line of a
history file was empty.

FreeBSD's libedit does not include NetBSD's readline emulation code.
Remove references to it from the Authors and History sections.

Zap now-unused SHLIB_MINOR

Restore local bits lost in recent merge from NetBSD.

Usage style sweep: spell "usage" with a small 'u'.
Also change one case of blatant __progname abuse (several more remain)
This commit does not touch anything in src/{contrib,crypto,gnu}/.

-ltermcap is spelled -lncurses nowadays.

Remove __P() usage.

Fix problem where with PicoBSD the shell coredumps if it does not find an
entry for its terminal type in /etc/termcap.

Submitted by: bde

mdoc(7) police: markup nit in the actual rev. 1.13 changes.

mdoc(7) police: restore all FreeBSD fixes to this file that got
clobbered by previous commit.

Clean this up after the NetBSD syncing.

Fix ID's after a total boch CVS merge due to multiple people making
commits to these files.
As I sing to CVS:
Have I told you lately that I hate your guts? Have I told you
all SCM's are above you? You fill my heart with pain, take away
all my merging joy, grow my troubles that's what you do."

Our histedit.h lives in src/include.

Re-applied some of rev. 1.11 and 1.13 fixes that were lost in the last commit.
Fixed some more.

+ Sync with NetBSD, bringing in feature enhancements.
+ Convert to ANSI-C function definitions
+ style(9)

Submitted by: kris

Add __FBSDID()s to libedit

mdoc(7) police: protect trailing full stops of abbreviations
with a trailing zero-width space: `e.g.\&'.

mdoc(7) police:

Avoid using parenthesis enclosure macros (.Pq and .Po/.Pc) with plain text.
Not only this slows down the mdoc(7) processing significantly, but it also
has an undesired (in this case) effect of disabling hyphenation within the
entire enclosed block.

Remove whitespace at EOL.

mdoc(7) police: removed HISTORY info from the .Os call.

Back out history.3 link removing - conflict fixed in libreadline instead

Comment out one of many editline.3 MLINKS conflicting with libreadline
(history.3)

MAN[1-9] -> MAN.

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

Prepare for mdoc(7)NG.

Constify

log

Include fcntl.h

PR: 21697
Submitted by: Barak Enat <barak_enat@yahoo.com>

Teach library about Home/End keys

Fully preserve original tty settings outside of line edition mode. Old variant
preserve them only partially, so tty state becomes different after el_*
functions used.

PR: 20138

Move terminal descriptor flush before stty to eliminate potential problems
whith characters conversion changed like \n -> \r\n and so on.

Fix temp. singnals blocking. Only one signal was blocked due to typo pasted
many times.

<blush> I tested the real code changes, but neglected to test the
insertion of $FreeBSD$. I miffed it (pointy hat please). Hopefully
no one will notice this short window where -current didn't compile.

Do not read editrc file from '.'. This can be as unsafe as having
. first in root's path.

While I'm here:
o Add $FreeBSD$
o Get errno from <errno.h>, but extern int errno.

Submitted by: Tim Vanderhoek

Make comment match code forgotten in last commit

Add $FreeBSD$ so I can commit:

Remove extern int errno;. Instead include the ANSI <errno.h>. No
functional changes, just a higher level of pedantry.

Introduce .Lb macro to libedit manpage

Fix style bugs

Submitted by: bde

sigset_t change (part 5 of 5)
-----------------------------

Most of the userland changes are in libc. For both the alpha
and the i386 setjmp has been changed to accomodate for the
new sigset_t. Internally, libc is mostly rewritten to use the
new syscalls. The exception is in compat-43/sigcompat.c

The POSIX thread library has also been rewritten to use the
new sigset_t. Except, that it currently only handles NSIG
signals instead of the maximum _SIG_MAXSIG. This should not
be a problem because current applications don't use any
signals higher than NSIG.

There are version bumps for the following libraries:
libdialog
libreadline
libc
libc_r
libedit
libftpio
libss

These libraries either a) have one of the modified structures
visible in the interface, or b) use sigset_t internally and
may cause breakage if new binaries are used against libraries
that don't have the sigset_t change. This not an immediate
issue, but will be as soon as applications start using the
new range to its fullest.

NOTE: libncurses already had an version bump and has not been
given one now.

NOTE: doscmd is a real casualty and has been disconnected for
the moment. Reconnection will eventually happen after
doscmd has been fixed. I'm aware that being the last one
to touch it, I'm automaticly promoted to being maintainer.
According to good taste this means that I will receive a
badge which either will be glued or mechanically stapled,
drilled or otherwise violently forced onto me :-)

NOTE: pcvt/vttest cannot be compiled with -traditional. The
change cause sys/types to be included along the way which
contains the const and volatile modifiers. I don't consider
this a solution, but more a workaround.

$Id$ -> $FreeBSD$

Fix MLINKS.

Noticed by: Norman C. Rice <nrice@emu.sourcee.com>

Add 2 functions: el_data_set() and el_data_get() which do what you
would expect. (Allow user data to be associated with an EditLine context).

As this changes no existing interfaces and doesn't alter any structs
visable to the user I've been told that its not necessary to bump
the version of the library.

Add $Id$, to make it simpler for members of the translation teams to
track.

The $Id$ line is normally at the bottom of the main comment block in the
man page, separated from the rest of the manpage by an empty comment,
like so;

.\" $Id$
.\"

If the immediately preceding comment is a @(#) format ID marker than the
the $Id$ will line up underneath it with no intervening blank lines.
Otherwise, an additional blank line is inserted.

Approved by: bde

Switch to using ".So" as the extension for PIC object files rather
than ".so". The old extension conflicted with well-established
naming conventions for dynamically loadable modules.

The "clean" targets continue to remove ".so" files too, to deal with
old systems.

On the alpha, sizeof(char*) != sizeof(int) which was assumed in
term_init(). This is the cause of /usr/bin/ftp faulting on the alpha.

Submitted by: Hidetoshi Shimokawa <simokawa@sat.t.u-tokyo.ac.jp>

Replace memory leaking instances of realloc with non-leaking reallocf.
In some cases replace if (a == null) a = malloc(x); else a =
realloc(a, x); with simple reallocf(a, x). Per ANSI-C, this is
guaranteed to be the same thing.

I've been running these on my system here w/o ill effects for some
time. However, the CTM-express is at part 6 of 34 for the CAM
changes, so I've not been able to do a build world with the CAM in the
tree with these changes. Shouldn't impact anything, but...

Fixed print format errors.

Fixes assorted problems with the history edit functions in libedit. This
affects sh, ftp (and others?).

Submitted by: Max Euston <meuston@jmrodgers.com>
PR: 6516

Spelling fixes.

PR: 6903
Reviewed by: phk
Submitted by: Josh Gilliam <josh@quick.net>

Spelling corrections.

PR: 6868
Submitted by: Josh Gilliam <josh@quick.net>

Don't use absolute path.
Submitted by: jhay

.Sh AUTHOR -> .Sh AUTHORS. Use .An/.Aq

Don't swap carriage return and new line in quoted mode (after ^V).

Fixed wrong prototype for history().
Don't (mis)use .Fd outside of the synopsis.

Sort cross refereces in section SEE ALSO.

Improve dependancy behaviour a little more.

This is still pretty disgusting.

Submitted by: bde

List help.h a a dependancy for editline.c
Use 'beforedepend' instead of '.depend' to hang automatically-generated
headers off.

XXX the latter is bogus without a 'beforeall' target and explicit ordering
of dependancy generation for targets.

Reorder decomposition of the filename argument for the '-h' flag to
avoid misprocessing in the case where the filename argument contains
more than one period.

Submitted by: micke@dynas.se (Mikael Hybsch)

Kill this file really dead. The default branch was cleared, even
though the file was still on the vendor branch. I don't know why.
It doesn't look like the cvs-add-on-a-branch bug that we already
know about.

Fix vi-mode searching broken with the NetBSD changes update.
PR: bin/4064
Submitted by: Wolfgang Helbig <helbig@MX.BA-Stuttgart.De>

Kill histedit.h again. Importing Lite2 brought it back for some reason
(although it hasn't changed).

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

ctype: portability, sign extension and cleanup fixes

Move editrc.5 from MAN3 to MAN5

Pull histedit.h out, it lives in /usr/src/include, not here.

Add extra test functionality.

Obtained from: NetBSD

Update libedit with changes from NetBSD. Includes history load/save,
some buffer overflow guards and some stylistic cleanups.
Also adds manpages.

Obtained from: NetBSD

Fix a minor buffer overflow.

Obtained from: BSDi by way of Keith Bostic

Add missing DPADD, remove duplicate -ltermcap

8bit cleaness (ctype) fixes

General -Wall warning cleanup, part I.
Submitted-By: Kent Vander Velden <graphix@iastate.edu>

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

Fix PR#858, /bin/sh corruption caused by non-zeroed malloc() in libedit
in particular circumstances. (malloc() does not zero memory, but usually
does by coincidenct that sbrk() returns zeroed pages)

Submitted-by: John Hood <cgull@smoke.marlboro.vt.us>

Update to 4.4lite2 (initialize arrow key data completely).

Change my parse fix from 'return argc' to 'return 0'.
Pointed by: davidg

Fix sh coredump in vi mode with empty colon command

Simplify baud printing code

Nuke local termcap.h and use system one

Remove trailing whitespace.

Add LDADD+= -ltermcap

Little regex code cleaness, idea from jgreco@ns.sol.net

Fix bug with 8-bit chars sign extention (ctype not works)

Rewritten using POSIX regex
Add 57600 and 115200 speeds
Correct termcap path

Change all references to LIBTERM and -ltermlib to LIBTERMCAP and -ltermcap

In emacs editing mode, sh treated ^D at the end of a line as EOF.
(Apparently by Christos Zoulas.)
Liberated from: NetBSD

Add dependencies on libraries to DPADD. Someday this should be done
automagically. -lfoo has to be right to work, but ${LIBFO0} is too
easy to forget or misspell; nothing checks it and it should be
different for shared libraries.

Make this work even if make depend is not run.
Reviewed by:
Submitted by: jkh

histedit.h is now installed from include.

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