Import of tcsh-6.12.00

svn path=/vendor/tcsh/dist/; revision=100616
2002-07-24 16:23:10 +00:00 · 2002-07-24 16:23:10 +00:00 · 2930157267 · 2020-12-20 02:59:44 +00:00
commit 2930157267
parent ad35f55d45
151 changed files with 2532 additions and 1872 deletions
--- a/contrib/tcsh/Fixes
+++ b/contrib/tcsh/Fixes
@ -1,9 +1,76 @@
 57. misc cleanups.
 56. V6.11.05 - 20020712
 55. We should have socklen_t in the INET6 case, but we leave int otherwise.
 54. Fixed for Darwin/Rhapsody (Mark Peek)
 53. provide new config.sub and config.guess from ftp://ftp.gnu.org/gnu/config/
     (Nelson Beebe)
 52. V6.11.04 - 20020709
 51. Dissallow setting of environment variables that do not contain
     alphanumeric names (Ton Voon)
 50. Don't expand path components that don't resolve to path names (Jonathan
     Chen)
 49. Make $ignoreeof agree with the man page (Matias Moreno Meringer)
 48. Fix argument passing in tc.prompt.c expdollar (Nelson Beebe)
 47. Completion fixes from FreeBSD (Mark Peek)
 46. FreeBSD's sbsize limit (Mark Peek)
 45. Fix repeat 3 repeat 2 echo foo
 44. Fix I/O redirection in scripts (Ian D Allen)
 43. Fix ` \\\n ` evaluation (Jean-Luc Leger)
 42. add --version (Nelson Beebe)
 41. portability fixes for sed (Nelson Beebe)
 40. undef sv_handler for AIX's benefit. (Nelson Beebe)
 39. Add a test for ss_family that disables IPV6 (linux/ppc, osf/1 have
     problems) (Nelson Beebe)
 38. Disable ipv6 for Apple (Nelson Beebe)
 37. Fix darwin configure entry (Nelson Beebe)
 36. V6.11.03 - 20020701
 35. Add Ian D. Allen's bug list.
 34. If we are invoked as csh, default to bsd echo (Matej Vela)
 33. Don't close file descriptors too early because setuid scripts fail.
     (Jill Pryse-Davies)
 32. Completion updates (Tom Warzeka)
 31. Fix compilation issue on SunOS4 with _POSIX_VDISABLE (Tom Warzeka)
 30. ukrainian update (Olexander Kunytsa)
 29. DSPMBYTE=utf8 patch (Jean-Luc Leger)
 28. fix ipv4 only compilation, remove extra sigsetmask() call (Takayuki Nakao)
 27. window change can cause free to be re-entered causing abort (Mark Peek)
 26. vp->vec vetting, suggested by Ian Dall.
 25. V6.11.02 - 20020516
 24. Fix prompt bugs in $var and %c0n (TAKAI Kousuke)
 23. Add Cray SV2 config (Rafal Maszkowski)
 22. Add pdf manual page (Warren Ferguson)
 21. Fix REMOTEHOST lossage in with AF_LOCAL sockets (Tom Mander)
 20. Fix win32 break because of TIOCSTI (Amol)
 19. Fix TIOCSTI for hpux 11  (Igor Schein)
 18. Avoid collapsing paths that refer to non-existent components
     (Martin Kraemer)
 17. Make -shell invocations always treated as a login shell.
 16. V6.11.01 - 20020308
 15. Fixes to polish nls locale (Pawe³ Niewiadomski)
 14. russian locale fixes (Alexey Dokuchaev)
 13. document door support (Shaen)
 12. tcsh euc handling extensions (Alexey Zelkin)
 11. Make sure that jobcmd does not clobber the current job (Rob McMahon)
 10. Make sure that the output of verbose and echo do not end up in the
     command output (Victor I. Pasko)
  9. Add %j in prompt [needs more work; is not right the first time
     after proclist changes] (Hr. Peter Kruse)
  8. `` commands with embedded newlines would ignore commands following
     the new line (Victor I. Pasko)
  7. Re-initialize nls if NLSPATH is changed (Naoki Wakamatsu)
  6. Fix 64 bit compilation with linux and resource limits.
  5. Avoid double globbing when ls-F needs to fork (Joe Townsend)
  4. put back csh filec compatible support.
  3. add support for quads in xprintf in the presence of gcc.
  2. unlimit should set rlim.rlim_max to rlim.rlim_cur if max < cur.
  1. Make ~user work again when the home directory is '/'.
 40. V6.11.00 - 20010902
 39. Completion fixes (Tom Warzeka)
 38. make c_insert not static so that it can be used from win32 (amol)
 37. Fix rmstar not to corrupt memory when we say no. (Mark Peek)
 36. V6.10.02 - 20010806
- 35. polish nls locale (Pawe³ New)
+ 35. polish nls locale (Pawe³ Niewiadomski))
 34. Fix a tcsetattr race running background jobs as the last line on an xterm
     window (Andrew Brown)
 33. jobcmd alias (Greg Parker)
--- a/contrib/tcsh/Imakefile
+++ b/contrib/tcsh/Imakefile
@ -1,7 +1,7 @@
 XCOMM
-XCOMM $Id: Imakefile,v 1.79 2001/09/02 21:16:24 christos Exp $
+XCOMM $Id: Imakefile,v 1.81 2002/07/23 16:18:31 christos Exp $
 XCOMM
-XCOMM Imakefile for tcsh 6.11
+XCOMM Imakefile for tcsh 6.12
 XCOMM Marc Horowitz, MIT SIPB
 XCOMM
@ -480,7 +480,7 @@ LDLIBS = MyLibs
 #endif
 SUF = o
-VERSION = 6.11
+VERSION = 6.12
 SHSRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
 	sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \
--- a/contrib/tcsh/Makefile.in
+++ b/contrib/tcsh/Makefile.in
@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 3.16 2001/09/02 21:16:25 christos Exp $
+# $Id: Makefile.in,v 3.19 2002/07/23 16:13:21 christos Exp $
 #	Makefile.in	4.3	6/11/83
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@ -8,7 +8,7 @@
 # things; Paul Placeway, CIS Dept., Ohio State University
 #
 SHELL=/bin/sh
-VERSION=6.11
+VERSION=6.12
 BUILD=tcsh
 VPATH=@srcdir@
 srcdir=@srcdir@
@ -295,11 +295,11 @@ PSSRCS= sh.decls.h glob.c glob.h mi.termios.c mi.wait.h mi.varargs.h ma.setp.c \
 	vms.termcap.c
 SHSRCS= ${ASSRCS} ${PSSRCS}
 SHOBJS=	sh.${SUF} sh.dir.${SUF} sh.dol.${SUF} sh.err.${SUF} sh.exec.${SUF} \
-	sh.char.${SUF} sh.exp.${SUF} sh.func.${SUF} sh.glob.${SUF} \
+	sh.char.${SUF} sh.exp.${SUF} sh.file.${SUF} sh.func.${SUF} \
-	sh.hist.${SUF} sh.init.${SUF} sh.lex.${SUF} sh.misc.${SUF} \
+	sh.glob.${SUF} sh.hist.${SUF} sh.init.${SUF} sh.lex.${SUF} \
-	sh.parse.${SUF} sh.print.${SUF} sh.proc.${SUF} sh.sem.${SUF} \
+	sh.misc.${SUF} sh.parse.${SUF} sh.print.${SUF} sh.proc.${SUF} \
-	sh.set.${SUF} sh.time.${SUF} glob.${SUF} mi.termios.${SUF} \
+	sh.sem.${SUF} sh.set.${SUF} sh.time.${SUF} glob.${SUF} \
-	ma.setp.${SUF} vms.termcap.${SUF}
+	mi.termios.${SUF} ma.setp.${SUF} vms.termcap.${SUF}
 TWSRCS= tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \
 	tw.comp.c tw.color.c
@ -431,7 +431,7 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
 	@echo '#define _h_tc_const' >> $@
 	${CPP} $(CPPFLAGS) ${DFLAGS} ${EXTRAFLAGS} -D_h_tc_const\
 	    $(srcdir)/tc.const.c | grep 'Char STR' | \
-	    sed -e 's/Char \([a-zA-Z0-9_]*\)\[\].*/extern Char \1[];/' | \
+	    sed -e 's/Char \([a-zA-Z0-9_]*\) *\[ *\].*/extern Char \1[];/' | \
 	    sort >> $@
 	@echo '#endif /* _h_tc_const */' >> $@
--- a/contrib/tcsh/Makefile.std
+++ b/contrib/tcsh/Makefile.std
@ -1,4 +1,4 @@
-# $Id: Makefile.std,v 1.92 2001/09/02 21:16:25 christos Exp $
+# $Id: Makefile.std,v 1.95 2002/07/23 16:13:21 christos Exp $
 #	Makefile.std	4.3	6/11/83
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@ -8,7 +8,7 @@
 # things; Paul Placeway, CIS Dept., Ohio State University
 #
 SHELL=/bin/sh
-VERSION=6.11
+VERSION=6.12
 BUILD=tcsh
 srcdir=.
@ -291,11 +291,11 @@ PSSRCS= sh.decls.h glob.c glob.h mi.termios.c mi.wait.h mi.varargs.h ma.setp.c \
 	vms.termcap.c
 SHSRCS= ${ASSRCS} ${PSSRCS}
 SHOBJS=	sh.${SUF} sh.dir.${SUF} sh.dol.${SUF} sh.err.${SUF} sh.exec.${SUF} \
-	sh.char.${SUF} sh.exp.${SUF} sh.func.${SUF} sh.glob.${SUF} \
+	sh.char.${SUF} sh.exp.${SUF} sh.file.${SUF} sh.func.${SUF} \
-	sh.hist.${SUF} sh.init.${SUF} sh.lex.${SUF} sh.misc.${SUF} \
+	sh.glob.${SUF} sh.hist.${SUF} sh.init.${SUF} sh.lex.${SUF} \
-	sh.parse.${SUF} sh.print.${SUF} sh.proc.${SUF} sh.sem.${SUF} \
+	sh.misc.${SUF} sh.parse.${SUF} sh.print.${SUF} sh.proc.${SUF} \
-	sh.set.${SUF} sh.time.${SUF} glob.${SUF} mi.termios.${SUF} \
+	sh.sem.${SUF} sh.set.${SUF} sh.time.${SUF} glob.${SUF} \
-	ma.setp.${SUF} vms.termcap.${SUF}
+	mi.termios.${SUF} ma.setp.${SUF} vms.termcap.${SUF}
 TWSRCS= tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \
 	tw.comp.c tw.color.c
@ -423,7 +423,7 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
 	@echo '#define _h_tc_const' >> $@
 	${CPP} $(INCLUDES) ${DFLAGS} ${EXTRAFLAGS} -D_h_tc_const\
 	    $(srcdir)/tc.const.c | grep 'Char STR' | \
-	    sed -e 's/Char \([a-zA-Z0-9_]*\)\[\].*/extern Char \1[];/' | \
+	    sed -e 's/Char \([a-zA-Z0-9_]*\) *\[ *\].*/extern Char \1[];/' | \
 	    sort >> $@
 	@echo '#endif /* _h_tc_const */' >> $@
--- a/contrib/tcsh/Makefile.vms
+++ b/contrib/tcsh/Makefile.vms
@ -1,4 +1,4 @@
-# $Id: Makefile.vms,v 1.35 2001/09/02 21:16:25 christos Exp $
+# $Id: Makefile.vms,v 1.37 2002/07/23 16:13:21 christos Exp $
 #	Makefile.vms	4.3	6/11/83
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@ -8,7 +8,7 @@
 # things; Paul Placeway, CIS Dept., Ohio State University
 #
 SHELL=/bin/sh
-VERSION=6.11
+VERSION=6.12
 BUILD=tcsh
 ################################################################
@ -401,7 +401,7 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
 	@echo '\#define _h_tc_const' >> $@
 	${CC} -E $(INCLUDES) ${DFLAGS} -D_h_tc_const tc.const.c | \
 	    grep 'Char STR' | \
-	    sed -e 's/Char \([a-zA-Z0-9_]*\)\[\].*/extern Char \1[];/' | \
+	    sed -e 's/Char \([a-zA-Z0-9_]*\) *\[ *\].*/extern Char \1[];/' | \
 	    sort >> $@
 	@echo '\#endif /* _h_tc_const */' >> $@
--- a/contrib/tcsh/Ported
+++ b/contrib/tcsh/Ported
@ -165,7 +165,7 @@ NOTES	:	Does Ultrix 4.x still need YPBUGS?
 NOTES	:	Ultrix4.2 may need NAMEI_BUG
 VERSION	:	6.09.00
-VENDOR	:	apple
+VENDOR	:	Apple
 MODELS	:	macII
 COMPILER:	cc
 CFLAGS	:	normal		(-ZP)
@ -353,6 +353,17 @@ ENVIRON	:	n/a
 NOTES	:	none
 VERSION	:	6.08
 VENDOR  :       Cray Research
 MODELS  :       SV1, probably also SV2
 COMPILER:       cc
 CFLAGS  :       normal
 LIBES   :       -ltermlib
 OS      :       Unicos 10.0.1.0
 CONFIG  :       cray
 ENVIRON :       n/a
 NOTES   :       none
 VERSION :       6.11
 VENDOR	:	pyramid
 MODELS	:	MIS4/2T 
 COMPILER:	cc
@ -388,9 +399,19 @@ CFLAGS	:	-O3 -pipe -g -arch ppc -arch i386 -UNeXT
 OS	:	Rhapsody 5
 CONFIG	:	rhapsody
 ENVIRON	:	n/a
-NOTES	:	CFLAGS="-O3 -pipe -g -arch ppc -arch i386 -UNeXT" configure && make
+NOTES	:	CFLAGS="-O3 -pipe -g -UNeXT" configure && make
 VERSION	:	6.08.00
 VENDOR	:	Apple
 MODELS	:	any
 COMPILER:	cc
 CFLAGS	:	-O3 -pipe -g -arch ppc -arch i386
 OS	:	Darwin
 CONFIG	:	darwin
 ENVIRON	:	n/a
 NOTES	:	CFLAGS="-O3 -pipe -g -arch ppc -arch i386 -UNeXT" configure && make
 VERSION	:	6.11.05
 VENDOR	:	Heurikon
 MODELS	:	HK68
 COMPILER:	gcc (Green Hills C-68000)
--- a/contrib/tcsh/README
+++ b/contrib/tcsh/README
@ -1,4 +1,4 @@
-This is tcsh version 6.11.  Tcsh is a version of the Berkeley
+This is tcsh version 6.12.  Tcsh is a version of the Berkeley
 C-Shell, with the addition of: a command line editor, command and file
 name completion, listing, etc. and a bunch of small additions to the
 shell itself.
--- a/contrib/tcsh/complete.tcsh
+++ b/contrib/tcsh/complete.tcsh
@ -1,5 +1,5 @@
 #
-# $Id: complete.tcsh,v 1.37 2001/09/02 21:06:02 christos Exp $
+# $Id: complete.tcsh,v 1.40 2002/07/07 15:37:20 christos Exp $
 # example file using the new completion code
 #
@ -21,16 +21,20 @@ endif
 if ($?_complete) then
    set noglob
-    set hosts
+    if ( ! $?hosts ) set hosts
    foreach f ($HOME/.hosts /usr/local/etc/csh.hosts $HOME/.rhosts /etc/hosts.equiv)
        if ( -r $f ) then
-	    set hosts = ($hosts `grep -v "+" $f | tr -s " " "	" | cut -f 1`)
+	    set hosts = ($hosts `grep -v "+" $f | grep -E -v "^#" | tr -s " " "	" | cut -f 1`)
 	endif
    end
    if ( -r $HOME/.netrc ) then
 	set f=`awk '/machine/ { print $2 }' < $HOME/.netrc` >& /dev/null
 	set hosts=($hosts $f)
    endif
    if ( -r $HOME/.ssh/known_hosts ) then
 	set f=`cat $HOME/.ssh/known_hosts | cut -f 1 -d \ ` >& /dev/null
 	set hosts=($hosts $f)
    endif
    unset f
    if ( ! $?hosts ) then
 	set hosts=(hyperion.ee.cornell.edu phaeton.ee.cornell.edu \
@ -416,7 +420,7 @@ if ($?_complete) then
    endif
    # from George Cox
-    complete acroread	'p/*/f:*.pdf/'
+    complete acroread	'p/*/f:*.{pdf,PDF}/'
    complete apachectl  'c/*/(start stop restart fullstatus status graceful \
 			configtest help)/'
    complete appletviewer	'p/*/f:*.class/'
@ -652,30 +656,36 @@ if ($?_complete) then
    endif
    unset _maildir
-    if (-r /usr/share/man) then
+    if (! $?MANPATH) then
-      set _man_dir = /usr/share/man
+	if (-r /usr/share/man) then
-    else
+	    setenv MANPATH /usr/share/man:
-      set _man_dir = /usr/man
+	else
 	    setenv MANPATH /usr/man:
 	endif
    endif
    # use of $MANPATH from Dan Nicolaescu <dann@ics.uci.edu>
    # use of 'find' adapted from Lubomir Host <host8@kepler.fmph.uniba.sk>
    complete man \
-		 n@0@\`if\ \(-r\ $_man_dir/man0\)\ \\ls\ -1\ $_man_dir/man0\ \|\ sed\ s%\\\.0.\\\*\\\$%%\`@ \
+	    'n@1@`set q = "$MANPATH:as%:%/man1 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.1.\*\$%%`@'\
-		 n@1@\`if\ \(-r\ $_man_dir/man1\)\ \\ls\ -1\ $_man_dir/man1\ \|\ sed\ s%\\\.1.\\\*\\\$%%\`@ \
+	    'n@2@`set q = "$MANPATH:as%:%/man2 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.2.\*\$%%`@'\
-		 n@2@\`if\ \(-r\ $_man_dir/man2\)\ \\ls\ -1\ $_man_dir/man2\ \|\ sed\ s%\\\.2.\\\*\\\$%%\`@ \
+	    'n@3@`set q = "$MANPATH:as%:%/man3 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.3.\*\$%%`@'\
-		 n@3@\`if\ \(-r\ $_man_dir/man3\)\ \\ls\ -1\ $_man_dir/man3\ \|\ sed\ s%\\\.3.\\\*\\\$%%\`@ \
+	    'n@4@`set q = "$MANPATH:as%:%/man4 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.4.\*\$%%`@'\
-		 n@4@\`if\ \(-r\ $_man_dir/man4\)\ \\ls\ -1\ $_man_dir/man4\ \|\ sed\ s%\\\.4.\\\*\\\$%%\`@ \
+	    'n@5@`set q = "$MANPATH:as%:%/man5 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.5.\*\$%%`@'\
-		 n@5@\`if\ \(-r\ $_man_dir/man5\)\ \\ls\ -1\ $_man_dir/man5\ \|\ sed\ s%\\\.5.\\\*\\\$%%\`@ \
+	    'n@6@`set q = "$MANPATH:as%:%/man6 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.6.\*\$%%`@'\
-		 n@6@\`if\ \(-r\ $_man_dir/man6\)\ \\ls\ -1\ $_man_dir/man6\ \|\ sed\ s%\\\.6.\\\*\\\$%%\`@ \
+	    'n@7@`set q = "$MANPATH:as%:%/man7 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.7.\*\$%%`@'\
-		 n@7@\`if\ \(-r\ $_man_dir/man7\)\ \\ls\ -1\ $_man_dir/man7\ \|\ sed\ s%\\\.7.\\\*\\\$%%\`@ \
+	    'n@8@`set q = "$MANPATH:as%:%/man8 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.8.\*\$%%`@'\
-		 n@8@\`if\ \(-r\ $_man_dir/man8\)\ \\ls\ -1\ $_man_dir/man8\ \|\ sed\ s%\\\.8.\\\*\\\$%%\`@ \
+	    'n@9@`set q = "$MANPATH:as%:%/man9 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.9.\*\$%%`@'\
-		 n@9@\`if\ \(-r\ $_man_dir/man9\)\ \\ls\ -1\ $_man_dir/man9\ \|\ sed\ s%\\\.9.\\\*\\\$%%\`@ \
+	    'n@0@`set q = "$MANPATH:as%:%/man0 %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.0.\*\$%%`@'\
-	       n@new@\`if\ \(-r\ $_man_dir/mann\)\ \\ls\ -1\ $_man_dir/mann\ \|\ sed\ s%\\\.n.\\\*\\\$%%\`@ \
+	    'n@n@`set q = "$MANPATH:as%:%/mann %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.n.\*\$%%`@'\
-	       n@old@\`if\ \(-r\ $_man_dir/mano\)\ \\ls\ -1\ $_man_dir/mano\ \|\ sed\ s%\\\.o.\\\*\\\$%%\`@ \
+	    'n@o@`set q = "$MANPATH:as%:%/mano %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.o.\*\$%%`@'\
-	     n@local@\`if\ \(-r\ $_man_dir/manl\)\ \\ls\ -1\ $_man_dir/manl\ \|\ sed\ s%\\\.l.\\\*\\\$%%\`@ \
+	    'n@l@`set q = "$MANPATH:as%:%/manl %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.l.\*\$%%`@'\
-	    n@public@\`if\ \(-r\ $_man_dir/manp\)\ \\ls\ -1\ $_man_dir/manp\ \|\ sed\ s%\\\.p.\\\*\\\$%%\`@ \
+	    'n@p@`set q = "$MANPATH:as%:%/manp %" ; \ls -1 $q |& sed -e s%^.\*:.\*\$%% -e s%\\.p.\*\$%%`@'\
-	    c@-@"(- f k M P s t)"@ n@-f@c@ n@-k@x:'<keyword>'@ n@-[MP]@d@ \
+	    c@-@"(- f k M P s S t)"@ n@-f@c@ n@-k@x:'<keyword>'@ n@-[MP]@d@   \
-	    n@-s@\`\\ls\ -1\ $_man_dir\ \|\ sed\ -n\ s%man%%p\`@ \
+	    'N@-[MP]@`\ls -1 $:-1/man? |& sed -n s%\\..\\+\$%%p`@'            \
-	    N@-[MP]@'`\ls -1 $:-1/man? | sed s%\\..\*\$%%`'@ n@*@c@
+	    'n@-[sS]@`\ls -1 $MANPATH:as%:% % |& sed -n s%^man%%p | sort -u`@'\
-    unset _man_dir
+	    'n@*@`find $MANPATH:as%:% % \( -type f -o -type l \) -printf "%f " |& sed -e "s%find: .*: No such file or directory%%" -e "s%\([^\.]\+\)\.\([^ ]*\) %\1 %g"`@'
 	    #n@*@c@ # old way -- commands only
    complete ps	        c/-t/x:'<tty>'/ c/-/"(a c C e g k l S t u v w x)"/ \
 			n/-k/x:'<kernel>'/ N/-k/x:'<core_file>'/ n/*/x:'<PID>'/
@ -686,15 +696,27 @@ if ($?_complete) then
    complete uudecode	c/-/"(f)"/ n/-f/f:*.{uu,UU}/ p/1/f:*.{uu,UU}/ n/*/n/
    complete xhost	c/[+-]/\$hosts/ n/*/\$hosts/
    complete xpdf	c/-/"(z g remote raise quit cmap rgb papercolor       \
 			      eucjp t1lib freetype ps paperw paperh level1    \
 			      upw fullscreen cmd q v h help)"/                \
 			n/-z/x:'<zoom (-5 .. +5) or "page" or "width">'/      \
 			n/-g/x:'<geometry>'/ n/-remote/x:'<name>'/            \
 			n/-rgb/x:'<number>'/ n/-papercolor/x:'<color>'/       \
 			n/-{t1lib,freetype}/x:'<font_type>'/                  \
 			n/-ps/x:'<PS_file>'/ n/-paperw/x:'<width>'/           \
 			n/-paperh/x:'<height>'/ n/-upw/x:'<password>'/        \
 			n/-/f:*.{pdf,PDF}/                                    \
 			N/-{z,g,remote,rgb,papercolor,t1lib,freetype,ps,paperw,paperh,upw}/f:*.{pdf,PDF}/ \
 			N/-/x:'<page>'/ p/1/f:*.{pdf,PDF}/ p/2/x:'<page>'/
    # these conform to the latest GNU versions available at press time ...
    # updates by John Gotts <jgotts@engin.umich.edu>
    if (-X emacs) then
      # TW note:  if your version of GNU Emacs supports the "--version" option,
      #           uncomment this line and comment the next to automatically
-      #           detect the version, else replace "20.7" with your version.
+      #           detect the version, else replace "21.2" with your version.
-      #set _emacs_ver=`emacs --version | head -1 | sed 's%GNU Emacs %%' | cut -d . -f1-2`
+      #set _emacs_ver=`emacs --version | sed -e 's%GNU Emacs %%' -e q | cut -d . -f1-2`
-      set _emacs_ver=20.7
+      set _emacs_ver=21.2
      set _emacs_dir=`which emacs | sed s%/bin/emacs%%` 
      complete emacs	c/--/"(batch terminal display no-windows no-init-file \
                               user debug-init unibyte multibyte version help \
@ -707,6 +729,7 @@ if ($?_complete) then
      unset _emacs_ver _emacs_dir
    endif
    # if your "zcat" is the GNU version, change "gzcat" below to just "zcat"
    complete gzcat	c/--/"(force help license quiet version)"/ \
 			c/-/"(f h L q V -)"/ n/*/f:*.{gz,Z,z,zip}/
    complete gzip	c/--/"(stdout to-stdout decompress uncompress \
@ -777,6 +800,11 @@ if ($?_complete) then
 			p/1/x:'<fixed_string>'/ N/-*e/f/ \
 			n/-*e/x:'<fixed_string>'/ n/-*f/f/ n/*/f/
    complete sed	c/--/"(quiet silent version help expression file)"/   \
 			c/-/"(n V e f -)"/ n/{-e,--expression}/x:'<script>'/  \
 			n/{-f,--file}/f:*.sed/ N/-{e,f,-{file,expression}}/f/ \
 			n/-/x:'<script>'/ N/-/f/ p/1/x:'<script>'/ p/2/f/
    complete users	c/--/"(help version)"/ p/1/x:'<accounting_file>'/
    complete who	c/--/"(heading idle count mesg message writable help \
    			version)"/ c/-/"(H i m q s T w u -)"/ \
--- a/contrib/tcsh/config.guess
+++ b/contrib/tcsh/config.guess
--- a/contrib/tcsh/config.sub
+++ b/contrib/tcsh/config.sub
@ -1,6 +1,10 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
+# Configuration validation subroutine script.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 timestamp='2002-07-03'
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@ -25,6 +29,9 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@ -45,30 +52,73 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
-if [ x$1 = x ]
+me=`echo "$0" | sed -e 's,.*/,,'`
 then
 	echo Configuration name missing. 1>&2
 	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
 	echo "or     $0 ALIAS" 1>&2
 	echo where ALIAS is a recognized configuration type. 1>&2
 	exit 1
 fi
-# First pass through any local machine types.
+usage="\
-case $1 in
+Usage: $0 [OPTION] CPU-MFR-OPSYS
-	*local*)
+       $0 [OPTION] ALIAS
-		echo $1
+
-		exit 0
+Canonicalize a configuration name.
-		;;
+
-	*)
+Operation modes:
-	;;
+  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit
 Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 help="
 Try \`$me --help' for more information."
 # Parse command line
 while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
       echo "$timestamp" ; exit 0 ;;
    --version | -v )
       echo "$version" ; exit 0 ;;
    --help | --h* | -h )
       echo "$usage"; exit 0 ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
       break ;;
    -* )
       echo "$me: invalid option $1$help"
       exit 1 ;;
    *local*)
       # First pass through any local machine types.
       echo $1
       exit 0;;
    * )
       break ;;
  esac
 done
 case $# in
 0) echo "$me: missing argument$help" >&2
    exit 1;;
 1) ;;
 *) echo "$me: too many arguments$help" >&2
    exit 1;;
 esac
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  linux-gnu*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@ -94,7 +144,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@ -108,6 +158,14 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
 	-chorusos*)
 		os=-chorusos
 		basic_machine=$1
 		;;
 	-chorusrdb)
 		os=-chorusrdb
 		basic_machine=$1
 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@ -166,27 +224,58 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+	1750a | 580 \
-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+	| a29k \
-		| 580 | i960 | h8300 \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+	| c4x | clipper \
-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+	| d10v | d30v | dlx | dsp16xx \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+	| fr30 | frv \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-		| mips64vr5000 | miprs64vr5000el | mcore \
+	| i370 | i860 | i960 | ia64 \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+	| ip2k \
-		| thumb | d10v | fr30)
+	| m32r | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
 	| mips64orion | mips64orionel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| ns16k | ns32k \
 	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[34567]86)
+	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@ -195,24 +284,54 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	# FIXME: clean up the formatting here.
+	580-* \
-	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+	| a29k-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	      | xmp-* | ymp-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+	| avr-* \
-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+	| bs2000-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	      | clipper-* | orion-* \
+	| clipper-* | cydra-* \
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	| d10v-* | d30v-* | dlx-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+	| elxsi-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+	| h8300-* | h8500-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	      | f301-* | armv*-* | t3e-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+	| ip2k-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
+	| m32r-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
 	| mips64orion-* | mips64orionel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipstx39 | mipstx39el \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
 	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
 	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@ -249,14 +368,14 @@ case $basic_machine in
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-sysv4
 		;;
 	apollo68)
@ -275,6 +394,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@ -295,27 +418,30 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
+	cray | j90)
-		basic_machine=ymp-cray
+		basic_machine=j90-cray
 		os=-unicos
 		;;
 	cray2)
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
 	[ctj]90-cray)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
 	decsystem10* | dec10*)
 		basic_machine=pdp10-dec
 		os=-tops10
 		;;
 	decsystem20* | dec20*)
 		basic_machine=pdp10-dec
 		os=-tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@ -357,6 +483,10 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
 	go32)
 		basic_machine=i386-pc
 		os=-go32
 		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@ -432,19 +562,19 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@ -456,17 +586,6 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
 	i386-go32 | go32)
 		basic_machine=i386-unknown
 		os=-go32
 		;;
 	i386-mingw32 | mingw32)
 		basic_machine=i386-unknown
 		os=-mingw32
 		;;
 	i386-qnx | qnx)
 		basic_machine=i386-qnx
 		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@ -492,6 +611,10 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@ -499,26 +622,26 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
 	mipsel*-linux*)
 		basic_machine=mipsel-unknown
 		os=-linux-gnu
 		;;
 	mips*-linux*)
 		basic_machine=mips-unknown
 		os=-linux-gnu
 		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
 	mmix*)
 		basic_machine=mmix-knuth
 		os=-mmixware
 		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
 	morphos)
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
 	msdos)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-msdos
 		;;
 	mvs)
@ -582,13 +705,24 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
 	nonstopux)
 		basic_machine=mips-compaq
 		os=-nonstopux
 		;;
 	np1)
 		basic_machine=np1-gould
 		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
 	or32 | or32-*)
 		basic_machine=or32-unknown
 		os=-coff
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@ -614,28 +748,28 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i786-pc
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=rs6000-ibm
+	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
 	        ;;
@ -647,9 +781,23 @@ case $basic_machine in
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 	        ;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
 	        ;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
 	pw32)
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@ -660,6 +808,12 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
 	s390 | s390-*)
 		basic_machine=s390-ibm
 		;;
 	s390x | s390x-*)
 		basic_machine=s390x-ibm
 		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@ -671,7 +825,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@ -729,20 +883,40 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
        sv1)
 		basic_machine=sv1-cray
 		os=-unicos
 		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
-	t3e)
+	t3d)
-		basic_machine=t3e-cray
+		basic_machine=alpha-cray
 		os=-unicos
 		;;
 	t3e)
 		basic_machine=alphaev5-cray
 		os=-unicos
 		;;
 	t90)
 		basic_machine=t90-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
 	toad1)
 		basic_machine=pdp10-xkl
 		os=-tops20
 		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@ -789,13 +963,17 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xmp)
+	windows32)
-		basic_machine=xmp-cray
+		basic_machine=i386-pc
-		os=-unicos
+		os=-windows32-msvcrt
 		;;
        xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
 		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@ -816,13 +994,6 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
 	mips)
 		if [ x$os = x-linux-gnu ]; then
 			basic_machine=mips-unknown
 		else
 			basic_machine=mips-mips
 		fi
 		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@ -832,13 +1003,23 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
 	pdp10)
 		# there are many clones, so DEC is not a safe bet
 		basic_machine=pdp10-unknown
 		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc | sparcv9)
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
 		basic_machine=sh-unknown
 		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
        cydra)
@ -860,6 +1041,9 @@ case $basic_machine in
 		basic_machine=c4x-none
 		os=-coff
 		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@ -916,14 +1100,31 @@ case $os in
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
 		    x86-* | i*86-*)
 			;;
 		    *)
 			os=-nto$os
 			;;
 		esac
 		;;
 	-nto*)
 		os=-nto-qnx
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
@ -940,6 +1141,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
 	-wince*)
 		os=-wince
 		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@ -955,15 +1159,24 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
 	-atheos*)
 		os=-atheos
 		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
 	-nova*)
 		os=-rtmk-nova
 		;;
 	-ns2 )
 	        os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
@ -977,9 +1190,6 @@ case $os in
 	-oss*)
 		os=-sysv3
 		;;
        -qnx)
 		os=-qnx4
 		;;
 	-svr4)
 		os=-sysv4
 		;;
@ -1001,7 +1211,7 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -*MiNT)
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 	        os=-mint
 		;;
 	-none)
@ -1035,6 +1245,10 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
        pdp11-*)
 		os=-none
 		;;
@ -1062,6 +1276,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
 	or32-*)
 		os=-coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@ -1143,7 +1360,7 @@ case $basic_machine in
 	*-masscomp)
 		os=-rtu
 		;;
-	f301-fujitsu)
+	f30[01]-fujitsu | f700-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@ -1209,7 +1426,7 @@ case $basic_machine in
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)
@ -1221,12 +1438,23 @@ case $basic_machine in
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -*MiNT)
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
 			-vos*)
 				vendor=stratus
 				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 echo $basic_machine$os
 exit 0
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
--- a/contrib/tcsh/config/bsd4.4
+++ b/contrib/tcsh/config/bsd4.4
@ -129,6 +129,7 @@
 /*
 * _PATH_TCSHELL      if you've change the installation location (vix)
 */
 #include <sys/param.h>
 # ifdef _BSDI_VERSION >= 199701
 #  define _PATH_TCSHELL "/bin/tcsh"
 #  undef SYSMALLOC
--- a/contrib/tcsh/config_f.h
+++ b/contrib/tcsh/config_f.h
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/config_f.h,v 3.23 2000/06/11 02:14:10 kim Exp $ */
+/* $Header: /src/pub/tcsh/config_f.h,v 3.25 2002/03/08 17:36:45 christos Exp $ */
 /*
 * config_f.h -- configure various defines for tcsh
 *
@ -19,11 +19,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -176,6 +172,11 @@
 */
 #undef COLORCAT
 /*
 * FILEC    support for old style file completion
 */
 #define FILEC
 /*
 * RCSID	This defines if we want rcs strings in the binary or not
 *
--- a/contrib/tcsh/configure
+++ b/contrib/tcsh/configure
@ -671,6 +671,11 @@ case "${host}" in
    tcsh_config_file=bsd4.4
  ;;
  ## Mac OS X Server
  *-*-darwin* )
    tcsh_config_file=bsd4.4
  ;;
  ## Silicon Graphics machines
  *-sgi-iri* )
    tcsh_config_file=irix
@ -792,7 +797,7 @@ echo "Tcsh will use configuration file \`$tcsh_config_file'."
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:796: checking for $ac_word" >&5
+echo "configure:801: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -822,7 +827,7 @@ if test -z "$CC"; then
  # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:826: checking for $ac_word" >&5
+echo "configure:831: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -873,7 +878,7 @@ fi
      # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:877: checking for $ac_word" >&5
+echo "configure:882: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -905,7 +910,7 @@ fi
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:909: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:914: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@ -916,12 +921,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 cat > conftest.$ac_ext << EOF
-#line 920 "configure"
+#line 925 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  ac_cv_prog_cc_works=yes
  # If we can't run a trivial program, we are probably using a cross compiler.
  if (./conftest; exit) 2>/dev/null; then
@ -947,12 +952,12 @@ if test $ac_cv_prog_cc_works = no; then
  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:951: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:956: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:956: checking whether we are using GNU C" >&5
+echo "configure:961: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -961,7 +966,7 @@ else
  yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
  ac_cv_prog_gcc=yes
 else
  ac_cv_prog_gcc=no
@ -980,7 +985,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:984: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:989: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -1012,7 +1017,7 @@ else
 fi
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1016: checking how to run the C preprocessor" >&5
+echo "configure:1021: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
  CPP=
@ -1027,13 +1032,13 @@ else
  # On the NeXT, cc -E runs the code through the compiler's parser,
  # not just through cpp.
  cat > conftest.$ac_ext <<EOF
-#line 1031 "configure"
+#line 1036 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  :
@ -1044,13 +1049,13 @@ else
  rm -rf conftest*
  CPP="${CC-cc} -E -traditional-cpp"
  cat > conftest.$ac_ext <<EOF
-#line 1048 "configure"
+#line 1053 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  :
@ -1061,13 +1066,13 @@ else
  rm -rf conftest*
  CPP="${CC-cc} -nologo -E"
  cat > conftest.$ac_ext <<EOF
-#line 1065 "configure"
+#line 1070 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  :
@ -1093,13 +1098,13 @@ echo "$ac_t""$CPP" 1>&6
 if test $ac_cv_prog_gcc = yes; then
    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:1097: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:1102: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
    ac_pattern="Autoconf.*'x'"
  cat > conftest.$ac_ext <<EOF
-#line 1103 "configure"
+#line 1108 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@ -1117,7 +1122,7 @@ rm -f conftest*
  if test $ac_cv_prog_gcc_traditional = no; then
    cat > conftest.$ac_ext <<EOF
-#line 1121 "configure"
+#line 1126 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@ -1153,14 +1158,14 @@ esac
 echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6
-echo "configure:1157: checking for library containing crypt" >&5
+echo "configure:1162: checking for library containing crypt" >&5
 if eval "test \"`echo '$''{'ac_cv_search_crypt'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_crypt="no"
 cat > conftest.$ac_ext <<EOF
-#line 1164 "configure"
+#line 1169 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1171,7 +1176,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:1175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_crypt="none required"
 else
@ -1182,7 +1187,7 @@ rm -f conftest*
 test "$ac_cv_search_crypt" = "no" && for i in crypt; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1186 "configure"
+#line 1191 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1193,7 +1198,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:1197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_crypt="-l$i"
 break
@ -1215,14 +1220,14 @@ else :
 fi
 echo $ac_n "checking for library containing tgetent""... $ac_c" 1>&6
-echo "configure:1219: checking for library containing tgetent" >&5
+echo "configure:1224: checking for library containing tgetent" >&5
 if eval "test \"`echo '$''{'ac_cv_search_tgetent'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_tgetent="no"
 cat > conftest.$ac_ext <<EOF
-#line 1226 "configure"
+#line 1231 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1233,7 +1238,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:1237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_tgetent="none required"
 else
@ -1244,7 +1249,7 @@ rm -f conftest*
 test "$ac_cv_search_tgetent" = "no" && for i in termlib curses termcap; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1248 "configure"
+#line 1253 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1255,7 +1260,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_tgetent="-l$i"
 break
@ -1277,14 +1282,14 @@ else :
 fi
 echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6
-echo "configure:1281: checking for library containing gethostbyname" >&5
+echo "configure:1286: checking for library containing gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_gethostbyname="no"
 cat > conftest.$ac_ext <<EOF
-#line 1288 "configure"
+#line 1293 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1295,7 +1300,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_gethostbyname="none required"
 else
@ -1306,7 +1311,7 @@ rm -f conftest*
 test "$ac_cv_search_gethostbyname" = "no" && for i in nsl; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1310 "configure"
+#line 1315 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1317,7 +1322,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_gethostbyname="-l$i"
 break
@ -1339,14 +1344,14 @@ else :
 fi
 echo $ac_n "checking for library containing connect""... $ac_c" 1>&6
-echo "configure:1343: checking for library containing connect" >&5
+echo "configure:1348: checking for library containing connect" >&5
 if eval "test \"`echo '$''{'ac_cv_search_connect'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_connect="no"
 cat > conftest.$ac_ext <<EOF
-#line 1350 "configure"
+#line 1355 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1357,7 +1362,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:1361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_connect="none required"
 else
@ -1368,7 +1373,7 @@ rm -f conftest*
 test "$ac_cv_search_connect" = "no" && for i in socket; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1372 "configure"
+#line 1377 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1379,7 +1384,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:1383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_connect="-l$i"
 break
@ -1401,6 +1406,38 @@ else :
 fi
 echo $ac_n "checking ss_family in sockaddr_storage""... $ac_c" 1>&6
 echo "configure:1411: checking ss_family in sockaddr_storage" >&5
 if eval "test \"`echo '$''{'ac_cv_ss_family'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
 #line 1416 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 int main() {
 struct sockaddr_storage ss; ss.ss_family;
 ; return 0; }
 EOF
 if { (eval echo configure:1424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_ss_family=yes
 else
  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
  rm -rf conftest*
  ac_cv_ss_family=no
 fi
 rm -f conftest*
 if test "$ac_cv_ss_family" = no; then
  DFLAGS="$DFLAGS -DNO_SS_FAMILY"
 fi
 fi
 echo "$ac_t""$ac_cv_ss_family" 1>&6
 # Check whether --with-hesiod or --without-hesiod was given.
@ -1414,12 +1451,12 @@ fi
 if test "$hesiod" != no; then
  HESLIB="-lhesiod"
  echo $ac_n "checking for res_send""... $ac_c" 1>&6
-echo "configure:1418: checking for res_send" >&5
+echo "configure:1455: checking for res_send" >&5
 if eval "test \"`echo '$''{'ac_cv_func_res_send'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1423 "configure"
+#line 1460 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char res_send(); below.  */
@ -1442,7 +1479,7 @@ res_send();
 ; return 0; }
 EOF
-if { (eval echo configure:1446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_res_send=yes"
 else
@ -1460,7 +1497,7 @@ if eval "test \"`echo '$ac_cv_func_'res_send`\" = yes"; then
 else
  echo "$ac_t""no" 1>&6
 echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6
-echo "configure:1464: checking for res_send in -lresolv" >&5
+echo "configure:1501: checking for res_send in -lresolv" >&5
 ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -1468,7 +1505,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1472 "configure"
+#line 1509 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -1479,7 +1516,7 @@ int main() {
 res_send()
 ; return 0; }
 EOF
-if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
--- a/contrib/tcsh/configure.in
+++ b/contrib/tcsh/configure.in
@ -115,6 +115,11 @@ case "${host}" in
    tcsh_config_file=bsd4.4
  ;;
  ## Mac OS X Server
  *-*-darwin* )
    tcsh_config_file=bsd4.4
  ;;
  ## Silicon Graphics machines
  *-sgi-iri* )
    tcsh_config_file=irix
@ -301,7 +306,16 @@ dnl else
 dnl   ipv6_cv_$1=no
 dnl   ifelse([$3], , :, [$3])
 dnl fi])
-dnl IPv6_CHECK_FUNC(getaddrinfo, DFLAGS="$DFLAGS -DINET6")
+dnl IPv6_CHECK_FUNC(getnameinfo, DFLAGS="$DFLAGS -DINET6")
 AC_CACHE_CHECK([ss_family in sockaddr_storage], ac_cv_ss_family,
 [AC_TRY_COMPILE([#include <sys/types.h>
 #include <sys/socket.h>], [struct sockaddr_storage ss; ss.ss_family;],
  ac_cv_ss_family=yes, ac_cv_ss_family=no)]
 if test "$ac_cv_ss_family" = no; then
  DFLAGS="$DFLAGS -DNO_SS_FAMILY"
 fi
 )
 AC_SUBST(DFLAGS)
--- a/contrib/tcsh/ed.chared.c
+++ b/contrib/tcsh/ed.chared.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.chared.c,v 3.70 2001/09/02 21:06:02 christos Exp $ */
+/* $Header: /src/pub/tcsh/ed.chared.c,v 3.71 2002/03/08 17:36:45 christos Exp $ */
 /*
 * ed.chared.c: Character editing functions.
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -76,7 +72,7 @@
 #include "sh.h"
-RCSID("$Id: ed.chared.c,v 3.70 2001/09/02 21:06:02 christos Exp $")
+RCSID("$Id: ed.chared.c,v 3.71 2002/03/08 17:36:45 christos Exp $")
 #include "ed.h"
 #include "tw.h"
--- a/contrib/tcsh/ed.decls.h
+++ b/contrib/tcsh/ed.decls.h
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.decls.h,v 3.30 2001/02/19 23:30:43 kim Exp $ */
+/* $Header: /src/pub/tcsh/ed.decls.h,v 3.31 2002/03/08 17:36:45 christos Exp $ */
 /*
 * ed.decls.h: Editor external definitions
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
--- a/contrib/tcsh/ed.defns.c
+++ b/contrib/tcsh/ed.defns.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.defns.c,v 3.38 2001/04/26 19:07:47 kim Exp $ */
+/* $Header: /src/pub/tcsh/ed.defns.c,v 3.39 2002/03/08 17:36:45 christos Exp $ */
 /*
 * ed.defns.c: Editor function definitions and initialization
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -36,7 +32,7 @@
 */
 #include "sh.h"
-RCSID("$Id: ed.defns.c,v 3.38 2001/04/26 19:07:47 kim Exp $")
+RCSID("$Id: ed.defns.c,v 3.39 2002/03/08 17:36:45 christos Exp $")
 #include "ed.h"
--- a/contrib/tcsh/ed.h
+++ b/contrib/tcsh/ed.h
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.h,v 3.31 2001/02/19 23:30:44 kim Exp $ */
+/* $Header: /src/pub/tcsh/ed.h,v 3.33 2002/07/06 22:28:13 christos Exp $ */
 /*
 * ed.h: Editor declarations and globals
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -187,39 +183,6 @@ EXTERN Char T_HasMeta;		/* true if we have a meta key */
 #define min(x,y)	(((x)<(y))?(x):(y))
 #define max(x,y)	(((x)>(y))?(x):(y))
 /*
 * Terminal dependend data structures
 */
 typedef struct {
 #ifdef WINNT_NATIVE
    int dummy;
 #else /* !WINNT_NATIVE */
 # if defined(POSIX) || defined(TERMIO)
 #  ifdef POSIX
    struct termios d_t;
 #  else
    struct termio d_t;
 #  endif /* POSIX */
 # else /* SGTTY */
 #  ifdef TIOCGETP
    struct sgttyb d_t;
 #  endif /* TIOCGETP */
 #  ifdef TIOCGETC
    struct tchars d_tc;
 #  endif /* TIOCGETC */
 #  ifdef TIOCGPAGE
    struct ttypagestat d_pc;
 #  endif /* TIOCGPAGE */
 #  ifdef TIOCLGET
    int d_lb;
 #  endif /* TIOCLGET */
 # endif /* POSIX || TERMIO */
 # ifdef TIOCGLTC
    struct ltchars d_ltc;
 # endif /* TIOCGLTC */
 #endif /* WINNT_NATIVE */
 } ttydata_t;
 #define MODE_INSERT	0
 #define MODE_REPLACE	1
 #define MODE_REPLACE_1	2
@ -250,6 +213,7 @@ typedef struct {
 } ttyperm_t[NN_IO][M_NN];
 extern ttyperm_t ttylist;
 #include "ed.term.h"
 #include "ed.decls.h"
 #endif /* _h_ed */
--- a/contrib/tcsh/ed.init.c
+++ b/contrib/tcsh/ed.init.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.init.c,v 3.44 2001/02/19 23:30:44 kim Exp $ */
+/* $Header: /src/pub/tcsh/ed.init.c,v 3.48 2002/07/06 22:28:13 christos Exp $ */
 /*
 * ed.init.c: Editor initializations
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -36,10 +32,9 @@
 */
 #include "sh.h"
-RCSID("$Id: ed.init.c,v 3.44 2001/02/19 23:30:44 kim Exp $")
+RCSID("$Id: ed.init.c,v 3.48 2002/07/06 22:28:13 christos Exp $")
 #include "ed.h"
 #include "ed.term.h"
 #include "tc.h"
 #include "ed.defns.h"
@ -145,7 +140,7 @@ int snum;
    if (snum > 0)
      sigset(snum, window_change);
 #endif /* UNRELSIGS */
-    check_window_size(0);
+    windowchg = 1;
 #ifndef SIGVOID
    return (snum);
 #endif 
@ -197,7 +192,7 @@ ed_Setup(rst)
    vdisable = (unsigned char) _POSIX_VDISABLE;
 #endif /* POSIX && _PC_VDISABLE && !BSD4_4 && !WINNT_NATIVE */
-    if ((imode = adrof(STRinputmode)) != NULL) {
+    if ((imode = adrof(STRinputmode)) != NULL && imode->vec != NULL) {
 	if (!Strcmp(*(imode->vec), STRinsert))
 	    inputmode = MODE_INSERT;
 	else if (!Strcmp(*(imode->vec), STRoverwrite))
--- a/contrib/tcsh/ed.inputl.c
+++ b/contrib/tcsh/ed.inputl.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.inputl.c,v 3.49 2000/11/11 23:03:34 christos Exp $ */
+/* $Header: /src/pub/tcsh/ed.inputl.c,v 3.51 2002/06/25 19:02:11 christos Exp $ */
 /*
 * ed.inputl.c: Input line handling.
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -36,7 +32,7 @@
 */
 #include "sh.h"
-RCSID("$Id: ed.inputl.c,v 3.49 2000/11/11 23:03:34 christos Exp $")
+RCSID("$Id: ed.inputl.c,v 3.51 2002/06/25 19:02:11 christos Exp $")
 #include "ed.h"
 #include "ed.defns.h"		/* for the function names */
@ -110,7 +106,7 @@ Inputl()
    if (GettingInput)
 	MacroLvl = -1;		/* editor was interrupted during input */
-    if (imode) {
+    if (imode && imode->vec != NULL) {
 	if (!Strcmp(*(imode->vec), STRinsert))
 	    inputmode = MODE_INSERT;
 	else if (!Strcmp(*(imode->vec), STRoverwrite))
@ -229,7 +225,7 @@ Inputl()
 	    curlen = 0;
 	    curchoice = -1;
 	    matchval = 1;
-	    if (crct && (!Strcmp(*(crct->vec), STRcmd) ||
+	    if (crct && crct->vec != NULL && (!Strcmp(*(crct->vec), STRcmd) ||
 			 !Strcmp(*(crct->vec), STRall))) {
                PastBottom();
 		copyn(Origin, InputBuf, INBUFSIZE);
@ -284,7 +280,8 @@ Inputl()
 		    }
 		    flush();
 		}
-	    } else if (crct && !Strcmp(*(crct->vec), STRcomplete)) {
+	    } else if (crct && crct->vec != NULL &&
 		!Strcmp(*(crct->vec), STRcomplete)) {
                if (LastChar > InputBuf && LastChar[-1] == '\n') {
                    LastChar[-1] = '\0';
                    LastChar--;
@ -397,12 +394,12 @@ Inputl()
 	    expnum = (int) (Cursor - InputBuf);
 	    switch (matchval = tenematch(InputBuf, Cursor-InputBuf, fn)){
 	    case 1:
-		if (non_unique_match && matchbeep &&
+		if (non_unique_match && matchbeep && matchbeep->vec != NULL &&
 		    (Strcmp(*(matchbeep->vec), STRnotunique) == 0))
 		    SoundBeep();
 		break;
 	    case 0:
-		if (matchbeep) {
+		if (matchbeep && matchbeep->vec != NULL) {
 		    if (Strcmp(*(matchbeep->vec), STRnomatch) == 0 ||
 			Strcmp(*(matchbeep->vec), STRambiguous) == 0 ||
 			Strcmp(*(matchbeep->vec), STRnotunique) == 0)
@ -417,7 +414,7 @@ Inputl()
 		    SoundBeep();
 		    break;
 		}
-		if (matchbeep) {
+		if (matchbeep && matchbeep->vec != NULL) {
 		    if ((Strcmp(*(matchbeep->vec), STRambiguous) == 0 ||
 			 Strcmp(*(matchbeep->vec), STRnotunique) == 0))
 			SoundBeep();
@ -430,7 +427,8 @@ Inputl()
 		 * (PWP: this is the best feature addition to tcsh I have 
 		 * seen in many months.)
 		 */
-		if (autol && (Strcmp(*(autol->vec), STRambiguous) != 0 || 
+		if (autol && autol->vec != NULL && 
 		    (Strcmp(*(autol->vec), STRambiguous) != 0 || 
 				     expnum == Cursor - InputBuf)) {
 		    PastBottom();
 		    fn = (retval == CC_COMPLETE_ALL) ? LIST_ALL : LIST;
--- a/contrib/tcsh/ed.refresh.c
+++ b/contrib/tcsh/ed.refresh.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.refresh.c,v 3.28 2000/11/11 23:03:34 christos Exp $ */
+/* $Header: /src/pub/tcsh/ed.refresh.c,v 3.29 2002/03/08 17:36:45 christos Exp $ */
 /*
 * ed.refresh.c: Lower level screen refreshing functions
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -36,7 +32,7 @@
 */
 #include "sh.h"
-RCSID("$Id: ed.refresh.c,v 3.28 2000/11/11 23:03:34 christos Exp $")
+RCSID("$Id: ed.refresh.c,v 3.29 2002/03/08 17:36:45 christos Exp $")
 #include "ed.h"
 /* #define DEBUG_UPDATE */
--- a/contrib/tcsh/ed.screen.c
+++ b/contrib/tcsh/ed.screen.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.screen.c,v 3.48 2000/11/11 23:03:34 christos Exp $ */
+/* $Header: /src/pub/tcsh/ed.screen.c,v 3.49 2002/03/08 17:36:45 christos Exp $ */
 /*
 * ed.screen.c: Editor/termcap-curses interface
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -36,7 +32,7 @@
 */
 #include "sh.h"
-RCSID("$Id: ed.screen.c,v 3.48 2000/11/11 23:03:34 christos Exp $")
+RCSID("$Id: ed.screen.c,v 3.49 2002/03/08 17:36:45 christos Exp $")
 #include "ed.h"
 #include "tc.h"
--- a/contrib/tcsh/ed.term.c
+++ b/contrib/tcsh/ed.term.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.term.c,v 1.26 2001/08/06 23:51:09 christos Exp $ */
+/* $Header: /src/pub/tcsh/ed.term.c,v 1.28 2002/07/06 22:28:13 christos Exp $ */
 /*
 * ed.term.c: Low level terminal interface
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -37,10 +33,9 @@
 #include "sh.h"
 #ifndef WINNT_NATIVE
-RCSID("$Id: ed.term.c,v 1.26 2001/08/06 23:51:09 christos Exp $")
+RCSID("$Id: ed.term.c,v 1.28 2002/07/06 22:28:13 christos Exp $")
 #include "ed.h"
 #include "ed.term.h"
 int didsetty = 0;
 ttyperm_t ttylist = {   
--- a/contrib/tcsh/ed.term.h
+++ b/contrib/tcsh/ed.term.h
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.term.h,v 1.13 1996/09/24 16:57:20 christos Exp $ */
+/* $Header: /src/pub/tcsh/ed.term.h,v 1.16 2002/07/06 22:28:13 christos Exp $ */
 /*
 * ed.term.h: Local terminal header
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -454,9 +450,10 @@
 /*
 * fix for hpux10 inconsistency: it has VWERASE, but TIOCSLTC returns
 * EINVAL if one tries to change it
 * Also for RH6.2 on the alpha, defined TIOCGLTC, but does not have
 * struct ltchars
 */
-#if defined(hpux) && defined(VSUSP) && defined(VDSUSP) && defined(VWERASE) && d
+#if (defined(hpux) && defined(VSUSP) && defined(VDSUSP) && defined(VWERASE) && defined(VLNEXT)) || defined(__linux__)
 efined(VLNEXT)
 # undef TIOCGLTC       /* not really needed */
 # undef TIOCSLTC
 #endif
@ -489,4 +486,37 @@ efined(VLNEXT)
 #define C_NCC		25
 #define C_SH(A)		(1 << (A))
 /*
 * Terminal dependend data structures
 */
 typedef struct {
 #ifdef WINNT_NATIVE
    int dummy;
 #else /* !WINNT_NATIVE */
 # if defined(POSIX) || defined(TERMIO)
 #  ifdef POSIX
    struct termios d_t;
 #  else
    struct termio d_t;
 #  endif /* POSIX */
 # else /* SGTTY */
 #  ifdef TIOCGETP
    struct sgttyb d_t;
 #  endif /* TIOCGETP */
 #  ifdef TIOCGETC
    struct tchars d_tc;
 #  endif /* TIOCGETC */
 #  ifdef TIOCGPAGE
    struct ttypagestat d_pc;
 #  endif /* TIOCGPAGE */
 #  ifdef TIOCLGET
    int d_lb;
 #  endif /* TIOCLGET */
 # endif /* POSIX || TERMIO */
 # ifdef TIOCGLTC
    struct ltchars d_ltc;
 # endif /* TIOCGLTC */
 #endif /* WINNT_NATIVE */
 } ttydata_t;
 #endif /* _h_ed_term */
--- a/contrib/tcsh/ed.xmap.c
+++ b/contrib/tcsh/ed.xmap.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.xmap.c,v 3.24 2001/04/27 22:37:03 christos Exp $ */
+/* $Header: /src/pub/tcsh/ed.xmap.c,v 3.25 2002/03/08 17:36:45 christos Exp $ */
 /*
 * ed.xmap.c: This module contains the procedures for maintaining
 *	      the extended-key map.
@ -70,11 +70,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -92,7 +88,7 @@
 */
 #include "sh.h"
-RCSID("$Id: ed.xmap.c,v 3.24 2001/04/27 22:37:03 christos Exp $")
+RCSID("$Id: ed.xmap.c,v 3.25 2002/03/08 17:36:45 christos Exp $")
 #include "ed.h"
 #include "ed.defns.h"
--- a/contrib/tcsh/gethost.c
+++ b/contrib/tcsh/gethost.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/gethost.c,v 1.7 1997/10/28 22:34:19 christos Exp $ */
+/* $Header: /src/pub/tcsh/gethost.c,v 1.8 2002/03/08 17:36:46 christos Exp $ */
 /*
 * gethost.c: Create version file from prototype
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -36,7 +32,7 @@
 */
 #include "sh.h"
-RCSID("$Id: gethost.c,v 1.7 1997/10/28 22:34:19 christos Exp $")
+RCSID("$Id: gethost.c,v 1.8 2002/03/08 17:36:46 christos Exp $")
 #ifdef SCO
 # define perror __perror
--- a/contrib/tcsh/glob.3
+++ b/contrib/tcsh/glob.3
@ -13,11 +13,7 @@
 .\" 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
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    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.
 .\"
--- a/contrib/tcsh/glob.c
+++ b/contrib/tcsh/glob.c
@ -13,11 +13,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
--- a/contrib/tcsh/glob.h
+++ b/contrib/tcsh/glob.h
@ -15,11 +15,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -75,7 +71,7 @@ typedef struct {
 #define	GLOB_NOMATCH	(-3)	/* No match, and GLOB_NOCHECK was not set. */
 #define	GLOB_NOSYS	(-4)	/* Implementation does not support function. */
-#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
+/* #if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) */
 #define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
 #define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
 #define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
@ -86,7 +82,7 @@ typedef struct {
 #define	GLOB_QUOTE	0x2000	/* XXX: source compatibility */
 #define	GLOB_ABEND	GLOB_ABORTED	/* source compatibility */
-#endif
+/* #endif */
 int	glob __P((const char *, int, int (*)(const char *, int), glob_t *));
 void	globfree __P((glob_t *));
--- a/contrib/tcsh/host.defs
+++ b/contrib/tcsh/host.defs
@ -1,5 +1,5 @@
 newcode	:
-/* $Header: /src/pub/tcsh/host.defs,v 1.31 2001/06/10 02:19:11 christos Exp $ */
+/* $Header: /src/pub/tcsh/host.defs,v 1.35 2002/07/23 16:13:21 christos Exp $ */
 /*
 * host.defs: Hosttype/Machtype etc.
 */
@ -15,11 +15,7 @@ newcode	:
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -37,7 +33,7 @@ newcode	:
 */
 #include "sh.h"
-RCSID("$Id: host.defs,v 1.31 2001/06/10 02:19:11 christos Exp $")
+RCSID("$Id: host.defs,v 1.35 2002/07/23 16:13:21 christos Exp $")
 endcode	:
@ -468,7 +464,7 @@ enddef	:
 newdef	: defined(__NetBSD__) 
 comment	: NetBSD
-vendor	: defined(arm32)				: "acorn"
+vendor	: defined(arm32) || defined(__arm__)		: "acorn"
 vendor	: defined(alpha)				: "digital"
 vendor	: defined(amiga)				: "commodore"
 vendor	: defined(atari)				: "atari"
@ -484,7 +480,9 @@ vendor	: defined(sun3)					: "sun"
 vendor	: defined(vax)					: "digital"
 hosttype: 						: "NetBSD"
 ostype	: 						: "NetBSD"
-machtype: defined(arm32)				: "arm32"
+machtype: defined(arm32) || defined(__APCS_32__)	: "arm32"
 machtype: defined(arm26) || defined(__APCS_26__)	: "arm26"
 machtype: defined(arm) || defined(__arm__)		: "arm"
 machtype: defined(sparc)				: "sparc"
 machtype: defined(mc68020)				: "m68k"
 machtype: defined(M_i386)				: "i386"
@ -727,12 +725,12 @@ machtype: defined(sparc)   || defined(__sparc__)	: "sparc"
 enddef	:
-newdef	: defined(__APPLE__)
+newdef	: defined(__APPLE__) && defined(__MACH__)
-comment	: Rhapsody
+comment	: OS X
 vendor	:						: "apple"
 hosttype: defined(__i386__)				: "intel-pc"
-hosttype: defined(__ppc__)				: "macintosh"
+hosttype: defined(__ppc__)				: "powermac"
-ostype	:						: "rhapsody"
+ostype	:						: "darwin"
 machtype: defined(__i386__)				: "i386"
 machtype: defined(__ppc__)				: "powerpc"
 enddef	:
--- a/contrib/tcsh/nls/finnish/set1
+++ b/contrib/tcsh/nls/finnish/set1
@ -1,4 +1,4 @@
-$ $Id: set1,v 1.1 2000/01/14 22:57:31 christos Exp $
+$ $Id: set1,v 1.2 2001/09/03 02:13:26 kim Exp $
 $ Error messages
 $set 1 
 1 Kielioppivirhe
@ -137,4 +137,4 @@ $set 1
 134 Käyttö: unlimit [-fh] [rajoitteet (limits)]
 135 Muuttujalle $%S ei voida asettaa arvoa
 136 Viitattua työtä ei ole
-137 Tuntematon colorls -muuttuja `%c%c'
+137 Tuntematon colorls-muuttuja `%c%c'
--- a/contrib/tcsh/nls/finnish/set20
+++ b/contrib/tcsh/nls/finnish/set20
@ -1,4 +1,4 @@
-$ $Id: set20,v 1.1 2000/01/14 22:57:32 christos Exp $
+$ $Id: set20,v 1.2 2001/09/03 02:14:04 kim Exp $
 $ tc.bind.c
 $set 20 
 1 Invalid key name `%S'\n
@ -6,13 +6,13 @@ $set 20
 3 Bad command name: %S\n
 4 Bad key spec %S\n
 5 Null string specification\n
-6 Standard key bindings\n
+6 Standard näppäinmäärittelyt\n
-7 Alternative key bindings\n
+7 Vaihtoehtoiset näppäinmäärittelyt\n
-8 Multi-character bindings\n
+8 Monimerkkiset määrittelyt\n
-9 Arrow key bindings\n
+9 Nuolinäppäinmäärittelyt\n
-10 %-15s->  is undefined\n
+10 %-15s->  ei ole määritelty\n
-11 BUG!!! %s isn't bound to anything.\n
+11 VIKA!!! %s ei ole määritelty mihinkään näppäimeen.\n
-12 Usage: bindkey [options] [--] [KEY [COMMAND]]\n
+12 Käyttö: bindkey [valitsimet] [--] [NÄPPÄIN [KOMENTO]]\n
 13     -a   list or bind KEY in alternative key map\n
 14     -b   interpret KEY as a C-, M-, F- or X- key name\n
 15     -s   interpret COMMAND as a literal string to be output\n
@ -25,8 +25,8 @@ $set 20
 22     -k   interpret KEY as a symbolic arrow-key name\n
 23     --   force a break from option processing\n
 24     -u   (or any invalid option) this message\n
-25 Without KEY or COMMAND, prints all bindings\n
+25 Ilman NÄPPÄINTÄ tai KOMENTOA tulostetaan kaikki määrittelyt\n
-26 Without COMMAND, prints the binding for KEY.\n
+26 Ilman KOMENTOA tulostetaan NÄPPÄIMEN määrittely.\n
 27 bad key specification -- null string\n
 28 bad key specification -- empty string\n
 29 Bad function-key specification.  Null key not allowed\n
@ -36,6 +36,6 @@ $set 20
 33 Bad function-key specification.\n
 34 Null key not allowed\n
 35 bad key specification -- unknown name "%S"\n
-36 usage: bind [KEY | COMMAND KEY | "emacs" | "vi" | "-a"]\n
+36 Käyttö: bind [NÄPPÄIN | KOMENTO NÄPPÄIN | "emacs" | "vi" | "-a"]\n
 37 Invalid function
 38  %s\t\tis undefined\n
--- a/contrib/tcsh/nls/pl/set1
+++ b/contrib/tcsh/nls/pl/set1
--- a/contrib/tcsh/nls/pl/set13
+++ b/contrib/tcsh/nls/pl/set13
@ -6,7 +6,7 @@ $set 13
 3 maska odpluskwiania = 0x%08x\n
 4 %d trafień, %d chybień, %d%%\n
 5 %S: polecenie wbudowane w powłokę.\n
-6 %S: nie znaleziono polecenia.\n
+6 %S: Nie znaleziono polecenia.\n
 7 gdzie: / w poleceniu nie ma sensu\n
 8 %S jest aliasem do 
 9 %S jest wbudowane w powłokę\n
--- a/contrib/tcsh/nls/pl/set17
+++ b/contrib/tcsh/nls/pl/set17
@ -4,7 +4,7 @@ $set 17
 1 PLUSKWA: czekam na zadanie pracujące w tle!\n
 2 Zakończono %d\n
 3 PLUSKWA: proces wywołany drugi raz
-4 Dzia³a 
+4 Running 
 5 Sygnał 
 6 Zwrócono %-25d
 7 Zakończony
--- a/contrib/tcsh/nls/pl/set19
+++ b/contrib/tcsh/nls/pl/set19
@ -2,12 +2,12 @@ $ $Id: set19,v 1.3 1996/04/26 20:31:58 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 n-bajtów=%d: Brak pamięci\n
-2 free(%lx) wywołany przed jakąkolwiek allokacją.
+2 free(%lx) wywo³any przez jak±kolwiek allokacj±.
-3 free(%lx) ponad obszarem pamięci.
+3 free(%lx) above top of memory.
-4 free(%lx) poniżej początku używanej pamięci.
+4 free(%lx) below bottom of memory.
-5 free(%lx) zły blok.
+5 free(%lx) bad block.
-6 free(%lx) złe sprawdzanie zasięgu.
+6 free(%lx) bad range check.
-7 free(%lx) zły index bloku.
+7 free(%lx) bad block index.
 8 %s aktualnie allokowana pamięć:\nwolna:\t
 9 \nużywane:\t
 10 \n\tAktualnie w użyciu: %d, wolnych: %d\n
--- a/contrib/tcsh/nls/pl/set2
+++ b/contrib/tcsh/nls/pl/set2
@ -10,59 +10,59 @@ $set 2
 7 Abort
 8 IOT trap
 9 System Crash Imminent
-10 Powrót z błędem
+10 Error exit
 11 EMT trap
 12 Floating exception
 13 Zabity
-14 1 sygnał użytkownika
+14 User signal 1
-15 2 sygnał użytkownika
+15 User signal 2
 16 Naruszenie ochrony pamiêci
 17 B³±d szyny
 18 Program range error
 19 Operand range error
 20 Nieprawid³owe wywo³anie systemowe
-21 Przerwany potok
+21 Broken pipe
 22 Alarm clock
 23 Zakoñczono
-24 Zmiana statusu potomka
+24 Child status change
 25 ¦mieræ potomka
-26 Błąd specyficzny dla Apollo
+26 Apollo-specific fault
 27 Potomek zakoñczy³ dzia³anie, lub zosta³ wy³±czony
 28 Potomek zakoñczy³ dzia³anie
 29 Brak zasilania
-30 Zasób stracony
+30 Resource Lost
 31 Przerwanie (Ctrl-Break)
 32 Input/output possible signal
 33 Asynchroniczne We/Wy (select)
-34 Pilne zdarzenie na kanale I/O
+34 Urgent condition on I/O channel
 35 Multitasking wake-up
 36 Multitasking kill
 37 Fortran asynchronous I/O completion
 38 Recovery
-39 Nienaprawialny błąd pamięci
+39 Uncorrectable memory error
 40 Limit czasu CPU przekroczony
 41 System shutdown imminent
 42 micro-tasking group-no wakeup flag set
 43 Thread error - (use cord -T for detailed info)
-44 Błąd rejestru parzystości dla CRAY Y-MP
+44 CRAY Y-MP register parity error
-45 Żądanie informacji
+45 Information request
 46 Zawieszony (sygna³)
 47 Zatrzymany (sygna³)
 48 Zawieszony
 49 Zatrzymany
-50 Kontynuowany
+50 Continued
-51 Zawieszony (oczekuje wejścia z tty)
+51 Suspended (tty input)
-52 Zatrzymany (oczekuje wejścia z tty)
+52 Stopped (tty input)
-53 Zawieszony (wyjście na tty)
+53 Suspended (tty output)
-54 Zatrzymany (wyjście na tty)
+54 Stopped (tty output)
 55 Window status changed
 56 Window size changed
 57 Phone status changed
-58 Limit czasu CPU wyczerpany
+58 Cputime limit exceeded
-59 Limit systemu plików wyczerpany
+59 Filesize limit exceeded
 60 Virtual time alarm
 61 Profiling time alarm
-62 sygnał DIL
+62 DIL signal
 63 Pollable event occured
 64 Process's lwps are blocked
 65 Special LWP signal
@ -87,14 +87,14 @@ $set 2
 84 Secure attention key
 85 Reschedule
 86 Signaling SS$_DEBUG
-87 Zmieniono priorytet
+87 Priority changed
 88 True deadlock detected
 89 New input character
-90 Limit stosu wyczerpany
+90 Stack limit exceeded
-91 Nieużywany sygnał
+91 Unused signal
 92 LM overlay
-93 system zamrożony
+93 system freeze
-94 system odmrożony
+94 system defreeze
 95 dead lock
 96 exceeded memory size limit
 97 exceeded data size limit
@ -102,8 +102,8 @@ $set 2
 99 exce error for no memory
 100 check point start
 101 check point start of kernel
-102 początek restartu
+102 restart start
-103 restart jądra
+103 restart of kernel
 104 exeeded XMU size limit
 105 exeeded RLG0 limit
 106 exeeded RLG1 limit
--- a/contrib/tcsh/nls/pl/set20
+++ b/contrib/tcsh/nls/pl/set20
@ -1,18 +1,18 @@
 $ $Id: set20,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tc.bind.c
 $set 20 
-1 Nieprawid這wa nazwa klawisza `%S'\n
+1 Invalid key name `%S'\n
-2 Nieprawid這wa nazwa klawisza: %S\n
+2 Bad key name: %S\n
-3 Nieprawid這wa nazwa polecenia: %S\n
+3 Bad command name: %S\n
 4 Bad key spec %S\n
 5 Null string specification\n
-6 Standardowe przyporz康kowania klawiszy\n
+6 Standard key bindings\n
-7 Alternatywne przyporz康kowania klawiszy\n
+7 Alternative key bindings\n
 8 Multi-character bindings\n
 9 Arrow key bindings\n
 10 %-15s->  is undefined\n
-11 Pluskwa!!! %s nie jest przyporz康kowany niczemu.\n
+11 BUG!!! %s isn't bound to anything.\n
-12 U篡cie: bindkey [opcje] [--] [Klawisz [POLECENIE]]\n
+12 Usage: bindkey [options] [--] [KEY [COMMAND]]\n
 13     -a   list or bind KEY in alternative key map\n
 14     -b   interpret KEY as a C-, M-, F- or X- key name\n
 15     -s   interpret COMMAND as a literal string to be output\n
@ -36,6 +36,6 @@ $set 20
 33 Bad function-key specification.\n
 34 Null key not allowed\n
 35 bad key specification -- unknown name "%S"\n
-36 u篡cie: bind [Klawisz | Klawisz polecenia | "emacs" | "vi" | "-a"]\n
+36 usage: bind [KEY | COMMAND KEY | "emacs" | "vi" | "-a"]\n
-37 Nieprawid這wa funkcja
+37 Invalid function
-38  %s\t\tjest niezdefiniowany\n
+38  %s\t\tis undefined\n
--- a/contrib/tcsh/nls/pl/set21
+++ b/contrib/tcsh/nls/pl/set21
@ -1,5 +1,5 @@
 $ $Id: set21,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tc.disc.c
 $set 21 
-1 Nie mogłem pobrać lokalnych znaków.\n
+1 Couldn't get local chars.\n
-2 Nie mogłem ustawić lokalnych znaków.\n
+2 Couldn't set local chars.\n
--- a/contrib/tcsh/nls/pl/set22
+++ b/contrib/tcsh/nls/pl/set22
@ -1,17 +1,17 @@
 $ $Id: set22,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tc.func.c
 $set 22 
-1 %S: \t jest aliasem do 
+1 %S: \t aliased to 
-2 \nNieprawidłowe hasło dla %s\n
+2 \nIncorrect passwd for %s\n
 3 Faulty alias 'precmd' removed.\n
 4 Faulty alias 'cwdcmd' removed.\n
 5 Faulty alias 'beepcmd' removed.\n
 6 Faulty alias 'periodic' removed.\n
-7 przetwarzam linię poleceń\n
+7 parsing command line\n
-8 Czy na pewno chcesz usunąć wszystkie pliki? [n/t] 
+8 Do you really want to delete all files? [n/y] 
-9 pomijam kasowanie plików!\n
+9 skipping deletion of files!\n
-10 linią poleceń jest teraz:\n
+10 command line now is:\n
-11 przetwarzam linię poleceń\n
+11 parsing command line\n
-12 w jednej z list\n
+12 in one of the lists\n
-13 linią poleceń jest teraz:\n
+13 command line now is:\n
-14 tT
+14 yY
--- a/contrib/tcsh/nls/pl/set23
+++ b/contrib/tcsh/nls/pl/set23
@ -3,7 +3,7 @@ $ tc.os.c
 $set 23 
 1 Bad cpu/site name
 2 Site path too long
-3 nieznany
+3 unknown
 4 site: %s\n
 5 %d: Nie znaleziono komputera\n
 6 setlocal: %s: %s\n
--- a/contrib/tcsh/nls/pl/set26
+++ b/contrib/tcsh/nls/pl/set26
@ -1,8 +1,8 @@
 $ $Id: set26,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tc.who.c
 $set 26 
-1 stat dla %s nie powiódł się.  Wpisz "unset watch".\n
+1 cannot stat %s.  Please "unset watch".\n
-2 Nie można otworzyć %s.  Wpisz "unset watch".\n
+2 %s cannot be opened.  Please "unset watch".\n
 3 BUG! last element is not whotail!\n
 4 backward: 
 5 BUG! first element is not whohead!\n
--- a/contrib/tcsh/nls/pl/set3
+++ b/contrib/tcsh/nls/pl/set3
--- a/contrib/tcsh/nls/pl/set30
+++ b/contrib/tcsh/nls/pl/set30
@ -7,10 +7,10 @@ $set 30
 4 %s: Internal match error.\n
 5 elementów
 6 wierszy
-7 Jest %d %s, pokazać je? [n/t] 
+7 Jest %d %s, pokazaæ je? [n/y] 
 8 looking = %d\n
 9 \ntcsh internal error: I don't know what I'm looking for!\n
 10 nie jest katalogiem
 11 nie zosta³ znaleziony
 12 jest nieczytelny
-13 tT
+13 yY
--- a/contrib/tcsh/nls/pl/set4
+++ b/contrib/tcsh/nls/pl/set4
@ -41,5 +41,5 @@ $set 4
 38 Can use physical tabs
 39 Number of lines
 40 Number of columns
-41 Posiada klawisz meta
+41 Has meta key
 42 Newline ignored at right margin
--- a/contrib/tcsh/nls/pl/set7
+++ b/contrib/tcsh/nls/pl/set7
@ -1,27 +1,27 @@
 $ $Id: set7,v 1.3 1996/04/26 20:32:04 christos Exp $
 $ ed.screen.c
 $set 7
-1 \n\tTcsh myśli że twoj terminal posiada\n
+1 \n\tTcsh thinks your terminal has the\n
-2 \tnastępującą charakterystykę:\n\n
+2 \tfollowing characteristics:\n\n
-3 \tMa %d kolumn i %d linii\n
+3 \tIt has %d columns and %d lines\n
-4 \tKlawisze meta: %sposiada\n
+4 \tIt has %s meta key\n
 5 a
-6 nie 
+6 no
-7 \tTabulatory: %spotrafi używać\n
+7 \tIt can%s use tabs\n
-8 nie 
+8 not
-9 \tAutomatyczne marginesy: %s\n
+9 \tIt %s automatic margins\n
-10 tak
+10 has
-11 nie
+11 does not have
-12 \tMagiczne marginesy: %s\n
+12 \tIt %s magic margins\n
-13 (puste)
+13 (empty)
-14 tak
+14 yes
-15 nie
+15 no
-16 ERROR: nie można usuwać\r\n
+16 ERROR: cannot delete\r\n
 17 DeleteChars: num is riduculous: %d\r\n
-18 ERROR: nie można wstawiać\r\n
+18 ERROR: cannot insert\r\n
 19 StartInsert: num is riduculous: %d\r\n
-20 %s: Nie można otworzyć /etc/termcap.\n
+20 %s: Cannot open /etc/termcap.\n
-21 %s: Brak wpisu dla terminala typu "%s"\n
+21 %s: No entry for terminal type "%s"\n
 22 %s: using dumb terminal settings.\n
 23 %s: WARNING: Your terminal cannot move up.\n
 24 Editing may be odd for long lines.\n
--- a/contrib/tcsh/nls/pl/set9
+++ b/contrib/tcsh/nls/pl/set9
@ -7,6 +7,6 @@ $set 9
 4 Unbound extended key "%S"\n
 5 Some extended keys too long for internal print buffer
 6 Enumerate: BUG!! Null ptr passed\n!
-7 brak wej¶cia
+7 no input
-8 Co¶ musi byæ za: %c\n
+8 Something must follow: %c\n
 9 Octal constant does not fit in a char.\n
--- a/contrib/tcsh/nls/russian/set1
+++ b/contrib/tcsh/nls/russian/set1
@ -1,4 +1,4 @@
-$ $Id: set1,v 1.1 2001/03/18 19:06:35 christos Exp $
+$ $Id: set1,v 1.3 2002/03/08 17:46:50 christos Exp $
 $ Error messages
 $set 1 
 1 Синтаксическая ошибка
@ -15,14 +15,14 @@ $set 1
 12 Отсутствует имя файла
 13 Внутренняя ошибка glob
 14 Команда не найдена
-15 íÁÌÏ ÁÒÇÕÍÅÎÔÏ×
+15 Слишком мало аргументов
-16 íÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×
+16 Слишком много аргументов
 17 Слишком опасно переопределять это
 18 Пустой if
 19 Неверный then
 20 Слова не в скобках
 21 %s не найдено
-22 îÅ×ÅÒÎÙÊ mask
+22 Неверное значение mask
 23 Нет такого предела
 24 Аргумент слишком велик
 25 Неверный или неизвестный фактор увеличения
@ -33,26 +33,26 @@ $set 1
 30 Имя переменной должно начинаться с буквы
 31 Слишком длинное имя переменной
 32 В имени переменной должны содержаться алфавитно-цифровые символы
-33 õÐÒÁ×ÌÅÎÉÅ ÚÁÄÁÎÉÑÍÉ × ÜÔÏÍ ÛÅÌÌÅ ÏÔÓÕÔÓ×ÕÅÔ
+33 Управление заданиями отсутствует в этом шелле
-34 óÉÎÔÁÈ ×ÙÒÁÖÅÎÉÑ
+34 Синтаксис выражения
-35 ïÔÓÕÔÓ×ÕÅÔ ÄÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ
+35 Отсутствует домашний каталог
 36 Не могу перейти в домашний каталог
 37 Пропущена команда
-38 ÷ ÐÒÉÓ×ÏÅÎÉÉ ÏÔÓÕÔÓ×ÕÅÔ ×ÙÒÁÖÅÎÉÅ
+38 В присвоении отсутствует выражение
 39 Неизвестный оператор
 40 Неоднозначно
 41 %s: Файл существует
-42 Argument for -c ends in backslash
+42 Аргумент для -c не должен оканчиваться на \
 43 Прервано
-44 Subscript out of range
+44 Подпрограмма выходит за пределы
 45 Переполнение строки
 46 Нет такого задания
-47 Can't from terminal
+47 Не могу из терминала
-48 Not in while/foreach
+48 Не внутри while/foreach
 49 Нет больше процессов
-50 No match
+50 Нет соответствий
 51 Отсутствует %c
-52 Unmatched %c
+52 Нет соответствия для %c
 53 Нет памяти
 54 Не могу создать неименованный канал
 55 %s: %s
@ -61,43 +61,43 @@ $set 1
 58 Аргументы должны являться идентификаторами заданий или процессов
 59 Нет текущего задания
 60 Нет предыдущего задания
-61 úÁÄÁÎÉÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ÛÁÂÌÏÎÕ ÏÔÓÕÔÓÔ×ÕÅÔ
+61 Соответствующее шаблону задание отсутствует
-62 Fork nesting > %d; maybe `...` loop
+62 Вложенность fork > %d; возможно это цикл `...`
-63 No job control in subshells
+63 Управление заданиями отсутствует в сабшеллах
-64 Sync fault: Process %d not found
+64 Ошибка синхронизации: Процесс %d не найден
-65 %sThere are suspended jobs
+65 %sСуществуют отложенные задания
 66 %sСуществуют остановленные задания
-67 No other directory
+67 Нет другого каталога
 68 Стек каталогов пуст
 69 Неверное имя каталога
 70 Использование: %s [-%s]%s
-71 ïÔÓÕÔÓ×ÕÅÔ ÏÐÅÒÁÎÄ ÆÌÁÇÁ -h
+71 Отсутствует операнд для флага -h
-72 Not a login shell
+72 Не является login-шеллом
 73 Деление на 0
-74 Mod by 0
+74 Остаток от деления на 0
-75 Bad scaling; did you mean "%s"?
+75 Плохой scaling; вы имеете в виду "%s"?
-76 Can't suspend a login shell (yet)
+76 Не могу отложить login-шелл (пока)
 77 Неизвестный пользователь: %s
 78 Переменная $home не установлена
 79 Использование: history [-%s] [# число событий]
-80 $, ! ÉÌÉ < ÚÁÐÒÅÝÅÎÏ Ë ÉÓÐÏÌØÚÏ×ÁÎÉÀ Ó $# ÉÌÉ $?
+80 $, ! или < запрещено использовать с $# или $?
-81 Newline in variable name
+81 Перевод строки в имени переменной
-82 * ÚÁÐÒÅÝÅÎÏ Ë ÉÓÐÏÌØÚÏ×ÁÎÉÀ Ó $# ÉÌÉ $?
+82 * запрещено использовать с $# или $?
 83 $?<цифра> или $#<цифра> запрещено
 84 Неверное имя переменной
-85 Newline in variable index
+85 Перевод строки в индексе переменной
-86 ðÅÒÅÐÏÌÎÅÎÉÑ ÂÕÆÅÒÁ ÒÁÓÛÉÒÅÎÉÑ
+86 Переполнение буфера расширения
-87 óÉÎÔÁÈ ÐÅÒÅÍÅÎÎÏÊ
+87 Синтаксис переменной
 88 Неверная форма !
-89 ïÔÓÕÔÓ×ÕÅÔ ÐÒÅÄÙÄÕÝÁÑ ÐÏÄÓÔÁÎÏ×ËÁ
+89 Отсутствует предыдущая подстановка
 90 Плохая подстановка
-91 No previous left hand side
+91 Отсутствует предыдущая левая сторона
-92 Right hand side too long
+92 Правая сторона слишком длинная
 93 Плохой модификатор !: %c
-94 Modifier failed
+94 Ошибка модификатора
 95 Переполнение буфера подстановки
-96 Bad ! arg selector
+96 Плохой селектор для аргумента !
-97 No prev search
+97 Нет предыдущей строки поиска
 98 %s: Событие не найдено
 99 Слишком много )
 100 Слишком много (
@ -108,33 +108,33 @@ $set 1
 105 Неоднозначное перенаправление ввода
 106 Неверно указанные ()
 107 Зацикливание псевдонимов
-108 No $watch variable set
+108 Переменная $watch не установлена
-109 No scheduled events
+109 Нет запланированных событий
 110 Использование: sched -<номер элемента>.\nИспользование: sched [+]ЧЧ:ММ <команда>
 111 Не так много событий для запуска по расписанию
 112 Отсутствует команда для исполнения
 113 Неверное время для события
-114 Relative time inconsistent with am/pm
+114 Относительное время не соответствует am/pm
-115 Out of termcap string space
+115 Переполнение строки termcap
 116 Использование: settc %s [yes|no]
-117 Unknown capability `%s'
+117 Неизвестная capability `%s'
 118 Неизвестный параметр termcap `%%%c'
 119 Слишком много аргументов для `%s' (%d)
 120 `%s' требует %d аргументов
-121 éÓÐÏÌØÚÏ×ÁÎÉÅ: echotc [-v|-s] [<capability> [<args>]]
+121 Использование: echotc [-v|-s] [<capability> [<аргументы>]]
 122 %s: %s. Неверная архитектура
 123 !# зацикливание памяти команд
-124 Malformed file inquiry
+124 Неправильно сформированный файловый запрос
-125 Selector overflow
+125 Переполнение селектора
 126 Неизвестная опция: `-%s'\nИспользование: %s [ -bcdefilmnqstvVxX -Dимя[=значение] ] [ аргумент ... ]
 127 Неизвестная опция: `-%s'\nИспользование: %s [ -bcdefFilmnqstvVxX ] [ аргумент ... ]
 128 Неизвестная опция: `-%s'\nИспользование: %s [ -bcdefilmnqstvVxX ] [ аргумент ... ]
-129 \nInvalid completion: "%s"
+129 \nНеверное достраивание: "%s"
-130 \nInvalid %s: '%c'
+130 \nНеверный %s: '%c'
-131 \nMissing separator '%c' after %s "%s"
+131 \nОтсутствует сепаратор '%c' после %s "%s"
-132 \nIncomplete %s: "%s"
+132 \n%s не полно: "%s"
-133 îÅÔ ÏÐÅÒÁÎÄÁ ÄÌÑ ÆÌÁÇÁ -m
+133 Отсутствует операнд для флага -m
-134 éÓÐÏÌØÚÏ×ÁÎÉÅ: unlimit [-fh] [limits]
+134 Использование: unlimit [-fh] [пределы]
 135 $%S только для чтения
 136 Нет такого задания
 137 Неизвестное значение `%c%c' переменной colorls
--- a/contrib/tcsh/nls/russian/set10
+++ b/contrib/tcsh/nls/russian/set10
@ -1,8 +1,8 @@
-$ $Id: set10,v 1.1 2001/03/18 19:06:35 christos Exp $
+$ $Id: set10,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: неверная команда '%s'.\n
 2 setpath: недостаточно аргументов для команды '%s'.\n
-3 setpath: value missing in path '%s'\n
+3 setpath: отсутствует значение в пути '%s'\n
 4 setpath: %s не найдено в %s\n
-5 setpath: %d not valid position in %s\n
+5 setpath: %d неверная позиция в %s\n
--- a/contrib/tcsh/nls/russian/set13
+++ b/contrib/tcsh/nls/russian/set13
@ -1,13 +1,13 @@
-$ $Id: set13,v 1.1 2001/03/18 19:06:36 christos Exp $
+$ $Id: set13,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
 2 %d hash buckets of %d bits each\n
-3 debug mask = 0x%08x\n
+3 значение mask для отладки = 0x%08x\n
-4 %d hits, %d misses, %d%%\n
+4 %d совпадения(й), %d промаха(ов), %d%%\n
-5 %S: shell built-in command.\n
+5 %S: внутренняя команда.\n
-6 %S: Command not found.\n
+6 %S: Команда не найдена.\n
-7 where: / in command makes no sense\n
+7 where: / в команде не имеет смысла\n
-8 %S is aliased to 
+8 %S переопределено на 
-9 %S is a shell built-in\n
+9 %S является внутренней командой\n
 10 hash miss: 
--- a/contrib/tcsh/nls/russian/set17
+++ b/contrib/tcsh/nls/russian/set17
@ -1,16 +1,16 @@
-$ $Id: set17,v 1.1 2001/03/18 19:06:38 christos Exp $
+$ $Id: set17,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ sh.proc.c
 $set 17 
 1 BUG: waiting for background job!\n
 2 ÷ÙÈÏÄ %d\n
 3 BUG: process flushed twice
-4 Running 
+4 Выполняется 
 5 óÉÇÎÁÌ 
 6 Exit %-25d
-7 ïËÏÎÞÅÎÏ 
+7 Окончено
 8 BUG: status=%-9o
 9 \040(core dumped)
 10 \040(wd:
 11 wd now: 
-12 %S: Already suspended\n
+12 %S: Уже отложено\n
-13 %S: Already stopped\n
+13 %S: Уже остановлено\n
--- a/contrib/tcsh/nls/russian/set18
+++ b/contrib/tcsh/nls/russian/set18
@ -1,4 +1,4 @@
-$ $Id: set18,v 1.1 2001/03/18 19:06:38 christos Exp $
+$ $Id: set18,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ sh.set.c
 $set 18 
-1 Предупреждение: Длинный PATH обрезан\n
+1 Предупреждение: Чересчур длинный PATH обрезан\n
--- a/contrib/tcsh/nls/russian/set19
+++ b/contrib/tcsh/nls/russian/set19
@ -1,4 +1,4 @@
-$ $Id: set19,v 1.1 2001/03/18 19:06:38 christos Exp $
+$ $Id: set19,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: îÅÔ ÐÁÍÑÔÉ\n
@ -10,6 +10,6 @@ $set 19
 7 free(%lx) bad block index.
 8 %s current memory allocation:\nfree:\t
 9 \nused:\t
-10 \n\tTotal in use: %d, total free: %d\n
+10 \n\tВсего используется: %d, всего свободно: %d\n
 11 \tAllocated memory from 0x%lx to 0x%lx.  Real top at 0x%lx\n
 12 Allocated memory from 0x%lx to 0x%lx (%ld).\n
--- a/contrib/tcsh/nls/russian/set2
+++ b/contrib/tcsh/nls/russian/set2
@ -1,8 +1,8 @@
-$ $Id: set2,v 1.1 2001/03/18 19:06:39 christos Exp $
+$ $Id: set2,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ Signal names
 $set 2 
 1 îÕÌÅ×ÏÊ ÓÉÇÎÁÌ
-2 Hangup
+2 Разрыв связи
 3 ðÒÅÒÙ×ÁÎÉÅ
 4 ÷ÙÈÏÄ
 5 îÅ×ÅÒÎÁÑ ÉÎÓÔÒÕËÃÉÑ
@ -23,29 +23,29 @@ $set 2
 20 îÅ×ÅÒÎÙÊ ÓÉÓÔÅÍÎÙÊ ×ÙÚÏ×
 21 Broken pipe
 22 Alarm clock
-23 ðÒÅÒ×ÁÎ
+23 Прервано
-24 Child status change
+24 Изменение состояния потомка
-25 Death of child
+25 Смерть потомка
 26 Apollo-specific fault
 27 ðÏÔÏÍÏË ÏÓÔÁÎÏ×ÉÌÓÑ ÉÌÉ ÚÁ×ÅÒÛÉÌÓÑ
 28 ðÏÔÏÍÏË ÚÁ×ÅÒÛÉÌÓÑ
-29 Power failure
+29 Сбой питания
 30 Resource Lost
 31 Break (Ctrl-Break)
 32 Input/output possible signal
-33 Asynchronous I/O (select)
+33 Асинхронный ввод/вывод (select)
 34 Urgent condition on I/O channel
 35 Multitasking wake-up
 36 Multitasking kill
 37 Fortran asynchronous I/O completion
 38 Recovery
-39 Uncorrectable memory error
+39 Неисправимая ошибка памяти
 40 CPU time limit exceeded
 41 System shutdown imminent
 42 micro-tasking group-no wakeup flag set
 43 Thread error - (use cord -T for detailed info)
-44 CRAY Y-MP register parity error
+44 Ошибка четности в регистре CRAY Y-MP
-45 Information request
+45 Запрос на информацию
 46 Suspended (signal)
 47 Stopped (signal)
 48 Suspended
--- a/contrib/tcsh/nls/russian/set20
+++ b/contrib/tcsh/nls/russian/set20
@ -1,41 +1,41 @@
-$ $Id: set20,v 1.2 2001/04/26 19:09:19 kim Exp $
+$ $Id: set20,v 1.4 2002/03/08 17:46:50 christos Exp $
 $ tc.bind.c
 $set 20 
-1 îÅ×ÅÒÎÏÅ ÉÍÑ ËÌÀÞÁ `%S'\n
+1 Неверное имя клавиши `%S'\n
-2 ðÌÏÈÏÅ ÉÍÑ ËÌÀÞÁ: %S\n
+2 Плохое имя клавиши: %S\n
 3 Плохое имя команды: %S\n
-4 ðÌÏÈÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÀÞÁ %S\n
+4 Плохая спецификация клавиши %S\n
-5 Null string specification\n
+5 Пустая строка\n
-6 óÔÁÎÄÁÒÔÎÙÅ ÐÒÉ×ÑÚËÉ ËÌÀÞÅÊ\n
+6 Стандартные привязки клавиш\n
-7 áÌØÔÅÒÎÁÔÉ×ÎÙÅ ÐÒÉ×ÑÚËÉ ËÌÀÞÅÊ\n
+7 Альтернативные привязки клавиш\n
-8 Multi-character bindings\n
+8 Много-символьные привязки\n
-9 Arrow key bindings\n
+9 Привязки управляющих клавиш\n
-10 %-15s->  ÎÅÏÐÒÅÄÅÌÅÎÏ\n
+10 %-15s->  не определено\n
 11 BUG!!! %s не связан ни с чем.\n
-12 éÓÐÏÌØÚÏ×ÁÎÉÅ: bindkey [ÏÐÃÉÉ] [--] [ëìàþ [ëïíáîäá]]\n
+12 Использование: bindkey [опции] [--] [КЛАВИШа [КОМАНДа]]\n
-13     -a   list or bind KEY in alternative key map\n
+13     -a   вывести или привязать КЛАВИШу в альтернативной раскладке клавиатуры\n
-14     -b   interpret KEY as a C-, M-, F- or X- key name\n
+14     -b   воспринимать КЛАВИШу как C-, M-, F- или X- название клавиши\n
-15     -s   interpret COMMAND as a literal string to be output\n
+15     -s   воспринимать КОМАНДу как строку, которую нужно вывести\n
-16     -c   interpret COMMAND as a builtin or external command\n
+16     -c   воспринимать КОМАНДу как встроенную или внешнюю команду\n
-17     -v   bind all keys to vi bindings\n
+17     -v   привязать все клавиши в соответствии с редактором vi\n
-18     -e   bind all keys to emacs bindings\n
+18     -e   привязать все клавиши в соответствии с редактором emacs\n
-19     -d   bind all keys to default editor's bindings\n
+19     -d   привязать все клавиши в соответствии с редактором по умолчанию\n
-20     -l   list editor commands with descriptions\n
+20     -l   вывести список команд редактора и их описания\n
-21     -r   remove KEY's binding\n
+21     -r   удалить привязку КЛАВИШи\n
-22     -k   interpret KEY as a symbolic arrow-key name\n
+22     -k   воспринимать КЛАВИШу как явное название управляющей клавиши\n
-23     --   force a break from option processing\n
+23     --   не воспринимать все последующие параметры как опции\n
-24     -u   (or any invalid option) this message\n
+24     -u   (или любая неправильная опция) вывести этот текст\n
-25 âÅÚ ëìàþÁ ÉÌÉ ëïíáîäÙ ×Ù×ÅÓÔÉ ×ÓÅ ÐÒÉ×ÑÚËÉ.\n
+25 Без КЛАВИШи или КОМАНДы, вывести все привязки.\n
-26 âÅÚ ëïíáîäÙ, ×Ù×ÅÓÔÉ ÐÒÉ×ÑÚËÕ ëìàþÁ.\n
+26 Без КОМАНДы, вывести привязку КЛАВИШи\n.\n
-27 ÐÌÏÈÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÀÞÁ -- ÎÕÌÅ×ÁÑ ÓÔÒÏËÁ\n
+27 плохая спецификация клавиши -- нулевая строка\n
-28 ÐÌÏÈÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÀÞÁ -- ÐÕÓÔÁÑ ÓÔÒÏËÁ\n
+28 плохая спецификация клавиши -- пустая строка\n
-29 ðÌÏÈÁÑ ÓÐÅÃÉÆËÁÃÉÑ ÆÕÎËÃÉÏÎÁÌØÎÏÊ ËÌÁ×ÉÛÉ. îÕÌÅ×ÏÊ ËÌÀÞ ÚÁÐÒÅÝÅÎ\n
+29 Плохая спецификация функциональной клавиши. Нулевая клавиша запрещена\n
-30 ÐÌÏÈÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÀÞÁ -- ÎÅ×ÅÒÎÙÊ ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÙÊ ÎÏÍÅÒ\n
+30 плохая спецификация клавиши -- неверный шестнадцатеричный номер\n
-31 ÐÌÏÈÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÀÞÁ -- ÎÅ×ÅÒÎÙÊ ×ÏÓØÍÅÒÉÞÎÙÊ ÎÏÍÅÒ\n
+31 плохая спецификация клавиши -- неверный восьмеричный номер\n
-32 ÐÌÏÈÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÀÞÁ -- ÎÅ×ÅÒÎÙÊ ÄÅÓÑÔÉÞÎÙÊ ÎÏÍÅÒ\n
+32 плохая спецификация клавиши -- неверный десятичный номер\n
-33 Bad function-key specification.\n
+33 Плохая спецификация функциональной клавиши.\n
-34 îÕÌÅ×ÙÅ ËÌÀÞÉ ÚÁÐÒÅÝÅÎÙ\n
+34 Нулевые клавиши запрещены\n
-35 ÐÌÏÈÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ËÌÀÞÁbad key specification -- unknown name "%S"\n
+35 плохая спецификация клавиши -- неизвестное имя "%S"\n
-36 ÉÓÐÏÌØÚÏ×ÁÎÉÅ: bind [ëìàþ | ëïíáîäá ëìàþ | "emacs" | "vi" | "-a"]\n
+36 использование: bind [КЛАВИШа | КОМАНДа КЛАВИШа | "emacs" | "vi" | "-a"]\n
 37 Неверная функция
-38  %s\t\tis undefined\n
+38  %s\t\tне определен\n
--- a/contrib/tcsh/nls/russian/set22
+++ b/contrib/tcsh/nls/russian/set22
@ -1,17 +1,17 @@
-$ $Id: set22,v 1.1 2001/03/18 19:06:39 christos Exp $
+$ $Id: set22,v 1.3 2002/03/08 17:46:50 christos Exp $
 $ tc.func.c
 $set 22 
-1 %S: \t ÐÅÒÅÏÐÒÅÄÅÌÅÎ ×
+1 %S: \t переопределено в 
-2 \nIncorrect passwd for %s\n
+2 \nНеверный пароль для %s\n
-3 Faulty alias 'precmd' removed.\n
+3 Ошибочное переопределение 'precmd' удалено.\n
-4 Faulty alias 'cwdcmd' removed.\n
+4 Ошибочное переопределение 'cwdcmd' удалено.\n
-5 Faulty alias 'beepcmd' removed.\n
+5 Ошибочное переопределение 'beepcmd' удалено.\n
-6 Faulty alias 'periodic' removed.\n
+6 Ошибочное переопределение 'periodic' удалено.\n
 7 разбор командной строки\n
 8 Вы действительно хотите удалить все файлы? [n/y] 
-9 ÐÒÏÐÕÓË ÕÄÁÌÅÎÉÑ ×ÓÅÈ ÆÁÊÌÏ×!\n
+9 удаление всех файлов пропущено!\n
 10 командная строка теперь:\n
 11 разбор командной строки\n
-12 in one of the lists\n
+12 в одном из списков\n
 13 командная строка теперь:\n
 14 yY
--- a/contrib/tcsh/nls/russian/set23
+++ b/contrib/tcsh/nls/russian/set23
@ -1,4 +1,4 @@
-$ $Id: set23,v 1.1 2001/03/18 19:06:40 christos Exp $
+$ $Id: set23,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ tc.os.c
 $set 23 
 1 Bad cpu/site name
@ -19,16 +19,16 @@ $set 23
 16 release:  %s\n
 17 version:  %s\n
 18 machine:  %s\n
-19 getwd: Cannot open ".." (%s)
+19 getwd: Не могу открыть ".." (%s)
-20 getwd: Cannot chdir to ".." (%s)
+20 getwd: Не могу сменить каталог на ".." (%s)
-21 getwd: Read error in ".." (%s)
+21 getwd: Ошибка чтения в ".." (%s)
-22 getwd: Cannot change back to "." (%s)
+22 getwd: Не могу вернуться назад в "." (%s)
-23 getwd: Cannot stat "/" (%s)
+23 getwd: Не могу выполнить stat на "/" (%s)
-24 getwd: Cannot stat "." (%s)
+24 getwd: Не могу выполнить stat на "." (%s)
-25 getwd: Cannot stat directory "%s" (%s)
+25 getwd: Не могу выполнить stat на каталог "%s" (%s)
-26 getwd: Cannot open directory "%s" (%s)
+26 getwd: Не могу открыть каталог "%s" (%s)
-27 getwd: Cannot find "." in ".." (%s)
+27 getwd: Не могу найти "." в ".." (%s)
 28 îÅ×ÅÒÎÙÊ ÔÉÐ ÓÉÓÔÅÍÙ
-29 System type is not set
+29 Тип системы не установлен
 30 óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×
 31 îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ
--- a/contrib/tcsh/nls/russian/set26
+++ b/contrib/tcsh/nls/russian/set26
@ -1,15 +1,15 @@
-$ $Id: set26,v 1.1 2001/03/18 19:06:41 christos Exp $
+$ $Id: set26,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ tc.who.c
 $set 26 
-1 cannot stat %s.  Please "unset watch".\n
+1 не могу выполнить stat на %s. Пожалуйста, выполните "unset watch".\n
-2 %s cannot be opened.  Please "unset watch".\n
+2 %s не может быть открыт. Пожалуйста, выполните "unset watch".\n
-3 BUG! last element is not whotail!\n
+3 BUG! последний элемент не является whotail!\n
-4 backward: 
+4 назад: 
-5 BUG! first element is not whohead!\n
+5 BUG! первый элемент не является whohead!\n
-6 new: %s/%s\n
+6 новый: %s/%s\n
 7 %n has %a %l from %m.
 8 %n has %a %l.
 9 logged on
 10 logged off
 11 replaced %s on
-12 local
+12 локальный
--- a/contrib/tcsh/nls/russian/set27
+++ b/contrib/tcsh/nls/russian/set27
@ -1,8 +1,8 @@
-$ $Id: set27,v 1.1 2001/03/18 19:06:41 christos Exp $
+$ $Id: set27,v 1.3 2002/03/08 17:46:50 christos Exp $
 $ tw.comp.c
 $set 27 
 1 команда
-2 ÓÅÐÅÒÁÔÏÒ
+2 ÓÅÐÁÒÁÔÏÒ
 3 шаблон
 4 интервал
 5 завершение
--- a/contrib/tcsh/nls/russian/set3
+++ b/contrib/tcsh/nls/russian/set3
@ -1,4 +1,4 @@
-$ $Id: set3,v 1.2 2001/04/26 19:07:51 kim Exp $
+$ $Id: set3,v 1.3 2002/03/08 17:46:50 christos Exp $
 $ Editor function descriptions
 $set 3 
 1 Move back a character
@ -115,10 +115,3 @@ $set 3
 112 Vi goto the beginning of line
 113 Perform which of current command
 114 Paste cut buffer at cursor position
 115 Replace just-yanked text with yank from earlier kill
 116 (WIN32 only) Copy cut buffer to system clipboard
 117 (WIN32 only) Paste clipboard buffer at cursor position
 118 (WIN32 only) Convert each '/' in next word to '\\\\'
 119 (WIN32 only) Convert each '/' in previous word to '\\\\'
 120 (WIN32 only) Page visible console window up
 121 (WIN32 only) Page visible console window down
--- a/contrib/tcsh/nls/russian/set30
+++ b/contrib/tcsh/nls/russian/set30
@ -1,16 +1,17 @@
-$ $Id: set30,v 1.1 2001/03/18 19:06:42 christos Exp $
+$ $Id: set30,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
 2 complete %d 
 3 complete %d %S\n
-4 %s: Internal match error.\n
+4 %s: Внутренняя match error.\n
-5 items
+5 элементов
-6 rows
+6 рядов
-7 There are %d %s, list them anyway? [n/y] 
+7 Найдено %d %s, вы действительно хотите вывести их всех? [n/y] 
 8 looking = %d\n
-9 \ntcsh internal error: I don't know what I'm looking for!\n
+9 \nвнутренняя ошибка tcsh: я не знаю, что я ищу!\n
 10 ÎÅ ËÁÔÁÌÏÇ
 11 ÎÅ ÎÁÊÄÅÎÏ
 12 ÎÅÞÉÔÁÅÍÏ
 12 нечитаемо
 13 yY
--- a/contrib/tcsh/nls/russian/set31
+++ b/contrib/tcsh/nls/russian/set31
@ -1,7 +1,7 @@
-$ $Id: set31,v 1.1 2001/03/18 19:06:42 christos Exp $
+$ $Id: set31,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 Не могу открыть TERMCAP: [%s]\n
 2 Не могу открыть %s.\n
 3 Найдено %s в %s.\n
-4 No match found for %s in file %s\n
+4 Соответствий для %s не найдено в файле %s\n
--- a/contrib/tcsh/nls/russian/set4
+++ b/contrib/tcsh/nls/russian/set4
@ -1,26 +1,26 @@
-$ $Id: set4,v 1.1 2001/03/18 19:06:42 christos Exp $
+$ $Id: set4,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ Termcap strings
 $set 4
-1 add new blank line
+1 добавить новую пустую строку
-2 audible bell
+2 звуковой звонок
-3 clear to bottom
+3 очистить до конца
-4 clear to end of line
+4 очистить до конца строки
-5 cursor to horiz pos
+5 курсор на горизонтальную позицию
-6 clear screen
+6 очистить экран
-7 delete a character
+7 удалить символ
-8 delete a line
+8 удалить строку
-9 start delete mode
+9 перейти в режим удаления
-10 end delete mode
+10 выйти из режима удаления
-11 end insert mode
+11 выйти из режима вставки
 12 cursor from status line
 13 home cursor
-14 insert character
+14 вставить символ
-15 start insert mode
+15 перейти в режим вставки
 16 insert padding
-17 sends cursor down
+17 переместить курсор вниз
-18 sends cursor left
+18 переместить курсор влево
-19 sends cursor right
+19 переместить курсор вправо
-20 sends cursor up
+20 переместить курсор вверх
 21 begin bold
 22 end attributes
 23 non destructive space
@ -30,16 +30,16 @@ $set 4
 27 cursor up one
 28 begin underline
 29 end underline
-30 visible bell
+30 визуальный звонок
-31 delete multiple chars
+31 удалить несколько символов
 32 cursor down multiple
-33 insert multiple chars
+33 вставить несколько символов
 34 cursor left multiple
 35 cursor right multiple
 36 cursor up multiple
 37 Has automatic margins
 38 Can use physical tabs
-39 Number of lines
+39 Число строк
-40 Number of columns
+40 Чисто столбцов
 41 Has meta key
 42 Newline ignored at right margin
--- a/contrib/tcsh/nls/russian/set6
+++ b/contrib/tcsh/nls/russian/set6
@ -1,4 +1,4 @@
-$ $Id: set6,v 1.1 2001/03/18 19:06:43 christos Exp $
+$ $Id: set6,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ОШИБКА: неверная команда ключа 0%o\r\n
@ -6,6 +6,6 @@ $set 6
 3 редактировать\n
 4 прервать\n
 5 нет\n
-6 No matching command\n
+6 Нет соответствующей команды\n
 7 Неоднозначная команда\n
 8 *** фатальная ОШИБКА редактора ***\r\n\n
--- a/contrib/tcsh/nls/russian/set7
+++ b/contrib/tcsh/nls/russian/set7
@ -1,4 +1,4 @@
-$ $Id: set7,v 1.1 2001/03/18 19:06:43 christos Exp $
+$ $Id: set7,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh thinks your terminal has the\n
@ -10,20 +10,20 @@ $set 7
 7 \tIt can%s use tabs\n
 8 not
 9 \tIt %s automatic margins\n
-10 has
+10 имеет
-11 does not have
+11 не имеет
 12 \tIt %s magic margins\n
-13 (empty)
+13 (пусто)
-14 yes
+14 да
-15 no
+15 нет
-16 ERROR: cannot delete\r\n
+16 ОШИБКА: не могу удалить\r\n
 17 DeleteChars: num is riduculous: %d\r\n
-18 ERROR: cannot insert\r\n
+18 ОШИБКА: не могу вставить\r\n
 19 StartInsert: num is riduculous: %d\r\n
-20 %s: Cannot open /etc/termcap.\n
+20 %s: Не могу открыть /etc/termcap.\n
 21 %s: No entry for terminal type "%s"\n
 22 %s: using dumb terminal settings.\n
-23 %s: WARNING: Your terminal cannot move up.\n
+23 %s: ВНИМАНИЕ: Your terminal cannot move up.\n
 24 Editing may be odd for long lines.\n
 25 no clear EOL capability.\n
 26 no delete char capability.\n
--- a/contrib/tcsh/nls/russian/set9
+++ b/contrib/tcsh/nls/russian/set9
@ -1,4 +1,4 @@
-$ $Id: set9,v 1.1 2001/03/18 19:06:44 christos Exp $
+$ $Id: set9,v 1.2 2002/03/08 17:46:50 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null extended-key not allowed.\n
@ -6,7 +6,7 @@ $set 9
 3 DeleteXkey: Null extended-key not allowed.\n
 4 Unbound extended key "%S"\n
 5 Some extended keys too long for internal print buffer
-6 Enumerate: BUG!! Null ptr passed\n!
+6 Enumerate: BUG!! Передан нулевой указатель!\n
-7 no input
+7 нет вводимых данных
 8 Something must follow: %c\n
-9 Octal constant does not fit in a char.\n
+9 Восьмеричная константа не умещается в char.\n
--- a/contrib/tcsh/nls/ukrainian/set1
+++ b/contrib/tcsh/nls/ukrainian/set1
@ -1,140 +1,140 @@
-$ $Id: set1,v 1.1 2000/11/11 23:03:42 christos Exp $
+$ $Id: set1,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ Error messages
 $set 1 
 1 Синтаксична помилка
-2 %s is not allowed
+2 %s не дозволя╓ться
-3 Word too long
+3 Задовге слово
-4 $< line too long
+4 Задовгий рядок $<
-5 No file for $0
+5 Нема╓ файлу для $0
-6 Incomplete [] modifier
+6 Неповний модиф╕катор []
-7 $ expansion must end before ]
+7 Розширення $ ма╓ бути перед ]
-8 Bad : modifier in $ (%c)
+8 Поганий модиф╕катор : в $ (%c)
-9 Subscript error
+9 Помилковий ╕ндекс
-10 Badly formed number
+10 Число погано сформоване
-11 No more words
+11 Не можна б╕льше сл╕в
 12 Пропущено ╕м'я файлу
-13 Internal glob error
+13 Внутр╕шня помилка glob
 14 Нев╕дома команда
 15 Замало параметр╕в
 16 Забагато параметр╕в
 17 Небезпечно створювати такий псевдон╕м
 18 Порожн╕й оператор if
-19 Improper then
+19 Нев╕рне then
-20 Words not parenthesized
+20 Слова не в дужках
 21 %s не знайдено
-22 Improper mask
+22 Некоректна маска
-23 No such limit
+23 Такого л╕м╕ту не ╕сну╓
-24 Argument too large
+24 Задовгий параметр
 25 Improper or unknown scale factor
-26 Undefined variable
+26 Невизначена зм╕нна
-27 Directory stack not that deep
+27 Стек каталог╕в не такий вже ╕ великий
-28 ðÏÇÁÎÉÊ ÎÏÍÅÒ ÓÉÇÎÁÌÕ
+28 Нев╕рний номер сигналу
-29 Unknown signal; kill -l lists signals
+29 Нев╕домий сигнал; kill -l показу╓ вс╕ можлив╕
-30 Variable name must begin with a letter
+30 ╤м'я зм╕нно╖ ма╓ починатися з л╕тери
-31 Variable name too long
+31 Задовге ╕м'я зм╕нно╖ 
-32 Variable name must contain alphanumeric characters
+32 ╤м'я зм╕нно╖ ма╓ починатися з алфав╕тно-цифрового символу
-33 No job control in this shell
+33 Ця оболонка не м╕стить засоб╕в керування задачами
-34 Expression Syntax
+34 Синтакс виразу
 35 Нема╓ домашнього каталогу
 36 Не можу перейти до домашнього каталогу
-37 Invalid null command
+37 Некоректна порожня команда
 38 Assignment missing expression
 39 Нев╕домий оператор
 40 Неоднозначно
 41 %s: Файл ╕сну╓
-42 Argument for -c ends in backslash
+42 Аргумент -c зак╕нчу╓ться backslash'ем
 43 Перервано
 44 Subscript out of range
-45 Line overflow
+45 Переповнення рядку
-46 îÅÍÁ ÔÁËÏ§ ÚÁÄÁÞ¦
+46 Нема╓ тако╖ задач╕
 47 Неможливо з терм╕налу
-48 Not in while/foreach
+48 Не у while/foreach
 49 Не можна б╕льше процес╕в
 50 Нема╓ сп╕впадань
-51 Missing %c
+51 Пропущено %c
-52 Unmatched %c
+52 В╕дсутн╕й в╕дпов╕дник до %c
 53 Мало пам'ят╕
-54 Can't make pipe
+54 Не можу створити канал
 55 %s: %s
 56 %s
 57 Використання: jobs [ -l ]
-58 Arguments should be jobs or process id's
+58 Аргументом ма╓ бути номер задач╕ чи процесу
 59 Нема╓ поточно╖ задач╕
 60 Нема╓ попередньо╖ задач╕
-61 No job matches pattern
+61 Жодна задача не в╕дпов╕да╓ шаблону
 62 Fork nesting > %d; maybe `...` loop
-63 No job control in subshells
+63 П╕доболонка не м╕ститить засоб╕в керування задачами
 64 Sync fault: Process %d not found
 65 %sЩе ╓ 'п╕дв╕шен╕' задач╕
 66 %sЩе ╓ 'призупинен╕' задач╕
-67 No other directory
+67 Нема╓ ╕нших каталог╕в
 68 Стек каталог╕в пустий
 69 Поганий каталог
 70 Використання: %s [-%s]%s
-71 No operand for -h flag
+71 В╕дсутн╕й операнд прапорця -h
-72 Not a login shell
+72 Це не первинна оболонка
 73 Д╕лення на 0
 74 Д╕лення на 0
 75 Bad scaling; did you mean "%s"?
-76 Can't suspend a login shell (yet)
+76 Не можу п╕дв╕сити первинну оболонку (поки що)
 77 Нев╕домий користувач: %s
 78 Зм╕нна $home не визначена
 79 Використання: history [-%s] [# к╕льк╕сть под╕й]
-80 $, ! ÔÁ < ÎÅ ÄÏÚ×ÏÌÑ¤ÔØÓÑ Ú $# ÞÉ $?
+80 Не можна використовувати $, ! та < разом з $# чи $?
-81 Newline in variable name
+81 Символ нового рядку в ╕мен╕ зм╕нно╖
-82 * not allowed with $# or $?
+82 Не можна використовувати * разом з $# чи $?
-83 $?<ÃÉÆÒÁ> ÞÉ $#<ÃÉÆÒÁ> ÎÅ ÄÏÚ×ÏÌÑ¤ÔØÓÑ
+83 Не можна використовувати $?<цифра> чи $#<цифра>
-84 Illegal variable name
+84 Неправильне ╕м'я зм╕нно╖
-85 Newline in variable index
+85 Символ нового рядка в ╕ндекс╕ зм╕нно╖
-86 Expansion buffer overflow
+86 Переповнення буферу розширення
-87 Variable syntax
+87 Синтакс зм╕нно╖
-88 Bad ! form
+88 Неправильна форма '!'
-89 No previous substitute
+89 Ще не було п╕дстановок
-90 Bad substitute
+90 Погана п╕дстановка
 91 No previous left hand side
 92 Right hand side too long
-93 Bad ! modifier: %c
+93 Поганий модиф╕катор !: %c
-94 Modifier failed
+94 Невдача модиф╕катора
-95 Substitution buffer overflow
+95 Переповнення буферу п╕дстановки
 96 Bad ! arg selector
-97 No prev search
+97 Пошуку ще не було
 98 %s: Под╕ю не знайдено
-99 âÁÇÁÔÏ ÌÁÐÏË )
+99 Багато дужок )
-100 âÁÇÁÔÏ ÌÁÐÏË (
+100 Багато дужок (
-101 ðÏÇÁÎÏ ÒÏÚÍ¦ÝÅÎÏ ÌÁÐËÉ (
+101 Погано розм╕щено дужку ()
 102 В╕дсутн╓ ╕м'я для перенаправлення
-103 Ambiguous output redirect
+103 Неоднозначне перенаправлення виведення
-104 Can't << within ()'s
+104 Не можна використовувати << в середин╕ ()
-105 Ambiguous input redirect
+105 Неоднозначне перенаправлення введення
-106 ðÏÇÁÎÏ ÒÏÚÍ¦ÝÅÎÏ ÌÁÐËÉ ()'s
+106 Погано розм╕щено дужки ()
-107 Alias loop
+107 Зациклення псевдон╕м╕в
-108 No $watch variable set
+108 Зм╕нну $watch не встановлено
-109 No scheduled events
+109 Нема╓ запланованих завдань
-110 ÷ÉËÏÒÉÓÔÁÎÎÑ: sched -<item#>.\n÷ÉËÏÒÉÓÔÁÎÎÑ: sched [+]hh:mm <command>
+110 Використання: sched -<# елемента>.\nВикористання: sched [+]год:хв <команда>
-111 Not that many scheduled events
+111 Забагато плану╓те запускати!
-112 No command to run
+112 А що запускати?
-113 Invalid time for event
+113 Неправильний час для запланованого завдання
-114 Relative time inconsistent with am/pm
+114 В╕дносний час несум╕сний з am/pm
 115 Out of termcap string space
 116 Використання: settc %s [yes|no]
 117 Unknown capability `%s'
-118 Unknown termcap parameter `%%%c'
+118 Нев╕домий параметр termcap `%%%c'
-119 Too many arguments for `%s' (%d)
+119 Забагато аргумент╕в для `%s' (%d)
-120 `%s' requires %d arguments
+120 `%s' вимага╓ %d аргумент(╕в)
 121 Використання: echotc [-v|-s] [<capability> [<args>]]
-122 %s: %s. Wrong Architecture
+122 %s: %s. Неправильна арх╕тектура
-123 !# History loop
+123 !# Зациклення ╕стор╕╖
 124 Malformed file inquiry
-125 Selector overflow
+125 Переповнення селектора
-126 Unknown option: `-%s'\n÷ÉËÏÒÉÓÔÁÎÎÑ: %s [ -bcdefilmnqstvVxX -Dname[=value] ] [ argument ... ]
+126 Нев╕домий параметр: `-%s'\nВикористання: %s [ -bcdefilmnqstvVxX -D╕м'я[=значення] ] [ аргумент ... ]
-127 Unknown option: `-%s'\n÷ÉËÏÒÉÓÔÁÎÎÑ: %s [ -bcdefFilmnqstvVxX ] [ argument ... ]
+127 Нев╕домий параметр: `-%s'\nВикористання: %s [ -bcdefFilmnqstvVxX ] [ аргумент ... ]
-128 Unknown option: `-%s'\n÷ÉËÏÒÉÓÔÁÎÎÑ: %s [ -bcdefilmnqstvVxX ] [ argument ... ]
+128 Нев╕домий параметр: `-%s'\nВикористання: %s [ -bcdefilmnqstvVxX ] [ аргумент ... ]
-129 \nInvalid completion: "%s"
+129 \nНев╕рне завершеня: "%s"
-130 \nInvalid %s: '%c'
+130 \nНев╕рне %s: '%c'
-131 \nMissing separator '%c' after %s "%s"
+131 \nПропущено розд╕льник '%c' п╕сля %s "%s"
-132 \nIncomplete %s: "%s"
+132 \nНеповне %s: "%s"
-133 No operand for -m flag
+133 В╕дсутн╕й операнд прапорця -m
-134 ÷ÉËÏÒÉÓÔÁÎÎÑ: unlimit [-fh] [limits]
+134 Використання: unlimit [-fh] [л╕м╕ти]
 135 $%S лише для читання
 136 Нема╓ тако╖ задач╕
-137 Unknown colorls variable `%c%c'
+137 Нев╕доме значення зм╕нно╖ colorls: `%c%c'
--- a/contrib/tcsh/nls/ukrainian/set10
+++ b/contrib/tcsh/nls/ukrainian/set10
@ -1,8 +1,8 @@
-$ $Id: set10,v 1.1 2000/11/11 23:03:42 christos Exp $
+$ $Id: set10,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ ma.setp.c
 $set 10 
-1 setpath: invalid command '%s'.\n
+1 setpath: нев╕рна команда '%s'.\n
-2 setpath: insufficient arguments to command '%s'.\n
+2 setpath: недостатньо аргумент╕в для команди '%s'.\n
-3 setpath: value missing in path '%s'\n
+3 setpath: значення в╕дсутн╓ в шляху '%s'\n
-4 setpath: %s not found in %s\n
+4 setpath: %s не знайдено в %s\n
-5 setpath: %d not valid position in %s\n
+5 setpath: %d нед╕йсна позиц╕я в %s\n
--- a/contrib/tcsh/nls/ukrainian/set11
+++ b/contrib/tcsh/nls/ukrainian/set11
@ -1,10 +1,10 @@
-$ $Id: set11,v 1.1 2000/11/11 23:03:42 christos Exp $
+$ $Id: set11,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ sh.c
 $set 11 
-1 Warning: no access to tty (%s).\n
+1 Увага: нема╓ доступу до tty (%s).\n
-2 Thus no job control in this shell.\n
+2 Все ще нема керування задачами в ц╕й оболонц╕.\n
-3 You have %d mail messages.\n
+3 К╕льк╕сть лист╕в: %d.\n
-4 You have %d mail messages in %s.\n
+4 К╕льк╕сть лист╕в: %d (в %s).\n
 5 õ ÷ÁÓ ¤ %sÐÏÛÔÁ.\n
 6 ÎÏ×Á 
 7 õ ÷ÁÓ ¤ %sÐÏÛÔÁ × %s.\n
--- a/contrib/tcsh/nls/ukrainian/set12
+++ b/contrib/tcsh/nls/ukrainian/set12
@ -1,4 +1,4 @@
-$ $Id: set12,v 1.1 2000/11/11 23:03:42 christos Exp $
+$ $Id: set12,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ sh.dir.c
 $set 12 
-1 %s: Trying to start from "%s"\n
+1 %s: óÐÒÏÂÕÀ ÐÏÞÁÔÉ Ú "%s"\n
--- a/contrib/tcsh/nls/ukrainian/set13
+++ b/contrib/tcsh/nls/ukrainian/set13
@ -1,13 +1,13 @@
-$ $Id: set13,v 1.1 2000/11/11 23:03:42 christos Exp $
+$ $Id: set13,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ sh.exec.c
 $set 13 
-1 hash=%-4d dir=%-2d prog=%s\n
+1 хеш=%-4d dir=%-2d prog=%s\n
 2 %d hash buckets of %d bits each\n
 3 debug mask = 0x%08x\n
 4 %d ÐÏÐÁÄÁÎØ, %d ÐÒÏÍÁÈ¦×, %d%%\n
-5 %S: shell built-in command.\n
+5 %S: вбудована команда.\n
-6 %S: Command not found.\n
+6 %S: Команду не знайдено.\n
-7 where: / in command makes no sense\n
+7 where: символ / в командах не ма╓ зм╕сту\n
-8 %S is aliased to 
+8 %S переназначено у 
-9 %S is a shell built-in\n
+9 %S внутр╕шня команда оболонки\n
-10 hash miss: 
+10 промахи хешу: 
--- a/contrib/tcsh/nls/ukrainian/set14
+++ b/contrib/tcsh/nls/ukrainian/set14
@ -1,6 +1,6 @@
-$ $Id: set14,v 1.1 2000/11/11 23:03:42 christos Exp $
+$ $Id: set14,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ sh.file.c
 $set 14 
-1 \nYikes!! Too many %s!!\n
+1 \nОй!! Забагато %s!!\n
-2 names in password file
+2 ╕мен у файл╕ парол╕в
-3 files
+3 файл╕в
--- a/contrib/tcsh/nls/ukrainian/set15
+++ b/contrib/tcsh/nls/ukrainian/set15
@ -1,7 +1,7 @@
-$ $Id: set15,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set15,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ sh.func.c
 $set 15 
-1 %s: %s: Can't %s%s limit\n
+1 %s: %s: îÅ ÍÏÖÕ %s%s Ì¦Í¦Ô\n
-2 remove
+2 ÚÎÑÔÉ
-3 set
+3 ×ÉÓÔÁ×ÉÔÉ
-4 \040hard
+4 \040ÖÏÒÓÔËÉÊ
--- a/contrib/tcsh/nls/ukrainian/set16
+++ b/contrib/tcsh/nls/ukrainian/set16
@ -1,4 +1,4 @@
-$ $Id: set16,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set16,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Reset tty pgrp from %d to %d\n
--- a/contrib/tcsh/nls/ukrainian/set17
+++ b/contrib/tcsh/nls/ukrainian/set17
@ -1,16 +1,16 @@
-$ $Id: set17,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set17,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ sh.proc.c
 $set 17 
-1 BUG: waiting for background job!\n
+1 ПОМИЛКА: оч╕кування фоново╖ задач╕!\n
-2 Exit %d\n
+2 Завершення %d\n
-3 BUG: process flushed twice
+3 ПОМИЛКА: process flushed twice
-4 Running 
+4 Запущено 
-5 Signal 
+5 Сигнал 
-6 Exit %-25d
+6 Завершення %-25d
-7 Done
+7 Завершено
-8 BUG: status=%-9o
+8 ПОМИЛКА: статус=%-9o
 9 \040(ÚÁÐÉÓÁÎÏ core)
 10 \040(wd:
 11 wd ÔÅÐÅÒ: 
-12 %S: Already suspended\n
+12 %S: вже п╕дв╕шено\n
-13 %S: Already stopped\n
+13 %S: вже призупинено\n
--- a/contrib/tcsh/nls/ukrainian/set18
+++ b/contrib/tcsh/nls/ukrainian/set18
@ -1,4 +1,4 @@
-$ $Id: set18,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set18,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ sh.set.c
 $set 18 
-1 Warning: ridiculously long PATH truncated\n
+1 õ×ÁÇÁ: ÚÁÄÏ×ÇÉÊ PATH ÏÂÒ¦ÚÁÎÏ\n
--- a/contrib/tcsh/nls/ukrainian/set19
+++ b/contrib/tcsh/nls/ukrainian/set19
@ -1,7 +1,7 @@
-$ $Id: set19,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set19,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tc.alloc.c
 $set 19 
-1 nbytes=%d: Out of memory\n
+1 nbytes=%d: Мало пам'ят╕\n
 2 free(%lx) called before any allocations.
 3 free(%lx) above top of memory.
 4 free(%lx) below bottom of memory.
@ -11,5 +11,5 @@ $set 19
 8 îÉÎ¦ÛÎ¤ ÒÏÚÐÏÄ¦ÌÅÎÎÑ ÐÁÍ'ÑÔ¦ %s:\n×¦ÌØÎÏ:\t
 9 \nÚÁÎÑÔÏ:\t
 10 \n\t÷ÓØÏÇÏ ÚÁÎÑÔÏ: %d, ×ÓØÏÇÏ ×¦ÌØÎÏ: %d\n
-11 \tAllocated memory from 0x%lx to 0x%lx.  Real top at 0x%lx\n
+11 \tЗанято пам'ять з 0x%lx до 0x%lx.  Real top at 0x%lx\n
-12 Allocated memory from 0x%lx to 0x%lx (%ld).\n
+12 Занято пам'ять з 0x%lx до 0x%lx (%ld).\n
--- a/contrib/tcsh/nls/ukrainian/set2
+++ b/contrib/tcsh/nls/ukrainian/set2
@ -1,36 +1,36 @@
-$ $Id: set2,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set2,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ Signal names
 $set 2 
-1 Null signal
+1 Нульовий сигнал
 2 Hangup
-3 Interrupt
+3 Переривання
-4 Quit
+4 Вих╕д
-5 Illegal instruction
+5 Некоректна ╕нструкц╕яn
 6 Trace/BPT trap
-7 Abort
+7 Авар╕йне завершення
 8 IOT trap
 9 System Crash Imminent
-10 Error exit
+10 Помилка завершення
 11 EMT trap
-12 Floating exception
+12 Помилка операц╕╖ з плаваючою комою
 13 ÷ÂÉÔÏ
-14 User signal 1
+14 Сигнал користувача 1
-15 User signal 2
+15 Сигнал користувача 2
-16 Segmentation fault
+16 Помилка адресац╕╖
 17 Bus error
 18 Program range error
 19 Operand range error
-20 Bad system call
+20 Поганий системний виклик
-21 Broken pipe
+21 Обрив каналу
 22 Alarm clock
 23 Terminated
-24 Child status change
+24 Зм╕на статусу нащадка
-25 Death of child
+25 Смерть нащадка
 26 Apollo-specific fault
 27 Child stopped or exited
 28 Child exited
-29 Power failure
+29 Зб╕й живлення
-30 Resource Lost
+30 Втрата ресурсу
 31 Break (Ctrl-Break)
 32 Input/output possible signal
 33 Asynchronous I/O (select)
@ -40,21 +40,21 @@ $set 2
 37 Fortran asynchronous I/O completion
 38 Recovery
 39 Uncorrectable memory error
-40 CPU time limit exceeded
+40 Досягнуто л╕м╕ту CPU time
 41 System shutdown imminent
 42 micro-tasking group-no wakeup flag set
 43 Thread error - (use cord -T for detailed info)
 44 CRAY Y-MP register parity error
 45 Information request
-46 Suspended (signal)
+46 П╕дв╕шено (сигнал)
-47 Stopped (signal)
+47 Призупинено (сигнал)
-48 Suspended
+48 П╕дв╕шено
-49 Stopped
+49 Призупинено
-50 Continued
+50 Продовжено
-51 Suspended (tty input)
+51 П╕дв╕шено (tty input)
-52 Stopped (tty input)
+52 Призупинено (tty input)
-53 Suspended (tty output)
+53 П╕дв╕шено (tty output)
-54 Stopped (tty output)
+54 Призупинено (tty output)
 55 Window status changed
 56 Window size changed
 57 Phone status changed
--- a/contrib/tcsh/nls/ukrainian/set20
+++ b/contrib/tcsh/nls/ukrainian/set20
@ -1,4 +1,4 @@
-$ $Id: set20,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set20,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Invalid key name `%S'\n
@ -10,9 +10,9 @@ $set 20
 7 Alternative key bindings\n
 8 Multi-character bindings\n
 9 Arrow key bindings\n
-10 %-15s->  is undefined\n
+10 %-15s->  не визначено\n
 11 BUG!!! %s isn't bound to anything.\n
-12 Usage: bindkey [options] [--] [KEY [COMMAND]]\n
+12 Використання: bindkey [параметри] [--] [КЛЮЧ [КОМАНДА]]\n
 13     -a   list or bind KEY in alternative key map\n
 14     -b   interpret KEY as a C-, M-, F- or X- key name\n
 15     -s   interpret COMMAND as a literal string to be output\n
@ -36,6 +36,6 @@ $set 20
 33 Bad function-key specification.\n
 34 Null key not allowed\n
 35 bad key specification -- unknown name "%S"\n
-36 usage: bind [KEY | COMMAND KEY | "emacs" | "vi" | "-a"]\n
+36 Використання: bind [KEY | COMMAND KEY | "emacs" | "vi" | "-a"]\n
-37 Invalid function
+37 Нев╕рна функц╕я
-38  %s\t\tis undefined\n
+38  %s\t\tне визначено\n
--- a/contrib/tcsh/nls/ukrainian/set21
+++ b/contrib/tcsh/nls/ukrainian/set21
@ -1,4 +1,4 @@
-$ $Id: set21,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set21,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tc.disc.c
 $set 21 
 1 Couldn't get local chars.\n
--- a/contrib/tcsh/nls/ukrainian/set22
+++ b/contrib/tcsh/nls/ukrainian/set22
@ -1,17 +1,17 @@
-$ $Id: set22,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set22,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tc.func.c
 $set 22 
-1 %S: \t aliased to 
+1 %S: \t перевизначено на
-2 \nIncorrect passwd for %s\n
+2 \nНев╕рний пароль користувача %s\n
 3 Faulty alias 'precmd' removed.\n
 4 Faulty alias 'cwdcmd' removed.\n
 5 Faulty alias 'beepcmd' removed.\n
 6 Faulty alias 'periodic' removed.\n
-7 parsing command line\n
+7 синтаксичний розб╕р командного рядка\n
-8 Do you really want to delete all files? [n/y] 
+8 Ви справд╕ хочете видалити вс╕ файли? [n/y] 
-9 skipping deletion of files!\n
+9 пропуска╓мо видалення вс╕х файл╕в!\n
-10 command line now is:\n
+10 командний рядок тепер:\n
-11 parsing command line\n
+11 синтаксичний розб╕р командного рядка\n
-12 in one of the lists\n
+12 в одному ╕з списк╕в\n
-13 command line now is:\n
+13 командний рядок тепер:\n
 14 yY
--- a/contrib/tcsh/nls/ukrainian/set23
+++ b/contrib/tcsh/nls/ukrainian/set23
@ -1,4 +1,4 @@
-$ $Id: set23,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set23,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tc.os.c
 $set 23 
 1 Bad cpu/site name
@ -17,7 +17,7 @@ $set 23
 14 sysname:  %s\n
 15 nodename: %s\n
 16 release:  %s\n
-17 version:  %s\n
+17 верс╕я:   %s\n
 18 machine:  %s\n
 19 getwd: Cannot open ".." (%s)
 20 getwd: Cannot chdir to ".." (%s)
@ -28,7 +28,7 @@ $set 23
 25 getwd: Cannot stat directory "%s" (%s)
 26 getwd: Cannot open directory "%s" (%s)
 27 getwd: Cannot find "." in ".." (%s)
-28 Invalid system type
+28 Нев╕рний тип системи
-29 System type is not set
+29 Тип системи не визначено
-30 Too many arguments
+30 Забагато аргумент╕в
-31 Invalid argument
+31 Нев╕рний аргумент
--- a/contrib/tcsh/nls/ukrainian/set24
+++ b/contrib/tcsh/nls/ukrainian/set24
@ -1,4 +1,4 @@
-$ $Id: set24,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set24,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tc.sched.c
 $set 24 
 1 kludge
--- a/contrib/tcsh/nls/ukrainian/set25
+++ b/contrib/tcsh/nls/ukrainian/set25
@ -1,6 +1,6 @@
-$ $Id: set25,v 1.1 2000/11/11 23:03:43 christos Exp $
+$ $Id: set25,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
-2 error: bsd_signal(%d) signal out of range\n
+2 ÐÏÍÉÌËÁ: bsd_signal(%d) ÓÉÇÎÁÌ ÚÁ ÍÅÖÁÍÉ ¦ÎÔÅÒ×ÁÌÕ\n
-3 error: bsd_signal(%d) - sigaction failed, errno %d\n
+3 ÐÏÍÉÌËÁ: bsd_signal(%d) - ÎÅ×ÄÁÞÁ sigaction, ËÏÄ ÐÏÍÉÌËÉ %d\n
--- a/contrib/tcsh/nls/ukrainian/set26
+++ b/contrib/tcsh/nls/ukrainian/set26
@ -1,15 +1,15 @@
-$ $Id: set26,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set26,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tc.who.c
 $set 26 
 1 cannot stat %s.  Please "unset watch".\n
 2 %s cannot be opened.  Please "unset watch".\n
-3 BUG! last element is not whotail!\n
+3 ðïíéìëá! last element is not whotail!\n
 4 backward: 
-5 BUG! first element is not whohead!\n
+5 ðïíéìëá! first element is not whohead!\n
 6 new: %s/%s\n
-7 %n has %a %l from %m.
+7 ëÏÒÉÓÔÕ×ÁÞ %n %a %l (%m).
-8 %n has %a %l.
+8 ëÏÒÉÓÔÕ×ÁÞ %n %a %l.
-9 logged on
+9 Ð¦Ä'¤ÄÎÁ×ÓÑ ÄÏ
-10 logged off
+10 ×¦Ä'¤ÄÎÁ×ÓÑ ×¦Ä
-11 replaced %s on
+11 ÚÁÍ¦ÎÉ× %s ÎÁ
-12 local
+12 ÌÏËÁÌØÎÏ
--- a/contrib/tcsh/nls/ukrainian/set27
+++ b/contrib/tcsh/nls/ukrainian/set27
@ -1,8 +1,8 @@
-$ $Id: set27,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set27,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tw.comp.c
 $set 27 
-1 command
+1 讼土文<EFBFBD>
-2 separator
+2 蚁谀μ匚伤
-3 pattern
+3 哿绿衔
-4 range
+4 幸贤χ纤
-5 completion
+5 诹着役盼窝
--- a/contrib/tcsh/nls/ukrainian/set29
+++ b/contrib/tcsh/nls/ukrainian/set29
@ -1,4 +1,4 @@
-$ $Id: set29,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set29,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tw.help.c
 $set 29 
-1 No help file for %S\n
+1 ÷¦ÄÓÕÔÎ¦Ê ÆÁÊÌ ÄÏ×¦ÄËÉ ÄÌÑ %S\n
--- a/contrib/tcsh/nls/ukrainian/set3
+++ b/contrib/tcsh/nls/ukrainian/set3
@ -1,4 +1,4 @@
-$ $Id: set3,v 1.2 2001/04/26 19:07:52 kim Exp $
+$ $Id: set3,v 1.3 2002/07/01 20:50:22 christos Exp $
 $ Editor function descriptions
 $set 3 
 1 Move back a character
--- a/contrib/tcsh/nls/ukrainian/set30
+++ b/contrib/tcsh/nls/ukrainian/set30
@ -1,4 +1,4 @@
-$ $Id: set30,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set30,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
@ -7,10 +7,10 @@ $set 30
 4 %s: Internal match error.\n
 5 items
 6 rows
-7 There are %d %s, list them anyway? [n/y] 
+7 Тут %d %s, все-таки показувати? [n/y] 
 8 looking = %d\n
-9 \n×ÎÕÔÒ¦ÛÎÑ ÐÏÍÉÌËÁ tcsh: I don't know what I'm looking for!\n
+9 \nвнутр╕шня помилка tcsh: Вже й не знаю, що саме я шукаю!\n
 10 ÎÅ ËÁÔÁÌÏÇ
 11 ÎÅ ÚÎÁÊÄÅÎÏ
-12 unreadable
+12 не чита╓ться
 13 yY
--- a/contrib/tcsh/nls/ukrainian/set31
+++ b/contrib/tcsh/nls/ukrainian/set31
@ -1,7 +1,7 @@
-$ $Id: set31,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set31,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ vms.termcap.c
 $set 31 
-1 Can't open TERMCAP: [%s]\n
+1 Не можу в╕дкрити TERMCAP: [%s]\n
-2 Can't open %s.\n
+2 Не можу в╕дкрити %s.\n
-3 Found %s in %s.\n
+3 Знайдено %s в %s.\n
-4 No match found for %s in file %s\n
+4 Не знайдено сп╕впадань по %s у %s\n
--- a/contrib/tcsh/nls/ukrainian/set4
+++ b/contrib/tcsh/nls/ukrainian/set4
@ -1,4 +1,4 @@
-$ $Id: set4,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set4,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ Termcap strings
 $set 4
 1 add new blank line
--- a/contrib/tcsh/nls/ukrainian/set5
+++ b/contrib/tcsh/nls/ukrainian/set5
@ -1,4 +1,4 @@
-$ $Id: set5,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set5,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ ed.chared.c
 $set 5
-1 Load average unavailable\n
+1 Недоступне значення: середн╓ завантаження\n
--- a/contrib/tcsh/nls/ukrainian/set6
+++ b/contrib/tcsh/nls/ukrainian/set6
@ -1,4 +1,4 @@
-$ $Id: set6,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set6,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ERROR: illegal command from key 0%o\r\n
@ -6,6 +6,6 @@ $set 6
 3 edit\n
 4 abort\n
 5 no\n
-6 No matching command\n
+6 Нема╓ схожо╖ команди\n
-7 Ambiguous command\n
+7 Неоднозначна команда\n
-8 *** editor fatal ERROR ***\r\n\n
+8 *** Фатальна ПОМИЛКА редактора ***\r\n\n
--- a/contrib/tcsh/nls/ukrainian/set7
+++ b/contrib/tcsh/nls/ukrainian/set7
@ -1,4 +1,4 @@
-$ $Id: set7,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set7,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh thinks your terminal has the\n
@ -14,11 +14,11 @@ $set 7
 11 does not have
 12 \tIt %s magic margins\n
 13 (empty)
-14 yes
+14 ÔÁË
-15 no
+15 Î¦
-16 ERROR: cannot delete\r\n
+16 ðïíéìëá: cannot delete\r\n
 17 DeleteChars: num is riduculous: %d\r\n
-18 ERROR: cannot insert\r\n
+18 ðïíéìëá: cannot insert\r\n
 19 StartInsert: num is riduculous: %d\r\n
 20 %s: Cannot open /etc/termcap.\n
 21 %s: No entry for terminal type "%s"\n
--- a/contrib/tcsh/nls/ukrainian/set8
+++ b/contrib/tcsh/nls/ukrainian/set8
@ -1,5 +1,5 @@
-$ $Id: set8,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set8,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ ed.term.c
 $set 8
-1 Unknown switch
+1 îÅ×¦ÄÏÍÉÊ ÐÅÒÅÍÉËÁÞ
-2 Invalid argument
+2 îÅ×¦ÒÎÉÊ ÁÒÇÕÍÅÎÔ
--- a/contrib/tcsh/nls/ukrainian/set9
+++ b/contrib/tcsh/nls/ukrainian/set9
@ -1,4 +1,4 @@
-$ $Id: set9,v 1.1 2000/11/11 23:03:44 christos Exp $
+$ $Id: set9,v 1.2 2002/07/01 20:50:22 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null extended-key not allowed.\n
@ -6,7 +6,7 @@ $set 9
 3 DeleteXkey: Null extended-key not allowed.\n
 4 Unbound extended key "%S"\n
 5 Some extended keys too long for internal print buffer
-6 Enumerate: BUG!! Null ptr passed\n!
+6 Enumerate: ðïíéìëá!! Null ptr passed\n!
 7 no input
 8 Something must follow: %c\n
 9 Octal constant does not fit in a char.\n
--- a/contrib/tcsh/patchlevel.h
+++ b/contrib/tcsh/patchlevel.h
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/patchlevel.h,v 3.129 2001/09/02 21:16:25 christos Exp $ */
+/* $Header: /src/pub/tcsh/patchlevel.h,v 3.135 2002/07/23 16:13:22 christos Exp $ */
 /*
 * patchlevel.h: Our life story.
 */
@ -7,8 +7,8 @@
 #define ORIGIN "Astron"
 #define REV 6
-#define VERS 11
+#define VERS 12
-#define PATCHLEVEL 0
+#define PATCHLEVEL 00
-#define DATE "2001-09-02"
+#define DATE "2002-07-23"
 #endif /* _h_patchlevel */
--- a/contrib/tcsh/pathnames.h
+++ b/contrib/tcsh/pathnames.h
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/pathnames.h,v 3.17 1998/09/13 13:51:03 christos Exp $ */
+/* $Header: /src/pub/tcsh/pathnames.h,v 3.18 2002/03/08 17:36:46 christos Exp $ */
 /*
 * pathnames.h: Location of things to find
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
--- a/contrib/tcsh/sh.c
+++ b/contrib/tcsh/sh.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/sh.c,v 3.95 2001/04/27 22:36:39 christos Exp $ */
+/* $Header: /src/pub/tcsh/sh.c,v 3.105 2002/07/05 16:28:16 christos Exp $ */
 /*
 * sh.c: Main shell routines
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -43,7 +39,7 @@ char    copyright[] =
 All rights reserved.\n";
 #endif /* not lint */
-RCSID("$Id: sh.c,v 3.95 2001/04/27 22:36:39 christos Exp $")
+RCSID("$Id: sh.c,v 3.105 2002/07/05 16:28:16 christos Exp $")
 #include "tc.h"
 #include "ed.h"
@ -136,7 +132,10 @@ extern char **environ;
 */
 struct saved_state {
    int		  insource;
    int		  OLDSTD;
    int		  SHIN;
    int		  SHOUT;
    int		  SHDIAG;
    int		  intty;
    struct whyle *whyles;
    Char 	 *gointr;
@ -302,7 +301,6 @@ main(argc, argv)
    gid = getgid();
    euid = geteuid();
    egid = getegid();
 #if defined(OREO) || defined(DT_SUPPORT)
    /*
     * We are a login shell if: 1. we were invoked as -<something> with
     * optional arguments 2. or we were invoked only with the -l flag
@ -310,16 +308,6 @@ main(argc, argv)
    loginsh = (**tempv == '-') || (argc == 2 &&
 				   tempv[1][0] == '-' && tempv[1][1] == 'l' &&
 						tempv[1][2] == '\0');
 #else
    /*
     * We are a login shell if: 1. we were invoked as -<something> and we had
     * no arguments 2. or we were invoked only with the -l flag
     */
    loginsh = (**tempv == '-' && argc == 1) || (argc == 2 &&
 				   tempv[1][0] == '-' && tempv[1][1] == 'l' &&
 						tempv[1][2] == '\0');
 #endif
 #ifdef _VMS_POSIX
    /* No better way to find if we are a login shell */
    if (!loginsh) {
@ -505,27 +493,28 @@ main(argc, argv)
    set(STRstatus, Strsave(STR0), VAR_READWRITE);
    /*
-     * get and set machine specific envirnment variables
+     * get and set machine specific environment variables
     */
    getmachine();
    fix_version();		/* publish the shell version */
    /*
     * Publish the selected echo style
     */
-#if ECHO_STYLE == NONE_ECHO
+#if ECHO_STYLE != BSD_ECHO
-    set(STRecho_style, Strsave(STRnone), VAR_READWRITE);
+    if (tcsh) {
-#endif /* ECHO_STYLE == NONE_ECHO */
+# if ECHO_STYLE == NONE_ECHO
-#if ECHO_STYLE == BSD_ECHO
+	set(STRecho_style, Strsave(STRnone), VAR_READWRITE);
-    set(STRecho_style, Strsave(STRbsd), VAR_READWRITE);
+# endif /* ECHO_STYLE == NONE_ECHO */
-#endif /* ECHO_STYLE == BSD_ECHO */
+# if ECHO_STYLE == SYSV_ECHO
-#if ECHO_STYLE == SYSV_ECHO
+	set(STRecho_style, Strsave(STRsysv), VAR_READWRITE);
-    set(STRecho_style, Strsave(STRsysv), VAR_READWRITE);
+# endif /* ECHO_STYLE == SYSV_ECHO */
-#endif /* ECHO_STYLE == SYSV_ECHO */
+# if ECHO_STYLE == BOTH_ECHO
-#if ECHO_STYLE == BOTH_ECHO
+	set(STRecho_style, Strsave(STRboth), VAR_READWRITE);
-    set(STRecho_style, Strsave(STRboth), VAR_READWRITE);
+# endif /* ECHO_STYLE == BOTH_ECHO */
-#endif /* ECHO_STYLE == BOTH_ECHO */
+    } else
 #endif /* ECHO_STYLE != BSD_ECHO */
 	set(STRecho_style, Strsave(STRbsd), VAR_READWRITE);
    /*
     * increment the shell level.
@ -799,6 +788,12 @@ main(argc, argv)
 #endif /* WINNT_NATIVE */
 #endif
    fix_version();		/* publish the shell version */
    if (argc > 1 && strcmp(argv[1], "--version") == 0) {
 	xprintf("%S\n", varval(STRversion));
 	xexit(0);
    }
    /*
     * Process the arguments.
     * 
@ -1009,6 +1004,13 @@ main(argc, argv)
 	 /* argc not used any more */ tempv++;
    }
    /* 
     * Call to closem() used to be part of initdesc(). Now called below where
     * the script name argument has become stdin. Kernel may have used a file
     * descriptor to hold the name of the script (setuid case) and this name
     * mustn't be lost by closing the fd too soon.
     */
    closem();
    /*
     * Consider input a tty if it really is or we are interactive. but not for
@ -1482,6 +1484,31 @@ st_save(st, unit, hflg, al, av)
 {
    st->insource	= insource;
    st->SHIN		= SHIN;
    /* Want to preserve the meaning of "source file >output".
     * Save old descriptors, move new 0,1,2 to safe places and assign
     * them to SH* and let process() redo 0,1,2 from them.
     *
     * The macro returns true if d1 and d2 are good and they point to
     * different things.  If you don't avoid saving duplicate
     * descriptors, you really limit the depth of "source" recursion
     * you can do because of all the open file descriptors.  -IAN!
     */
 #define NEED_SAVE_FD(d1,d2) \
    (fstat(d1, &s1) != -1 && fstat(d2, &s2) != -1 \
 	&& (s1.st_ino != s2.st_ino || s1.st_dev != s2.st_dev) )
    st->OLDSTD = st->SHOUT = st->SHDIAG = -1;/* test later to restore these */
    if (didfds) {
 	    struct stat s1, s2;
 	    if (NEED_SAVE_FD(0,OLDSTD))
 		    st->OLDSTD = OLDSTD, OLDSTD = dmove(0, -1);
 	    if (NEED_SAVE_FD(1,SHOUT))
 		    st->SHOUT = SHOUT, SHOUT = dmove(1, -1);
 	    if (NEED_SAVE_FD(2,SHDIAG))
 		    st->SHDIAG = SHDIAG, SHDIAG = dmove(2, -1);
 	    donefds();
    }
    st->intty		= intty;
    st->whyles		= whyles;
    st->gointr		= gointr;
@ -1506,7 +1533,7 @@ st_save(st, unit, hflg, al, av)
     */
    if (av != NULL && *av != NULL) {
 	struct varent *vp;
-	if ((vp = adrof(STRargv)) != NULL)
+	if ((vp = adrof(STRargv)) != NULL && vp->vec != NULL)
 	    st->argv = saveblk(vp->vec);
 	else
 	    st->argv = NULL;
@ -1569,6 +1596,12 @@ st_restore(st, av)
    insource	= st->insource;
    SHIN	= st->SHIN;
    if (st->OLDSTD != -1)
 	    (void)close(OLDSTD), OLDSTD = st->OLDSTD;
    if (st->SHOUT != -1)
 	    (void)close(SHOUT),  SHOUT = st->SHOUT;
    if (st->SHDIAG != -1)
 	    (void)close(SHDIAG), SHDIAG = st->SHDIAG;
    arginp	= st->arginp;
    onelflg	= st->onelflg;
    evalp	= st->evalp;
@ -1606,9 +1639,6 @@ srcunit(unit, onlyown, hflg, av)
    if (unit < 0)
 	return;
    if (didfds)
 	donefds();
    if (onlyown) {
 	struct stat stb;
@ -2045,9 +2075,13 @@ process(catch)
 	 */
 	if ((lex(&paraml) && !seterr && intty && !tellwhat && !Expand && 
 	     !whyles) || adrof(STRverbose)) {
 	    int odidfds = didfds;
 	    haderr = 1;
 	    didfds = 0;
 	    prlex(&paraml);
 	    flush();
 	    haderr = 0;
 	    didfds = odidfds;
 	}
 	(void) alarm(0);	/* Autologout OFF */
@ -2122,7 +2156,7 @@ process(catch)
 	 * Execute the parse tree From: Michael Schroeder
 	 * <mlschroe@immd4.informatik.uni-erlangen.de> was execute(t, tpgrp);
 	 */
-	execute(savet, (tpgrp > 0 ? tpgrp : -1), NULL, NULL);
+	execute(savet, (tpgrp > 0 ? tpgrp : -1), NULL, NULL, TRUE);
 	/*
 	 * Made it!
@ -2130,8 +2164,10 @@ process(catch)
 	freelex(&paraml);
 	freesyn(savet), savet = NULL;
 #ifdef SIG_WINDOW
-	if (catch && intty && !whyles && !tellwhat)
+	if (windowchg || (catch && intty && !whyles && !tellwhat)) {
-	    (void) window_change(0);	/* for window systems */
+	    windowchg = 0;
 	    (void) check_window_size(0);	/* for window systems */
 	}
 #endif /* SIG_WINDOW */
 	set(STR_, Strsave(InputBuf), VAR_READWRITE | VAR_NOGLOB);
    }
@ -2200,7 +2236,7 @@ mailchk()
    bool    new;
    v = adrof(STRmail);
-    if (v == 0)
+    if (v == NULL || v->vec == NULL)
 	return;
    (void) time(&t);
    vp = v->vec;
@ -2341,7 +2377,6 @@ initdesc()
 #endif /* CLOSE_ON_EXEC */
    isdiagatty = isatty(SHDIAG);
    isoutatty = isatty(SHOUT);
    closem();
 #ifdef NLS_BUGS
 #ifdef NLS_CATALOGS
    nlsinit();
--- a/contrib/tcsh/sh.char.c
+++ b/contrib/tcsh/sh.char.c
@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/sh.char.c,v 3.16 2001/03/20 04:16:56 christos Exp $ */
+/* $Header: /src/pub/tcsh/sh.char.c,v 3.18 2002/07/01 20:50:21 christos Exp $ */
 /*
 * sh.char.c: Character classification tables
 */
@ -14,11 +14,7 @@
 * 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
+ * 3. Neither the name of the University nor the names of its contributors
 *    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.
 *
@ -36,7 +32,7 @@
 */
 #include "sh.h"
-RCSID("$Id: sh.char.c,v 3.16 2001/03/20 04:16:56 christos Exp $")
+RCSID("$Id: sh.char.c,v 3.18 2002/07/01 20:50:21 christos Exp $")
 #include "sh.char.h"
@ -874,6 +870,35 @@ unsigned short _mbmap_big5[256] = {
    _MB1|_MB2,	_MB1|_MB2,	_MB1|_MB2,	0,
 };
 unsigned short _mbmap_utf8[256] = {
 /* utf8 uses up to 6 bytes */
 /* first byte        0xc0 - 0xfd */
 /* any further bytes 0x80 - 0xbf */
 /* 0 - 7f all 0 */
    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 /*  80 - bf : all _MB2 */
    _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2,
    _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2,
    _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2,
    _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2,
    _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2,
    _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2,
    _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2,
    _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2, _MB2,
 /* c0 - fc : all _MB1 */
    _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1,
    _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1,
    _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1,
    _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1,
    _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1,
    _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1,
    _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, _MB1,
 /*  f8    f9    fa    fb    fc    fd    fe    ff*/
    _MB1, _MB1, _MB1, _MB1, _MB1, _MB1, 0,    0
 };
 #else /* !(defined(KANJI) && defined(SHORT_STRINGS) && defined(DSPMBYTE)) */
 unsigned short _cmap[256] = {
--- a/Show More
+++ b/Show More