Update to tcsh 6.18.01.

author: mp <mp@FreeBSD.org> 2012-02-22 03:36:15 +0000
committer: mp <mp@FreeBSD.org> 2012-02-22 03:36:15 +0000
commit: 3ee51a00f36c11a6172d08d787943dfc63f66110 (patch)
tree: 522fd2d4d27770566e466a79d636194e5743d94a /contrib
parent: d177303078ee8f6069218009d6c3c2b6d9d9ca97 (diff)
parent: 54c5644df8eb87e7a5b1c4c411e349ac329ee04b (diff)
download: FreeBSD-src-3ee51a00f36c11a6172d08d787943dfc63f66110.zip
FreeBSD-src-3ee51a00f36c11a6172d08d787943dfc63f66110.tar.gz
327 files changed, 11147 insertions, 10187 deletions
diff --git a/contrib/tcsh/Fixes b/contrib/tcsh/Fixes
index c3cae1e..8eac9d4 100644
--- a/contrib/tcsh/Fixes
+++ b/contrib/tcsh/Fixes
@@ -1,3 +1,147 @@
+  6. V6.18.01 - 20120214
+  5. fix interruptible wait again
+  4. ignore bogus compiler overflow message
+  3. cleanup ifdefs in utmp code, and provide default array entries
+  2. Ignore #machine entries in host.defs
+  1. Detect missing ) in gethost.c (Corinna Vinschen)
+
+104. V6.18.00 - 20120114
+103. remove unused variables.
+102. Make gethost use definitions for x __x__ and __x automatically.
+101. More utmp fixes
+100. V6.17.10 - 20120105
+ 99. Add more FreeBSD/NetBSD machines
+ 98. Add portability wrapper for gencat
+ 97. Fix warning for write in SYSMALLOC systems.
+ 96. V6.17.09 - 20120102
+ 95. revert gencat handling to pre-cygwin fixes (without the env settings)
+ 94. remove stray endutent()
+ 93. V6.17.08 - 20111230
+ 92. Remove - from gencat
+ 91. Provide support for malloc_usable_size() so that linux works again
+     without SYSMALLOC
+ 90. Add support for FreeBSD's utmpx.
+ 89. V6.17.07 - 20111227
+ 88. Fix debian bug #645238: tcsh segfaults when prompt includes %j and
+     there are more than 10 jobs.
+ 87. PR/155: Default $anyerror to set for backward compatibility
+ 86. PR/149: Don't print -1 in %j (Vojtech Vitek)
+ 85. handle -- on chdir commands as the end of options processing so that
+     they can process a directory like -x without resorting to ./-x
+     (Andrew Stevenson)
+ 84. Handle write(2) returning ENOENT from SoFS, thanks ++HAL (Robert Byrnes)
+ 83. PR/38: Null check for jobs (Kurt Miller)
+ 82. Fix spelling correction correcting ./foo -> ../foo2 (jean-luc leger)
+ 81. PR/120: string0 in filetest does not have enough space.
+ 80. V6.17.06 - 20110415
+ 79. PR/110: Add $anyerror to select behavior. Default to the new one.
+ 78. Don't try to spell commands that are correct (Rouben Rostamian)
+     [./tcsh -f; set path=($path 2); mkdir foo2; cd foo2; touch foo;
+      chmod +x foo; set correct=cmd; ./foo -> ../foo]
+ 77. Don't push the syntax struct on the cleanup stack, because on foo;bar
+     if foo fails, we will free bar prematurely (Ben Miller)
+ 76. Avoid infinite loop while trying to print the pid of a dying process
+     to a closed file (Bob Arendt)
+ 75. Handle completion of ${ variables (Anthony Mallet)
+ 74. Add --disable-nls-catalogs (Corinna Vinschen)
+ 73. convert message catalogs to UTF-8 (Werner Fink)
+ 72. check that the NLS path works before setting $NLSPATH.
+ 71. use SYSMALLOC for GLIBC (Werner Fink)
+ 70. use mallinfo for SYSMALLOC (Corinna Vinschen)
+ 69. V6.17.05 - 20110201
+ 68. Use mkstemp() if there for here docs (Werner Fink)
+ 67. Fix handling of errors and exit values in builtins (Werner Fink)
+ 66. Better pty name detection (Werner Fink)
+ 65. Enable NLS catalogs on Cygwin (Corinna Vinschen)
+ 64. NLSPATH handling fixes (Corinna Vinschen)
+ 63. Avoid infrequent exit when tcsh cd's into a non-existent directory
+     https://bugzilla.novell.com/show_bug.cgi?id=293395 (Werner Fink)
+ 62. Don't try to spell check full path binaries that are correct because
+     they can cause hangs when other nfs partitions are hung. (Werner Fink)
+ 61. Avoid nested interrupts when exiting causing history writing to fail
+     https://bugzilla.novell.com/show_bug.cgi?id=331627 (Werner Fink)
+ 60. Instead of giving an error or ignoring lines with missing eol at eof,
+     process them.
+ 59. Avoid leaking fd's in mail check (Werner Fink)
+ 58. Add cygwin_xcrypt() (Corinna Vinschen)
+ 57. Recognize i686 (Corinna Vinschen)
+ 56. Rename cygwin32 to cygwin and bring it up-to-date with modern cygwin
+     settings (Corinna Vinschen)
+ 55. Avoid double slashes in cdpath (Corinna Vinschen)
+ 54. V6.17.04 - 20110118
+ 53. Revert PR/110, breaks the test suite.
+ 52. V6.17.03 - 20110117
+ 51. PR/102: Complain on input files with missing trailing \n
+ 50. PR/104: If atime == mtime we don't have new mail.
+ 49. PR/113: Don't allow illegal variable names to be set.
+ 48. PR/112: don't set $REMOTEHOST on the local machine.
+ 47. PR/110: exit status of the pipeline should be the status of the last
+     command.
+ 46. Android support (Corinna Vinschen)
+ 45. Add AUTOSET_KANJI which works around the Shift-JIS encoding that
+     translates unshifted 7 bit ASCII (Werner Fink)
+ 44. Handle mb{r,}towc() returning 0 by setting the return value to NUL
+     (Jean-Luc Leger)
+ 43. PR/109: make wait interruptible (Vojtech Vitek)
+ 42. resource limit fixes: signed vs. unsigned, megabyte issue, doc issues
+     (Robert Byrnes)
+ 41. remove .bat and .cmd handling for executables on cygwin (Corinna Vinschen)
+ 40. Don't echo history while history -L or history -M
+ 39. Check for EOS before ** from Greg Dionne
+ 38. Don't fork in backeval from Bryan Mason
+ 37. Better globstar support from Greg Dionne
+ 36. Error out when processing the last incomplete line instead of silently
+     ignoring it (Anders Kaseorg)
+ 35. Fix SEGV from echo ``
+ 34. Better fixes for histchars and promptchars (nargs)
+ 33. Fix win32 issue calling fmalloc/ffree from non-thread-safe context.
+     (Fabio Fabbri)
+ 32. V6.17.02 - 20100512
+ 31. PR/79: nargs: Better handling for promptchars.
+ 30. PR/97: Add parseoctal to retain compatibility with previous versions (Jim
+     Zajkowski)
+ 29. PR/84: Performance fixes for large history merges (add
+     hashtable (Ted Anderson)
+ 28. Revert previous #23; people should use $histlit if they want this
+     feature.
+ 27. Don't kill "hup" background jobs when a child of the shell exits.
+     From Debian.
+ 26. Ignore \r\n in the command line options for OS's that don't strip
+     these from #!; from Debian
+ 25. Fix enhanced missing patch (Greg Dionne)
+ 24. Callers of rt_mbtowc don't grok -2 as a return. Return -1 for now.
+     (Corinna Vinschen)
+ 23. Turn HistLit on while recording history to avoid \!\! losing its \.
+     From Debian
+ 22. set autoexpand; set histchars="";\n<tab> crash. From Debian
+ 21. V6.17.01 - 20100506
+ 20. unset verbose while we are reading the history file to avoid echoing
+     to the terminal. (Jeffrey Bastian)
+ 19. globstar addition, Enhance addition, euid, euser, gid variables
+     (Greg Dionne)
+ 18. Make 'e' in vi mode work like 'b' - use wordchars (Alistair Crooks)
+ 17. Handle UTF-16 surrogates (Corinna Vinschen)
+ 16. Make tcsh work on systems where sizeof(wchar_t) == 2 (Corinna Vinschen)
+ 15. Better support for Solaris >= 2.9 (Thomas Uhle)
+ 14. Change internal expression calculations to long long so that we can
+     deal with > 32 bit time, inodes, uids, file sizes etc.
+ 13. Add new linux resource limits.
+ 12. Don't print 'Exit X' when printexitvalue is set in `` expressions
+     (Jeff Bastian)
+ 11. Add more LS_COLORS vars (M.H. Anderson)
+ 10. Reduce whitespace in Makefile (Don Estabrook)
+  9. Manual page fixes (Alan R. S. Bueno)
+  8. Remove history in loops bug from the documentation (Holger Weiss)
+  7. Add autorehash (Holger Weiss)
+  6. Add history.at (Ted Anderson)
+  5. Better NLSPATH handling (Norm Jacobs)
+  4. Fix hostname building from utmp (Cyrus Rahman)
+  3. Handle pending signals before flush so that the the history file does
+     not get truncated.  (Ted Anderson)
+  2. Fix AsciiOnly setting that broke 8 bit input. (Juergen Keil)
+  1. remember to closedir in mailchk (from Werner Fink, reported by
+     David Binderman)
+
  21. V6.17.00 - 20090710
  20. Fix dataroot autoconf issue.
  19. Fix directory stuff for unit tests.
diff --git a/contrib/tcsh/Imakefile b/contrib/tcsh/Imakefile
index 3855ff9..7bedd71 100644
--- a/contrib/tcsh/Imakefile
+++ b/contrib/tcsh/Imakefile
@@ -1,5 +1,5 @@
 XCOMM
-XCOMM $tcsh: Imakefile,v 1.86 2007/03/19 23:25:02 christos Exp $
+XCOMM $tcsh: Imakefile,v 1.87 2010/01/28 19:01:05 christos Exp $
 XCOMM
 XCOMM Imakefile for tcsh 6.12
 XCOMM Marc Horowitz, MIT SIPB
@@ -93,7 +93,11 @@ ones.  Please send in your fixes and additions! */
 #      if (OSMinorVersion < 6)
 #       define ConfigH sol24
 #      else
-#       define ConfigH sol26
+#       if (OSMinorVersion < 9)
+#        define ConfigH sol26
+#       else
+#        define ConfigH sol29
+#       endif
 #      endif
 #     endif
 #    endif
diff --git a/contrib/tcsh/Makefile.in b/contrib/tcsh/Makefile.in
index 784e409..cff1487 100644
--- a/contrib/tcsh/Makefile.in
+++ b/contrib/tcsh/Makefile.in
@@ -1,4 +1,4 @@
-# $tcsh: Makefile.in,v 3.40 2009/06/24 22:09:05 christos Exp $
+# $tcsh: Makefile.in,v 3.49 2011/02/05 17:35:31 christos Exp $
 #	Makefile.in	4.3	6/11/83
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -26,22 +26,27 @@ CF=-c
 CPPFLAGS=-I. -I$(srcdir)
 
 LFLAGS=
-#LFLAGS= -Zn10000		# hpux lint
+# hpux lint
+#LFLAGS= -Zn10000
 
 
-CFLAGS = @CFLAGS@		# This is set by autoconf.
-#CFLAGS= -g			# debug
-#CFLAGS= -O			# production
-#CFLAGS= 			# Broken optimizers....
+# This is set by autoconf:
+CFLAGS = @CFLAGS@
+# debug:
+#CFLAGS= -g
+# production:
+#CFLAGS= -O
+# Broken optimizers....
+#CFLAGS=
 
 #CFLAGS= -g -pg -DPROF
 #CFLAGS= -O -pg -DPROF
 
 # gcc 1.00-1.37
-#CFLAGS= -O -finline-functions -fstrength-reduce 
+#CFLAGS= -O -finline-functions -fstrength-reduce
 
 # gcc 1.37-1.40
-#CFLAGS= -O -fcombine-regs -finline-functions -fstrength-reduce 
+#CFLAGS= -O -fcombine-regs -finline-functions -fstrength-reduce
 # add -msoft-float for 68881 machines.
 
 # gcc 2.0
@@ -67,8 +72,10 @@ CFLAGS = @CFLAGS@		# This is set by autoconf.
 #CFLAGS= -O -Mnodebug -Mnoperfmon
 
 # DEC Alpha OSF/1
-#CFLAGS= -O2 -Olimit 2000	## Normal Optimization
-#CFLAGS= -O3 -Olimit 2000	## Full Optimization - may not work
+## Normal Optimization
+#CFLAGS= -O2 -Olimit 2000
+## Full Optimization - may not work
+#CFLAGS= -O3 -Olimit 2000
 #CF=-j
 #SUF=u
 #.SUFFIXES: .u
@@ -77,7 +84,8 @@ CFLAGS = @CFLAGS@		# This is set by autoconf.
 # global optimizer! (-O3).
 # On SGI 4.0+ you need to add -D__STDC__ too.
 #CFLAGS= -O3
-#CFLAGS= -O3 -Olimit 2000	## Ultrix 4.2a
+## Ultrix 4.2a
+#CFLAGS= -O3 -Olimit 2000
 #CF=-j
 #SUF=u
 #.SUFFIXES: .u 				## Ultrix and gnu-make need that
@@ -110,14 +118,14 @@ CFLAGS = @CFLAGS@		# This is set by autoconf.
 # CFLAGS= -O3
 
 # SINIX RMx00
-#CFLAGS= -O # -D_POSIX_SOURCE # -kansi
+#CFLAGS= -O# -D_POSIX_SOURCE# -kansi
 
 # Apollo's with cc [apollo builtins don't work with gcc]
 # and apollo should not define __STDC__ if it does not have
 # the standard header files. RT's (aos4.3) need that too;
 # you might want to skip the -O on the rt's... Not very wise.
 # AIX/ESA needs -D_IBMESA on command line (this may disappear by GA)
-#DFLAGS=-U__STDC__ 
+#DFLAGS=-U__STDC__
 #DFLAGS=-D_IBMESA
 # On aix2.2.1 we need more compiler space.
 #DFLAGS=-Nd4000 -Nn3000
@@ -142,17 +150,25 @@ DFLAGS = -D_PATH_TCSHELL='"${bindir}/tcsh"' @DFLAGS@ @CPPFLAGS@
 ################################################################
 ## LDFLAGS.  Define something here if you need to
 ################################################################
-LDFLAGS= @LDFLAGS@		## This is set by autoconf.
-#LDFLAGS= 			## The simplest, suitable for all.
-#LDFLAGS= -s			## Stripped. Takes less space on disk.
-#LDFLAGS= -s -n			## Pure executable. Spares paging over
-# 				## the network for machines with local
-#				## swap but external /usr/local/bin .
-#LDFLAGS= -s -n -Bstatic	## Without dynamic linking. (SunOS/cc)
-#LDFLAGS= -s -n -static		## Without dynamic linking. (SunOS/gcc)
-#LDFLAGS= -Wl,-s,-n		## Stripped, shared text (Unicos)
-#LDFLAGS= -s -static		## Link statically. (linux)
-#LDFLAGS= -s -N			## Impure executable (linux)
+## This is set by autoconf:
+LDFLAGS= @LDFLAGS@
+## The simplest, suitable for all.
+#LDFLAGS=
+## Stripped. Takes less space on disk.
+#LDFLAGS= -s
+## Pure executable.  Spares paging over the network for machines with
+## local swap but external /usr/local/bin .
+#LDFLAGS= -s -n
+## Without dynamic linking. (SunOS/cc)
+#LDFLAGS= -s -n -Bstatic
+## Without dynamic linking. (SunOS/gcc)
+#LDFLAGS= -s -n -static
+## Stripped, shared text (Unicos)
+#LDFLAGS= -Wl,-s,-n
+## Link statically. (linux)
+#LDFLAGS= -s -static
+## Impure executable (linux)
+#LDFLAGS= -s -N
 
 ################################################################
 ## SBINLDFLAGS.  Flags to build a tcsh suitable for installation in
@@ -164,53 +180,100 @@ SBINLDFLAGS=-Wl,-R/etc/lib,-I/etc/lib/ld.so.1,-ldl,-Bstatic
 ################################################################
 ## LIBES.  Pick one, or roll your own.
 ################################################################
-LIBES= @LIBS@	 			 ## This is set by autoconf.
-#LIBES= -ltermcap 			 ## BSD style things
-#LIBES= -ltermcap			 ## SunOS, HP-UX, pyramid
-#LIBES= -ltermcap			 ## Linux
-#LIBES= -ltermcap -lshadow		 ## Linux with PW_SHADOW
-#LIBES= -ltermcap -lsec			 ## Tek XD88/10 (UTekV) with PW_SHADOW
-#LIBES= -ltermcap -lsec			 ## Motorola MPC (sysV88) with PW_SHADOW
-#LIBES= -ltermcap -lcs			 ## Mach
-#LIBES= -ltermcap -lbsd			 ## DEC osf1 on the alpha
-#LIBES= -ltermcap -lbsd			 ## Intel paragon
-#LIBES= -ltermcap -lbsd			 ## Clipper intergraph
-#LIBES= -ltermcap -lseq			 ## Sequent's Dynix
-#LIBES= -ltermcap -lauth		 ## Ultrix with Enhanced Security
-#LIBES= -ltermcap -ldir -lx		 ## Xenix 386 style things
-#LIBES= -ltermcap -lndir -lsocket -ljobs ## masscomp RTU6.0
-#LIBES= -lcurses			 ## AIX on the rt
-#LIBES= -lcurses			 ## TitanOS on the stellar
-#LIBES= -ltermlib -lsocket -lnsl	 ## SysV4 w/o BSDTIMES or Solaris 2
-#LIBES= -lcurses			 ## SysV3 w/o networking
-#LIBES= -lcurses -lnet			 ## SysV3 with networking
-#LIBES= -lcurses -ldir			 ## SysV2 w/o networking & dirlib
-#LIBES= -lcurses -ldir -lnet		 ## SysV2 with networking & dirlib
-#LIBES= -lcurses -lbsd			 ## AIX on the IBM 370 or rs6000 or ps2
-#LIBES= -lcurses -lbsd			 ## ETA10
-#LIBES= -lcurses -lbsd			 ## Irix3.1 on the SGI-IRIS4D
-#LIBES= -lcurses -lbsd -lc_s		 ## Irix3.3 on the SGI-IRIS4D w/o yp
-#LIBES= -lcurses -lsun -lbsd -lc_s	 ## Irix3.3 on the SGI-IRIS4D with yp
-#LIBES= -lcurses -lsocket -lbsd		 ## Amdahl UTS 2.1
-#LIBES= -lcurses -lsocket		 ## Intel's hypercube.
-#LIBES= -lcurses -lsocket		 ## ns32000 based Opus.
-#LIBES= -lcurses -lcposix		 ## ISC 2.2 without networking
-#LIBES= -lcposix -lc_s -lcurses -linet	 ## ISC 2.2 with networking
-#LIBES= -lcurses -lsec -lc_s		 ## ISC 2.0.2 without networking
-#LIBES= -lcurses -linet -lsec -lc_s	 ## ISC 2.0.2 with networking
-#LIBES= -lcurses -lintl -lcrypt		 ## SCO SysVR3.2v2.0
-#LIBES= -lcurses -lintl -lsocket -lcrypt ## SCO+ODT1.1
-#LIBES= -lposix -ltermcap		 ## A/UX 2.0
-#LIBES= -lposix -ltermcap -lc_s		 ## A/UX 3.0
-#LIBES= -ldirent -lcurses		 ## att3b1 cc w/o shared lib & dirlib
-#LIBES= -shlib -ldirent -lcurses	 ## att3b1 gcc with shared lib & dirlib
-#LIBES= -ltermlib -lsocket -lnsl -lc /usr/ucblib/libucb.a ## SysV4 with BSDTIMES
-#LIBES= -lcurses -lnsl -lsocket -lc /usr/ucblib/libucb.a ## Stardent Vistra
-#LIBES= -ltermc				 ## emx under OS/2
-#LIBES=					 ## Minix, VMS_POSIX
-#LIBES= -ltermcap -lcrypt		 ## Multiflow
-#LIBES= -ltermcap -lcrypt		 ## NetBSD
-#LIBES= -lcurses 			 ## DDE Supermax
+## This is set by autoconf.
+LIBES= @LIBS@
+## BSD style things
+#LIBES= -ltermcap
+## SunOS, HP-UX, pyramid
+#LIBES= -ltermcap
+## Linux
+#LIBES= -ltermcap
+## Linux with PW_SHADOW
+#LIBES= -ltermcap -lshadow
+## Tek XD88/10 (UTekV) with PW_SHADOW
+#LIBES= -ltermcap -lsec
+## Motorola MPC (sysV88) with PW_SHADOW
+#LIBES= -ltermcap -lsec
+## Mach
+#LIBES= -ltermcap -lcs
+## DEC osf1 on the alpha
+#LIBES= -ltermcap -lbsd
+## Intel paragon
+#LIBES= -ltermcap -lbsd
+## Clipper intergraph
+#LIBES= -ltermcap -lbsd
+## Sequent's Dynix
+#LIBES= -ltermcap -lseq
+## Ultrix with Enhanced Security
+#LIBES= -ltermcap -lauth
+## Xenix 386 style things
+#LIBES= -ltermcap -ldir -lx
+## masscomp RTU6.0
+#LIBES= -ltermcap -lndir -lsocket -ljobs
+## AIX on the rt
+#LIBES= -lcurses
+## TitanOS on the stellar
+#LIBES= -lcurses
+## SysV4 w/o BSDTIMES or Solaris 2
+#LIBES= -ltermlib -lsocket -lnsl
+## SysV3 w/o networking
+#LIBES= -lcurses
+## SysV3 with networking
+#LIBES= -lcurses -lnet
+## SysV2 w/o networking & dirlib
+#LIBES= -lcurses -ldir
+## SysV2 with networking & dirlib
+#LIBES= -lcurses -ldir -lnet
+## AIX on the IBM 370 or rs6000 or ps2
+#LIBES= -lcurses -lbsd
+## ETA10
+#LIBES= -lcurses -lbsd
+## Irix3.1 on the SGI-IRIS4D
+#LIBES= -lcurses -lbsd
+## Irix3.3 on the SGI-IRIS4D w/o yp
+#LIBES= -lcurses -lbsd -lc_s
+## Irix3.3 on the SGI-IRIS4D with yp
+#LIBES= -lcurses -lsun -lbsd -lc_s
+## Amdahl UTS 2.1
+#LIBES= -lcurses -lsocket -lbsd
+## Intel's hypercube.
+#LIBES= -lcurses -lsocket
+## ns32000 based Opus.
+#LIBES= -lcurses -lsocket
+## ISC 2.2 without networking
+#LIBES= -lcurses -lcposix
+## ISC 2.2 with networking
+#LIBES= -lcposix -lc_s -lcurses -linet
+## ISC 2.0.2 without networking
+#LIBES= -lcurses -lsec -lc_s
+## ISC 2.0.2 with networking
+#LIBES= -lcurses -linet -lsec -lc_s
+## SCO SysVR3.2v2.0
+#LIBES= -lcurses -lintl -lcrypt
+## SCO+ODT1.1
+#LIBES= -lcurses -lintl -lsocket -lcrypt
+## A/UX 2.0
+#LIBES= -lposix -ltermcap
+## A/UX 3.0
+#LIBES= -lposix -ltermcap -lc_s
+## att3b1 cc w/o shared lib & dirlib
+#LIBES= -ldirent -lcurses
+## att3b1 gcc with shared lib & dirlib
+#LIBES= -shlib -ldirent -lcurses
+## SysV4 with BSDTIMES
+#LIBES= -ltermlib -lsocket -lnsl -lc /usr/ucblib/libucb.a
+## Stardent Vistra
+#LIBES= -lcurses -lnsl -lsocket -lc /usr/ucblib/libucb.a
+## emx under OS/2
+#LIBES= -ltermc
+## Minix, VMS_POSIX
+#LIBES=
+## Multiflow
+#LIBES= -ltermcap -lcrypt
+## NetBSD
+#LIBES= -ltermcap -lcrypt
+## DDE Supermax
+#LIBES= -lcurses
 
 ################################################################
 ## EXTRAFLAGS and EXTRALIBS
@@ -222,8 +285,10 @@ LIBES= @LIBS@	 			 ## This is set by autoconf.
 #
 #Solaris and HPUX require the BSD libraries with AFS.
 #We use -lc to use only what we require.
-#AFSAUXLIB = -lsocket -lnsl -lc -lucb                    # Solaris
-#AFSAUXLIB = -lc -lBSD                                   # HPUX   
+# Solaris
+#AFSAUXLIB = -lsocket -lnsl -lc -lucb
+# HPUX   
+#AFSAUXLIB = -lc -lBSD
 #
 #AFSLIB = -L$(AFSLIBDIR) -L$(AFSLIBDIR)/afs -lkauth -lprot -lubik\
 #         -lauth -lrxkad -lsys -ldes -lrx -llwp -lcom_err\
@@ -244,26 +309,38 @@ EXTRALIBS = @HESLIB@ $(AFSLIB) @LIBICONV@
 # will lose the editor and job control.
 
 # This is for setting your C preprocessor value.
-CPP = @CPP@ # This is set by autoconf.
+# This is set by autoconf.
+CPP = @CPP@
 # The -B tells gcc to use /bin/ld. This is to avoid using the gnu ld, which
 # on the suns does not know how to make dynamically linked binaries.
-CC = @CC@ # This is set by autoconf.
+# This is set by autoconf.
+CC = @CC@
 #CC= gcc -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Werror -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wsign-compare -Wcast-qual -Wreturn-type -Wswitch -Wshadow -Wwrite-strings -Wextra
-#CC=	gcc -Wall -pipe -B/bin/	# -ansi -pedantic
-#CC=	gcc -m486 -pipe -Wall # Generate code for Intel 486 (linux)
-#CC=	shlicc 	# BSDI2.1 w/ shared libraries
+# -ansi -pedantic
+#CC=	gcc -Wall -pipe -B/bin/
+# Generate code for Intel 486 (linux)
+#CC=	gcc -m486 -pipe -Wall
+# BSDI2.1 w/ shared libraries
+#CC=	shlicc
 #CC=	cc
 #CC=	occ
 #CC=	acc
 #CC=	pcc
 #CC=	hc -w
-#CC=	c89	# For VMS/POSIX
-#CC=	/bin/cc	# For suns, w/o gcc and SVR4
-#CC=	/usr/lib/sun.compile/cc  # FPS 500 (+FPX) with Sun C compiler
-#CC=	/opt/SUNWspro/bin/cc	# Solaris 2.1
-#CC=	scc 	# Alliant fx2800
-#CC=	cc	-h0,ansi,novector,float0 # for NEC SX-4
+# For VMS/POSIX
+#CC=	c89
+# For suns, w/o gcc and SVR4
+#CC=	/bin/cc
+# FPS 500 (+FPX) with Sun C compiler
+#CC=	/usr/lib/sun.compile/cc
+# Solaris 2.1
+#CC=	/opt/SUNWspro/bin/cc
+# Alliant fx2800
+#CC=	scc
+# for NEC SX-4
+#CC=	cc	-h0,ansi,novector,float0
 #CC=	lcc	-wa 
+CC_FOR_GETHOST = @CC_FOR_GETHOST@
 ED=	ed
 AS=	as
 RM=	rm
@@ -272,8 +349,10 @@ VGRIND=	csh /usr/ucb/vgrind
 CTAGS=	/usr/ucb/ctags
 #XSTR= /usr/ucb/xstr
 SCCS=	/usr/local/sccs
-PARALLEL=12				# Make the multi-max run fast.
-#P=&					# Use Sequent's parallel make
+# Make the multi-max run fast.
+PARALLEL=12
+# Use Sequent's parallel make
+#P=&
 P=
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -282,12 +361,17 @@ mandir=@datarootdir@/man
 MANSECT=1
 DESTBIN=${DESTDIR}${bindir}
 DESTMAN=${DESTDIR}${mandir}/man${MANSECT}
-# DESTMAN=${DESTDIR}/catman/man${MANSECT}	 # A/UX
-# DESTMAN=${DESTDIR}/usr/share/man/man${MANSECT} # Stardent Vistra (SysVR4)
-# DESTMAN=/usr/catman/1l			 # Amiga unix (SysVR4)
+# A/UX
+# DESTMAN=${DESTDIR}/catman/man${MANSECT}
+# Stardent Vistra (SysVR4)
+# DESTMAN=${DESTDIR}/usr/share/man/man${MANSECT}
+# Amiga unix (SysVR4)
+# DESTMAN=/usr/catman/1l
 EXEEXT=@EXEEXT@
 FTPAREA=/usr/spool/ftp
 
+BUILD_CATALOGS = @BUILD_CATALOGS@
+
 ASSRCS=	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 \
 	sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \
@@ -330,9 +414,9 @@ AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \
 	host.defs gethost.c tcsh.man2html configure.in configure config.h.in \
 	tests/testsuite.at
 TESTFILES= tests/aliases.at tests/arguments.at tests/commands.at \
-	tests/expr.at tests/lexical.at tests/mb-eucjp.at tests/mb-utf8.at \
-	tests/noexec.at tests/syntax.at tests/subst.at tests/variables.at \
-	tests/sh.dol.at
+	tests/expr.at tests/lexical.at tests/mb-eucjp.at \
+	tests/mb-utf8.at tests/noexec.at tests/syntax.at tests/subst.at \
+	tests/variables.at tests/sh.dol.at
 
 VHSRCS=${PVSRCS} ${AVSRCS}
 
@@ -345,7 +429,7 @@ DISTSRCS= ${PSSRCS} ${TWSRCS} ${EDSRCS} ${TCSRCS} ${AVSRCS} $(TESTFILES)
 OBJS= ${SHOBJS} ${TWOBJS} ${EDOBJS} ${TCOBJS}
 
 
-all: ${BUILD}
+all: ${BUILD} catalogs
 
 tcsh$(EXEEXT):$(P) ${OBJS} 
 	rm -f tcsh$(EXEEXT) core
@@ -365,7 +449,7 @@ pure:$(P) ${OBJS}
 
 gethost:  gethost.c sh.err.h tc.const.h sh.h
 	rm -f gethost
-	${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
+	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} $(srcdir)/gethost.c
 
 tc.defs.c:	gethost host.defs
 	@rm -f $@.tmp
@@ -463,7 +547,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/configure.in
 	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
 	} >$(srcdir)/tests/package.m4
 
-$(srcdir)/tests/testsuite: $(srcdir)/tests/package.m4 $(srcdir}/tests/testsuite.at $(TESTFILES)
+$(srcdir)/tests/testsuite: $(srcdir)/tests/package.m4 $(srcdir)/tests/testsuite.at $(TESTFILES)
 	autom4te --language=autotest -I $(srcdir)/tests \
 		$(srcdir)/tests/testsuite.at -o $@.tmp
 	mv $@.tmp $@
@@ -511,20 +595,36 @@ vgrind:
 
 install-strip: install
 
-install: tcsh$(EXEEXT) 
+install: tcsh$(EXEEXT) install.catalogs install.man
 	-mkdir -p ${DESTBIN}
 	-mv -f ${DESTBIN}/tcsh$(EXEEXT)  ${DESTBIN}/tcsh.old
 	cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
 	-strip ${DESTBIN}/tcsh$(EXEEXT)
 	chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
 
+install.catalogs:
+	@test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} install DESTDIR=${DESTDIR}) || exit 0
+
 install.man: tcsh.man
 	-mkdir -p ${DESTMAN}
 	-rm -f ${DESTMAN}/tcsh.${MANSECT}
 	cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
 	chmod 444 ${DESTMAN}/tcsh.${MANSECT}
 
-install.cygwin: install install.man
+# Amiga Unix
+#install.man: tcsh.man
+#        compress tcsh.man
+#	cp tcsh.man.Z ${DESTMAN}/tcsh.Z
+#	chmod 444 ${DESTMAN}/tcsh.Z
+
+# Apple A/UX
+#install.man: tcsh.man
+#	-rm -f ${DESTMAN}/tcsh.${MANSECT}.Z
+#	nroff -man tcsh.man | compress > ${DESTMAN}/tcsh.${MANSECT}.Z
+#	chmod 444 ${DESTMAN}/tcsh.${MANSECT}.Z
+
+install.cygwin: install
+	-gzip ${DESTMAN}/tcsh.${MANSECT}
 	-mkdir -p ${DESTDIR}${prefix}/share/doc/tcsh
 	cp ${srcdir}/FAQ ${srcdir}/Fixes ${DESTDIR}${prefix}/share/doc/tcsh
 	cp ${srcdir}/NewThings ${srcdir}/README ${DESTDIR}${prefix}/share/doc/tcsh
@@ -542,24 +642,15 @@ install.cygwin: install install.man
 	cp -p ${srcdir}/cygwin/postinstall.sh ${DESTDIR}/etc/postinstall/tcsh.sh
 	cp -p ${srcdir}/cygwin/preremove.sh ${DESTDIR}/etc/preremove/tcsh.sh
 
-# Amiga Unix
-#install.man: tcsh.man
-#        compress tcsh.man
-#	cp tcsh.man.Z ${DESTMAN}/tcsh.Z
-#	chmod 444 ${DESTMAN}/tcsh.Z
-
-# Apple A/UX
-#install.man: tcsh.man
-#	-rm -f ${DESTMAN}/tcsh.${MANSECT}.Z
-#	nroff -man tcsh.man | compress > ${DESTMAN}/tcsh.${MANSECT}.Z
-#	chmod 444 ${DESTMAN}/tcsh.${MANSECT}.Z
-
-clean:
+clean: clean.catalogs
 	${RM} -f a.out strings x.c xs.c tcsh$(EXEEXT) tcsh.a _MAKE_LOG gethost
 	${RM} -f *.${SUF} *.i *.s
 	${RM} -f sh.prof.c ed.defns.h tc.const.h sh.err.h tc.defs.c
 	${RM} -f tcsh.*.m tcsh.*.cat
 
+clean.catalogs:
+	@test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} clean) || exit 0
+
 veryclean: clean
 	${RM} -f Makefile config.h config_p.h
 	${RM} -f config.status config.cache config.log tcsh.ps
@@ -607,7 +698,7 @@ shar:
 	rm -rf tcsh-${VERSION}
 
 catalogs:
-	@(cd nls; make catalogs)
+	@test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} catalogs) || exit 0
 
 tcsh-${VERSION}.tar.Z:
 	rm -rf tcsh-${VERSION} 
diff --git a/contrib/tcsh/Ported b/contrib/tcsh/Ported
index 43d29bc..ca1ac3b 100644
--- a/contrib/tcsh/Ported
+++ b/contrib/tcsh/Ported
@@ -7,7 +7,7 @@ find it out-of-date, or you have additions or changes, please let me know.
 christos
 
 
-VENDOR	:	sun
+VENDOR	:	Sun
 MODELS	:	sun3, sun4, sun386i
 COMPILER:	cc, gcc, acc
 CFLAGS	:	normal
@@ -18,7 +18,7 @@ ENVIRON	:	n/a
 NOTES	:	Don't compile with /usr/5bin/cc
 VERSION	:	6.08
 
-VENDOR	:	sun
+VENDOR	:	Sun
 MODELS	:	sun4, ultra
 COMPILER:	cc, gcc
 CFLAGS	:	normal
@@ -34,18 +34,29 @@ NOTES	:	The sunpro compiler cannot compile tcsh with -O, it crashes
 	:	point failures of programs exec'ed from tcsh.
 VERSION	:	6.08
 
-VENDOR	:	sun
+VENDOR	:	Sun
 MODELS	:	ultra
 COMPILER:	WorkShop cc
 CFLAGS	:	normal
 LIBES	:	-lcurses -lsocket -lnsl
-OS	:	solaris 2.6
+OS	:	solaris 2.6, 2.7, 8
 CONFIG	:	sol26
 ENVIRON	:	n/a
 NOTES	:	none
 VERSION	:	6.08
 
-VENDOR	:	sun
+VENDOR	:	Sun
+MODELS	:	ultra, i686, x86_64
+COMPILER:	Sun Studio cc
+CFLAGS	:	normal
+LIBES	:	-lcurses -lsocket -lnsl
+OS	:	solaris 9, 10
+CONFIG	:	sol29
+ENVIRON	:	n/a
+NOTES	:	none
+VERSION	:	6.18
+
+VENDOR	:	Sun
 MODELS	:	i386
 COMPILER:	cc, gcc
 CFLAGS	:	-D__STDC__=0
@@ -56,7 +67,7 @@ ENVIRON	:	n/a
 NOTES	:	n/a
 VERSION	:	6.04.13
 
-VENDOR	:	sun
+VENDOR	:	Sun
 MODELS	:	sun4
 COMPILER:	gcc
 CFLAGS	:	normal
diff --git a/contrib/tcsh/README b/contrib/tcsh/README
index ae06b57..b05f589 100644
--- a/contrib/tcsh/README
+++ b/contrib/tcsh/README
@@ -1,4 +1,4 @@
-This is tcsh version 6.17.00.  Tcsh is a version of the Berkeley
+This is tcsh version 6.18.01.  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.
@@ -87,7 +87,7 @@ To install tcsh:
 
 10) Enjoy.
 
-12) PLEASE file any bug reports (and fixes), code for new features at:
+11) PLEASE file any bug reports (and fixes), code for new features at:
 
 	http://bugs.gw.com/
 
diff --git a/contrib/tcsh/WishList b/contrib/tcsh/WishList
index 6eb5acf..6a2a0d9 100644
--- a/contrib/tcsh/WishList
+++ b/contrib/tcsh/WishList
@@ -52,17 +52,6 @@ ey )
    - bhooglan
      _________________________________________________________________
 
-   I'm a long-time faithful user of tcsh, and one thing has always bugged
-   me -- the need to type "rehash" at a prompt when adding a new command.
-   My  suggestions  is  to  change  tcsh  so before printing "Command not
-   found.",  it  first  searches  its  entire  path and rebuilds its hash
-   table.  Only  after doing this, and if the command is still not in the
-   path,  then  print  "Command  not  found.".  I  realize there are some
-   extreme  cases  in  which  this  is suboptimal, but in most cases with
-   normal  users  this  would  be  a big win, and simplify the manual and
-   perhaps even the code.
-     _________________________________________________________________
-
    Wish "tcsh -l" would accept other flags. At least "-c".
 
    Currently I can't get ssh to have the right environment unless it is a
diff --git a/contrib/tcsh/complete.tcsh b/contrib/tcsh/complete.tcsh
index 4e13bf8..4fb1ad2 100644
--- a/contrib/tcsh/complete.tcsh
+++ b/contrib/tcsh/complete.tcsh
@@ -1,5 +1,5 @@
 #
-# $tcsh: complete.tcsh,v 1.51 2007/10/01 21:51:59 christos Exp $
+# $tcsh: complete.tcsh,v 1.52 2010/05/07 17:54:13 christos Exp $
 # example file using the new completion code
 #
 # Debian GNU/Linux
@@ -636,7 +636,7 @@ if ($?_complete) then
     complete nmap	'n@-e@`ifconfig -l`@' 'p/*/$hostnames/'
     complete perldoc 	'n@*@`\ls -1 /usr/libdata/perl/5.*/pod | sed s%\\.pod.\*\$%%`@'
     complete postfix    'n/*/(start stop reload abort flush check)/'
-    complete postmap	'n/1/(hash: regexp:)' 'c/hash:/f/' 'c/regexp:/f/'
+    complete postmap	'n/1/(hash: regexp:)/' 'c/hash:/f/' 'c/regexp:/f/'
     complete rcsdiff	'p@1@`\ls -1a RCS | sed -e "s/\(.*\),v/\1/"`@'
     complete X		'c/-/(I a ac allowMouseOpenFail allowNonLocalModInDev \
 			allowNonLocalXvidtune ar1 ar2 audit auth bestRefresh \
diff --git a/contrib/tcsh/config.guess b/contrib/tcsh/config.guess
index e3a2116..c2246a4 100755
--- a/contrib/tcsh/config.guess
+++ b/contrib/tcsh/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-10'
+timestamp='2009-12-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-06-10'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -807,12 +811,12 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -854,6 +858,20 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -876,6 +894,17 @@ EOF
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -901,39 +930,18 @@ EOF
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -942,8 +950,11 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -966,58 +977,6 @@ EOF
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1247,6 +1206,16 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff --git a/contrib/tcsh/config.h.in b/contrib/tcsh/config.h.in
index 09aa898..0ba48c4 100644
--- a/contrib/tcsh/config.h.in
+++ b/contrib/tcsh/config.h.in
@@ -10,9 +10,6 @@
 /* Define to 1 if you have the <auth.h> header file. */
 #undef HAVE_AUTH_H
 
-/* Define to 1 if you have the `catgets' function. */
-#undef HAVE_CATGETS
-
 /* Define to 1 if you have the <crypt.h> header file. */
 #undef HAVE_CRYPT_H
 
@@ -39,6 +36,9 @@
 /* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 
+/* Define to 1 if you have the <features.h> header file. */
+#undef HAVE_FEATURES_H
+
 /* Define to 1 if you have the `getauthid' function. */
 #undef HAVE_GETAUTHID
 
@@ -54,7 +54,10 @@
 /* Define to 1 if you have the `getutent' function. */
 #undef HAVE_GETUTENT
 
-/* Define if you have the iconv() function. */
+/* Define to 1 if you have the `getutxent' function. */
+#undef HAVE_GETUTXENT
+
+/* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
 /* Define to 1 if you have the <inttypes.h> header file. */
@@ -63,6 +66,9 @@
 /* Define to 1 if the system has the type `long long'. */
 #undef HAVE_LONG_LONG
 
+/* Define to 1 if you have the `mallinfo' function. */
+#undef HAVE_MALLINFO
+
 /* Define to 1 if mbrtowc and mbstate_t are properly declared. */
 #undef HAVE_MBRTOWC
 
@@ -75,6 +81,9 @@
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
@@ -84,6 +93,9 @@
 /* Define to 1 if you have the `nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
+/* Define to 1 if you have the <paths.h> header file. */
+#undef HAVE_PATHS_H
+
 /* Define to 1 if you have the `sbrk' function. */
 #undef HAVE_SBRK
 
@@ -118,22 +130,34 @@
 /* Define to 1 if you have the `strstr' function. */
 #undef HAVE_STRSTR
 
-/* Define to 1 if `d_ino' is member of `struct dirent'. */
+/* Define to 1 if `d_ino' is a member of `struct dirent'. */
 #undef HAVE_STRUCT_DIRENT_D_INO
 
-/* Define to 1 if `ss_family' is member of `struct sockaddr_storage'. */
+/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
 
-/* Define to 1 if `ut_host' is member of `struct utmp'. */
+/* Define to 1 if `ut_host' is a member of `struct utmpx'. */
+#undef HAVE_STRUCT_UTMPX_UT_HOST
+
+/* Define to 1 if `ut_tv' is a member of `struct utmpx'. */
+#undef HAVE_STRUCT_UTMPX_UT_TV
+
+/* Define to 1 if `ut_user' is a member of `struct utmpx'. */
+#undef HAVE_STRUCT_UTMPX_UT_USER
+
+/* Define to 1 if `ut_xtime' is a member of `struct utmpx'. */
+#undef HAVE_STRUCT_UTMPX_UT_XTIME
+
+/* Define to 1 if `ut_host' is a member of `struct utmp'. */
 #undef HAVE_STRUCT_UTMP_UT_HOST
 
-/* Define to 1 if `ut_tv' is member of `struct utmp'. */
+/* Define to 1 if `ut_tv' is a member of `struct utmp'. */
 #undef HAVE_STRUCT_UTMP_UT_TV
 
-/* Define to 1 if `ut_user' is member of `struct utmp'. */
+/* Define to 1 if `ut_user' is a member of `struct utmp'. */
 #undef HAVE_STRUCT_UTMP_UT_USER
 
-/* Define to 1 if `ut_xtime' is member of `struct utmp'. */
+/* Define to 1 if `ut_xtime' is a member of `struct utmp'. */
 #undef HAVE_STRUCT_UTMP_UT_XTIME
 
 /* Define to 1 if you have the `sysconf' function. */
@@ -177,6 +201,9 @@
 /* Support NLS. */
 #undef NLS
 
+/* Support NLS catalogs. */
+#undef NLS_CATALOGS
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -189,6 +216,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -204,6 +234,11 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT32_T
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
@@ -225,6 +260,10 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t
 
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint32_t
+
 /* Define to empty if the keyword `volatile' does not work. Warning: valid
    code using `volatile' can become incorrect without. Disable with care. */
 #undef volatile
diff --git a/contrib/tcsh/config.sub b/contrib/tcsh/config.sub
index eb0389a..8518609 100755
--- a/contrib/tcsh/config.sub
+++ b/contrib/tcsh/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-11'
+timestamp='2009-12-31'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2009-06-11'
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU 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.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@ 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,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
@@ -149,7 +153,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 | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
@@ -284,6 +288,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -291,13 +296,14 @@ case $basic_machine in
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -340,7 +346,7 @@ case $basic_machine in
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -368,7 +374,7 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -377,6 +383,7 @@ case $basic_machine in
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -726,6 +733,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1247,6 +1257,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1268,8 +1281,8 @@ case $os in
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1290,7 +1303,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1423,6 +1436,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
diff --git a/contrib/tcsh/config/bsd4.4 b/contrib/tcsh/config/bsd4.4
index 6be4ebb..e799d1c 100644
--- a/contrib/tcsh/config/bsd4.4
+++ b/contrib/tcsh/config/bsd4.4
@@ -96,13 +96,8 @@
 #  define _PATH_TCSHELL "/usr/contrib/bin/tcsh"
 # endif
 
-# undef NLS_CATALOGS
-
 #elif defined(__APPLE__)
 # define SYSMALLOC
-
-#else
-# define NLS_CATALOGS
 #endif
 
 #endif /* _h_config */
diff --git a/contrib/tcsh/config_f.h b/contrib/tcsh/config_f.h
index 1fd3921..433730e 100644
--- a/contrib/tcsh/config_f.h
+++ b/contrib/tcsh/config_f.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/config_f.h,v 3.42 2009/06/25 12:10:56 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/config_f.h,v 3.47 2011/02/05 20:34:55 christos Exp $ */
 /*
  * config_f.h -- configure various defines for tcsh
  *
@@ -50,19 +50,11 @@
  * WIDE_STRINGS	Represent strings using wide characters
  *		Allows proper function in multibyte encodings like UTF-8
  */
-#if defined (SHORT_STRINGS) && defined (NLS) && SIZEOF_WCHAR_T >= 4 && defined (HAVE_MBRTOWC) && !defined (WINNT_NATIVE) && !defined(_OSD_POSIX)
+#if defined (SHORT_STRINGS) && defined (NLS) && !defined (WINNT_NATIVE) && !defined(_OSD_POSIX)
 # define WIDE_STRINGS
-#endif
-
-/*
- * NLS_CATALOGS:Use Native Language System catalogs for
- *		international messages.
- *		Routines like catopen() are needed
- *		if you don't have <nl_types.h>, you don't want
- *		to define this.
- */
-#if defined (NLS) && defined (HAVE_CATGETS)
-# define NLS_CATALOGS
+# if SIZEOF_WCHAR_T < 4
+#  define UTF16_STRINGS
+# endif
 #endif
 
 /*
@@ -143,7 +135,7 @@
  *		This can be much slower and no memory statistics will be
  *		provided.
  */
-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__)
+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__)
 # define SYSMALLOC
 #else
 # undef SYSMALLOC
@@ -197,10 +189,6 @@
 
 /* Consistency checks */
 #ifdef WIDE_STRINGS
-# if SIZEOF_WCHAR_T < 4
-    #error "wchar_t must be at least 4 bytes for WIDE_STRINGS"
-# endif
-
 # ifdef WINNT_NATIVE
     #error "WIDE_STRINGS cannot be used together with WINNT_NATIVE"
 # endif
diff --git a/contrib/tcsh/configure b/contrib/tcsh/configure
index b4b0f8b..04775a1 100755
--- a/contrib/tcsh/configure
+++ b/contrib/tcsh/configure
@@ -1,62 +1,85 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for tcsh 6.17.00.
+# Generated by GNU Autoconf 2.68 for tcsh 6.18.01.
 #
 # Report bugs to <http://bugs.gw.com/>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
@@ -65,20 +88,19 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -89,354 +111,329 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: http://bugs.gw.com/ about your system, including any
+$0: error possibly output before this message. Then install
+$0: a modern shell, or manually run the script under such a
+$0: shell if you do have one."
+  fi
+  exit 1
 fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
 }
+as_unset=as_fn_unset
 
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
-if as_func_ret_success; then
-  :
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
 else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-exitcode=0
-if as_func_success; then
-  :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
+  as_expr=false
 fi
 
-if as_func_ret_success; then
-  :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -453,8 +450,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -464,49 +460,40 @@ test \$exitcode = 0") || {
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -514,7 +501,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -531,12 +518,12 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
-	case $1 in
-        -*)set "./$1";;
+	case $1 in #(
+	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -550,11 +537,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -569,14 +556,14 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='tcsh'
 PACKAGE_TARNAME='tcsh'
-PACKAGE_VERSION='6.17.00'
-PACKAGE_STRING='tcsh 6.17.00'
+PACKAGE_VERSION='6.18.01'
+PACKAGE_STRING='tcsh 6.18.01'
 PACKAGE_BUGREPORT='http://bugs.gw.com/'
+PACKAGE_URL=''
 
 ac_unique_file="tc.vers.c"
 # Factoring default headers for most tests.
@@ -615,69 +602,85 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CPP
-GREP
-EGREP
-LIBICONV
-LTLIBICONV
-DFLAGS
-HESDEF
-HESLIB
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+BUILD_CATALOGS
+HESLIB
+HESDEF
+DFLAGS
+LTLIBICONV
+LIBICONV
+CC_FOR_GETHOST
+GENCAT
+EGREP
+GREP
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_gnu_ld
+enable_rpath
+with_libiconv_prefix
+enable_nls
+enable_nls_catalogs
+with_hesiod
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -692,6 +695,8 @@ CPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -747,8 +752,9 @@ do
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -790,13 +796,20 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -809,13 +822,20 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1006,22 +1026,36 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1041,26 +1075,26 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1068,23 +1102,36 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
 fi
 
-# Be sure to have absolute directory names.
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1098,8 +1145,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1114,23 +1161,21 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1157,13 +1202,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1189,7 +1232,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tcsh 6.17.00 to adapt to many kinds of systems.
+\`configure' configures tcsh 6.18.01 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1203,7 +1246,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1211,9 +1254,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1223,25 +1266,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/tcsh]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/tcsh]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1254,15 +1297,17 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tcsh 6.17.00:";;
+     short | recursive ) echo "Configuration of tcsh 6.18.01:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-rpath         do not hardcode runtime library paths
   --disable-nls           Disable NLS support
+  --disable-nls-catalogs  Disable NLS catalog support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1278,7 +1323,7 @@ Some influential environment variables:
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
 
@@ -1293,15 +1338,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1337,7 +1384,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1346,22 +1393,765 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tcsh configure 6.17.00
-generated by GNU Autoconf 2.61
+tcsh configure 6.18.01
+generated by GNU Autoconf 2.68
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ---------------------------------- ##
+## Report this to http://bugs.gw.com/ ##
+## ---------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_find_uintX_t LINENO BITS VAR
+# ------------------------------------
+# Finds an unsigned integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_uintX_t ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+$as_echo_n "checking for uint$2_t... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  case $ac_type in #(
+  uint$2_t) :
+    eval "$3=yes" ;; #(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+  break
+fi
+     done
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_find_uintX_t
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_member
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tcsh $as_me 6.17.00, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+It was created by tcsh $as_me 6.18.01, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -1397,8 +2187,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1432,12 +2222,12 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1453,13 +2243,13 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1471,11 +2261,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1484,12 +2272,13 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -1508,128 +2297,136 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1643,68 +2440,56 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1714,12 +2499,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 ac_config_headers="$ac_config_headers config.h"
 
 ac_config_commands="$ac_config_commands ./atconfig"
 
 
-
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -1737,9 +2522,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1751,37 +2534,122 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -1797,28 +2665,24 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -1835,18 +2699,16 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
-{ echo "$as_me:$LINENO: checking cached host tuple" >&5
-echo $ECHO_N "checking cached host tuple... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking cached host tuple" >&5
+$as_echo_n "checking cached host tuple... " >&6; }
 if { test x"${ac_cv_host_system_type+set}" = x"set" &&
      test x"$ac_cv_host_system_type" != x"$host"; }; then
-  { echo "$as_me:$LINENO: result: different" >&5
-echo "${ECHO_T}different" >&6; }
-  { { echo "$as_me:$LINENO: error: remove config.cache and re-run configure" >&5
-echo "$as_me: error: remove config.cache and re-run configure" >&2;}
-   { (exit 1); exit 1; }; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: different" >&5
+$as_echo "different" >&6; }
+  as_fn_error $? "remove config.cache and re-run configure" "$LINENO" 5
 else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 ac_cv_host_system_type="$host"
 
@@ -1901,6 +2763,11 @@ case "${host}" in
     tcsh_config_file=os390
   ;;
 
+  ## Android
+  *-*-android*)
+    tcsh_config_file=android
+  ;;
+
   ## Linux
   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
     tcsh_config_file=linux
@@ -2001,9 +2868,12 @@ case "${host}" in
   *-*-solaris2.[45] ) # Should handle sparc, x86 and powerpc
     tcsh_config_file=sol24
   ;;
-  *-*-solaris2.* ) # Should handle sparc, x86 and powerpc
+  *-*-solaris2.[678] ) # Should handle sparc, x86 and powerpc
     tcsh_config_file=sol26
   ;;
+  *-*-solaris2.* ) # Should handle sparc, x86 and powerpc
+    tcsh_config_file=sol29
+  ;;
 
   ## Dell SVR4
   *-dell-sysv4* )
@@ -2053,7 +2923,7 @@ case "${host}" in
 
   ## Red Hat Cygwin
   *-cygwin)
-    tcsh_config_file=cygwin32
+    tcsh_config_file=cygwin
   ;;
 
   ## mips-compaq-nonstopux
@@ -2072,13 +2942,9 @@ case "${host}" in
   ;;
 
   * )
-    { { echo "$as_me:$LINENO: error: Tcsh can't guess the configuration file name
-for \`${host}' systems.
-Check tcsh's \`Ported' file for manual configuration instructions." >&5
-echo "$as_me: error: Tcsh can't guess the configuration file name
+    as_fn_error $? "Tcsh can't guess the configuration file name
 for \`${host}' systems.
-Check tcsh's \`Ported' file for manual configuration instructions." >&2;}
-   { (exit 1); exit 1; }; }
+Check tcsh's \`Ported' file for manual configuration instructions." "$LINENO" 5
     ;;
 
 esac
@@ -2087,7 +2953,6 @@ echo "Tcsh will use configuration file \`$tcsh_config_file'."
 cp ${srcdir}/config/${tcsh_config_file} config_p.h
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2096,10 +2961,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2109,25 +2974,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2136,10 +3001,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2149,25 +3014,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2175,12 +3040,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2193,10 +3054,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2206,25 +3067,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2233,10 +3094,10 @@ fi
 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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2247,18 +3108,18 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -2277,11 +3138,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2292,10 +3153,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2305,25 +3166,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2336,10 +3197,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2349,25 +3210,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2379,12 +3240,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2394,51 +3251,37 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2450,42 +3293,38 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -2495,14 +3334,14 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -2521,78 +3360,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2600,37 +3402,90 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2642,51 +3497,46 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2700,54 +3550,34 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2758,34 +3588,11 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2796,35 +3603,12 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2835,42 +3619,18 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2886,18 +3646,14 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -2954,31 +3710,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -2989,17 +3723,19 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3012,15 +3748,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3034,11 +3770,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3047,76 +3779,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -3128,8 +3818,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3139,11 +3829,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3152,83 +3838,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -3239,45 +3882,40 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -3289,77 +3927,61 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
+  done
   done
-done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -3371,54 +3993,39 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
+  done
   done
-done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; }
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
+$as_echo_n "checking whether $CC needs -traditional... " >&6; }
+if ${ac_cv_prog_gcc_traditional+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
     ac_pattern="Autoconf.*'x'"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sgtty.h>
 Autoconf TIOCGETP
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
   ac_cv_prog_gcc_traditional=yes
 else
   ac_cv_prog_gcc_traditional=no
@@ -3427,47 +4034,87 @@ rm -f conftest*
 
 
   if test $ac_cv_prog_gcc_traditional = no; then
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <termio.h>
 Autoconf TCGETA
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
   ac_cv_prog_gcc_traditional=yes
 fi
 rm -f conftest*
 
   fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
+$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
 
+# Extract the first word of "gencat", so it can be a program name with args.
+set dummy gencat; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GENCAT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GENCAT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GENCAT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GENCAT=$ac_cv_path_GENCAT
+if test -n "$GENCAT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENCAT" >&5
+$as_echo "$GENCAT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+if test "x${cross_compiling}" = xyes ; then
+  CC_FOR_GETHOST="cc"
+else
+  CC_FOR_GETHOST="\$(CC)"
+fi
+
+
 if test "x$GCC" != xyes ; then
   DFLAGS="$DFLAGS $NON_GNU_DFLAGS"
   CFLAGS="$CFLAGS $NON_GNU_CFLAGS"
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing crypt" >&5
-echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; }
-if test "${ac_cv_search_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
+$as_echo_n "checking for library containing crypt... " >&6; }
+if ${ac_cv_search_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -3492,65 +4139,38 @@ for ac_lib in '' crypt; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_crypt=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_crypt+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_crypt+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_crypt+set}" = set; then
-  :
+if ${ac_cv_search_crypt+:} false; then :
+
 else
   ac_cv_search_crypt=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
-echo "${ECHO_T}$ac_cv_search_crypt" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5
+$as_echo "$ac_cv_search_crypt" >&6; }
 ac_res=$ac_cv_search_crypt
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing getspnam" >&5
-echo $ECHO_N "checking for library containing getspnam... $ECHO_C" >&6; }
-if test "${ac_cv_search_getspnam+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getspnam" >&5
+$as_echo_n "checking for library containing getspnam... " >&6; }
+if ${ac_cv_search_getspnam+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -3575,65 +4195,38 @@ for ac_lib in '' sec; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_getspnam=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_getspnam+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_getspnam+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_getspnam+set}" = set; then
-  :
+if ${ac_cv_search_getspnam+:} false; then :
+
 else
   ac_cv_search_getspnam=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_getspnam" >&5
-echo "${ECHO_T}$ac_cv_search_getspnam" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getspnam" >&5
+$as_echo "$ac_cv_search_getspnam" >&6; }
 ac_res=$ac_cv_search_getspnam
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing tgetent" >&5
-echo $ECHO_N "checking for library containing tgetent... $ECHO_C" >&6; }
-if test "${ac_cv_search_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
+$as_echo_n "checking for library containing tgetent... " >&6; }
+if ${ac_cv_search_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -3658,65 +4251,38 @@ for ac_lib in '' termlib termcap curses ncurses; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_tgetent=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_tgetent+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_tgetent+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_tgetent+set}" = set; then
-  :
+if ${ac_cv_search_tgetent+:} false; then :
+
 else
   ac_cv_search_tgetent=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_tgetent" >&5
-echo "${ECHO_T}$ac_cv_search_tgetent" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5
+$as_echo "$ac_cv_search_tgetent" >&6; }
 ac_res=$ac_cv_search_tgetent
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
-echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; }
-if test "${ac_cv_search_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
+$as_echo_n "checking for library containing gethostbyname... " >&6; }
+if ${ac_cv_search_gethostbyname+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -3741,65 +4307,38 @@ for ac_lib in '' nsl; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_gethostbyname=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_gethostbyname+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_gethostbyname+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_gethostbyname+set}" = set; then
-  :
+if ${ac_cv_search_gethostbyname+:} false; then :
+
 else
   ac_cv_search_gethostbyname=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
+$as_echo "$ac_cv_search_gethostbyname" >&6; }
 ac_res=$ac_cv_search_gethostbyname
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing connect" >&5
-echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; }
-if test "${ac_cv_search_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing connect" >&5
+$as_echo_n "checking for library containing connect... " >&6; }
+if ${ac_cv_search_connect+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -3824,50 +4363,83 @@ for ac_lib in '' socket; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_connect=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_connect+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_connect+:} false; then :
 
+else
+  ac_cv_search_connect=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_connect" >&5
+$as_echo "$ac_cv_search_connect" >&6; }
+ac_res=$ac_cv_search_connect
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_connect+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing catgets" >&5
+$as_echo_n "checking for library containing catgets... " >&6; }
+if ${ac_cv_search_catgets+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char catgets ();
+int
+main ()
+{
+return catgets ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' catgets; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_catgets=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_catgets+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_connect+set}" = set; then
-  :
+if ${ac_cv_search_catgets+:} false; then :
+
 else
-  ac_cv_search_connect=no
+  ac_cv_search_catgets=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5
-echo "${ECHO_T}$ac_cv_search_connect" >&6; }
-ac_res=$ac_cv_search_connect
-if test "$ac_res" != no; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_catgets" >&5
+$as_echo "$ac_cv_search_catgets" >&6; }
+ac_res=$ac_cv_search_catgets
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -3890,7 +4462,7 @@ fi
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -3912,8 +4484,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -3928,7 +4500,7 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -3942,14 +4514,14 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${acl_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${acl_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -3962,9 +4534,9 @@ else
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
       *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
+        test "$with_gnu_ld" != no && break ;;
       *)
-	test "$with_gnu_ld" != yes && break ;;
+        test "$with_gnu_ld" != yes && break ;;
       esac
     fi
   done
@@ -3976,19 +4548,17 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${acl_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -3998,17 +4568,17 @@ case `$LD -v 2>&1 </dev/null` in
   acl_cv_prog_gnu_ld=no ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
 
-                                                { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
-if test "${acl_cv_rpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if ${acl_cv_rpath+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
@@ -4018,17 +4588,19 @@ else
     acl_cv_rpath=done
 
 fi
-{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
     # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then
+if test "${enable_rpath+set}" = set; then :
   enableval=$enable_rpath; :
 else
   enable_rpath=yes
@@ -4037,6 +4609,74 @@ fi
 
 
 
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+$as_echo_n "checking for 64-bit host... " >&6; }
+if ${gl_cv_solaris_64bit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef _LP64
+sixtyfour bits
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
+  gl_cv_solaris_64bit=yes
+else
+  gl_cv_solaris_64bit=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+$as_echo "$gl_cv_solaris_64bit" >&6; }
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+
+
+
+
+
+
 
 
 
@@ -4056,7 +4696,7 @@ fi
 
 
 # Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
+if test "${with_libiconv_prefix+set}" = set; then :
   withval=$with_libiconv_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -4076,7 +4716,11 @@ if test "${with_libiconv_prefix+set}" = set; then
 
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
       fi
     fi
 
@@ -4085,6 +4729,8 @@ fi
       LIBICONV=
   LTLIBICONV=
   INCICONV=
+  LIBICONV_PREFIX=
+      HAVE_LIBICONV=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -4118,22 +4764,52 @@ fi
           found_la=
           found_so=
           found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
                 fi
               fi
             fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBICONV; do
@@ -4149,21 +4825,44 @@ fi
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
                       found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
                       fi
                     fi
                   fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -4174,7 +4873,9 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
                                 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
               else
                                                                                 haveit=
@@ -4187,10 +4888,10 @@ fi
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$hardcode_direct" = yes; then
+                                if test "$acl_hardcode_direct" = yes; then
                                                       LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                 else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
                                                             LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -4222,7 +4923,7 @@ fi
                     if test -z "$haveit"; then
                       LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
                     fi
-                    if test "$hardcode_minus_L" != no; then
+                    if test "$acl_hardcode_minus_L" != no; then
                                                                                         LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                     else
                                                                                                                                                                                 LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
@@ -4239,8 +4940,18 @@ fi
             fi
                         additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -4289,9 +5000,11 @@ fi
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -4391,21 +5104,21 @@ fi
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
@@ -4423,6 +5136,11 @@ fi
 
 
 
+
+
+
+
+
           am_save_CPPFLAGS="$CPPFLAGS"
 
   for element in $INCICONV; do
@@ -4448,19 +5166,15 @@ fi
   done
 
 
-  { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
-if test "${am_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if ${am_cv_func_iconv+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
@@ -4474,42 +5188,15 @@ iconv_t cd = iconv_open("","");
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
@@ -4523,53 +5210,145 @@ iconv_t cd = iconv_open("","");
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      LIBS="$am_save_LIBS"
+    fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+  if test "$am_cv_func_iconv" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if ${am_cv_func_iconv_works+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
+            am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\263";
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  am_cv_func_iconv_works=yes
+else
+  am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
-    fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6; }
-  if test "$am_cv_func_iconv" = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -4579,17 +5358,13 @@ echo "${ECHO_T}$LIBICONV" >&6; }
 
 
   if test "$am_cv_func_iconv" = yes; then
-    { echo "$as_me:$LINENO: checking for iconv declaration" >&5
-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
-    if test "${am_cv_proto_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+    if ${am_cv_proto_iconv+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -4612,40 +5387,20 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   am_cv_proto_iconv_arg1=""
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	am_cv_proto_iconv_arg1="const"
+  am_cv_proto_iconv_arg1="const"
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    { echo "$as_me:$LINENO: result: ${ac_t:-
-         }$am_cv_proto_iconv" >&5
-echo "${ECHO_T}${ac_t:-
-         }$am_cv_proto_iconv" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result:
+         $am_cv_proto_iconv" >&5
+$as_echo "
+         $am_cv_proto_iconv" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define ICONV_CONST $am_cv_proto_iconv_arg1
@@ -4654,16 +5409,12 @@ _ACEOF
   fi
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4678,47 +5429,23 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -4728,18 +5455,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -4749,14 +5472,10 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -4783,113 +5502,35 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4897,708 +5538,53 @@ fi
 done
 
 
-
-
-
-
-
-
-
-for ac_header in auth.h crypt.h inttypes.h shadow.h stdint.h utmp.h utmpx.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to http://bugs.gw.com/ ##
-## ---------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+for ac_header in auth.h crypt.h features.h inttypes.h paths.h 		 shadow.h stdint.h utmp.h utmpx.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-
 for ac_header in wchar.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to http://bugs.gw.com/ ##
-## ---------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
+if test "x$ac_cv_header_wchar_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- { echo "$as_me:$LINENO: checking for wchar_t" >&5
-echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_wchar_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <wchar.h>
-
-typedef wchar_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
+#define HAVE_WCHAR_H 1
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_wchar_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_wchar_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
-echo "${ECHO_T}$ac_cv_type_wchar_t" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+ # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of wchar_t" >&5
-echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <wchar.h>
-
-   typedef wchar_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <wchar.h>
-
-   typedef wchar_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <wchar.h>
-
-   typedef wchar_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <wchar.h>
-
-   typedef wchar_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5
+$as_echo_n "checking size of wchar_t... " >&6; }
+if ${ac_cv_sizeof_wchar_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t"        "#include <stdio.h>
 #include <wchar.h>
+"; then :
 
-   typedef wchar_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_wchar_t=$ac_lo;;
-'') if test "$ac_cv_type_wchar_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (wchar_t)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_wchar_t=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <wchar.h>
-
-   typedef wchar_t ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_wchar_t=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_wchar_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (wchar_t)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_wchar_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (wchar_t)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_wchar_t=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_wchar_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5
+$as_echo "$ac_cv_sizeof_wchar_t" >&6; }
 
 
 
@@ -5607,145 +5593,12 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-
-for ac_header in wctype.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to http://bugs.gw.com/ ##
-## ---------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+	for ac_header in wctype.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "wctype.h" "ac_cv_header_wctype_h" "$ac_includes_default"
+if test "x$ac_cv_header_wctype_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_WCTYPE_H 1
 _ACEOF
 
 fi
@@ -5756,24 +5609,15 @@ fi
 
 done
 
-
-
-
-
-
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+if eval \${$as_ac_Header+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -5787,39 +5631,19 @@ return 0;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+eval ac_res=\$$as_ac_Header
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
 
 ac_header_dirent=$ac_hdr; break
@@ -5828,17 +5652,13 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if ${ac_cv_search_opendir+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5863,66 +5683,39 @@ for ac_lib in '' dir; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_opendir+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
+if ${ac_cv_search_opendir+:} false; then :
+
 else
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 else
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if ${ac_cv_search_opendir+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5947,66 +5740,39 @@ for ac_lib in '' x; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_opendir+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
+if ${ac_cv_search_opendir+:} false; then :
+
 else
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
-echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6; }
-if test "${ac_cv_header_stat_broken+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
+$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+if ${ac_cv_header_stat_broken+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -6028,53 +5794,27 @@ extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
 #endif
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stat_broken=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stat_broken=yes
+  ac_cv_header_stat_broken=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
-echo "${ECHO_T}$ac_cv_header_stat_broken" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
+$as_echo "$ac_cv_header_stat_broken" >&6; }
 if test $ac_cv_header_stat_broken = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STAT_MACROS_BROKEN 1
-_ACEOF
+$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6089,47 +5829,23 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -6139,18 +5855,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -6160,14 +5872,10 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -6194,106 +5902,28 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-if test $ac_cv_type_long_long = yes; then
+ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
+if test "x$ac_cv_type_long_long" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LONG_LONG 1
@@ -6302,22 +5932,18 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if ${ac_cv_type_uid_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
+  $EGREP "uid_t" >/dev/null 2>&1; then :
   ac_cv_type_uid_t=yes
 else
   ac_cv_type_uid_t=no
@@ -6325,34 +5951,26 @@ fi
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
+$as_echo "#define uid_t int" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
+$as_echo "#define gid_t int" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
-echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6; }
-if test "${ac_cv_type_getgroups+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking type of array argument to getgroups" >&5
+$as_echo_n "checking type of array argument to getgroups... " >&6; }
+if ${ac_cv_type_getgroups+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_type_getgroups=cross
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Thanks to Mike Rendell for this test.  */
 $ac_includes_default
@@ -6378,51 +5996,23 @@ main ()
   return n > 0 && gidset[n] != val.gval;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_type_getgroups=gid_t
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_type_getgroups=int
+  ac_cv_type_getgroups=int
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 if test $ac_cv_type_getgroups = cross; then
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then
+  $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then :
   ac_cv_type_getgroups=gid_t
 else
   ac_cv_type_getgroups=int
@@ -6431,69 +6021,17 @@ rm -f conftest*
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
-echo "${ECHO_T}$ac_cv_type_getgroups" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_getgroups" >&5
+$as_echo "$ac_cv_type_getgroups" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define GETGROUPS_T $ac_cv_type_getgroups
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_mode_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef mode_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_mode_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_mode_t=no
-fi
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = xyes; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
-if test $ac_cv_type_mode_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -6502,61 +6040,9 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_size_t=no
-fi
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -6565,22 +6051,18 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if ${ac_cv_type_uid_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
+  $EGREP "uid_t" >/dev/null 2>&1; then :
   ac_cv_type_uid_t=yes
 else
   ac_cv_type_uid_t=no
@@ -6588,87 +6070,43 @@ fi
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
+$as_echo "#define uid_t int" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
+$as_echo "#define gid_t int" >>confdefs.h
 
 fi
 
+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
+case $ac_cv_c_uint32_t in #(
+  no|yes) ;; #(
+  *)
 
+$as_echo "#define _UINT32_T 1" >>confdefs.h
 
 
-{ echo "$as_me:$LINENO: checking for ssize_t" >&5
-echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_ssize_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat >>confdefs.h <<_ACEOF
+#define uint32_t $ac_cv_c_uint32_t
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+;;
+  esac
 
-#include <sys/types.h>
 
 
-typedef ssize_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_ssize_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_ssize_t=no
-fi
+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "
+#include <sys/types.h>
+
+"
+if test "x$ac_cv_type_ssize_t" = xyes; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
-if test $ac_cv_type_ssize_t = yes; then
-  :
 else
 
-cat >>confdefs.h <<\_ACEOF
-#define ssize_t int
-_ACEOF
+$as_echo "#define ssize_t int" >>confdefs.h
 
 fi
 
@@ -6676,88 +6114,23 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for socklen_t" >&5
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_socklen_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
 #include <sys/types.h>
 #include <sys/socket.h>
 
+"
+if test "x$ac_cv_type_socklen_t" = xyes; then :
 
-typedef socklen_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_socklen_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_socklen_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
-echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; }
-if test $ac_cv_type_socklen_t = yes; then
-  :
 else
 
-cat >>confdefs.h <<\_ACEOF
-#define socklen_t int
-_ACEOF
+$as_echo "#define socklen_t int" >>confdefs.h
 
 fi
 
 
 
 
-{ echo "$as_me:$LINENO: checking for struct dirent.d_ino" >&5
-echo $ECHO_N "checking for struct dirent.d_ino... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_dirent_d_ino+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef HAVE_DIRENT_H
+ac_fn_c_check_member "$LINENO" "struct dirent" "d_ino" "ac_cv_member_struct_dirent_d_ino" "#ifdef HAVE_DIRENT_H
 # include <dirent.h>
 #else
 # ifdef HAVE_NDIR_H
@@ -6767,99 +6140,8 @@ cat >>conftest.$ac_ext <<_ACEOF
 # endif
 # define dirent direct
 #endif
-
-int
-main ()
-{
-static struct dirent ac_aggr;
-if (ac_aggr.d_ino)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_dirent_d_ino=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# else
-#  include <sys/dir.h>
-# endif
-# define dirent direct
-#endif
-
-int
-main ()
-{
-static struct dirent ac_aggr;
-if (sizeof ac_aggr.d_ino)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_dirent_d_ino=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_dirent_d_ino=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_dirent_d_ino" >&5
-echo "${ECHO_T}$ac_cv_member_struct_dirent_d_ino" >&6; }
-if test $ac_cv_member_struct_dirent_d_ino = yes; then
+"
+if test "x$ac_cv_member_struct_dirent_d_ino" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_DIRENT_D_INO 1
@@ -6868,565 +6150,139 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for struct utmp.ut_host" >&5
-echo $ECHO_N "checking for struct utmp.ut_host... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_utmp_ut_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
+ac_fn_c_check_member "$LINENO" "struct utmp" "ut_host" "ac_cv_member_struct_utmp_ut_host" "#include <sys/types.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #define utmp utmpx
 #elif defined HAVE_UTMP_H
 #include <utmp.h>
 #endif
+"
+if test "x$ac_cv_member_struct_utmp_ut_host" = xyes; then :
 
-int
-main ()
-{
-static struct utmp ac_aggr;
-if (ac_aggr.ut_host)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UTMP_UT_HOST 1
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_utmp_ut_host=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
+
+fi
+ac_fn_c_check_member "$LINENO" "struct utmp" "ut_user" "ac_cv_member_struct_utmp_ut_user" "#include <sys/types.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #define utmp utmpx
 #elif defined HAVE_UTMP_H
 #include <utmp.h>
 #endif
-
-int
-main ()
-{
-static struct utmp ac_aggr;
-if (sizeof ac_aggr.ut_host)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_utmp_ut_host=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_utmp_ut_host=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_host" >&5
-echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_host" >&6; }
-if test $ac_cv_member_struct_utmp_ut_host = yes; then
+"
+if test "x$ac_cv_member_struct_utmp_ut_user" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_UTMP_UT_HOST 1
+#define HAVE_STRUCT_UTMP_UT_USER 1
 _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct utmp.ut_user" >&5
-echo $ECHO_N "checking for struct utmp.ut_user... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_utmp_ut_user+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
+ac_fn_c_check_member "$LINENO" "struct utmp" "ut_tv" "ac_cv_member_struct_utmp_ut_tv" "#include <sys/types.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #define utmp utmpx
 #elif defined HAVE_UTMP_H
 #include <utmp.h>
 #endif
+"
+if test "x$ac_cv_member_struct_utmp_ut_tv" = xyes; then :
 
-int
-main ()
-{
-static struct utmp ac_aggr;
-if (ac_aggr.ut_user)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UTMP_UT_TV 1
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_utmp_ut_user=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
+
+fi
+ac_fn_c_check_member "$LINENO" "struct utmp" "ut_xtime" "ac_cv_member_struct_utmp_ut_xtime" "#include <sys/types.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #define utmp utmpx
 #elif defined HAVE_UTMP_H
 #include <utmp.h>
 #endif
-
-int
-main ()
-{
-static struct utmp ac_aggr;
-if (sizeof ac_aggr.ut_user)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_utmp_ut_user=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_utmp_ut_user=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_user" >&5
-echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_user" >&6; }
-if test $ac_cv_member_struct_utmp_ut_user = yes; then
+"
+if test "x$ac_cv_member_struct_utmp_ut_xtime" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_UTMP_UT_USER 1
+#define HAVE_STRUCT_UTMP_UT_XTIME 1
 _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct utmp.ut_tv" >&5
-echo $ECHO_N "checking for struct utmp.ut_tv... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_utmp_ut_tv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
+ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_host" "ac_cv_member_struct_utmpx_ut_host" "#include <sys/types.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #define utmp utmpx
 #elif defined HAVE_UTMP_H
 #include <utmp.h>
 #endif
+"
+if test "x$ac_cv_member_struct_utmpx_ut_host" = xyes; then :
 
-int
-main ()
-{
-static struct utmp ac_aggr;
-if (ac_aggr.ut_tv)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UTMPX_UT_HOST 1
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_utmp_ut_tv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
+
+fi
+ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_user" "ac_cv_member_struct_utmpx_ut_user" "#include <sys/types.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #define utmp utmpx
 #elif defined HAVE_UTMP_H
 #include <utmp.h>
 #endif
-
-int
-main ()
-{
-static struct utmp ac_aggr;
-if (sizeof ac_aggr.ut_tv)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_utmp_ut_tv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_utmp_ut_tv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_tv" >&5
-echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_tv" >&6; }
-if test $ac_cv_member_struct_utmp_ut_tv = yes; then
+"
+if test "x$ac_cv_member_struct_utmpx_ut_user" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_UTMP_UT_TV 1
+#define HAVE_STRUCT_UTMPX_UT_USER 1
 _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct utmp.ut_xtime" >&5
-echo $ECHO_N "checking for struct utmp.ut_xtime... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_utmp_ut_xtime+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
+ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_tv" "ac_cv_member_struct_utmpx_ut_tv" "#include <sys/types.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #define utmp utmpx
 #elif defined HAVE_UTMP_H
 #include <utmp.h>
 #endif
+"
+if test "x$ac_cv_member_struct_utmpx_ut_tv" = xyes; then :
 
-int
-main ()
-{
-static struct utmp ac_aggr;
-if (ac_aggr.ut_xtime)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UTMPX_UT_TV 1
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_utmp_ut_xtime=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
+
+fi
+ac_fn_c_check_member "$LINENO" "struct utmpx" "ut_xtime" "ac_cv_member_struct_utmpx_ut_xtime" "#include <sys/types.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
 #define utmp utmpx
 #elif defined HAVE_UTMP_H
 #include <utmp.h>
 #endif
-
-int
-main ()
-{
-static struct utmp ac_aggr;
-if (sizeof ac_aggr.ut_xtime)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_utmp_ut_xtime=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_utmp_ut_xtime=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_xtime" >&5
-echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_xtime" >&6; }
-if test $ac_cv_member_struct_utmp_ut_xtime = yes; then
+"
+if test "x$ac_cv_member_struct_utmpx_ut_xtime" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_UTMP_UT_XTIME 1
+#define HAVE_STRUCT_UTMPX_UT_XTIME 1
 _ACEOF
 
 
 fi
 
-{ echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_family" >&5
-echo $ECHO_N "checking for struct sockaddr_storage.ss_family... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_sockaddr_storage_ss_family+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
+ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" "#include <sys/types.h>
 #include <sys/socket.h>
-
-int
-main ()
-{
-static struct sockaddr_storage ac_aggr;
-if (ac_aggr.ss_family)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_sockaddr_storage_ss_family=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int
-main ()
-{
-static struct sockaddr_storage ac_aggr;
-if (sizeof ac_aggr.ss_family)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_sockaddr_storage_ss_family=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_sockaddr_storage_ss_family=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_family" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage_ss_family" >&6; }
-if test $ac_cv_member_struct_sockaddr_storage_ss_family = yes; then
+"
+if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
@@ -7436,16 +6292,12 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -7505,53 +6357,27 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_const=no
+  ac_cv_c_const=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for working volatile" >&5
-echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; }
-if test "${ac_cv_c_volatile+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
+$as_echo_n "checking for working volatile... " >&6; }
+if ${ac_cv_c_volatile+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -7565,543 +6391,120 @@ return !x && !y;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_volatile=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_volatile=no
+  ac_cv_c_volatile=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
-echo "${ECHO_T}$ac_cv_c_volatile" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
+$as_echo "$ac_cv_c_volatile" >&6; }
 if test $ac_cv_c_volatile = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define volatile
-_ACEOF
+$as_echo "#define volatile /**/" >>confdefs.h
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether crypt is declared" >&5
-echo $ECHO_N "checking whether crypt is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "config_p.h"
+ac_fn_c_check_decl "$LINENO" "crypt" "ac_cv_have_decl_crypt" "#include \"config_p.h\"
 $ac_includes_default
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif
 
-
-int
-main ()
-{
-#ifndef crypt
-  (void) crypt;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_crypt=yes
+"
+if test "x$ac_cv_have_decl_crypt" = xyes; then :
+  ac_have_decl=1
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_crypt=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_have_decl=0
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_crypt" >&5
-echo "${ECHO_T}$ac_cv_have_decl_crypt" >&6; }
-if test $ac_cv_have_decl_crypt = yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_CRYPT 1
+#define HAVE_DECL_CRYPT $ac_have_decl
 _ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_CRYPT 0
-_ACEOF
-
-
-fi
-{ echo "$as_me:$LINENO: checking whether environ is declared" >&5
-echo $ECHO_N "checking whether environ is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_environ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "config_p.h"
+ac_fn_c_check_decl "$LINENO" "environ" "ac_cv_have_decl_environ" "#include \"config_p.h\"
 $ac_includes_default
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif
 
-
-int
-main ()
-{
-#ifndef environ
-  (void) environ;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_environ=yes
+"
+if test "x$ac_cv_have_decl_environ" = xyes; then :
+  ac_have_decl=1
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_environ=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_have_decl=0
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_environ" >&5
-echo "${ECHO_T}$ac_cv_have_decl_environ" >&6; }
-if test $ac_cv_have_decl_environ = yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ENVIRON 1
+#define HAVE_DECL_ENVIRON $ac_have_decl
 _ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ENVIRON 0
-_ACEOF
-
-
-fi
-{ echo "$as_me:$LINENO: checking whether gethostname is declared" >&5
-echo $ECHO_N "checking whether gethostname is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "config_p.h"
+ac_fn_c_check_decl "$LINENO" "gethostname" "ac_cv_have_decl_gethostname" "#include \"config_p.h\"
 $ac_includes_default
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif
 
-
-int
-main ()
-{
-#ifndef gethostname
-  (void) gethostname;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_gethostname=yes
+"
+if test "x$ac_cv_have_decl_gethostname" = xyes; then :
+  ac_have_decl=1
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_gethostname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_have_decl=0
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_gethostname" >&5
-echo "${ECHO_T}$ac_cv_have_decl_gethostname" >&6; }
-if test $ac_cv_have_decl_gethostname = yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETHOSTNAME 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETHOSTNAME 0
-_ACEOF
-
-
-fi
-{ echo "$as_me:$LINENO: checking whether getpgrp is declared" >&5
-echo $ECHO_N "checking whether getpgrp is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_getpgrp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+#define HAVE_DECL_GETHOSTNAME $ac_have_decl
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include "config_p.h"
+ac_fn_c_check_decl "$LINENO" "getpgrp" "ac_cv_have_decl_getpgrp" "#include \"config_p.h\"
 $ac_includes_default
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif
 
-
-int
-main ()
-{
-#ifndef getpgrp
-  (void) getpgrp;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_getpgrp=yes
+"
+if test "x$ac_cv_have_decl_getpgrp" = xyes; then :
+  ac_have_decl=1
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_getpgrp=no
+  ac_have_decl=0
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getpgrp" >&5
-echo "${ECHO_T}$ac_cv_have_decl_getpgrp" >&6; }
-if test $ac_cv_have_decl_getpgrp = yes; then
-
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETPGRP 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETPGRP 0
+#define HAVE_DECL_GETPGRP $ac_have_decl
 _ACEOF
 
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for setlocale" >&5
-echo $ECHO_N "checking for setlocale... $ECHO_C" >&6; }
-if test "${ac_cv_func_setlocale+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define setlocale to an innocuous variant, in case <limits.h> declares setlocale.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define setlocale innocuous_setlocale
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char setlocale (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef setlocale
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char setlocale ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_setlocale || defined __stub___setlocale
-choke me
-#endif
-
-int
-main ()
-{
-return setlocale ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_setlocale=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_setlocale=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_setlocale" >&5
-echo "${ECHO_T}$ac_cv_func_setlocale" >&6; }
-if test $ac_cv_func_setlocale = yes; then
+ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
+if test "x$ac_cv_func_setlocale" = xyes; then :
   have_setlocale=yes
 else
   have_setlocale=no
 fi
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in catgets dup2 getauthid getcwd gethostname getpwent 	getutent memmove memset nice nl_langinfo sbrk setpgid setpriority 	strerror strstr sysconf wcwidth
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
+ac_fn_c_check_func "$LINENO" "catgets" "ac_cv_func_catgets"
+if test "x$ac_cv_func_catgets" = xyes; then :
+  have_catgets=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
+  have_catgets=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+for ac_func in dup2 getauthid getcwd gethostname getpwent 	getutent getutxent mallinfo memmove memset mkstemp nice 	nl_langinfo sbrk setpgid setpriority strerror strstr sysconf wcwidth
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-{ echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
-echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6; }
-if test "${ac_cv_func_getpgrp_void+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5
+$as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
+if ${ac_cv_func_getpgrp_void+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   # Use it with a single arg.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -8112,55 +6515,29 @@ getpgrp (0);
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_getpgrp_void=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_getpgrp_void=yes
+  ac_cv_func_getpgrp_void=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
-echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getpgrp_void" >&5
+$as_echo "$ac_cv_func_getpgrp_void" >&6; }
 if test $ac_cv_func_getpgrp_void = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define GETPGRP_VOID 1
-_ACEOF
+$as_echo "#define GETPGRP_VOID 1" >>confdefs.h
 
 fi
 
 
-  { echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
-echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6; }
-if test "${ac_cv_func_mbrtowc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc and mbstate_t are properly declared" >&5
+$as_echo_n "checking whether mbrtowc and mbstate_t are properly declared... " >&6; }
+if ${ac_cv_func_mbrtowc+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
 int
@@ -8175,60 +6552,32 @@ wchar_t wc;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_mbrtowc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_mbrtowc=no
+  ac_cv_func_mbrtowc=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mbrtowc" >&5
-echo "${ECHO_T}$ac_cv_func_mbrtowc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mbrtowc" >&5
+$as_echo "$ac_cv_func_mbrtowc" >&6; }
   if test $ac_cv_func_mbrtowc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MBRTOWC 1
-_ACEOF
+$as_echo "#define HAVE_MBRTOWC 1" >>confdefs.h
 
   fi
 
-{ echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
-echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6; }
-if test "${ac_cv_func_setpgrp_void+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "x${cross_compiling}" != xyes ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setpgrp takes no argument" >&5
+$as_echo_n "checking whether setpgrp takes no argument... " >&6; }
+if ${ac_cv_func_setpgrp_void+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
-echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  if test "$cross_compiling" = yes; then :
+  as_fn_error $? "cannot check setpgrp when cross compiling" "$LINENO" 5
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -8242,63 +6591,36 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_setpgrp_void=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_setpgrp_void=yes
+  ac_cv_func_setpgrp_void=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
-echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_void" >&5
+$as_echo "$ac_cv_func_setpgrp_void" >&6; }
 if test $ac_cv_func_setpgrp_void = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define SETPGRP_VOID 1
-_ACEOF
+$as_echo "#define SETPGRP_VOID 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for working strcoll" >&5
-echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6; }
-if test "${ac_cv_func_strcoll_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$cross_compiling" = yes; then
+  ac_cv_func_setpgrp_void=yes
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
+$as_echo_n "checking for working strcoll... " >&6; }
+if ${ac_cv_func_strcoll_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_strcoll_works=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -8311,47 +6633,21 @@ return (strcoll ("abc", "def") >= 0 ||
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_strcoll_works=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_strcoll_works=no
+  ac_cv_func_strcoll_works=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
-echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5
+$as_echo "$ac_cv_func_strcoll_works" >&6; }
 if test $ac_cv_func_strcoll_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRCOLL 1
-_ACEOF
+$as_echo "#define HAVE_STRCOLL 1" >>confdefs.h
 
 fi
 
@@ -8361,7 +6657,7 @@ fi
 
 if test "$have_setlocale" != no; then
   # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
+if test "${enable_nls+set}" = set; then :
   enableval=$enable_nls;
 else
   enable_nls=yes
@@ -8369,119 +6665,49 @@ fi
 
   if test "x$enable_nls" != xno; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NLS 1
-_ACEOF
+$as_echo "#define NLS 1" >>confdefs.h
 
   fi
 fi
 
-
-# Check whether --with-hesiod was given.
-if test "${with_hesiod+set}" = set; then
-  withval=$with_hesiod; hesiod="$withval"
+if test "x$enable_nls" != xno -a "$have_catgets" != no -a -n "$GENCAT" ; then
+  # Check whether --enable-nls-catalogs was given.
+if test "${enable_nls_catalogs+set}" = set; then :
+  enableval=$enable_nls_catalogs;
 else
-  hesiod=no
+  enable_nls_catalogs=yes
 fi
 
-if test "$hesiod" != no; then
-  HESLIB="-lhesiod"
-  { echo "$as_me:$LINENO: checking for res_send" >&5
-echo $ECHO_N "checking for res_send... $ECHO_C" >&6; }
-if test "${ac_cv_func_res_send+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define res_send to an innocuous variant, in case <limits.h> declares res_send.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define res_send innocuous_res_send
+  if test "x$enable_nls_catalogs" != xno; then
+    BUILD_CATALOGS="yes"
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char res_send (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+$as_echo "#define NLS_CATALOGS 1" >>confdefs.h
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+  fi
+fi
 
-#undef res_send
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_send ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_res_send || defined __stub___res_send
-choke me
-#endif
-
-int
-main ()
-{
-return res_send ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_res_send=yes
+# Check whether --with-hesiod was given.
+if test "${with_hesiod+set}" = set; then :
+  withval=$with_hesiod; hesiod="$withval"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_res_send=no
+  hesiod=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_res_send" >&5
-echo "${ECHO_T}$ac_cv_func_res_send" >&6; }
-if test $ac_cv_func_res_send = yes; then
+if test "$hesiod" != no; then
+  HESLIB="-lhesiod"
+  ac_fn_c_check_func "$LINENO" "res_send" "ac_cv_func_res_send"
+if test "x$ac_cv_func_res_send" = xyes; then :
   :
 else
-  { echo "$as_me:$LINENO: checking for res_send in -lresolv" >&5
-echo $ECHO_N "checking for res_send in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv_res_send+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_send in -lresolv" >&5
+$as_echo_n "checking for res_send in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_res_send+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -8499,39 +6725,18 @@ return res_send ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_res_send=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv_res_send=no
+  ac_cv_lib_resolv_res_send=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_res_send" >&6; }
-if test $ac_cv_lib_resolv_res_send = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_send" >&5
+$as_echo "$ac_cv_lib_resolv_res_send" >&6; }
+if test "x$ac_cv_lib_resolv_res_send" = xyes; then :
   HESLIB="$HESLIB -lresolv"
 fi
 
@@ -8546,7 +6751,8 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile"
+
+ac_config_files="$ac_config_files Makefile nls/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8575,12 +6781,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -8588,8 +6795,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -8611,13 +6818,24 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -8630,14 +6848,15 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -8645,12 +6864,14 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -8660,59 +6881,79 @@ cat >$CONFIG_STATUS <<_ACEOF
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
@@ -8721,20 +6962,19 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -8745,32 +6985,111 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-done
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
 
-# Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -8784,13 +7103,17 @@ else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -8805,104 +7128,103 @@ echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -8919,12 +7241,12 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
-	case $1 in
-        -*)set "./$1";;
+	case $1 in #(
+	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -8939,13 +7261,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tcsh $as_me 6.17.00, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+This file was extended by tcsh $as_me 6.18.01, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -8958,7 +7286,16 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -8966,22 +7303,25 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -8992,35 +7332,42 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <http://bugs.gw.com/>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-tcsh config.status 6.17.00
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+tcsh config.status 6.18.01
+configured by $0, generated by GNU Autoconf 2.68,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
+INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -9033,34 +7380,41 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -9075,30 +7429,37 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+
+
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -9107,10 +7468,9 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "./atconfig") CONFIG_COMMANDS="$CONFIG_COMMANDS ./atconfig" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "nls/Makefile") CONFIG_FILES="$CONFIG_FILES nls/Makefile" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -9133,173 +7493,302 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
 
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LIBICONV!$LIBICONV$ac_delim
-LTLIBICONV!$LTLIBICONV$ac_delim
-DFLAGS!$DFLAGS$ac_delim
-HESDEF!$HESDEF$ac_delim
-HESLIB!$HESLIB$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+  print line
+}
+
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -9318,7 +7807,7 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -9327,26 +7816,34 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -9356,7 +7853,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -9374,55 +7871,15 @@ echo X"$ac_file" |
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -9456,14 +7913,18 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   # CONFIG_FILE
   #
 
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -9471,36 +7932,37 @@ case `sed -n '/datarootdir/ {
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -9508,124 +7970,55 @@ s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
 s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
-  rm -f "$tmp/out12"
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -9634,7 +8027,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
     "./atconfig":C) cat >./atconfig <<ATEOF
 # Configurable variable values for building test suites.
 # Generated by $0.
-# Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 
 # The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
 at_testdir='.'
@@ -9659,11 +8052,13 @@ ATEOF
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -9683,6 +8078,10 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/contrib/tcsh/configure.in b/contrib/tcsh/configure.in
index c6e6d515..c336e54 100644
--- a/contrib/tcsh/configure.in
+++ b/contrib/tcsh/configure.in
@@ -7,13 +7,16 @@ dnl You'll also need a version of config.guess from a gnu package
 dnl
 dnl Written by Kaveh Ghazi (ghazi@caip.rutgers.edu) 5/11/96.
 dnl
+dnl $tcsh: configure.in,v 3.99 2012/02/13 16:33:50 christos Exp $
 
 AC_PREREQ([2.59])dnl Minimum Autoconf version required.
-AC_INIT([tcsh], [6.17.00], [http://bugs.gw.com/])
+AC_INIT([tcsh], [6.18.01], [http://bugs.gw.com/])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([tc.vers.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([.], [.])
 
+AC_PROG_INSTALL
 AC_CANONICAL_HOST
 
 AC_MSG_CHECKING([cached host tuple])
@@ -78,6 +81,11 @@ case "${host}" in
     tcsh_config_file=os390
   ;;
 
+  ## Android
+  *-*-android*)
+    tcsh_config_file=android
+  ;;
+
   ## Linux
   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
     tcsh_config_file=linux
@@ -178,9 +186,12 @@ case "${host}" in
   *-*-solaris2.[45] ) # Should handle sparc, x86 and powerpc
     tcsh_config_file=sol24
   ;;
-  *-*-solaris2.* ) # Should handle sparc, x86 and powerpc
+  *-*-solaris2.[678] ) # Should handle sparc, x86 and powerpc
     tcsh_config_file=sol26
   ;;
+  *-*-solaris2.* ) # Should handle sparc, x86 and powerpc
+    tcsh_config_file=sol29
+  ;;
 
   ## Dell SVR4
   *-dell-sysv4* )
@@ -230,7 +241,7 @@ case "${host}" in
 
   ## Red Hat Cygwin
   *-cygwin)
-    tcsh_config_file=cygwin32
+    tcsh_config_file=cygwin
   ;;
 
   ## mips-compaq-nonstopux
@@ -270,6 +281,16 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_GCC_TRADITIONAL
 
+AC_PATH_PROG([GENCAT], [gencat]) 
+
+dnl Require build CC to create gethost helper when cross building
+if test "x${cross_compiling}" = xyes ; then
+  CC_FOR_GETHOST="cc"
+else
+  CC_FOR_GETHOST="\$(CC)"
+fi
+AC_SUBST(CC_FOR_GETHOST)
+
 if test "x$GCC" != xyes ; then
   DFLAGS="$DFLAGS $NON_GNU_DFLAGS"
   CFLAGS="$CFLAGS $NON_GNU_CFLAGS"
@@ -281,10 +302,12 @@ AC_SEARCH_LIBS(getspnam, sec)
 AC_SEARCH_LIBS(tgetent, termlib termcap curses ncurses)
 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(connect, socket)
+AC_SEARCH_LIBS(catgets, catgets)
 AM_ICONV
 
 dnl Checks for header files
-AC_CHECK_HEADERS([auth.h crypt.h inttypes.h shadow.h stdint.h utmp.h utmpx.h])
+AC_CHECK_HEADERS([auth.h crypt.h features.h inttypes.h paths.h] dnl
+		 [shadow.h stdint.h utmp.h utmpx.h])
 AC_CHECK_HEADERS([wchar.h],
 	[AC_CHECK_SIZEOF([wchar_t], [], [dnl
 #include <stdio.h>
@@ -300,6 +323,7 @@ AC_TYPE_GETGROUPS
 AC_TYPE_MODE_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
+AC_TYPE_UINT32_T
 
 AC_DEFUN([AC_TYPE_SSIZE_T], [
 AC_CHECK_TYPE(ssize_t,,
@@ -334,7 +358,9 @@ AC_CHECK_MEMBERS([struct dirent.d_ino], , ,
 # define dirent direct
 #endif])
 AC_CHECK_MEMBERS([struct utmp.ut_host, struct utmp.ut_user, struct utmp.ut_tv,
-		  struct utmp.ut_xtime], , ,
+		  struct utmp.ut_xtime, struct utmpx.ut_host,
+		  struct utmpx.ut_user, struct utmpx.ut_tv,
+		  struct utmpx.ut_xtime], , ,
 [#include <sys/types.h>
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
@@ -359,12 +385,17 @@ AC_INCLUDES_DEFAULT([])
 #endif
 ])
 AC_CHECK_FUNC([setlocale], [have_setlocale=yes], [have_setlocale=no])
-AC_CHECK_FUNCS([catgets dup2 getauthid getcwd gethostname getpwent] dnl
-	[getutent memmove memset nice nl_langinfo sbrk setpgid setpriority] dnl
-	[strerror strstr sysconf wcwidth])
+AC_CHECK_FUNC([catgets], [have_catgets=yes], [have_catgets=no])
+AC_CHECK_FUNCS([dup2 getauthid getcwd gethostname getpwent] dnl
+	[getutent getutxent mallinfo memmove memset mkstemp nice] dnl
+	[nl_langinfo sbrk setpgid setpriority strerror strstr sysconf wcwidth])
 AC_FUNC_GETPGRP
 AC_FUNC_MBRTOWC
-AC_FUNC_SETPGRP
+if test "x${cross_compiling}" != xyes ; then
+  AC_FUNC_SETPGRP
+else
+  ac_cv_func_setpgrp_void=yes
+fi
 AC_FUNC_STRCOLL
 
 dnl This is not good enough; we need sockaddr_storage too.
@@ -424,6 +455,15 @@ if test "$have_setlocale" != no; then
   fi
 fi
 
+if test "x$enable_nls" != xno -a "$have_catgets" != no -a -n "$GENCAT" ; then
+  AC_ARG_ENABLE([nls-catalogs], AS_HELP_STRING([--disable-nls-catalogs], [Disable NLS catalog support]),
+	        [], [enable_nls_catalogs=yes])
+  if test "x$enable_nls_catalogs" != xno; then
+    BUILD_CATALOGS="yes"
+    AC_DEFINE([NLS_CATALOGS], [1], [Support NLS catalogs.])
+  fi
+fi
+
 AC_ARG_WITH(hesiod,
   [  --with-hesiod=PREFIX    Use Hesiod lookup for ~ expansion],
   [hesiod="$withval"], [hesiod=no])
@@ -439,6 +479,7 @@ if test "$hesiod" != no; then
 fi
 AC_SUBST(HESDEF)
 AC_SUBST(HESLIB)
+AC_SUBST(BUILD_CATALOGS)
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile nls/Makefile])
 AC_OUTPUT
diff --git a/contrib/tcsh/ed.chared.c b/contrib/tcsh/ed.chared.c
index 1ab5a91..8d00326 100644
--- a/contrib/tcsh/ed.chared.c
+++ b/contrib/tcsh/ed.chared.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.chared.c,v 3.95 2009/06/25 21:15:37 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.chared.c,v 3.98 2010/05/08 00:37:39 christos Exp $ */
 /*
  * ed.chared.c: Character editing functions.
  */
@@ -72,7 +72,7 @@
 
 #include "sh.h"
 
-RCSID("$tcsh: ed.chared.c,v 3.95 2009/06/25 21:15:37 christos Exp $")
+RCSID("$tcsh: ed.chared.c,v 3.98 2010/05/08 00:37:39 christos Exp $")
 
 #include "ed.h"
 #include "tw.h"
@@ -506,7 +506,7 @@ excl_sw:
 	if (*q == ':')		/* short form: !:arg */
 	    --q;
 
-	if (*q != HIST) {
+	if (HIST != '\0' && *q != HIST) {
 	    /*
 	     * Search for a space, tab, or colon.  See if we have a number (as
 	     * in !1234:xyz).  Remember the number.
@@ -716,8 +716,9 @@ c_excl(Char *p)
      */
     nr_exp = 0;
     for (;;) {
-	while (*p != HIST && p < Cursor)
-	    ++p;
+	if (HIST != '\0')
+	    while (*p != HIST && p < Cursor)
+		++p;
 	for (i = 1; (p - i) >= InputBuf && p[-i] == '\\'; i++)
 	    continue;
 	if (i % 2 == 0)
@@ -729,8 +730,6 @@ c_excl(Char *p)
 	    ++nr_exp;
 	}
     }
-
-    return nr_exp;
 }
 
 
@@ -745,13 +744,13 @@ c_substitute(void)
      * for white space, the beginning of the line, or a history character.
      */
     for (p = Cursor - 1; 
-	 p > InputBuf && *p != ' ' && *p != '\t' && *p != HIST; --p)
+	 p > InputBuf && *p != ' ' && *p != '\t' && *p && *p != HIST; --p)
 	continue;
 
     /*
      * If we found a history character, go expand it.
      */
-    if (*p == HIST)
+    if (HIST != '\0' && *p == HIST)
 	nr_exp = c_excl(p);
     else
         nr_exp = 0;
@@ -832,11 +831,11 @@ c_eword(Char *p, Char *high, int n)
 	while ((p < high) && Isspace(*p)) 
 	    p++;
 
-	if (Isalnum(*p))
-	    while ((p < high) && Isalnum(*p)) 
+	if (isword(*p))
+	    while ((p < high) && isword(*p)) 
 		p++;
 	else
-	    while ((p < high) && !(Isspace(*p) || Isalnum(*p)))
+	    while ((p < high) && !(Isspace(*p) || isword(*p)))
 		p++;
     }
 
diff --git a/contrib/tcsh/ed.inputl.c b/contrib/tcsh/ed.inputl.c
index 248130a..df17f87 100644
--- a/contrib/tcsh/ed.inputl.c
+++ b/contrib/tcsh/ed.inputl.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.inputl.c,v 3.70 2009/06/25 21:15:37 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.inputl.c,v 3.71 2010/12/22 17:26:04 christos Exp $ */
 /*
  * ed.inputl.c: Input line handling.
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: ed.inputl.c,v 3.70 2009/06/25 21:15:37 christos Exp $")
+RCSID("$tcsh: ed.inputl.c,v 3.71 2010/12/22 17:26:04 christos Exp $")
 
 #include "ed.h"
 #include "ed.defns.h"		/* for the function names */
@@ -683,7 +683,7 @@ GetNextCommand(KEYCMD *cmdnum, Char *ch)
 #ifdef DSPMBYTE
 	     _enable_mbdisp &&
 #else
-	     MB_LEN_MAX == 1 &&
+	     MB_CUR_MAX == 1 &&
 #endif
 	     !adrof(STRnokanji) && (*ch & META)) {
 	    MetaNext = 0;
diff --git a/contrib/tcsh/ed.refresh.c b/contrib/tcsh/ed.refresh.c
index afba75e..e1e574d 100644
--- a/contrib/tcsh/ed.refresh.c
+++ b/contrib/tcsh/ed.refresh.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.refresh.c,v 3.46 2006/08/23 15:03:14 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.refresh.c,v 3.47 2011/02/27 00:14:51 christos Exp $ */
 /*
  * ed.refresh.c: Lower level screen refreshing functions
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: ed.refresh.c,v 3.46 2006/08/23 15:03:14 christos Exp $")
+RCSID("$tcsh: ed.refresh.c,v 3.47 2011/02/27 00:14:51 christos Exp $")
 
 #include "ed.h"
 /* #define DEBUG_UPDATE */
@@ -61,31 +61,31 @@ extern
 	void    PutPlusOne      (Char, int);
 static	void	cpy_pad_spaces		(Char *, Char *, int);
 #if defined(DEBUG_UPDATE) || defined(DEBUG_REFRESH) || defined(DEBUG_LITERAL)
-static	void	dprintf			(char *, ...);
+static	void	reprintf			(char *, ...);
 #ifdef DEBUG_UPDATE
 static	void	dprintstr		(char *, const Char *, const Char *);
 
 static void
 dprintstr(char *str, const Char *f, const Char *t)
 {
-    dprintf("%s:\"", str);
+    reprintf("%s:\"", str);
     while (f < t) {
 	if (ASC(*f) & ~ASCII)
-	  dprintf("[%x]", *f++);
+	  reprintf("[%x]", *f++);
 	else
-	  dprintf("%c", CTL_ESC(ASCII & ASC(*f++)));
+	  reprintf("%c", CTL_ESC(ASCII & ASC(*f++)));
     }
-    dprintf("\"\r\n");
+    reprintf("\"\r\n");
 }
 #endif /* DEBUG_UPDATE */
 
-/* dprintf():
+/* reprintf():
  *	Print to $DEBUGTTY, so that we can test editing on one pty, and 
  *      print debugging stuff on another. Don't interrupt the shell while
  *	debugging cause you'll mangle up the file descriptors!
  */
 static void
-dprintf(char *fmt, ...)
+reprintf(char *fmt, ...)
 {
     static int fd = -1;
     char *dtty;
@@ -242,9 +242,9 @@ Vdraw(Char c, int width)	/* draw char c onto V lines */
 {
 #ifdef DEBUG_REFRESH
 # ifdef SHORT_STRINGS
-    dprintf("Vdrawing %6.6o '%c' %d\r\n", (unsigned)c, (int)(c & ASCII), width);
+    reprintf("Vdrawing %6.6o '%c' %d\r\n", (unsigned)c, (int)(c & ASCII), width);
 # else
-    dprintf("Vdrawing %3.3o '%c' %d\r\n", (unsigned)c, (int)c, width);
+    reprintf("Vdrawing %3.3o '%c' %d\r\n", (unsigned)c, (int)c, width);
 # endif /* SHORT_STRNGS */
 #endif  /* DEBUG_REFRESH */
 
@@ -263,7 +263,7 @@ Vdraw(Char c, int width)	/* draw char c onto V lines */
 	vcursor_v++;
 #ifdef DEBUG_REFRESH
 	if (vcursor_v >= TermV) {	/* should NEVER happen. */
-	    dprintf("\r\nVdraw: vcursor_v overflow! Vcursor_v == %d > %d\r\n",
+	    reprintf("\r\nVdraw: vcursor_v overflow! Vcursor_v == %d > %d\r\n",
 		    vcursor_v, TermV);
 	    abort();
 	}
@@ -328,8 +328,8 @@ Refresh(void)
     Char    oldgetting;
 
 #ifdef DEBUG_REFRESH
-    dprintf("Prompt = :%s:\r\n", short2str(Prompt));
-    dprintf("InputBuf = :%s:\r\n", short2str(InputBuf));
+    reprintf("Prompt = :%s:\r\n", short2str(Prompt));
+    reprintf("InputBuf = :%s:\r\n", short2str(InputBuf));
 #endif /* DEBUG_REFRESH */
     oldgetting = GettingInput;
     GettingInput = 0;		/* avoid re-entrance via SIGWINCH */
@@ -382,12 +382,12 @@ Refresh(void)
     Vdraw('\0', 1);		/* put NUL on end */
 
 #if defined (DEBUG_REFRESH)
-    dprintf("TermH=%d, vcur_h=%d, vcur_v=%d, Vdisplay[0]=\r\n:%80.80s:\r\n",
+    reprintf("TermH=%d, vcur_h=%d, vcur_v=%d, Vdisplay[0]=\r\n:%80.80s:\r\n",
 	    TermH, vcursor_h, vcursor_v, short2str(Vdisplay[0]));
 #endif /* DEBUG_REFRESH */
 
 #ifdef DEBUG_UPDATE
-    dprintf("updating %d lines.\r\n", new_vcv);
+    reprintf("updating %d lines.\r\n", new_vcv);
 #endif  /* DEBUG_UPDATE */
     for (cur_line = 0; cur_line <= new_vcv; cur_line++) {
 	/* NOTE THAT update_line MAY CHANGE Display[cur_line] */
@@ -405,7 +405,7 @@ Refresh(void)
 	cpy_pad_spaces(Display[cur_line], Vdisplay[cur_line], TermH);
     }
 #ifdef DEBUG_REFRESH
-    dprintf("\r\nvcursor_v = %d, OldvcV = %d, cur_line = %d\r\n",
+    reprintf("\r\nvcursor_v = %d, OldvcV = %d, cur_line = %d\r\n",
 	    vcursor_v, OldvcV, cur_line);
 #endif /* DEBUG_REFRESH */
     if (OldvcV > new_vcv) {
@@ -416,7 +416,7 @@ Refresh(void)
     }
     OldvcV = new_vcv;		/* set for next time */
 #ifdef DEBUG_REFRESH
-    dprintf("\r\nCursorH = %d, CursorV = %d, cur_h = %d, cur_v = %d\r\n",
+    reprintf("\r\nCursorH = %d, CursorV = %d, cur_h = %d, cur_v = %d\r\n",
 	    CursorH, CursorV, cur_h, cur_v);
 #endif /* DEBUG_REFRESH */
 #ifdef WINNT_NATIVE
@@ -461,9 +461,9 @@ str_insert(Char *d, int dat, int dlen, Char *s, int num)
 	num = dlen - dat;
 
 #ifdef DEBUG_REFRESH
-    dprintf("str_insert() starting: %d at %d max %d, d == \"%s\"\n",
+    reprintf("str_insert() starting: %d at %d max %d, d == \"%s\"\n",
 	    num, dat, dlen, short2str(d));
-    dprintf("s == \"%s\"n", short2str(s));
+    reprintf("s == \"%s\"n", short2str(s));
 #endif /* DEBUG_REFRESH */
 
     /* open up the space for num chars */
@@ -475,9 +475,9 @@ str_insert(Char *d, int dat, int dlen, Char *s, int num)
 	d[dlen] = '\0';		/* just in case */
     }
 #ifdef DEBUG_REFRESH
-    dprintf("str_insert() after insert: %d at %d max %d, d == \"%s\"\n",
+    reprintf("str_insert() after insert: %d at %d max %d, d == \"%s\"\n",
 	    num, dat, dlen, short2str(d));
-    dprintf("s == \"%s\"n", short2str(s));
+    reprintf("s == \"%s\"n", short2str(s));
 #endif /* DEBUG_REFRESH */
 
     /* copy the characters */
@@ -485,9 +485,9 @@ str_insert(Char *d, int dat, int dlen, Char *s, int num)
 	*a++ = *s++;
 
 #ifdef DEBUG_REFRESH
-    dprintf("str_insert() after copy: %d at %d max %d, d == \"%s\"\n",
+    reprintf("str_insert() after copy: %d at %d max %d, d == \"%s\"\n",
 	    num, dat, dlen, d, short2str(s));
-    dprintf("s == \"%s\"n", short2str(s));
+    reprintf("s == \"%s\"n", short2str(s));
 #endif /* DEBUG_REFRESH */
 }
 
@@ -505,7 +505,7 @@ str_delete(Char *d, int dat, int dlen, int num)
     }
 
 #ifdef DEBUG_REFRESH
-    dprintf("str_delete() starting: %d at %d max %d, d == \"%s\"\n",
+    reprintf("str_delete() starting: %d at %d max %d, d == \"%s\"\n",
 	    num, dat, dlen, short2str(d));
 #endif /* DEBUG_REFRESH */
 
@@ -518,7 +518,7 @@ str_delete(Char *d, int dat, int dlen, int num)
 	d[dlen] = '\0';		/* just in case */
     }
 #ifdef DEBUG_REFRESH
-    dprintf("str_delete() after delete: %d at %d max %d, d == \"%s\"\n",
+    reprintf("str_delete() after delete: %d at %d max %d, d == \"%s\"\n",
 	    num, dat, dlen, short2str(d));
 #endif /* DEBUG_REFRESH */
 }
@@ -608,7 +608,7 @@ update_line(Char *old, Char *new, int cur_line)
      */
     if (*ofd == '\0' && *nfd == '\0') {
 #ifdef DEBUG_UPDATE
-	dprintf("no difference.\r\n");
+	reprintf("no difference.\r\n");
 #endif /* DEBUG_UPDATE */
 	return;
     }
@@ -768,13 +768,13 @@ update_line(Char *old, Char *new, int cur_line)
     sx = (int) ((nls - nse) - (ols - ose));
 
 #ifdef DEBUG_UPDATE
-    dprintf("\n");
-    dprintf("ofd %d, osb %d, ose %d, ols %d, oe %d\n",
+    reprintf("\n");
+    reprintf("ofd %d, osb %d, ose %d, ols %d, oe %d\n",
 	    ofd - old, osb - old, ose - old, ols - old, oe - old);
-    dprintf("nfd %d, nsb %d, nse %d, nls %d, ne %d\n",
+    reprintf("nfd %d, nsb %d, nse %d, nls %d, ne %d\n",
 	    nfd - new, nsb - new, nse - new, nls - new, ne - new);
-    dprintf("xxx-xxx:\"00000000001111111111222222222233333333334\"\r\n");
-    dprintf("xxx-xxx:\"01234567890123456789012345678901234567890\"\r\n");
+    reprintf("xxx-xxx:\"00000000001111111111222222222233333333334\"\r\n");
+    reprintf("xxx-xxx:\"01234567890123456789012345678901234567890\"\r\n");
     dprintstr("old- oe", old, oe);
     dprintstr("new- ne", new, ne);
     dprintstr("old-ofd", old, ofd);
@@ -837,7 +837,7 @@ update_line(Char *old, Char *new, int cur_line)
      */
     if ((nsb != nfd) && fx > 0 && ((p - old) + fx < TermH)) {
 #ifdef DEBUG_UPDATE
-	dprintf("first diff insert at %d...\r\n", nfd - new);
+	reprintf("first diff insert at %d...\r\n", nfd - new);
 #endif  /* DEBUG_UPDATE */
 	/*
 	 * Move to the first char to insert, where the first diff is.
@@ -848,7 +848,7 @@ update_line(Char *old, Char *new, int cur_line)
 	 */
 	if (nsb != ne) {
 #ifdef DEBUG_UPDATE
-	    dprintf("with stuff to keep at end\r\n");
+	    reprintf("with stuff to keep at end\r\n");
 #endif  /* DEBUG_UPDATE */
 	    /*
 	     * insert fx chars of new starting at nfd
@@ -856,7 +856,7 @@ update_line(Char *old, Char *new, int cur_line)
 	    if (fx > 0) {
 #ifdef DEBUG_UPDATE
 		if (!T_CanIns)
-		    dprintf("   ERROR: cannot insert in early first diff\n");
+		    reprintf("   ERROR: cannot insert in early first diff\n");
 #endif  /* DEBUG_UPDATE */
 		Insert_write(nfd, fx);
 		str_insert(old, (int) (ofd - old), TermH, nfd, fx);
@@ -869,7 +869,7 @@ update_line(Char *old, Char *new, int cur_line)
 	}
 	else {
 #ifdef DEBUG_UPDATE
-	    dprintf("without anything to save\r\n");
+	    reprintf("without anything to save\r\n");
 #endif  /* DEBUG_UPDATE */
 	    so_write(nfd, (nsb - nfd));
 	    str_cp(ofd, nfd, (int) (nsb - nfd));
@@ -881,7 +881,7 @@ update_line(Char *old, Char *new, int cur_line)
     }
     else if (fx < 0) {
 #ifdef DEBUG_UPDATE
-	dprintf("first diff delete at %d...\r\n", ofd - old);
+	reprintf("first diff delete at %d...\r\n", ofd - old);
 #endif  /* DEBUG_UPDATE */
 	/*
 	 * move to the first char to delete where the first diff is
@@ -892,7 +892,7 @@ update_line(Char *old, Char *new, int cur_line)
 	 */
 	if (osb != oe) {
 #ifdef DEBUG_UPDATE
-	    dprintf("with stuff to save at end\r\n");
+	    reprintf("with stuff to save at end\r\n");
 #endif  /* DEBUG_UPDATE */
 	    /*
 	     * fx is less than zero *always* here but we check for code
@@ -901,7 +901,7 @@ update_line(Char *old, Char *new, int cur_line)
 	    if (fx < 0) {
 #ifdef DEBUG_UPDATE
 		if (!T_CanDel)
-		    dprintf("   ERROR: cannot delete in first diff\n");
+		    reprintf("   ERROR: cannot delete in first diff\n");
 #endif /* DEBUG_UPDATE */
 		DeleteChars(-fx);
 		str_delete(old, (int) (ofd - old), TermH, -fx);
@@ -915,14 +915,14 @@ update_line(Char *old, Char *new, int cur_line)
 	}
 	else {
 #ifdef DEBUG_UPDATE
-	    dprintf("but with nothing left to save\r\n");
+	    reprintf("but with nothing left to save\r\n");
 #endif  /* DEBUG_UPDATE */
 	    /*
 	     * write (nsb-nfd) chars of new starting at nfd
 	     */
 	    so_write(nfd, (nsb - nfd));
 #ifdef DEBUG_REFRESH
-	    dprintf("cleareol %d\n", (oe - old) - (ne - new));
+	    reprintf("cleareol %d\n", (oe - old) - (ne - new));
 #endif  /* DEBUG_UPDATE */
 #ifndef WINNT_NATIVE
 	    ClearEOL((oe - old) - (ne - new));
@@ -943,7 +943,7 @@ update_line(Char *old, Char *new, int cur_line)
 
     if (sx < 0) {
 #ifdef DEBUG_UPDATE
-	dprintf("second diff delete at %d...\r\n", (ose - old) + fx);
+	reprintf("second diff delete at %d...\r\n", (ose - old) + fx);
 #endif  /* DEBUG_UPDATE */
 	/*
 	 * Check if we have stuff to delete
@@ -958,7 +958,7 @@ update_line(Char *old, Char *new, int cur_line)
 	 */
 	if (ols != oe) {
 #ifdef DEBUG_UPDATE
-	    dprintf("with stuff to save at end\r\n");
+	    reprintf("with stuff to save at end\r\n");
 #endif  /* DEBUG_UPDATE */
 	    /*
 	     * Again a duplicate test.
@@ -966,7 +966,7 @@ update_line(Char *old, Char *new, int cur_line)
 	    if (sx < 0) {
 #ifdef DEBUG_UPDATE
 		if (!T_CanDel)
-		    dprintf("   ERROR: cannot delete in second diff\n");
+		    reprintf("   ERROR: cannot delete in second diff\n");
 #endif  /* DEBUG_UPDATE */
 		DeleteChars(-sx);
 	    }
@@ -981,11 +981,11 @@ update_line(Char *old, Char *new, int cur_line)
 	    if (olen > TermH)
 		olen = TermH;
 #ifdef DEBUG_UPDATE
-	    dprintf("but with nothing left to save\r\n");
+	    reprintf("but with nothing left to save\r\n");
 #endif /* DEBUG_UPDATE */
 	    so_write(nse, (nls - nse));
 #ifdef DEBUG_REFRESH
-	    dprintf("cleareol %d\n", olen - (ne - new));
+	    reprintf("cleareol %d\n", olen - (ne - new));
 #endif /* DEBUG_UPDATE */
 #ifndef WINNT_NATIVE
 	    ClearEOL(olen - (ne - new));
@@ -1003,7 +1003,7 @@ update_line(Char *old, Char *new, int cur_line)
      */
     if ((nsb != nfd) && (osb - ofd) <= (nsb - nfd) && (fx == 0)) {
 #ifdef DEBUG_UPDATE
-	dprintf("late first diff insert at %d...\r\n", nfd - new);
+	reprintf("late first diff insert at %d...\r\n", nfd - new);
 #endif /* DEBUG_UPDATE */
 
 	MoveToChar(nfd - new);
@@ -1012,7 +1012,7 @@ update_line(Char *old, Char *new, int cur_line)
 	 */
 	if (nsb != ne) {
 #ifdef DEBUG_UPDATE
-	    dprintf("with stuff to keep at end\r\n");
+	    reprintf("with stuff to keep at end\r\n");
 #endif /* DEBUG_UPDATE */
 	    /* 
 	     * We have to recalculate fx here because we set it
@@ -1026,7 +1026,7 @@ update_line(Char *old, Char *new, int cur_line)
 		 */
 #ifdef DEBUG_UPDATE
 		if (!T_CanIns)
-		    dprintf("   ERROR: cannot insert in late first diff\n");
+		    reprintf("   ERROR: cannot insert in late first diff\n");
 #endif /* DEBUG_UPDATE */
 		Insert_write(nfd, fx);
 		str_insert(old, (int) (ofd - old), TermH, nfd, fx);
@@ -1040,7 +1040,7 @@ update_line(Char *old, Char *new, int cur_line)
 	}
 	else {
 #ifdef DEBUG_UPDATE
-	    dprintf("without anything to save\r\n");
+	    reprintf("without anything to save\r\n");
 #endif /* DEBUG_UPDATE */
 	    so_write(nfd, (nsb - nfd));
 	    str_cp(ofd, nfd, (int) (nsb - nfd));
@@ -1052,18 +1052,18 @@ update_line(Char *old, Char *new, int cur_line)
      */
     if (sx >= 0) {
 #ifdef DEBUG_UPDATE
-	dprintf("second diff insert at %d...\r\n", nse - new);
+	reprintf("second diff insert at %d...\r\n", nse - new);
 #endif /* DEBUG_UPDATE */
 	MoveToChar(nse - new);
 	if (ols != oe) {
 #ifdef DEBUG_UPDATE
-	    dprintf("with stuff to keep at end\r\n");
+	    reprintf("with stuff to keep at end\r\n");
 #endif /* DEBUG_UPDATE */
 	    if (sx > 0) {
 		/* insert sx chars of new starting at nse */
 #ifdef DEBUG_UPDATE
 		if (!T_CanIns)
-		    dprintf("   ERROR: cannot insert in second diff\n");
+		    reprintf("   ERROR: cannot insert in second diff\n");
 #endif /* DEBUG_UPDATE */
 		Insert_write(nse, sx);
 	    }
@@ -1075,7 +1075,7 @@ update_line(Char *old, Char *new, int cur_line)
 	}
 	else {
 #ifdef DEBUG_UPDATE
-	    dprintf("without anything to save\r\n");
+	    reprintf("without anything to save\r\n");
 #endif /* DEBUG_UPDATE */
 	    so_write(nse, (nls - nse));
 
@@ -1087,7 +1087,7 @@ update_line(Char *old, Char *new, int cur_line)
 	}
     }
 #ifdef DEBUG_UPDATE
-    dprintf("done.\r\n");
+    reprintf("done.\r\n");
 #endif /* DEBUG_UPDATE */
 }
 
diff --git a/contrib/tcsh/ed.screen.c b/contrib/tcsh/ed.screen.c
index cf36717..8bcbdac 100644
--- a/contrib/tcsh/ed.screen.c
+++ b/contrib/tcsh/ed.screen.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.screen.c,v 3.76 2009/06/25 21:15:37 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.screen.c,v 3.78 2011/02/27 00:14:38 christos Exp $ */
 /*
  * ed.screen.c: Editor/termcap-curses interface
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: ed.screen.c,v 3.76 2009/06/25 21:15:37 christos Exp $")
+RCSID("$tcsh: ed.screen.c,v 3.78 2011/02/27 00:14:38 christos Exp $")
 
 #include "ed.h"
 #include "tc.h"
@@ -1562,6 +1562,28 @@ GetSize(int *lins, int *cols)
 
 #endif /* SIG_WINDOW */
 
+#ifdef KNOWsize
+static void
+UpdateVal(const Char *tag, int value, Char *termcap, Char *backup)
+{
+    Char *ptr, *p;
+    if ((ptr = Strstr(termcap, tag)) == NULL) {
+	(void)Strcpy(backup, termcap);
+	return;
+    } else {
+	size_t len = (ptr - termcap) + Strlen(tag);
+	(void)Strncpy(backup, termcap, len);
+	backup[len] = '\0';
+	p = Itoa(value, 0, 0);
+	(void) Strcat(backup + len, p);
+	xfree(p);
+	ptr = Strchr(ptr, ':');
+	if (ptr)
+	    (void) Strcat(backup, ptr);
+    }
+}
+#endif
+
 void
 ChangeSize(int lins, int cols)
 {
@@ -1609,43 +1631,9 @@ ChangeSize(int lins, int cols)
 	    (void) Strncpy(termcap, ptr, TC_BUFSIZE);
 	    termcap[TC_BUFSIZE-1] = '\0';
 
-	    /* update termcap string; first do columns */
-	    buf[0] = 'c';
-	    buf[1] = 'o';
-	    buf[2] = '#';
-	    buf[3] = '\0';
-	    if ((ptr = Strstr(termcap, buf)) == NULL) {
-		(void) Strcpy(backup, termcap);
-	    }
-	    else {
-		size_t len = (ptr - termcap) + Strlen(buf);
-		(void) Strncpy(backup, termcap, len);
-		backup[len] = '\0';
-		p = Itoa(Val(T_co), 0, 0);
-		(void) Strcat(backup + len, p);
-		xfree(p);
-		ptr = Strchr(ptr, ':');
-		(void) Strcat(backup, ptr);
-	    }
+	    UpdateVal(STRco, Val(T_co), termcap, backup);
+	    UpdateVal(STRli, Val(T_li), termcap, backup);
 
-	    /* now do lines */
-	    buf[0] = 'l';
-	    buf[1] = 'i';
-	    buf[2] = '#';
-	    buf[3] = '\0';
-	    if ((ptr = Strstr(backup, buf)) == NULL) {
-		(void) Strcpy(termcap, backup);
-	    }
-	    else {
-		size_t len = (ptr - backup) + Strlen(buf);
-		(void) Strncpy(termcap, backup, len);
-		termcap[len] = '\0';
-		p = Itoa(Val(T_li), 0, 0);
-		(void) Strcat(termcap, p);
-		xfree(p);
-		ptr = Strchr(ptr, ':');
-		(void) Strcat(termcap, ptr);
-	    }
 	    /*
 	     * Chop the termcap string at TC_BUFSIZE-1 characters to avoid
 	     * core-dumps in the termcap routines
diff --git a/contrib/tcsh/ed.term.c b/contrib/tcsh/ed.term.c
index a235e11..8580007 100644
--- a/contrib/tcsh/ed.term.c
+++ b/contrib/tcsh/ed.term.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.term.c,v 1.36 2006/03/02 18:46:44 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.term.c,v 1.38 2011/02/25 23:58:34 christos Exp $ */
 /*
  * ed.term.c: Low level terminal interface
  */
@@ -33,8 +33,8 @@
 #include "sh.h"
 #ifndef WINNT_NATIVE
 
-RCSID("$tcsh: ed.term.c,v 1.36 2006/03/02 18:46:44 christos Exp $")
-
+RCSID("$tcsh: ed.term.c,v 1.38 2011/02/25 23:58:34 christos Exp $")
+#include <assert.h>
 #include "ed.h"
 
 int didsetty = 0;
@@ -633,6 +633,7 @@ dosetty(Char **v, struct command *t)
 		i = m->m_type;
 		st = len = strlen(ttylist[z][m->m_type].t_name);
 	    }
+	    assert(i != -1);
 
 	    x = (ttylist[z][i].t_setmask & m->m_value) ? '+' : '\0';
 	    x = (ttylist[z][i].t_clrmask & m->m_value) ? '-' : x;
diff --git a/contrib/tcsh/gethost.c b/contrib/tcsh/gethost.c
index efc095b..65c9a29 100644
--- a/contrib/tcsh/gethost.c
+++ b/contrib/tcsh/gethost.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/gethost.c,v 1.12 2006/03/02 18:46:44 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/gethost.c,v 1.15 2012/01/15 17:14:54 christos Exp $ */
 /*
  * gethost.c: Create version file from prototype
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: gethost.c,v 1.12 2006/03/02 18:46:44 christos Exp $")
+RCSID("$tcsh: gethost.c,v 1.15 2012/01/15 17:14:54 christos Exp $")
 
 #ifdef SCO
 # define perror __perror
@@ -91,6 +91,7 @@ static const char *keyword[] =
 
 static int findtoken (char *);
 static char *gettoken (char **, char  *);
+static char *pname;
 
 int main (int, char *[]);
 
@@ -141,13 +142,78 @@ gettoken(char **pptr, char *token)
     *pptr = ptr;
     return token;
 }
+
+static char *
+cat(const char *a, const char *b, size_t len)
+{
+	size_t l;
+	char *r;
+
+	if (len == 0)
+		len = strlen(b);
+	l = strlen(a) + len + 1;
+	if ((r = malloc(l)) == NULL)
+		abort();
+	snprintf(r, l, "%s%.*s", a, (int)len, b);
+	return r;
+}
+
+static const char *
+explode(const char *defs)
+{
+	static const char def[] = "defined("; /* ) */
+	static char *buf;
+	size_t len;
+	const char *ptr, *bptr, *eptr = NULL, *name;
+	size_t buflen = 0;
+
+	if (strstr(defs, "#machine(" /* ) */))
+		return defs;
+
+	free(buf);
+	buf = strdup("("); /* ) */
+	for (ptr = defs; (bptr = strstr(ptr, def)) != NULL; ptr = eptr + 1) {
+		if (ptr != bptr)
+			buf = cat(buf, ptr, bptr - ptr);
+		if ((eptr = strchr(ptr + sizeof(def) - 1, ')')) == NULL) {
+			(void) fprintf(stderr, "%s: missing close paren `%s'\n",
+			    pname, defs);
+			return defs;
+		}
+		buf = cat(buf, bptr, eptr - bptr + 1);
+		name = bptr + sizeof(def) - 1;
+		len = eptr - name;
+		if (len < 1) {
+			(void) fprintf(stderr, "%s: empty define `%s'\n",
+			    pname, defs);
+			return defs;
+		}
+		if (*name != '_') {
+			char *undername = malloc(len + 10);
+			buf = cat(buf, " || defined(", 0);
+			snprintf(undername, len + 10, "__%.*s__)", (int)len,
+			    name);
+			buf = cat(buf, undername, len + 5);
+			buf = cat(buf, " || defined(", 0);
+			snprintf(undername, len + 10, "__%.*s)", (int)len,
+			    name);
+			buf = cat(buf, undername, len + 3);
+		}
+	}
+	if (!eptr) {
+	    (void) fprintf(stderr, "%s: invalid input `%s'\n", pname, defs);
+	    return defs;
+        }
+	buf = cat(buf, eptr + 1, 0);
+	buf = cat(buf, ")", 0);
+	return buf;
+}
 	
 
 int
 main(int argc, char *argv[])
 {
     char line[INBUFSIZE];
-    char *pname;
     const char *fname = "stdin";
     char *ptr, *tok;
     char defs[INBUFSIZE];
@@ -231,7 +297,7 @@ main(int argc, char *argv[])
 	    break;
 
 	case T_NONE:
-	    if (state != S_CODE && defs && *defs != '\0') {
+	    if (state != S_CODE && *defs != '\0') {
 		(void) fprintf(stderr, "%s: \"%s\", %d: Discarded\n",
 			       pname, fname, lineno);
 		if (++errs == 30) {
@@ -280,7 +346,7 @@ main(int argc, char *argv[])
 	    else {
 		if (tok && *tok)
 		    (void) fprintf(stdout, "# if (%s) && !defined(_%s_)\n",
-				   defs, keyword[token]);
+				   explode(defs), keyword[token]);
 		else
 		    (void) fprintf(stdout, "# if !defined(_%s_)\n", 
 				   keyword[token]);
diff --git a/contrib/tcsh/glob.c b/contrib/tcsh/glob.c
index a828f63..3680403 100644
--- a/contrib/tcsh/glob.c
+++ b/contrib/tcsh/glob.c
@@ -83,7 +83,7 @@ typedef unsigned short Char;
 static	int	 glob1 		(Char *, glob_t *, int);
 static	int	 glob2		(struct strbuf *, const Char *, glob_t *, int);
 static	int	 glob3		(struct strbuf *, const Char *, const Char *,
-				 glob_t *, int);
+				 const Char *, glob_t *, int);
 static	void	 globextend	(const char *, glob_t *);
 static	int	 match		(const char *, const Char *, const Char *,
 				 int);
@@ -329,7 +329,7 @@ glob(const char *pattern, int flags, int (*errfunc) (const char *, int),
 	    
 	    len = mblen((const char *)(patnext - 1), MB_LEN_MAX);
 	    if (len == -1)
-		(void)mblen(NULL, 0);
+		TCSH_IGNORE(mblen(NULL, 0));
 	    else if (len > 1) {
 		*bufnext++ = (Char) c;
 		while (--len != 0)
@@ -389,10 +389,13 @@ glob(const char *pattern, int flags, int (*errfunc) (const char *, int),
 	    break;
 	case STAR:
 	    pglob->gl_flags |= GLOB_MAGCHAR;
-	    /* collapse adjacent stars to one, to avoid
-	     * exponential behavior
+	    /* collapse adjacent stars to one [or three if globstar],
+	     * to avoid exponential behavior
 	     */
-	    if (bufnext == patbuf || bufnext[-1] != M_ALL)
+	    if (bufnext == patbuf || bufnext[-1] != M_ALL ||
+	       ((flags & GLOB_STAR) != 0 && 
+		 (bufnext - 1 == patbuf || bufnext[-2] != M_ALL ||
+		 bufnext - 2 == patbuf || bufnext[-3] != M_ALL)))
 		*bufnext++ = M_ALL;
 	    break;
 	default:
@@ -524,25 +527,79 @@ glob2(struct strbuf *pathbuf, const Char *pattern, glob_t *pglob, int no_match)
 	}
 	else {			/* need expansion, recurse */
 	    pathbuf->len = orig_len;
-	    return (glob3(pathbuf, pattern, p, pglob, no_match));
+	    return (glob3(pathbuf, pattern, p, pattern, pglob, no_match));
 	}
     }
     /* NOTREACHED */
 }
 
+static size_t
+One_Char_mbtowc(__Char *pwc, const Char *s, size_t n)
+{
+#ifdef WIDE_STRINGS
+    char buf[MB_LEN_MAX], *p;
 
+    if (n > MB_LEN_MAX)
+	n = MB_LEN_MAX;
+    p = buf;
+    while (p < buf + n && (*p++ = LCHAR(*s++)) != 0)
+	;
+    return one_mbtowc(pwc, buf, n);
+#else
+    *pwc = *s & CHAR;
+    return 1;
+#endif
+}
+ 
 static int
 glob3(struct strbuf *pathbuf, const Char *pattern, const Char *restpattern,
-      glob_t *pglob, int no_match)
+      const Char *pglobstar, glob_t *pglob, int no_match)
 {
     DIR    *dirp;
     struct dirent *dp;
+    struct stat sbuf;
     int     err;
     Char m_not = (pglob->gl_flags & GLOB_ALTNOT) ? M_ALTNOT : M_NOT;
     size_t orig_len;
+    int globstar = 0;
+    int chase_symlinks = 0;
+    const Char *termstar = NULL;
 
     strbuf_terminate(pathbuf);
-    errno = 0;
+    orig_len = pathbuf->len;
+    errno = err = 0;
+
+    while (pglobstar < restpattern) {
+	__Char wc;
+	size_t width = One_Char_mbtowc(&wc, pglobstar, MB_LEN_MAX);
+	if ((pglobstar[0] & M_MASK) == M_ALL &&
+	    (pglobstar[width] & M_MASK) == M_ALL) {
+	    globstar = 1;
+	    chase_symlinks = (pglobstar[2 * width] & M_MASK) == M_ALL;
+	    termstar = pglobstar + (2 + chase_symlinks) * width;
+	    break;
+	}
+        pglobstar += width;
+    } 
+
+    if (globstar) {
+	err = pglobstar==pattern && termstar==restpattern ?
+		*restpattern == EOS ?
+		glob2(pathbuf, restpattern - 1, pglob, no_match) :
+		glob2(pathbuf, restpattern + 1, pglob, no_match) :
+		glob3(pathbuf, pattern, restpattern, termstar, pglob, no_match);
+	if (err)
+	    return err;
+	pathbuf->len = orig_len;
+	strbuf_terminate(pathbuf);
+    }
+
+    if (*pathbuf->s && (Lstat(pathbuf->s, &sbuf) || !S_ISDIR(sbuf.st_mode)
+#ifdef S_IFLINK
+	     && ((globstar && !chase_symlinks) || !S_ISLNK(sbuf.st_mode))
+#endif
+	))
+	return 0;
 
     if (!(dirp = Opendir(pathbuf->s))) {
 	/* todo: don't call for ENOENT or ENOTDIR? */
@@ -553,23 +610,37 @@ glob3(struct strbuf *pathbuf, const Char *pattern, const Char *restpattern,
 	    return (0);
     }
 
-    err = 0;
-
-    orig_len = pathbuf->len;
     /* search directory for matching names */
     while ((dp = readdir(dirp)) != NULL) {
 	/* initial DOT must be matched literally */
 	if (dp->d_name[0] == DOT && *pattern != DOT)
-	    continue;
+	    if (!(pglob->gl_flags & GLOB_DOT) || !dp->d_name[1] ||
+		(dp->d_name[1] == DOT && !dp->d_name[2]))
+		continue; /*unless globdot and not . or .. */
 	pathbuf->len = orig_len;
 	strbuf_append(pathbuf, dp->d_name);
 	strbuf_terminate(pathbuf);
-	if (match(pathbuf->s + orig_len, pattern, restpattern, (int) m_not)
-	    == no_match)
-	    continue;
-	err = glob2(pathbuf, restpattern, pglob, no_match);
-	if (err)
-	    break;
+
+	if (globstar) {
+#ifdef S_IFLNK
+	    if (!chase_symlinks &&
+		(Lstat(pathbuf->s, &sbuf) || S_ISLNK(sbuf.st_mode)))
+		    continue;
+#endif
+	    if (match(pathbuf->s + orig_len, pattern, termstar,
+		(int)m_not) == no_match) 
+		    continue;
+	    strbuf_append1(pathbuf, SEP);
+	    strbuf_terminate(pathbuf);
+	    if ((err = glob2(pathbuf, pglobstar, pglob, no_match)) != 0)
+		break;
+	} else {
+	    if (match(pathbuf->s + orig_len, pattern, restpattern,
+		(int) m_not) == no_match)
+		continue;
+	    if ((err = glob2(pathbuf, restpattern, pglob, no_match)) != 0)
+		break;
+	}
     }
     /* todo: check error from readdir? */
     closedir(dirp);
@@ -613,24 +684,6 @@ globextend(const char *path, glob_t *pglob)
     pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
 }
 
-static size_t
-One_Char_mbtowc(__Char *pwc, const Char *s, size_t n)
-{
-#ifdef WIDE_STRINGS
-    char buf[MB_LEN_MAX], *p;
-
-    if (n > MB_LEN_MAX)
-	n = MB_LEN_MAX;
-    p = buf;
-    while (p < buf + n && (*p++ = LCHAR(*s++)) != 0)
-	;
-    return one_mbtowc(pwc, buf, n);
-#else
-    *pwc = *s & CHAR;
-    return 1;
-#endif
-}
-
 /*
  * pattern matching function for filenames.  Each occurrence of the *
  * pattern causes a recursion level.
@@ -650,17 +703,17 @@ match(const char *name, const Char *pat, const Char *patend, int m_not)
 	lwk = one_mbtowc(&wk, name, MB_LEN_MAX);
 	switch (c & M_MASK) {
 	case M_ALL:
+	    while (pat < patend && (*pat & M_MASK) == M_ALL)  /* eat consecutive '*' */
+		pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
 	    if (pat == patend)
-		return (1);
-	    for (;;) {
-		if (match(name, pat, patend, m_not))
-		    return (1);
+	        return (1);
+	    while (!match(name, pat, patend, m_not)) {
 		if (*name == EOS)
-		    break;
+		    return (0);
 		name += lwk;
 		lwk = one_mbtowc(&wk, name, MB_LEN_MAX);
 	    }
-	    return (0);
+	    return (1);
 	case M_ONE:
 	    if (*name == EOS)
 		return (0);
@@ -691,9 +744,9 @@ match(const char *name, const Char *pat, const Char *patend, int m_not)
 		return (0);
 	    break;
 	default:
-	    name += lwk;
-	    if (samecase(wk) != samecase(wc))
+	    if (*name == EOS || samecase(wk) != samecase(wc))
 		return (0);
+	    name += lwk;
 	    break;
 	}
     }
diff --git a/contrib/tcsh/glob.h b/contrib/tcsh/glob.h
index 0a6fd39..13451ed 100644
--- a/contrib/tcsh/glob.h
+++ b/contrib/tcsh/glob.h
@@ -80,6 +80,8 @@ typedef struct {
 #define	GLOB_TILDE	0x0800	/* Expand tilde names from the passwd file. */
 #define	GLOB_ALTNOT     0x1000	/* use alternate glob character [^ not !] */ 
 #define	GLOB_QUOTE	0x2000	/* XXX: source compatibility */
+#define	GLOB_STAR	0x4000	/* use glob ** to recurse directories */
+#define	GLOB_DOT	0x8000	/* don't skip dotfiles (except . and ..) */
 
 #define	GLOB_ABEND	GLOB_ABORTED	/* source compatibility */
 /* #endif */
diff --git a/contrib/tcsh/host.defs b/contrib/tcsh/host.defs
index 38fe156..9cec8fa 100644
--- a/contrib/tcsh/host.defs
+++ b/contrib/tcsh/host.defs
@@ -1,5 +1,5 @@
-newcode	:
-/* $Header: /p/tcsh/cvsroot/tcsh/host.defs,v 1.46 2008/09/25 14:41:05 christos Exp $ */
+newcode :
+/* $Header: /p/tcsh/cvsroot/tcsh/host.defs,v 1.55 2012/01/11 20:20:15 christos Exp $ */
 /*
  * host.defs: Hosttype/Machtype etc.
  */
@@ -33,9 +33,9 @@ newcode	:
  */
 #include "sh.h"
 
-RCSID("$tcsh: host.defs,v 1.46 2008/09/25 14:41:05 christos Exp $")
+RCSID("$tcsh: host.defs,v 1.55 2012/01/11 20:20:15 christos Exp $")
 
-endcode	:
+endcode :
 
 macro	: M_mips64el : (defined(mips64) || defined(__mips64)) && (defined(MIPSEL) || defined(__MIPSEL))
 macro	: M_mips64eb : (defined(mips64) || defined(__mips64)) && (defined(MIPSEB) || defined(__MIPSEB))
@@ -44,10 +44,11 @@ macro	: M_mipseb : (!defined(M_mips64eb)) && (defined(mips) || defined(__mips))
 macro	: M_i386 : (defined(i386) || defined(__i386__))
 macro	: M_i486 : (defined(i486) || defined(__i486__))
 macro	: M_i586 : (defined(i586) || defined(__i586__))
+macro	: M_i686 : (defined(i686) || defined(__i686__))
 macro	: M_intel : (defined(M_i386) || defined(M_i486) || defined(M_i586))
 
 newdef	: defined(ns32000)
-newcode	:
+newcode :
 static char *
 isamultimax(int flag)
 {
@@ -56,12 +57,12 @@ isamultimax(int flag)
     else 
 	return flag ? "mach" : "ns32000";
 }
-endcode	:
+endcode :
 enddef	:
 
 
 newdef	: defined(cray)
-newcode	:
+newcode :
 /*  
  * On crays, find the current machine type via the target() syscall
  * We need ctype.h to convert the name returned to lower case
@@ -79,7 +80,7 @@ getcray(void)
 
     if (target(MC_GET_SYSTEM, &data) != -1) {
 	static char hosttype_buf[sizeof(data.mc_pmt)+1];
-	char *p = (char *) &(data.mc_pmt);
+	unsigned char *p = (unsigned char *) &(data.mc_pmt);
 	char *q = hosttype_buf;
 	int n;
 
@@ -95,18 +96,18 @@ getcray(void)
 	/* replace dashes with underscores if present */
 	while ((q = strchr(hosttype_buf, '-')) != NULL)
 	    *q = '_';
-	return hosttype_buf; 	/* Return in static buffer */
+	return hosttype_buf;	/* Return in static buffer */
     }
     else
 # endif /* MC_GET_SYSTEM */
 	return "cray";		/* target() failed */
 }
-endcode	:
+endcode :
 enddef	:
 
 
 newdef	: defined(convex)
-newcode	:
+newcode :
 /*  
  * On convex, find the current machine type via the getsysinfo() syscall
  */
@@ -117,7 +118,7 @@ static char *
 getconvex(void)
 {
     struct system_information  sysinfo;
-    static char  result[8];
+    static char	 result[8];
 
     if (getsysinfo(SYSINFO_SIZE, &sysinfo) == -1)
 	return "convex";
@@ -165,11 +166,64 @@ getconvex(void)
 	return "convex";
     }
 }
-endcode	:
+endcode :
 enddef	:
 
+newdef : defined(__linux__) || defined(__CYGWIN__) || defined(__GNU__) || defined(__GLIBC__)
+newcode :
+# include "tw.h"
+#include <sys/utsname.h>
+static char mach[256];
+static char host[256];
+static char ostype[32];
+static void populate(void)
+{
+	struct utsname uts;
+	int e = uname(&uts);
+	const char *p = short2str(tgetenv(STROSTYPE));
+	if (p == NULL) {
+#if defined(__ANDROID__)
+		p = "android";
+#elif defined(__CYGWIN__)
+		p = "cygwin";
+#else
+		p = "linux";
+#endif
+	}
+	xsnprintf(ostype, sizeof(ostype), "%s", p);
+	xsnprintf(mach, sizeof(mach), "%s", e != -1 ? uts.machine : "unknown");
+	xsnprintf(host, sizeof(host), "%s-%s",
+	    e != -1 ? uts.machine : "unknown", ostype);
+}
+
+static char *
+getmach(void)
+{
+    if (!mach[0])
+	populate();
+    return mach;
+}
+
+static char *
+gethost(void)
+{
+    if (!host[0])
+	populate();
+    return host;
+}
+
+static char *
+getostype(void)
+{
+    if (!ostype[0])
+	populate();
+    return ostype;
+}
+
+endcode :
+enddef :
 
-newcode	:
+newcode :
 void
 getmachine(void)
 {
@@ -178,7 +232,7 @@ getmachine(void)
      const char *vendor;
      const char *machtype;
 
-endcode	:
+endcode :
 
 
 newdef	: defined(HOSTTYPE)
@@ -187,16 +241,16 @@ enddef	:
 
 
 newdef	: defined(__PARAGON__)
-comment	: Intel Paragon running OSF/1
+comment : Intel Paragon running OSF/1
 vendor	:						: "intel"
 hosttype:						: "paragon"
 ostype	:						: "osf1"
-machtype: defined(M_i386) 				: "i386"
+machtype: defined(M_i386)				: "i386"
 enddef	:
 
 
 newdef	: defined(AMIX)
-comment	: Amiga running Amix 2.02
+comment : Amiga running Amix 2.02
 vendor	:						: "commodore"
 hosttype:						: "amiga"
 ostype	:						: "Amix"
@@ -205,41 +259,40 @@ enddef	:
 
 
 newdef	: defined(accel)
-comment	: celerity Accel
-vendor	: 						: "celerity"
-hosttype: 						: "celerityACCEL"
+comment : celerity Accel
+vendor	:						: "celerity"
+hosttype:						: "celerityACCEL"
 ostype	:						: "unix"
 machtype:						: "accel"
 enddef	:
 
 
 newdef	: defined(_VMS_POSIX)
-comment	: digital vax or alpha running vms posix
+comment : digital vax or alpha running vms posix
 vendor	:						: "dec"
 hosttype:						: "VMS-POSIX"
 ostype	:						: "vms"
-machtype: defined(__alpha)				: "alpha"
-machtype: defined(__vax) || defined(vax)		: "vax"
-machtype: defined(__vax__) 				: "vax"
+machtype: defined(alpha)				: "alpha"
+machtype: defined(vax)					: "vax"
 enddef	:
 
 
 newdef	: defined(__hp_osf)
-comment	: Hewlett Packard running OSF/1
+comment : Hewlett Packard running OSF/1
 vendor	:						: "hp"
-hosttype: defined(__pa_risc)				: "hp9000s700-osf1"
-hosttype: 						: "hp-osf1"
-ostype	: 						: "osf1"
-machtype: defined(__pa_risc)				: "pa_risc"
+hosttype: defined(pa_risc)				: "hp9000s700-osf1"
+hosttype:						: "hp-osf1"
+ostype	:						: "osf1"
+machtype: defined(pa_risc)				: "pa_risc"
 enddef	:
 
 
 newdef	: defined(hp9000)
-comment	: Hewlett Packard running MORE/bsd 
-vendor	: 						: "hp"
+comment : Hewlett Packard running MORE/bsd 
+vendor	:						: "hp"
 hosttype: defined(hp300)				: "hp300"
 hosttype: defined(hp800)				: "hp800"
-hosttype: 						: "hp9000"
+hosttype:						: "hp9000"
 ostype	: defined(BSD4_4)				: "bsd44"
 ostype	:						: "mtXinu"
 machtype: defined(hp300)				: "m68k"
@@ -248,54 +301,55 @@ enddef	:
 
 
 newdef	: defined(hpux) || defined(__hpux)
-comment	: Hewlett Packard running HP/UX
+comment : Hewlett Packard running HP/UX
 vendor	:						: "hp"
-hosttype: defined(__hp9000s700)				: "hp9000s700"
-hosttype: defined(__hp9000s800) || defined(hp9000s800)  : "hp9000s800"
+hosttype: defined(hp9000s800)				: "hp9000s800"
+hosttype: defined(hp9000s700)				: "hp9000s700"
 hosttype: defined(hp9000s500)				: "hp9000s500"
-hosttype: defined(__hp9000s300) || defined(hp9000s300)  : "hp9000s300"
-hosttype: 						: "hp"
+hosttype: defined(hp9000s300)				: "hp9000s300"
+hosttype:						: "hp"
 ostype	:						: "hpux"
-machtype: defined(__hp9000s700)				: "pa_risc"
-machtype: defined(__hp9000s800) || defined(hp9000s800)  : "pa_risc"
+machtype: defined(hp9000s800)				: "pa_risc"
+machtype: defined(hp9000s700)				: "pa_risc"
 machtype: defined(hp9000s500)				: "m68k"
-machtype: defined(__hp9000s300) || defined(hp9000s300)  : "m68k"
+machtype: defined(hp9000s300)				: "m68k"
 enddef	:
 
 
 newdef	: defined(apollo)
-comment	: Hewlett Packard apollo running Domain/OS
+comment : Hewlett Packard apollo running Domain/OS
 vendor	:						: "hp"
-hosttype: 						: "apollo"
+hosttype:						: "apollo"
 ostype	:						: "DomainOS"
-machtype: 						: "m68k"
+machtype:						: "m68k"
 enddef	:
 
 
 newdef	: defined(sun) || defined(__sun__)
-comment	: Sun Microsystems series 2 workstation (68010 based)
-comment	: Sun Microsystems series 3 workstation (68020 based)
-comment	: Sun Microsystems 386i workstation (386 based)
-comment	: Sun Microsystems series 4 workstation (SPARC based)
+comment : Sun Microsystems series 2 workstation (68010 based)
+comment : Sun Microsystems series 3 workstation (68020 based)
+comment : Sun Microsystems 386i workstation (386 based)
+comment : Sun Microsystems series 4 workstation (SPARC based)
 vendor	:						: "sun"
 hosttype: defined(M_i386) && !defined(__SVR4)		: "sun386i"
 hosttype: defined(M_i386) && defined(__SVR4)		: "i86pc"
-hosttype: defined(mc68010) || defined(__mc68010__)	: "sun2"
-hosttype: defined(mc68020) || defined(__mc68020__)	: "sun3"
-hosttype: defined(sparc) || defined(__sparc__)		: "sun4"
-hosttype: 						: "sun"
+hosttype: defined(mc68010)				: "sun2"
+hosttype: defined(mc68020)				: "sun3"
+hosttype: defined(sparc)				: "sun4"
+hosttype:						: "sun"
 ostype	: defined(SUNOS3)				: "sunos3"
 ostype	: defined(SUNOS4)				: "sunos4"
 ostype	: defined(SOLARIS2)				: "solaris"
-machtype: defined(mc68010) || defined(__mc68010__)	: "m68k"
-machtype: defined(mc68020) || defined(__mc68020__)	: "m68k"
-machtype: defined(sparc) || defined(__sparc__)		: "sparc"
+machtype: defined(mc68010)				: "m68k"
+machtype: defined(mc68020)				: "m68k"
+machtype: defined(sparcv9)				: "sparcv9"
+machtype: defined(sparc)				: "sparc"
 machtype: defined(M_i386)				: "i386"
 enddef	:
 
 
 newdef	: defined(pyr)
-comment	: Pyramid Technology
+comment : Pyramid Technology
 vendor	:						: "pyramid"
 hosttype:						: "pyramid"
 machtype:						: "pyramid"
@@ -303,7 +357,7 @@ enddef	:
 
 
 newdef	: defined(hcx) || defined(_CX_UX)
-comment	: Harris Tahoe running CX/UX
+comment : Harris Tahoe running CX/UX
 vendor	:						: "harris"
 hosttype:						: "hcx"
 ostype	:						: "hcx"
@@ -312,7 +366,7 @@ enddef	:
 
 
 newdef	: defined(tahoe)
-comment	: Harris Tahoe
+comment : Harris Tahoe
 vendor	:						: "harris"
 hosttype:						: "tahoe"
 machtype:						: "tahoe"
@@ -320,17 +374,17 @@ enddef	:
 
 
 newdef	: defined(ibm032)
-comment	: RT running IBM AOS4.3 or MACH
+comment : RT running IBM AOS4.3 or MACH
 vendor	:						: "ibm"
 hosttype:						: "rt"
 ostype	: defined(MACH)					: "mach"
-ostype	: 						: "aos"
+ostype	:						: "aos"
 machtype:						: "ibm032"
 enddef	:
 
 
 newdef	: defined(aiws)
-comment	: RT running IBM aix2.x
+comment : RT running IBM aix2.x
 vendor	:						: "ibm"
 hosttype:						: "rtpc"
 ostype	:						: "aix"
@@ -339,7 +393,7 @@ enddef	:
 
 
 newdef	: defined(_AIX370)
-comment	: IBM/370 running aix
+comment : IBM/370 running aix
 vendor	:						: "ibm"
 hosttype:						: "aix370"
 ostype	:						: "aix"
@@ -348,7 +402,7 @@ enddef	:
 
 
 newdef	: defined(_IBMESA)
-comment	: IBM/ESA running aix
+comment : IBM/ESA running aix
 vendor	:						: "ibm"
 hosttype:						: "aixESA"
 ostype	:						: "aix"
@@ -357,7 +411,7 @@ enddef	:
 
 
 newdef	: defined(_IBMR2)
-comment	: IBM/RS6000 running aix
+comment : IBM/RS6000 running aix
 vendor	:						: "ibm"
 hosttype:						: "rs6000"
 ostype	:						: "aix"
@@ -366,7 +420,7 @@ enddef	:
 
 
 newdef	: defined(_AIXPS2)
-comment	: IBM/PS2 running aix
+comment : IBM/PS2 running aix
 vendor	:						: "ibm"
 hosttype:						: "ps2"
 ostype	:						: "aix"
@@ -375,7 +429,7 @@ enddef	:
 
 
 newdef	: defined(OREO)
-comment	: Macintosh running AU/X
+comment : Macintosh running AU/X
 vendor	:						: "apple"
 hosttype:						: "mac2"
 ostype	:						: "aux"
@@ -384,7 +438,7 @@ enddef	:
 
 
 newdef	: defined(u3b20d)
-comment	: AT&T 3B/20 series running SVR2/3 
+comment : AT&T 3B/20 series running SVR2/3 
 vendor	:						: "att"
 hosttype:						: "att3b20"
 machtype:						: "u3b20"
@@ -392,7 +446,7 @@ enddef	:
 
 
 newdef	: defined(u3b15)
-comment	: AT&T 3B/15 series running SVR2/3 
+comment : AT&T 3B/15 series running SVR2/3 
 vendor	:						: "att"
 hosttype:						: "att3b15"
 machtype:						: "u3b15"
@@ -400,7 +454,7 @@ enddef	:
 
 
 newdef	: defined(u3b5)
-comment	: AT&T 3B/5 series running SVR2/3 
+comment : AT&T 3B/5 series running SVR2/3 
 vendor	:						: "att"
 hosttype:						: "att3b5"
 machtype:						: "u3b5"
@@ -408,7 +462,7 @@ enddef	:
 
 
 newdef	: defined(u3b2)
-comment	: AT&T 3B/2 series running SVR2/3 
+comment : AT&T 3B/2 series running SVR2/3 
 vendor	:						: "att"
 hosttype:						: "att3b2"
 machtype:						: "u3b2"
@@ -416,7 +470,7 @@ enddef	:
 
 
 newdef	: defined(UNIXPC)
-comment	: AT&T UnixPC att3b1/att7300
+comment : AT&T UnixPC att3b1/att7300
 vendor	:						: "att"
 hosttype:						: "unixpc"
 machtype: defined(u3b1)					: "u3b1"
@@ -425,7 +479,7 @@ enddef	:
 
 
 newdef	: defined(_MINIX)
-comment	: Andy Tanenbaum's minix
+comment : Andy Tanenbaum's minix
 vendor	: defined(M_i386)				: "intel"
 hosttype: defined(M_i386)				: "minix386"
 hosttype:						: "minix"
@@ -434,41 +488,35 @@ machtype: defined(M_i386)				: "i386"
 enddef	:
 
 
+newdef	: defined(__gnu_hurd__)
+comment : GNU/HURD
+vendor	: defined(M_intel)				: "intel"
+hosttype: defined(M_i686)				: "i686"
+hosttype: defined(M_i586)				: "i586"
+hosttype: defined(M_i486)				: "i486"
+hosttype: defined(M_i386)				: "i386"
+ostype	:						: "gnu"
+machtype: defined(M_i686)				: "i686-pc-gnu"
+machtype: defined(M_i586)				: "i586-pc-gnu"
+machtype: defined(M_i486)				: "i486-pc-gnu"
+machtype: defined(M_i386)				: "i386-pc-gnu"
+enddef	:
+
+
 newdef	: defined(linux) || defined(__GNU__) || defined(__GLIBC__)
-comment	: Linus Torvalds's linux
+comment : Linus Torvalds's linux
 vendor	: defined(M_intel)				: "intel"
-hosttype: defined(__ia64__)				: "ia64-linux"
-hosttype: defined(__powerpc64__)			: "powerpc64-linux"
-hosttype: defined(__s390x__)				: "s390x-linux"
-hosttype: defined(__s390__)				: "s390-linux"
-hosttype: defined(__x86_64__)				: "x86_64-linux"
-hosttype: defined(M_i586) 				: "i586-linux"
-hosttype: defined(M_i486) 				: "i486-linux"
-hosttype: defined(M_i386)				: "i386-linux"
-ostype	: 						: "linux"
-machtype: defined(__ia64__)				: "ia64"
-machtype: defined(__powerpc64__)			: "powerpc64"
-machtype: defined(__s390x__)				: "s390x"
-machtype: defined(__s390__)				: "s390"
-machtype: defined(__x86_64__)				: "x86_64"
-machtype: defined(M_i586) 				: "i586"
-machtype: defined(M_i486) 				: "i486"
-machtype: defined(M_i386)				: "i386"
-vendor	: defined(__alpha)				: "dec"
+hosttype:						: gethost()
+ostype	:						: getostype()
+machtype:						: getmach()
+vendor	: defined(__ANDROID__)				: "linux"
+vendor	: defined(alpha)				: "dec"
 vendor	: defined(PPC)					: "apple"
-hosttype: defined(__alpha)				: "alpha"
-hosttype: defined(PPC)					: "powerpc"
-machtype: defined(__alpha)				: "alpha"
-machtype: defined(PPC)					: "powerpc"
-machtype: defined(M_mipsel)				: "mipsel"
-machtype: defined(M_mipseb)				: "mipseb"
-machtype: defined(M_mips64el)				: "mips64el"
-machtype: defined(M_mips64eb)				: "mips64eb"
 enddef	:
 
 
 newdef	: defined(__EMX__)
-comment	: OS/2 EMX [unix emulation under OS/2]
+comment : OS/2 EMX [unix emulation under OS/2]
 vendor	: defined(M_intel)				: "intel"
 hosttype: defined(M_i386)				: "i386-emx"
 ostype	:						: "os2"
@@ -477,7 +525,8 @@ enddef	:
 
 
 newdef	: defined(__NetBSD__) 
-comment	: NetBSD
+comment : NetBSD
+vendor	: defined(algor)				: "algoritmics"
 vendor	: defined(arm32) || defined(__arm__)		: "acorn"
 vendor	: defined(alpha)				: "digital"
 vendor	: defined(amiga)				: "commodore"
@@ -488,49 +537,71 @@ vendor	: defined(m68k)					: "motorola"
 vendor	: defined(mac68k)				: "apple"
 vendor	: defined(pc532)				: "national-semi"
 vendor	: defined(pmax)					: "dec"
+vendor	: defined(powerpc)				: "motorola"
 vendor	: defined(mips)					: "mips"
 vendor	: defined(sparc)				: "sun"
+vendor	: defined(sparc64)				: "sun"
 vendor	: defined(sun3)					: "sun"
 vendor	: defined(vax)					: "digital"
-hosttype: 						: "NetBSD"
-ostype	: 						: "NetBSD"
+vendor	: defined(x86_64)				: "amd"
+hosttype:						: "NetBSD"
+ostype	:						: "NetBSD"
+machtype: defined(alpha)				: "alpha"
+machtype: defined(algor)				: "algor"
 machtype: defined(arm32) || defined(__APCS_32__)	: "arm32"
 machtype: defined(arm26) || defined(__APCS_26__)	: "arm26"
-machtype: defined(arm) || defined(__arm__)		: "arm"
+machtype: defined(arm)					: "arm"
 machtype: defined(sparc)				: "sparc"
+machtype: defined(sparc64)				: "sparc64"
 machtype: defined(mc68020)				: "m68k"
 machtype: defined(M_i386)				: "i386"
 machtype: defined(M_mipsel)				: "mipsel"
 machtype: defined(M_mipseb)				: "mipseb"
 machtype: defined(mips)					: "mips"
 machtype: defined(pc532)				: "pc532"
+machtype: defined(powerpc)				: "powerpc"
 machtype: defined(vax)					: "vax"
-machtype: defined(alpha)				: "alpha"
+machtype: defined(x86_64)				: "x86_64"
 enddef	:
 
 
 newdef	: defined(__FreeBSD__) 
-comment	: FreeBSD
-vendor	: defined(__alpha)				: "digital"
+comment : FreeBSD
+vendor	: defined(alpha)				: "digital"
+vendor	: defined(arm32) || defined(__arm__)		: "acorn"
 vendor	: defined(M_intel)				: "intel"
+vendor	: defined(ia64)					: "intel"
+vendor	: defined(mips)					: "mips"
+vendor	: defined(powerpc)				: "motorola"
+vendor	: defined(sparc)				: "sun"
+vendor	: defined(sparc64)				: "sun"
+vendor	: defined(x86_64)				: "amd"
 hosttype:						: "FreeBSD"
 ostype	:						: "FreeBSD"
-machtype: defined(__alpha)				: "alpha"
+machtype: defined(alpha)				: "alpha"
+machtype: defined(arm32) || defined(__APCS_32__)	: "arm32"
+machtype: defined(arm)					: "arm"
+machtype: defined(ia64)					: "ia64"
 machtype: defined(M_i386)				: "i386"
+machtype: defined(mips)					: "mips"
+machtype: defined(powerpc)				: "powerpc"
+machtype: defined(sparc)				: "sparc"
+machtype: defined(sparc64)				: "sparc64"
+machtype: defined(x86_64)				: "x86_64"
 enddef	:
 
 
-newdef  : defined(__MidnightBSD__)
+newdef	: defined(__MidnightBSD__)
 comment : MidnightBSD
-vendor  : defined(M_intel)                              : "intel"
-hosttype:                                               : "MidnightBSD"
-ostype  :                                               : "MidnightBSD"
-machtype: defined(M_i386)                               : "i386"
-enddef  :
+vendor	: defined(M_intel)				: "intel"
+hosttype:						: "MidnightBSD"
+ostype	:						: "MidnightBSD"
+machtype: defined(M_i386)				: "i386"
+enddef	:
 
 
 newdef	: defined(__386BSD__)
-comment	: Bill Jolitz's 386BSD
+comment : Bill Jolitz's 386BSD
 vendor	: defined(M_intel)				: "intel"
 hosttype:						: "386BSD"
 ostype	:						: "386BSD"
@@ -539,22 +610,22 @@ enddef	:
 
 
 newdef	: defined(bsdi)
-comment	: BSDI's unix
+comment : BSDI's unix
 vendor	: defined(M_intel)				: "intel"
 vendor	: defined(sparc)				: "sun"
-vendor	: defined(__powerpc__)				: "motorola"
+vendor	: defined(powerpc)				: "motorola"
 hosttype: defined(M_intel)				: "bsd386"
 hosttype: defined(sparc)				: "bsd-sparc"
-hosttype: defined(__powerpc__)				: "bsd-powerpc"
+hosttype: defined(powerpc)				: "bsd-powerpc"
 ostype	:						: "bsdi"
 machtype: defined(M_i386)				: "i386"
 machtype: defined(sparc)				: "sparc"
-machtype: defined(__powerpc__)				: "powerpc"
+machtype: defined(powerpc)				: "powerpc"
 enddef	:
 
 
 newdef	: defined(COHERENT)
-comment	: COHERENT's unix
+comment : COHERENT's unix
 vendor	: defined(_I386)				: "intel"
 hosttype:						: "coh386"
 hosttype:						: "coherent"
@@ -563,7 +634,7 @@ machtype: defined(_I386)				: "i386"
 enddef	:
 
 newdef	: defined(concurrent)
-comment	: Concurrent PowerHawk
+comment : Concurrent PowerHawk
 vendor	:						: "concurrent"
 hosttype:						: "powerhawk"
 ostype	:						: "powermax_os"
@@ -571,7 +642,7 @@ machtype:						: "powerhawk"
 enddef	:
 
 newdef	: defined(SCO)
-comment	: SCO UNIX System V/386 Release 3.2
+comment : SCO UNIX System V/386 Release 3.2
 vendor	:						: "sco"
 hosttype:						: "sco386"
 ostype	:						: "sco_unix"
@@ -579,7 +650,7 @@ machtype:						: "i386"
 enddef	:
 
 newdef	: defined(M_XENIX) && !defined(M_UNIX)
-comment	: SCO XENIX
+comment : SCO XENIX
 vendor	:						: "sco"
 hosttype:						: "sco_xenix"
 ostype	:						: "sco_xenix"
@@ -589,17 +660,17 @@ enddef	:
 
 
 newdef	: defined(ISC) || defined(ISC202)
-comment	: Interactive Unix
+comment : Interactive Unix
 vendor	:						: "isc"
 hosttype:						: "isc386"
 ostype	: defined(POSIX)				: "POSIX"
-ostype	: 						: "SVR3"
+ostype	:						: "SVR3"
 machtype: defined(M_i386)				: "i386"
 enddef	:
 
 
 newdef	: defined(INTEL)
-comment	: Intel Unix
+comment : Intel Unix
 vendor	:						: "intel"
 hosttype:						: "intel386"
 ostype	:						: "intel_unix"
@@ -608,7 +679,7 @@ enddef	:
 
 
 newdef	: defined(MACH)
-comment	: cmu's mach
+comment : cmu's mach
 vendor	:						: "cmu"
 hosttype: defined(M_i386)				: "i386-mach"
 ostype	:						: "mach"
@@ -617,7 +688,7 @@ enddef	:
 
 
 newdef	: defined(alliant)
-comment	: Alliants FSX
+comment : Alliants FSX
 vendor	:						: "alliant"
 hosttype: defined(mc68000)				: "alliant-fx80"
 hosttype: defined(i860)					: "alliant-fx2800"
@@ -629,38 +700,38 @@ enddef	:
 
 
 newdef	: defined(_FTX)
-comment	: Stratus Computer, Inc FTX2 (i860 based)
-comment	: Stratus Computer, Inc FTX3 (HPPA based)
+comment : Stratus Computer, Inc FTX2 (i860 based)
+comment : Stratus Computer, Inc FTX3 (HPPA based)
 vendor	:						: "stratus"
 hosttype: defined(i860) && defined(_FTX)		: "atlantic"
-hosttype: defined(__hppa) && defined(_FTX)		: "continuum"
+hosttype: defined(hppa) && defined(_FTX)		: "continuum"
 ostype	: defined(i860) && defined(_FTX)		: "ftx2"
-ostype	: defined(__hppa) && defined(_FTX)		: "ftx3"
+ostype	: defined(hppa) && defined(_FTX)		: "ftx3"
 machtype: defined(i860)					: "i860"
-machtype: defined(__hppa)				: "hppa"
+machtype: defined(hppa)					: "hppa"
 enddef	:
 
 
 newdef	: defined(sequent) || defined(_SEQUENT_)
-comment	: Sequent Balance (32000 based)
-comment	: Sequent Symmetry running DYNIX/ptx (386/486 based)
-comment	: Sequent Symmetry running DYNIX 3 (386/486 based)
+comment : Sequent Balance (32000 based)
+comment : Sequent Symmetry running DYNIX/ptx (386/486 based)
+comment : Sequent Symmetry running DYNIX 3 (386/486 based)
 vendor	:						: "sequent"
 hosttype: defined(M_i386) && defined(sequent)		: "symmetry"
 hosttype: defined(M_i386)				: "ptx"
-hosttype: 						: "balance"
+hosttype:						: "balance"
 ostype	: defined(M_i386) && !defined(sequent)		: "ptx"
-ostype	: 						: "dynix3"
+ostype	:						: "dynix3"
 machtype: defined(M_i386)				: "i386"
 machtype: defined(ns32000)				: "ns32000"
 enddef	:
 
 
 newdef	: defined(ns32000)
-comment	: Encore Computer Corp. Multimax (32000 based)
+comment : Encore Computer Corp. Multimax (32000 based)
 vendor	:						: "encore"
 hosttype: defined(CMUCS)				: "multimax"
-hosttype: 						: isamultimax(0)
+hosttype:						: isamultimax(0)
 ostype	: defined(CMUCS)				: "mach"
 ostype	:						: isamultimax(1)
 machtype:						: "ns32000"
@@ -668,16 +739,16 @@ enddef	:
 
 
 newdef	: defined(iconuxv)
-comment	: Icon 88k running Unix
+comment : Icon 88k running Unix
 vendor	:						: "icon"
 hosttype:						: "icon"
 ostype	:						: "iconuxv"
-machtype: defined(m88k) || defined(__m88k__)		: "m88k"
+machtype: defined(m88k)					: "m88k"
 enddef	:
 
 
 newdef	: defined(_CRAY) && defined(_CRAYCOM)
-comment	: Cray Computer Corp. running CSOS
+comment : Cray Computer Corp. running CSOS
 vendor	:						: "ccc"
 hosttype: defined(_CRAY2)				: "cray"
 hosttype: defined(_CRAY3)				: "cray"
@@ -690,7 +761,7 @@ enddef	:
 
 
 newdef	: defined(cray) && !defined(_CRAYMPP)
-comment	: Cray Research Inc. PVP running UNICOS
+comment : Cray Research Inc. PVP running UNICOS
 vendor	:						: "cri"
 hosttype:						: getcray()
 ostype	:						: "unicos"
@@ -698,17 +769,17 @@ machtype:						: getcray()
 enddef	:
 
 
-newdef  : defined(cray) && defined(_CRAYT3D)
+newdef	: defined(cray) && defined(_CRAYT3D)
 comment : Cray Research Inc. running UNICOS MAX
-vendor  :                                               : "cri"
-hosttype:                                               : getcray()
-ostype  :                                               : "unicosmax"
-machtype:                                               : getcray()
-enddef  :
+vendor	:						: "cri"
+hosttype:						: getcray()
+ostype	:						: "unicosmax"
+machtype:						: getcray()
+enddef	:
 
 
 newdef	: defined(cray) && defined(_CRAYT3E)
-comment	: Cray Research Inc. running UNICOS/mk
+comment : Cray Research Inc. running UNICOS/mk
 vendor	:						: "cri"
 hosttype:						: getcray()
 ostype	:						: "unicosmk"
@@ -717,8 +788,8 @@ enddef	:
 
 
 newdef	: defined(convex)
-comment	: Convex
-vendor	: 						: "convex"
+comment : Convex
+vendor	:						: "convex"
 hosttype:						: "convex"
 ostype	:						: "convexos"
 machtype:						: getconvex()
@@ -726,83 +797,81 @@ enddef	:
 
 
 newdef	: defined(butterfly)
-comment	: BBN Butterfly 1000
+comment : BBN Butterfly 1000
 vendor	:						: "bbn"
 hosttype:						: "butterfly"
-machtype: defined(mc68020) || defined(__mc68020__)	: "m68k"
+machtype: defined(mc68020)				: "m68k"
 enddef	:
 
 
 newdef	: defined(NeXT)
-comment	: NeXTStep
+comment : NeXTStep
 vendor	:						: "next"
-hosttype: defined(mc68020) || defined(__mc68020__)	: "next"
-hosttype: defined(M_i386)  || defined(__i386__)		: "intel-pc"
-hosttype: defined(hppa)    || defined(__hppa__)		: "hp"
-hosttype: defined(sparc)   || defined(__sparc__)	: "sun"
+hosttype: defined(mc68020)				: "next"
+hosttype: defined(M_i386) 				: "intel-pc"
+hosttype: defined(hppa)	  				: "hp"
+hosttype: defined(sparc)  				: "sun"
 ostype	:						: "nextstep"
-machtype: defined(mc68020) || defined(__mc68020__)	: "m68k"
-machtype: defined(M_i386)  || defined(__i386__)		: "i386"
-machtype: defined(hppa)    || defined(__hppa__)		: "hppa"
-machtype: defined(sparc)   || defined(__sparc__)	: "sparc"
+machtype: defined(mc68020)				: "m68k"
+machtype: defined(M_i386) 				: "i386"
+machtype: defined(hppa)	  				: "hppa"
+machtype: defined(sparc)  				: "sparc"
 enddef	:
 
 
 newdef	: defined(__APPLE__) && defined(__MACH__)
-comment	: OS X
+comment : OS X
 vendor	:						: "apple"
-hosttype: defined(__i386__)				: "intel-pc"
-hosttype: defined(__ppc__)				: "powermac"
+hosttype: defined(i386)					: "intel-pc"
+hosttype: defined(ppc)					: "powermac"
 ostype	:						: "darwin"
-machtype: defined(__i386__)				: "i386"
-machtype: defined(__ppc__)				: "powerpc"
+machtype: defined(i386)					: "i386"
+machtype: defined(ppc)					: "powerpc"
 enddef	:
 
 
 newdef	: defined(sony_news)
-comment	: Sony NEWS 800 or 1700 workstation
+comment : Sony NEWS 800 or 1700 workstation
 vendor	:						: "sony"
 hosttype: defined(mips)					: "news_mips"
-hosttype: defined(mc68020) || defined(__mc68020__)	: "news_m68k"
+hosttype: defined(mc68020)				: "news_m68k"
 ostype	:						: "News"
-machtype: defined(mc68020) || defined(__mc68020__)	: "m68k"
+machtype: defined(mc68020)				: "m68k"
 machtype: defined(M_mipsel)				: "mipsel"
 machtype: defined(M_mipseb)				: "mipseb"
 enddef	:
 
 
 newdef	: defined(sgi)
-comment	: Silicon Graphics
+comment : Silicon Graphics
 vendor	:						: "sgi"
 hosttype: defined(M_mipsel)				: "iris4d"
 hosttype: defined(M_mipseb)				: "iris4d"
-hosttype: defined(mc68000) 				: "iris3d"
+hosttype: defined(mc68000)				: "iris3d"
 ostype	:						: "irix"
 machtype: defined(M_mipsel)				: "mipsel"
 machtype: defined(M_mipseb)				: "mipseb"
-machtype: defined(mc68000) 				: "mc68000"
+machtype: defined(mc68000)				: "mc68000"
 enddef	:
 
 
 newdef	: defined(ultrix) || defined(__ultrix)
-comment	: Digital's Ultrix 
+comment : Digital's Ultrix 
 vendor	:						: "dec"
 hosttype: defined(M_mipsel)				: "decstation"
 hosttype: defined(M_mipseb)				: "decmips"
-hosttype: defined(vax) || defined(__vax)		: "vax"
-hosttype: defined(__vax__) 				: "vax"
+hosttype: defined(vax)					: "vax"
 ostype	:						: "ultrix"
 machtype: defined(M_mipsel)				: "mipsel"
 machtype: defined(M_mipseb)				: "mipseb"
-machtype: defined(vax) || defined (__vax)		: "vax"
-hosttype: defined(__vax__) 				: "vax"
+machtype: defined(vax)					: "vax"
 enddef	:
 
 
 newdef	: defined(MIPS)
-comment	: Mips OS
+comment : Mips OS
 vendor	:						: "mips"
-hosttype: defined(M_mipsel) 				: "mips"
+hosttype: defined(M_mipsel)				: "mips"
 hosttype: defined(M_mipseb)				: "mips"
 ostype	:						: "mips"
 machtype: defined(M_mipsel)				: "mipsel"
@@ -811,30 +880,30 @@ enddef	:
 
 
 newdef	: defined(DECOSF1)
-comment	: Digital's alpha running osf1
+comment : Digital's alpha running osf1
 vendor	:						: "dec"
 ostype	:						: "osf1"
-hosttype: defined(__alpha)				: "alpha"
-machtype: defined(__alpha)				: "alpha"
+hosttype: defined(alpha)				: "alpha"
+machtype: defined(alpha)				: "alpha"
 enddef	:
 
 
 newdef	: defined(Lynx)
-comment	: Lynx OS 2.1
+comment : Lynx OS 2.1
 vendor	:						: "Lynx"
 hosttype: defined(M_mipsel)				: "lynxos-mips"
 hosttype: defined(M_mipseb)				: "lynxos-mips"
 hosttype: defined(M_i386)				: "lynxos-i386"
-hosttype: defined(i860) || defined(__i860__)		: "lynxos-i860"
+hosttype: defined(i860)					: "lynxos-i860"
 hosttype: defined(m68k)					: "lynxos-m68k"
 hosttype: defined(m88k)					: "lynxos-m88k"
 hosttype: defined(sparc)				: "lynxos-sparc"
-hosttype: 						: "lynxos-unknown"
+hosttype:						: "lynxos-unknown"
 ostype	:						: "LynxOS"
 machtype: defined(M_mipsel)				: "mipsel"
 machtype: defined(M_mipseb)				: "mipseb"
 machtype: defined(M_i386)				: "i386"
-machtype: defined(i860) || defined(__i860__)		: "i860"
+machtype: defined(i860)					: "i860"
 machtype: defined(m68k)					: "m68k"
 machtype: defined(m88k)					: "m88k"
 machtype: defined(sparc)				: "sparc"
@@ -842,24 +911,24 @@ enddef	:
 
 
 newdef	: defined(masscomp)
-comment	: Masscomp
+comment : Masscomp
 vendor	:						: "masscomp"
 hosttype:						: "masscomp"
 ostype	:						: "masscomp"
 enddef	:
 
 newdef	: defined(__MACHTEN__)
-comment	: Machintosh
+comment : Machintosh
 vendor	:						: "Tenon"
 hosttype:						: "Macintosh"
-ostype	: 						: "MachTen"
+ostype	:						: "MachTen"
 machtype:						: "Macintosh"
 enddef	:
 
 
 
 newdef	: defined(GOULD_NP1)
-comment	: Gould
+comment : Gould
 vendor	:						: "gould"
 hosttype:						: "gould_np1"
 machtype:						: "gould"
@@ -867,7 +936,7 @@ enddef	:
 
 
 newdef	: defined(MULTIFLOW)
-comment	: Multiflow running 4.3BSD
+comment : Multiflow running 4.3BSD
 vendor	:						: "multiflow"
 hosttype:						: "multiflow"
 machtype:						: "multiflow"
@@ -876,24 +945,24 @@ enddef	:
 
 
 newdef	: defined(SXA)
-comment	: PFU/Fujitsu A-xx computer
+comment : PFU/Fujitsu A-xx computer
 vendor	:						: "sxa"
 hosttype:						: "pfa50"
 ostype	: defined(_BSDX_)				: "e60-bsdx"
-ostype	: 						: "e60"
+ostype	:						: "e60"
 machtype:						: "pfa50"
 enddef	:
 
 
 newdef	: defined(titan)
-comment	: (St)Ardent Titan
+comment : (St)Ardent Titan
 vendor	:						: "ardent"
 hosttype:						: "titan"
 enddef	:
 
 
 newdef	: defined(stellar)
-comment	: Stellar
+comment : Stellar
 vendor	:						: "stellar"
 hosttype:						: "stellar"
 ostype	:						: "stellix"
@@ -901,8 +970,8 @@ enddef	:
 
 
 newdef	: defined(atari)
-comment	: Atari TT running SVR4. This machine was never
-comment	: commercially available.
+comment : Atari TT running SVR4. This machine was never
+comment : commercially available.
 vendor	:						: "atari"
 hosttype:						: "atari"
 ostype	:						: "asv"
@@ -910,21 +979,21 @@ enddef	:
 
 
 newdef	: defined(OPUS)
-comment	: ???
+comment : ???
 vendor	:						: "opus"
 hosttype:						: "opus"
 enddef	:
 
 
 newdef	: defined(eta10)
-comment	: ETA running SVR3
+comment : ETA running SVR3
 vendor	:						: "eta"
 hosttype:						: "eta10"
 enddef	:
 
 
 newdef	: defined(hk68)
-comment	: Heurikon HK68 running Uniplus+ 5.0
+comment : Heurikon HK68 running Uniplus+ 5.0
 vendor	:						: "heurikon"
 hosttype:						: "hk68"
 ostype	:						: "uniplus"
@@ -932,7 +1001,7 @@ enddef	:
 
 
 newdef	: defined(NDIX)
-comment	: Norsk Data ND 500/5000 running Ndix
+comment : Norsk Data ND 500/5000 running Ndix
 vendor	:						: "norsk"
 hosttype:						: "nd500"
 ostype	:						: "ndix"
@@ -940,7 +1009,7 @@ enddef	:
 
 
 newdef	: defined(AMIGA)
-comment	: Amiga running AmigaOS+GG
+comment : Amiga running AmigaOS+GG
 vendor	:						: "commodore"
 hosttype:						: "amiga"
 ostype	:						: "AmigaOS"
@@ -949,8 +1018,8 @@ enddef	:
 
 
 newdef	: defined(uts)
-comment	: Amdahl running uts 2.1
-vendor	: 						: "amdahl"
+comment : Amdahl running uts 2.1
+vendor	:						: "amdahl"
 hosttype:						: "amdahl"
 ostype	:						: "uts"
 machtype:						: "amdahl"
@@ -958,55 +1027,55 @@ enddef	:
 
 
 newdef	: defined(UTek)
-comment	: Tektronix 4300 running UTek (BSD 4.2 / 68020 based)
+comment : Tektronix 4300 running UTek (BSD 4.2 / 68020 based)
 vendor	:						: "tektronix"
-hosttype: 						: "tek4300"
+hosttype:						: "tek4300"
 enddef	:
 
 
 newdef	: defined(UTekV)
-comment	: Tektronix XD88/10 running UTekV 3.2e (SVR3/88100 based)
+comment : Tektronix XD88/10 running UTekV 3.2e (SVR3/88100 based)
 vendor	:						: "tektronix"
-hosttype: 						: "tekXD88"
+hosttype:						: "tekXD88"
 enddef	:
 
 
 newdef	: defined(__DGUX__)
-comment	: Data-General AViiON running DGUX
+comment : Data-General AViiON running DGUX
 hosttype:						: "aviion"
 ostype	:						: "dgux"
 vendor	:						: "dg"
-machtype: defined(__m88k__)				: "m88k"
-machtype: defined(__i386__)				: "pentium"
+machtype: defined(m88k)					: "m88k"
+machtype: defined(i386)					: "pentium"
 enddef	:
 
 
 newdef	: defined(sysV68)
-comment	: Motorola MPC running System V/68 R32V2 (SVR3/68020 based)
+comment : Motorola MPC running System V/68 R32V2 (SVR3/68020 based)
 vendor	:						: "motorola"
-hosttype: 						: "sysV68"
+hosttype:						: "sysV68"
 machtype:						: "m68k"
 enddef	:
 
 
 newdef	: defined(supermax)
-comment	: DDE Supermax running System V/68 R3 (SVR3/68020 based)
+comment : DDE Supermax running System V/68 R3 (SVR3/68020 based)
 vendor	:						: "supermax"
-hosttype: 						: "supermax"
+hosttype:						: "supermax"
 machtype:						: "m68k"
 enddef	:
 
 
 newdef	: defined(sysV88)
-comment	: Motorola MPC running System V/88 R32V2 (SVR3/88100 based)
+comment : Motorola MPC running System V/88 R32V2 (SVR3/88100 based)
 vendor	:						: "motorola"
-hosttype: 						: "sysV88"
+hosttype:						: "sysV88"
 machtype:						: "m88k"
 enddef	:
 
 
 newdef	: defined(__clipper__)
-comment	: Clipper Chipset (Intergraph)
+comment : Clipper Chipset (Intergraph)
 vendor	:						: "intergraph"
 hosttype:						: "clipper"
 machtype:						: "clipper"
@@ -1017,7 +1086,7 @@ ostype :						: "qnx"
 enddef :
 
 newdef	: (defined(SNI) || defined(sinix)) && !defined(_OSD_POSIX)
-comment	: Fujitsu Siemens Computers (former "Siemens Nixdorf Informationssysteme"): SINIX aka. ReliantUNIX, a SVR4 derivative
+comment : Fujitsu Siemens Computers (former "Siemens Nixdorf Informationssysteme"): SINIX aka. ReliantUNIX, a SVR4 derivative
 vendor	:						: "fsc"
 hosttype: defined(M_intel)				: "wx200i"
 hosttype: defined(MIPSEB)				: "rm400"
@@ -1031,7 +1100,7 @@ machtype:						: "mips"
 enddef	:
 
 newdef	: defined(_OSD_POSIX)
-comment	: Fujitsu Siemens Computers (former "Siemens Nixdorf Informationssysteme"): BS2000 POSIX (mainframe, EBCDIC)
+comment : Fujitsu Siemens Computers (former "Siemens Nixdorf Informationssysteme"): BS2000 POSIX (mainframe, EBCDIC)
 vendor	:						: "fsc"
 hosttype:						: "bs2000"
 ostype	:						: "osdposix"
@@ -1042,31 +1111,31 @@ machtype:						: "bs2000"
 enddef	:
 
 newdef	: defined(__MVS__)
-comment	: ibm uss s/390 (mainframe, EBCDIC)
+comment : ibm uss s/390 (mainframe, EBCDIC)
 vendor	:						: "ibm"
-hosttype:					 	: "s390"
-ostype	: 						: "os390"
+hosttype:						: "s390"
+ostype	:						: "os390"
 machtype:						: "s390"
 enddef	:
 
 newdef	: defined(_SX)
 comment : NEC Corporation (SX-4)
-vendor	: 						: "nec"
+vendor	:						: "nec"
 ostype	:						: "superux"
 hosttype:						: "sx4"
 machtype:						: "sx4"
 enddef	:
 
-newdef  : !defined(SOLARIS2) && (SYSVREL == 4)
+newdef	: !defined(SOLARIS2) && (SYSVREL == 4)
 comment : Unix System V Release 4.0
-vendor  : defined(DELL)					: "dell"
+vendor	: defined(DELL)					: "dell"
 hosttype: defined(M_i386)				: "i386"
-ostype  :						: "svr4"
+ostype	:						: "svr4"
 machtype: defined(M_i386)				: "i386"
 enddef	:
 
 newdef	: defined(__uxp__) || defined(__uxps__)
-comment	: FUJITSU DS/90 7000
+comment : FUJITSU DS/90 7000
 vendor	:						: "fujitsu"
 hosttype:						: "ds90"
 ostype	:						: "sysv4"
@@ -1074,27 +1143,29 @@ machtype:						: "sparc"
 enddef	:
 
 newdef	: defined(__CYGWIN__)
-comment	: Cygwin
-hosttype:						: "i386-cygwin"
-ostype	:						: "cygwin"
+comment : Cygwin
+vendor	:						: "intel"
+hosttype:						: gethost()
+ostype	:						: getostype()
+machtype:						: getmach()
 enddef	:
 
-newdef  : defined(_UWIN)
+newdef	: defined(_UWIN)
 comment : AT&T Research Unix for Windows
-vendor  :               				: "att"
-hosttype:                       			: "win32.i386"
-machtype:                       			: "i386"
+vendor	:						: "att"
+hosttype:						: "win32.i386"
+machtype:						: "i386"
 enddef	:
 
 
-newdef	: defined(mc68000) || defined(__mc68000__) || defined(mc68k32) || defined(m68k) || defined(mc68010) || defined(mc68020)
+newdef	: defined(mc68000) || defined(mc68k32) || defined(m68k) || defined(mc68010) || defined(mc68020)
 hosttype:						: "m68k"
 vendor	: defined(m68k)					: "motorola"
 machtype:						: "m68k"
 enddef	:
 
 
-newdef	: defined(m88k) || defined(__m88k__)
+newdef	: defined(m88k)
 hosttype:						: "m88k"
 machtype:						: "m88k"
 enddef	:
@@ -1104,20 +1175,20 @@ newdef	: defined(M_intel)
 hosttype: defined(M_i586)				: "i586"
 hosttype: defined(M_i486)				: "i486"
 hosttype: defined(M_i386)				: "i386"
-vendor	: 						: "intel"
+vendor	:						: "intel"
 machtype: defined(M_i586)				: "i586"
 machtype: defined(M_i486)				: "i486"
 machtype: defined(M_i386)				: "i386"
 enddef	:
 
 
-newdef	: defined(sparc) || defined(__sparc__)
+newdef	: defined(sparc)
 hosttype:						: "sparc"
 machtype:						: "sparc"
 enddef	:
 
 
-newdef	: defined(i860) || defined(__i860__)
+newdef	: defined(i860)
 hosttype:						: "i860"
 machtype:						: "i860"
 enddef	:
@@ -1136,26 +1207,26 @@ enddef	:
 
 
 newdef	: SYSVREL == 1
-ostype	: 						: "svr1"
+ostype	:						: "svr1"
 enddef	:
 
 
 newdef	: SYSVREL == 2
-ostype	: 						: "svr2"
+ostype	:						: "svr2"
 enddef	:
 
 
 newdef	: SYSVREL == 3
-ostype	: 						: "svr3"
+ostype	:						: "svr3"
 enddef	:
 
 
 newdef	: SYSVREL == 4
-ostype	: 						: "svr4"
+ostype	:						: "svr4"
 enddef	:
 
 
-newcode	:
+newcode :
 #ifndef _hosttype_
     hosttype = "unknown";
 #endif
@@ -1169,8 +1240,8 @@ newcode	:
     machtype = "unknown";
 #endif
     tsetenv(STRHOSTTYPE, str2short(hosttype));
-    tsetenv(STRVENDOR,   str2short(vendor));
-    tsetenv(STROSTYPE,   str2short(ostype));
+    tsetenv(STRVENDOR,	 str2short(vendor));
+    tsetenv(STROSTYPE,	 str2short(ostype));
     tsetenv(STRMACHTYPE, str2short(machtype));
 } /* end setmachine */
-endcode	:
+endcode :
diff --git a/contrib/tcsh/install-sh b/contrib/tcsh/install-sh
index 6ebe46d..6781b98 100755
--- a/contrib/tcsh/install-sh
+++ b/contrib/tcsh/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-12-17.09
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@ scriptversion=2004-12-17.09
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+posix_mkdir=
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+# Desired mode of installed file.
+mode=0755
 
-chmodcmd="$chmodprog 0755"
-chowncmd=
 chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
-    --help) echo "$usage"; exit 0;;
+    --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit 0;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
+  shift
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,24 +199,47 @@ if test -z "$1"; then
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -190,71 +248,199 @@ do
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-  # Make sure that the destination directory exists.
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
 
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
 
-    pathcomp=
+      eval "$initialize_posix_glob"
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +448,9 @@ do
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -273,51 +458,63 @@ do
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
 done
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/contrib/tcsh/nls/C/charset b/contrib/tcsh/nls/C/charset
index f272278..81f1b66 100644
--- a/contrib/tcsh/nls/C/charset
+++ b/contrib/tcsh/nls/C/charset
@@ -1,3 +1,3 @@
-$ codeset=US-ASCII
+$ codeset=UTF-8
 $set 255
-1 US-ASCII
+1 UTF-8
diff --git a/contrib/tcsh/nls/C/set19 b/contrib/tcsh/nls/C/set19
index 1f10336..20e95d6 100644
--- a/contrib/tcsh/nls/C/set19
+++ b/contrib/tcsh/nls/C/set19
@@ -1,4 +1,4 @@
-$ $tcsh: set19,v 1.4 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set19,v 1.6 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Out of memory\n
@@ -9,7 +9,15 @@ $set 19
 6 free(%lx) bad range check.
 7 free(%lx) bad block index.
 8 %s current memory allocation:\nfree:\t
-9 \nused:\t
+9 used
 10 \n\tTotal in use: %d, total free: %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
+13 %s current memory allocation:\n
+14 Total space allocated from system: %d\n
+15 Number of non-inuse chunks: %d\n
+16 Number of mmapped regions: %d\n
+17 Total space in mmapped regions: %d\n
+18 Total allocated space: %d\n
+19 Total non-inuse space: %d\n
+20 Top-most, releasable space: %d\n
diff --git a/contrib/tcsh/nls/Makefile b/contrib/tcsh/nls/Makefile
deleted file mode 100644
index 6678fd6..0000000
--- a/contrib/tcsh/nls/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $tcsh: Makefile,v 1.14 2006/03/02 18:46:45 christos Exp $
-
-SUBDIRS=	C et finnish french german greek italian ja russian \
-		spanish ukrainian
-#GENCAT=	gencat --new
-CHARSET=	charset
-GENCAT=		gencat
-
-catalogs:
-	@for i in ${SUBDIRS} ; \
-	do \
-	    echo "$$i"; \
-	    cd $$i; \
-	    cat ${CHARSET} set[0-9] set[0-9][0-9] > ../../tcsh.$$i.m; \
-	    cd ..; \
-	    ${GENCAT} ../tcsh.$$i.cat ../tcsh.$$i.m; \
-	done
-
-clean:
-	@for i in ${SUBDIRS} ; \
-	do \
-	    rm -f $$i/*~; \
-	    rm -f ../tcsh.$$i.cat ../tcsh.$$i.m; \
-	done
diff --git a/contrib/tcsh/nls/Makefile.in b/contrib/tcsh/nls/Makefile.in
new file mode 100644
index 0000000..fb8f053
--- /dev/null
+++ b/contrib/tcsh/nls/Makefile.in
@@ -0,0 +1,119 @@
+# $tcsh: Makefile.in,v 1.13 2012/01/05 16:54:25 christos Exp $
+
+CATALOGS=	C.cat et.cat finnish.cat french.cat german.cat greek.cat \
+		italian.cat ja.cat pl.cat russian.cat spanish.cat ukrainian.cat
+LOCALES=	${CATALOGS:.cat=}
+GENCAT=		@GENCAT@
+INSTALL=	@INSTALL@
+RM?=		rm -f
+VPATH=@srcdir@
+srcdir=@srcdir@
+
+prefix=@prefix@
+datarootdir=@datarootdir@
+localedir=${DESTDIR}@localedir@
+CATGEN=		${srcdir}/catgen
+
+all: ${CATALOGS}
+
+INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh.cat
+${localedir}/C/LC_MESSAGES/tcsh.cat:	C.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+C.cat: ${srcdir}/C/charset ${srcdir}/C/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/et/LC_MESSAGES/tcsh.cat
+${localedir}/et/LC_MESSAGES/tcsh.cat:	et.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+et.cat: ${srcdir}/et/charset ${srcdir}/et/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/fi/LC_MESSAGES/tcsh.cat
+${localedir}/fi/LC_MESSAGES/tcsh.cat:	finnish.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+finnish.cat: ${srcdir}/finnish/charset ${srcdir}/finnish/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/fr/LC_MESSAGES/tcsh.cat
+${localedir}/fr/LC_MESSAGES/tcsh.cat:	french.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+french.cat: ${srcdir}/french/charset ${srcdir}/french/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/de/LC_MESSAGES/tcsh.cat
+${localedir}/de/LC_MESSAGES/tcsh.cat:	german.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+german.cat: ${srcdir}/german/charset ${srcdir}/german/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/gr/LC_MESSAGES/tcsh.cat
+${localedir}/gr/LC_MESSAGES/tcsh.cat:	greek.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+greek.cat: ${srcdir}/greek/charset ${srcdir}/greek/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/it/LC_MESSAGES/tcsh.cat
+${localedir}/it/LC_MESSAGES/tcsh.cat:	italian.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+italian.cat: ${srcdir}/italian/charset ${srcdir}/italian/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/ja/LC_MESSAGES/tcsh.cat
+${localedir}/ja/LC_MESSAGES/tcsh.cat:	ja.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+ja.cat: ${srcdir}/ja/charset ${srcdir}/ja/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/pl/LC_MESSAGES/tcsh.cat
+${localedir}/pl/LC_MESSAGES/tcsh.cat:	pl.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+pl.cat: ${srcdir}/pl/charset ${srcdir}/pl/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/ru/LC_MESSAGES/tcsh.cat
+${localedir}/ru/LC_MESSAGES/tcsh.cat:	russian.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+russian.cat: ${srcdir}/russian/charset ${srcdir}/russian/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/es/LC_MESSAGES/tcsh.cat
+${localedir}/es/LC_MESSAGES/tcsh.cat:	spanish.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+spanish.cat: ${srcdir}/spanish/charset ${srcdir}/spanish/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+INSTALLED+=${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh.cat
+${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh.cat:	ukrainian.cat
+	mkdir -p $(@D)
+	$(INSTALL) $< $@
+
+ukrainian.cat: ${srcdir}/ukrainian/charset ${srcdir}/ukrainian/*set[0-9]*
+	@${CATGEN} $(GENCAT) $@ $^ $>
+
+install:	$(INSTALLED)
+
+catalogs: all
+clean:
+	$(RM) $(CATALOGS)
diff --git a/contrib/tcsh/nls/catgen b/contrib/tcsh/nls/catgen
new file mode 100755
index 0000000..ae1614d
--- /dev/null
+++ b/contrib/tcsh/nls/catgen
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Wrapper for gencat
+TMP=/tmp/catgen.$$
+trap "rm -f $TMP" 0 1 2 3 15
+
+GENCAT="$1"
+shift
+OUT="$1"
+shift
+cat "$@" > "$TMP"
+echo "$(basename "$OUT" .cat)"
+"${GENCAT}" "$OUT" "$TMP"
diff --git a/contrib/tcsh/nls/et/charset b/contrib/tcsh/nls/et/charset
index 0b13559..81f1b66 100644
--- a/contrib/tcsh/nls/et/charset
+++ b/contrib/tcsh/nls/et/charset
@@ -1,3 +1,3 @@
-$ codeset=ISO-8859-1
+$ codeset=UTF-8
 $set 255
-1 ISO-8859-1
+1 UTF-8
diff --git a/contrib/tcsh/nls/et/set1 b/contrib/tcsh/nls/et/set1
index 03864df..23dda3d 100644
--- a/contrib/tcsh/nls/et/set1
+++ b/contrib/tcsh/nls/et/set1
@@ -1,140 +1,140 @@
-$ $tcsh: set1,v 1.3 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set1,v 1.4 2011/02/04 18:19:33 christos Exp $
 $ Error messages
 $set 1 
-1 S�ntaksi viga
+1 Süntaksi viga
 2 %s ei ole lubatud
-3 S�na on liiga pikk
+3 Sõna on liiga pikk
 4 $< rida on liiga pikk
 5 $0 jaoks pole faili
-6 Mittet�ielik [] muutja
-7 $ laiendus peab l�ppema enne ]
-8 Halb : t�iendaja $ (%c)
+6 Mittetäielik [] muutja
+7 $ laiendus peab lõppema enne ]
+8 Halb : täiendaja $ (%c)
 9 Viga indeksis
 10 Vigane number
-11 S�nad on otsas
+11 Sõnad on otsas
 12 Faili nimi on puudu
-13 Sisemine t�iendi viga
-14 K�sku pole
-15 Liiga v�he argumente
+13 Sisemine täiendi viga
+14 Käsku pole
+15 Liiga vähe argumente
 16 Liiga palju argumente
 17 Seda aliast on liiga ohtlik luua
-18 T�hi if
-19 Eba�ige then
-20 S�nad pole sulgudes
+18 Tühi if
+19 Ebaõige then
+20 Sõnad pole sulgudes
 21 %s ei leita
 22 Vigane mask
 23 Pole sellist limiiti
 24 Argument on liiga suur
-25 Vigane v�i tundmatu skaleerimis faktor
+25 Vigane või tundmatu skaleerimis faktor
 26 Defineerimata muutuja
-27 Kataloogi pinu pole nii s�gav
+27 Kataloogi pinu pole nii sügav
 28 Vigane signaali number
 29 Tundmatu signaal; kill -l annab signaalid
-30 Muutuja nimi peab algama t�hega
+30 Muutuja nimi peab algama tähega
 31 Muutuja nimi on liiga pikk
-32 Muutuja nimi v�ib koosneda ainult t�htedest ja numbritest
-33 Sellel k�suinterpretaatoril puudub t��kontroll
-34 Avaldises on s�ntaksi viga
+32 Muutuja nimi võib koosneda ainult tähtedest ja numbritest
+33 Sellel käsuinterpretaatoril puudub töökontroll
+34 Avaldises on süntaksi viga
 35 Kodukataloogi pole
 36 Kodukataloogi ei saa minna
-37 Vigane t�hi k�sk
+37 Vigane tühi käsk
 38 Omistamisel pole avaldist
 39 Tundmatu operaator
 40 Arusaamatu
 41 %s: Fail on olemas
-42 V�tme -c argumendi l�pus on langkriips
+42 Võtme -c argumendi lõpus on langkriips
 43 Katkestatud
-44 Indeks on piiridest v�ljas
-45 Rea �let�itumine 
-46 Sellist t��d pole
+44 Indeks on piiridest väljas
+45 Rea ületäitumine 
+46 Sellist tööd pole
 47 Terminalilt ei saa
 48 Pole while/foreach sees
 49 Protsessid on otsas
 50 Ei leia
 51 Puuduv %c
-52 Ei leia s�mbolit %c
-53 M�lu on otsas
+52 Ei leia sümbolit %c
+53 Mälu on otsas
 54 Toru ei saa luua
 55 %s: %s
 56 %s
 57 Kasuta: jobs [ -l ]
-58 Argumendid peavad olema t��de v�i protsesside identifikaatorid
-59 K�esolevat t��d pole
-60 Pole eelmist t��d
-61 Pole mustrile vastavat t��d
-62 Fork s�veneb > %d; v�ibolla `...` ts�kkel
-63 Alamshellis pole t��kontrolli
-64 S�nkroniseerimise t�rge: Protsessi %d pole
-65 %sTeil on peatatud t�id
-66 %sTeil on seisatud t�id
+58 Argumendid peavad olema tööde või protsesside identifikaatorid
+59 Käesolevat tööd pole
+60 Pole eelmist tööd
+61 Pole mustrile vastavat tööd
+62 Fork süveneb > %d; võibolla `...` tsükkel
+63 Alamshellis pole töökontrolli
+64 Sünkroniseerimise tõrge: Protsessi %d pole
+65 %sTeil on peatatud töid
+66 %sTeil on seisatud töid
 67 Pole teist kataloogi
-68 Kataloogi pinu on t�hi
+68 Kataloogi pinu on tühi
 69 Halb kataloog
 70 kasuta: %s [-%s]%s
-71 -h v�tmel puudub operand
+71 -h võtmel puudub operand
 72 Pole meldimise shell
 73 Nulliga jagamine
-74 J��gi leidmine nulliga
-75 Vigane skaala; te m�tlesite ehk "%s"?
+74 Jäägi leidmine nulliga
+75 Vigane skaala; te mõtlesite ehk "%s"?
 76 Login shelli ei saa peatada (praegu)
 77 Tundmatu kasutaja: %s
-78 $home muutujat pole v��rtustatud
-79 Kasuta: history [-%s] [# s�ndmuste number]
-80 $, ! v�i < pole lubatud kasutada koos $# v�i $?
+78 $home muutujat pole väärtustatud
+79 Kasuta: history [-%s] [# sündmuste number]
+80 $, ! või < pole lubatud kasutada koos $# või $?
 81 Reavahetus muutuja nimes
-82 * pole lubatud kasutada koos $# v�i $?
-83 $?<number> v�i $#<number> pole lubatud
+82 * pole lubatud kasutada koos $# või $?
+83 $?<number> või $#<number> pole lubatud
 84 Lubamatu muutuja nimi
 85 Reavahetus muutuja indeksis
-86 Laiendamise puhvri �let�itumine
-87 Muutuja s�ntaksi viga
+86 Laiendamise puhvri ületäitumine
+87 Muutuja süntaksi viga
 88 Vigane ! kasutamine
 89 Eelmist asendust pole
 90 Vigane asendamine
 91 Eelmist vasakut poolt pole
 92 Parem pool on liiga pikk
 93 Vigane ! modifikaator: %c
-94 Modifikaator eba�nnestus
-95 Asenduse puhvri �let�itumine
+94 Modifikaator ebaõnnestus
+95 Asenduse puhvri ületäitumine
 96 Vigane ! argumendi valik
 97 Pole eelmist otsimist
-98 %s: S�ndmust pole
+98 %s: Sündmust pole
 99 Liiga palju )
 100 Liiga palju (
 101 Halvasti paigutatud (
 102 Suunamisel pole nime antud
-103 Segane v�ljundi suunamine
+103 Segane väljundi suunamine
 104 << ei saa () vahel kasutada
 105 Segane sisendi suunamine
 106 Halvasti paigutatud ()
-107 Aliaste ts�kkel
+107 Aliaste tsükkel
 108 $watch muutuja pole seatud
-109 Plaanitud s�ndmuseid pole
-110 Kasuta: sched -<s�ndmuse#>.\nKasuta: sched [+]hh:mm <k�sk>
-111 Niipalju s�ndmuseid pole
-112 Pole k�sku, mida k�ivitada
-113 Vigane s�ndmuseaeg
-114 Suhteline aeg ei ole am/pm notatsiooniga koosk�las
-115 Termcap s�ne on liiga pikk
+109 Plaanitud sündmuseid pole
+110 Kasuta: sched -<sündmuse#>.\nKasuta: sched [+]hh:mm <käsk>
+111 Niipalju sündmuseid pole
+112 Pole käsku, mida käivitada
+113 Vigane sündmuseaeg
+114 Suhteline aeg ei ole am/pm notatsiooniga kooskõlas
+115 Termcap sõne on liiga pikk
 116 Kasuta: settc %s [yes|no]
 117 Tundmatu omadus `%s'
 118 Tundmatu termcap parameeter `%%%c'
 119 `%s' jaoks on liiga palju argumente (%d)
-120 `%s' n�uab %d argumenti
+120 `%s' nõuab %d argumenti
 121 Kasuta: echotc [-v|-s] [<omadus> [<argumendid>]]
 122 %s: %s. Vale arhitektuur
-123 !# Ajaloo ts�kkel
-124 Vigane failip�ring
-125 Valija �let�itumine 
-126 Tundmatu v�ti: `-%s'\nKasuta: %s [ -bcdefilmnqstvVxX -Dnimi[=v��rtus] ] [ argument ... ]
-127 Tundmatu v�ti: `-%s'\nKasuta: %s [ -bcdefFilmnqstvVxX ] [ argument ... ]
-128 Tundmatu v�ti: `-%s'\nKasuta: %s [ -bcdefilmnqstvVxX ] [ argument ... ]
-129 \nVigane t�iendus: "%s"
+123 !# Ajaloo tsükkel
+124 Vigane failipäring
+125 Valija ületäitumine 
+126 Tundmatu võti: `-%s'\nKasuta: %s [ -bcdefilmnqstvVxX -Dnimi[=väärtus] ] [ argument ... ]
+127 Tundmatu võti: `-%s'\nKasuta: %s [ -bcdefFilmnqstvVxX ] [ argument ... ]
+128 Tundmatu võti: `-%s'\nKasuta: %s [ -bcdefilmnqstvVxX ] [ argument ... ]
+129 \nVigane täiendus: "%s"
 130 \nVigane %s: '%c'
-131 \nEraldaja '%c' puudub p�rast %s "%s"
-132 \nMittet�ielik %s: "%s"
-133 -m v�tmel pole operandi
+131 \nEraldaja '%c' puudub pärast %s "%s"
+132 \nMittetäielik %s: "%s"
+133 -m võtmel pole operandi
 134 Kasuta: unlimit [-fh] [limiidid]
 135 $%S on ainult lugemiseks
-136 Pole sellist t��d
+136 Pole sellist tööd
 137 Tundmatu colorls muutuja `%c%c'
diff --git a/contrib/tcsh/nls/et/set10 b/contrib/tcsh/nls/et/set10
index d330cdb..c713120 100644
--- a/contrib/tcsh/nls/et/set10
+++ b/contrib/tcsh/nls/et/set10
@@ -1,8 +1,8 @@
-$ $tcsh: set10,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set10,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ ma.setp.c
 $set 10 
-1 setpath: vigane k�sk '%s'.\n
-2 setpath: k�sule '%s' pole piisavalt argumente.\n
-3 setpath: teel '%s' pole v��rtust\n
+1 setpath: vigane käsk '%s'.\n
+2 setpath: käsule '%s' pole piisavalt argumente.\n
+3 setpath: teel '%s' pole väärtust\n
 4 setpath: %s ei leitud %s's\n
 5 setpath: %d ei ole korrektne positsioon %s's\n
diff --git a/contrib/tcsh/nls/et/set11 b/contrib/tcsh/nls/et/set11
index ca85161..f12f103 100644
--- a/contrib/tcsh/nls/et/set11
+++ b/contrib/tcsh/nls/et/set11
@@ -1,8 +1,8 @@
-$ $tcsh: set11,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set11,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.c
 $set 11 
-1 Hoiatus: tty (%s) pole k�ttesaadav.\n
-2 Seega ei saa kasutada t��de kontrolli.\n
+1 Hoiatus: tty (%s) pole kättesaadav.\n
+2 Seega ei saa kasutada tööde kontrolli.\n
 3 Teil on %d kirja.\n
 4 Teil on %d kirja failis %s.\n
 5 Teil on %skiri.\n
diff --git a/contrib/tcsh/nls/et/set13 b/contrib/tcsh/nls/et/set13
index a71a9af..040d205 100644
--- a/contrib/tcsh/nls/et/set13
+++ b/contrib/tcsh/nls/et/set13
@@ -1,13 +1,13 @@
-$ $tcsh: set13,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set13,v 1.3 2011/02/04 18:19:33 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
 4 %d hits, %d misses, %d%%\n
-5 %S: k�suinterpretaatori sisek�sk.\n
-6 %S: K�sku pole.\n
-7 where: / k�sunimes on m�ttetu\n
+5 %S: käsuinterpretaatori sisekäsk.\n
+6 %S: Käsku pole.\n
+7 where: / käsunimes on mõttetu\n
 8 %S on tegelikult 
-9 %S on sisek�sk\n
+9 %S on sisekäsk\n
 10 hash miss: 
diff --git a/contrib/tcsh/nls/et/set14 b/contrib/tcsh/nls/et/set14
index 95b36c5..22c0943 100644
--- a/contrib/tcsh/nls/et/set14
+++ b/contrib/tcsh/nls/et/set14
@@ -1,6 +1,6 @@
-$ $tcsh: set14,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set14,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.file.c
 $set 14 
-1 \n�hh!! Liiga palju %s!!\n
+1 \nÄhh!! Liiga palju %s!!\n
 2 nimesid paroolifailis
 3 faile
diff --git a/contrib/tcsh/nls/et/set15 b/contrib/tcsh/nls/et/set15
index 4f5561f..6268e8d 100644
--- a/contrib/tcsh/nls/et/set15
+++ b/contrib/tcsh/nls/et/set15
@@ -1,7 +1,7 @@
-$ $tcsh: set15,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set15,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.func.c
 $set 15 
-1 %s: %s: Ei �nnestu %s%s piirangut\n
+1 %s: %s: Ei õnnestu %s%s piirangut\n
 2 eemaldada
 3 seada
-4 \040k�va
+4 \040kõva
diff --git a/contrib/tcsh/nls/et/set16 b/contrib/tcsh/nls/et/set16
index 1596568..93f8f32 100644
--- a/contrib/tcsh/nls/et/set16
+++ b/contrib/tcsh/nls/et/set16
@@ -1,9 +1,9 @@
-$ $tcsh: set16,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set16,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Seadsin tty pgrp numbrilt %d numbrile %d\n
-2 \nKasuta t�� l�petamiseks k�sku "logout".\n
-3 \nKasuta "exit" k�sku %s katkestamiseks.\n
+2 \nKasuta töö lõpetamiseks käsku "logout".\n
+3 \nKasuta "exit" käsku %s katkestamiseks.\n
 4 seek to eval %x %x\n
 5 seek to alias %x %x\n
 6 seek to file %x\n
diff --git a/contrib/tcsh/nls/et/set17 b/contrib/tcsh/nls/et/set17
index e154d7b..b051672 100644
--- a/contrib/tcsh/nls/et/set17
+++ b/contrib/tcsh/nls/et/set17
@@ -1,17 +1,17 @@
-$ $tcsh: set17,v 1.3 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set17,v 1.4 2011/02/04 18:19:33 christos Exp $
 $ sh.proc.c
 $set 17 
-1 BUG: ootan taustat�� j�rel!\n
+1 BUG: ootan taustatöö järel!\n
 2 Exit %d\n
 3 BUG: process flushed twice
-4 T��tab 
+4 Töötab 
 5 Signaal 
 6 Exit %-25d
 7 Valmis
 8 BUG: staatus=%-9o
-9 \040(m�lupilt p��stetud)
-10 \040(t��kataloog:
-11 (t��kataloog n��d: 
+9 \040(mälupilt päästetud)
+10 \040(töökataloog:
+11 (töökataloog nüüd: 
 12 %S: Juba peatatud\n
 13 %S: Juba seisatud\n
 14 %S: Badly formed number\n
diff --git a/contrib/tcsh/nls/et/set18 b/contrib/tcsh/nls/et/set18
index fc31346..b465816 100644
--- a/contrib/tcsh/nls/et/set18
+++ b/contrib/tcsh/nls/et/set18
@@ -1,4 +1,4 @@
-$ $tcsh: set18,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set18,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.set.c
 $set 18 
-1 Hoiatus: n�medalt pikk PATH sai l�hendatud\n
+1 Hoiatus: nõmedalt pikk PATH sai lühendatud\n
diff --git a/contrib/tcsh/nls/et/set19 b/contrib/tcsh/nls/et/set19
index 6f653d0..d829566 100644
--- a/contrib/tcsh/nls/et/set19
+++ b/contrib/tcsh/nls/et/set19
@@ -1,15 +1,23 @@
-$ $tcsh: set19,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set19,v 1.5 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
-1 nbytes=%d: M�lu on otsas\n
-2 free(%lx) kasutati enne m�lu haaramist.
-3 free(%lx) enne m�lu algust.
-4 free(%lx) p�rast m�lu l�ppu.
+1 nbytes=%d: Mälu on otsas\n
+2 free(%lx) kasutati enne mälu haaramist.
+3 free(%lx) enne mälu algust.
+4 free(%lx) pärast mälu lõppu.
 5 free(%lx) halb plokk.
 6 free(%lx) vigane piirkonna kontroll.
 7 free(%lx) vigane plokkide indeks.
-8 %s m�lu kasutamine hetkel:\nvaba:\t
-9 \nkasutatud:\t
+8 %s mälu kasutamine hetkel:\nvaba:\t
+9 kasutatud
 10 \n\tKokku kasutusel: %d, kokku vaba: %d\n
-11 \tM�lu vahemikus 0x%lx kuni 0x%lx.  Tegelik algus 0x%lx\n
-12 M�lu vahemikus 0x%lx kuni 0x%lx (%ld).\n
+11 \tMälu vahemikus 0x%lx kuni 0x%lx.  Tegelik algus 0x%lx\n
+12 Mälu vahemikus 0x%lx kuni 0x%lx (%ld).\n
+13 %s current memory allocation:\n
+14 Total space allocated from system: %d\n
+15 Number of non-inuse chunks: %d\n
+16 Number of mmapped regions: %d\n
+17 Total space in mmapped regions: %d\n
+18 Total allocated space: %d\n
+19 Total non-inuse space: %d\n
+20 Top-most, releasable space: %d\n
diff --git a/contrib/tcsh/nls/et/set2 b/contrib/tcsh/nls/et/set2
index ea1f4c9..8b7111d 100644
--- a/contrib/tcsh/nls/et/set2
+++ b/contrib/tcsh/nls/et/set2
@@ -1,4 +1,4 @@
-$ $tcsh: set2,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set2,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ Signal names
 $set 2 
 1 Null signaal
@@ -20,27 +20,27 @@ $set 2
 17 Viga siinil
 18 Program range error
 19 Operand range error
-20 Vigane s�steemifunktsioon
+20 Vigane süsteemifunktsioon
 21 Katkenud toru
 22 Alarmkell
 23 Terminated
 24 Alamprotsessi olek muutus
 25 Alamprotsessi surm
-26 Apollo-spetsiifiline t�rge
-27 Alamprotsess peatatud v�i l�petas
-28 Alamprotsess l�petas
-29 Voolut�rge
+26 Apollo-spetsiifiline tõrge
+27 Alamprotsess peatatud või lõpetas
+28 Alamprotsess lõpetas
+29 Voolutõrge
 30 Resource Lost
 31 Break (Ctrl-Break)
-32 Sisend/v�ljund v�imalik
-33 As�nkroonne S/V (select)
+32 Sisend/väljund võimalik
+33 Asünkroonne S/V (select)
 34 Urgent condition on I/O channel
 35 Multitasking wake-up
 36 Multitasking kill
-37 Fortrani as�nkroonne S/V l�petas
+37 Fortrani asünkroonne S/V lõpetas
 38 Recovery
-39 Mitteparandatav m�lu viga
-40 CPU aja piirang on �letatud
+39 Mitteparandatav mälu viga
+40 CPU aja piirang on ületatud
 41 System shutdown imminent
 42 micro-tasking group-no wakeup flag set
 43 Thread error - (use cord -T for detailed info)
@@ -50,16 +50,16 @@ $set 2
 47 Seisatud (signaal)
 48 Peatatud
 49 Seisatud
-50 J�tkab
+50 Jätkab
 51 Peatatud (tty sisend)
 52 Seisatud (tty sisend)
-53 Peatatud (tty v�ljund)
-54 Seisatud (tty v�ljund)
+53 Peatatud (tty väljund)
+54 Seisatud (tty väljund)
 55 Akna olek muutus
 56 Akna suurus muutus
 57 Telefoni olek muutus
-58 Cpu aja piirang on �letatud
-59 Faili suuruse piirang on �letatud
+58 Cpu aja piirang on ületatud
+59 Faili suuruse piirang on ületatud
 60 Virtuaalaja alarm
 61 Profiling time alarm
 62 DIL signaal
@@ -76,7 +76,7 @@ $set 2
 73 Kolmas viimane reaalaja signaal
 74 Teine viimane reaalaja signaal
 75 Viimane reaalaja signaal
-76 LAN As�nkroonne I/O
+76 LAN Asünkroonne I/O
 77 PTY read/write availability
 78 I/O intervention required
 79 HFT monitor mode granted
@@ -88,24 +88,24 @@ $set 2
 85 Reschedule
 86 Signaling SS$_DEBUG
 87 Prioriteedi muutus
-88 Tuvastati t�eline tupiksituatsioon
-89 Uus sisends�mbol
-90 Pinu piirang on �letatud
+88 Tuvastati tõeline tupiksituatsioon
+89 Uus sisendsümbol
+90 Pinu piirang on ületatud
 91 Kasutamata signaal
 92 LM overlay
-93 s�steemi k�lmutamine
-94 s�steemi sulatamine
+93 süsteemi külmutamine
+94 süsteemi sulatamine
 95 tupiksituatsioon
-96 m�lu suuruse piirang on �letatud
-97 andmete suuruse piirang on �letatud
+96 mälu suuruse piirang on ületatud
+97 andmete suuruse piirang on ületatud
 98 exceeded memory size limit of 32KB
 99 exce error for no memory
 100 check point start
 101 check point start of kernel
 102 restart start
 103 restart of kernel
-104 XMU suuruse piirang on �letatud
-105 RLG0 piirang on �letatud
-106 RLG1 piirang on �letatud
-107 RLG2 piirang on �letatud
-108 RLG3 piirang on �letatud
+104 XMU suuruse piirang on ületatud
+105 RLG0 piirang on ületatud
+106 RLG1 piirang on ületatud
+107 RLG2 piirang on ületatud
+108 RLG3 piirang on ületatud
diff --git a/contrib/tcsh/nls/et/set20 b/contrib/tcsh/nls/et/set20
index 3ba741b..802f5a6 100644
--- a/contrib/tcsh/nls/et/set20
+++ b/contrib/tcsh/nls/et/set20
@@ -1,41 +1,41 @@
-$ $tcsh: set20,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set20,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Vigane klahvi nimi `%S'\n
 2 Halb klahv: %S\n
-3 Halb k�sk: %S\n
+3 Halb käsk: %S\n
 4 Halb klahvi spetsifikatsioon %S\n
-5 Null s�ne spetsifikatsioonis\n
+5 Null sõne spetsifikatsioonis\n
 6 Standardsed klahviseosed\n
 7 Alternatiivsed klahviseosed\n
-8 Mitme-s�mbolised seosed\n
+8 Mitme-sümbolised seosed\n
 9 Seosed nooleklahvidele\n
 10 %-15s->  on defineerimata\n
 11 BUG!!! %s pole seotud.\n
-12 Kasuta: bindkey [v�tmed] [--] [KLAHV [K�SK]]\n
-13     -a   esita v�i seo KLAHVI alternatiivne tabel\n
-14     -b   k�sitle KLAHVI kui C-, M-, F- v�i X- klahvi nime\n
-15     -s   k�sitle COMMAND kui literaalset v�ljunds�ne\n
-16     -c   k�sitle COMMAND kui sisemist v�i v�list k�sku\n
-17     -v   seo k�ik klahvid vi seostega\n
-18     -e   seo k�ik klahvid emacsi seostega\n
-19     -d   seo k�ik klahvid vaikimisi toimeti seostega\n
-20     -l   esita toimeti k�sud koos kirjeldustega\n
+12 Kasuta: bindkey [võtmed] [--] [KLAHV [KÄSK]]\n
+13     -a   esita või seo KLAHVI alternatiivne tabel\n
+14     -b   käsitle KLAHVI kui C-, M-, F- või X- klahvi nime\n
+15     -s   käsitle COMMAND kui literaalset väljundsõne\n
+16     -c   käsitle COMMAND kui sisemist või välist käsku\n
+17     -v   seo kõik klahvid vi seostega\n
+18     -e   seo kõik klahvid emacsi seostega\n
+19     -d   seo kõik klahvid vaikimisi toimeti seostega\n
+20     -l   esita toimeti käsud koos kirjeldustega\n
 21     -r   kustuta KLAHVILT seos\n
-22     -k   kasuta KLAHVI kui noole-klahvi s�mbolnime\n
-23     --   katkesta v�tmete t��tlemine\n
-24     -u   (v�i suvaline vigane v�ti) see teade\n
-25 Ilma KLAHVI v�i K�SUTA tr�kib k�ik seosed\n
-26 Ilma K�SUTA tr�kib seosed KLAHVILE.\n
-27 Halb klahvi spetsifikatsioon -- null s�ne\n
-28 Halb klahvi spetsifikatsioon -- t�hi s�ne\n
+22     -k   kasuta KLAHVI kui noole-klahvi sümbolnime\n
+23     --   katkesta võtmete töötlemine\n
+24     -u   (või suvaline vigane võti) see teade\n
+25 Ilma KLAHVI või KÄSUTA trükib kõik seosed\n
+26 Ilma KÄSUTA trükib seosed KLAHVILE.\n
+27 Halb klahvi spetsifikatsioon -- null sõne\n
+28 Halb klahvi spetsifikatsioon -- tühi sõne\n
 29 Halb funktsioon-klahvi spetsifikatsioon.  Null klahv pole lubatud\n
-30 Halb klahvi spetsifikatsioon -- vigane kuueteistk�mnend number\n
+30 Halb klahvi spetsifikatsioon -- vigane kuueteistkümnend number\n
 31 Halb klahvi spetsifikatsioon -- vigane kaheksand number\n
-32 Halb klahvi spetsifikatsioon -- vigane k�mnend number\n
+32 Halb klahvi spetsifikatsioon -- vigane kümnend number\n
 33 Halb funktsioon-klahvi spetsifikatsioon.\n
 34 Null klahv pole lubatud\n
 35 halb klahvi spetsifikatsioon -- tundmatu nimi "%S"\n
-36 kasuta: bind [KLAHV | K�SK KLAHV | "emacs" | "vi" | "-a"]\n
+36 kasuta: bind [KLAHV | KÄSK KLAHV | "emacs" | "vi" | "-a"]\n
 37 Vigane funktsioon
 38  %s\t\ton defineerimata\n
diff --git a/contrib/tcsh/nls/et/set21 b/contrib/tcsh/nls/et/set21
index e435c1a..8e4c67e 100644
--- a/contrib/tcsh/nls/et/set21
+++ b/contrib/tcsh/nls/et/set21
@@ -1,5 +1,5 @@
-$ $tcsh: set21,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set21,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.disc.c
 $set 21 
-1 Lokaalseid s�mboleid ei �nnestu lugeda.\n
-2 Lokaalseid s�mboleid ei �nnestu seada.\n
+1 Lokaalseid sümboleid ei õnnestu lugeda.\n
+2 Lokaalseid sümboleid ei õnnestu seada.\n
diff --git a/contrib/tcsh/nls/et/set22 b/contrib/tcsh/nls/et/set22
index e619e53..79e814c 100644
--- a/contrib/tcsh/nls/et/set22
+++ b/contrib/tcsh/nls/et/set22
@@ -1,4 +1,4 @@
-$ $tcsh: set22,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set22,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t on tegelikult 
@@ -7,11 +7,11 @@ $set 22
 4 Vigane alias 'cwdcmd' eemaldatud.\n
 5 Vigane alias 'beepcmd' eemaldatud.\n
 6 Vigane alias 'periodic' eemaldatud.\n
-7 t��tlen k�surida\n
-8 Kas te t�epoolest tahate kustutada k�ik failid? [e/j] 
+7 töötlen käsurida\n
+8 Kas te tÕepoolest tahate kustutada kõik failid? [e/j] 
 9 katkestan failide kustutamise!\n
-10 k�surida on n��d:\n
-11 t��tlen k�surida\n
-12 �hes loenditest\n
-13 k�surida on n��d:\n
+10 käsurida on nüüd:\n
+11 töötlen käsurida\n
+12 ühes loenditest\n
+13 käsurida on nüüd:\n
 14 jJ
diff --git a/contrib/tcsh/nls/et/set23 b/contrib/tcsh/nls/et/set23
index 72432d0..342d031 100644
--- a/contrib/tcsh/nls/et/set23
+++ b/contrib/tcsh/nls/et/set23
@@ -1,4 +1,4 @@
-$ $tcsh: set23,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set23,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.os.c
 $set 23 
 1 Vigane cpu/saidi nimi
@@ -8,10 +8,10 @@ $set 23
 5 %d: Saiti pole\n
 6 setlocal: %s: %s\n
 7 Saiti pole
-8 Te olete l�ksus universumis, mida te pole loonud
-9 Getwarp eba�nnestus
+8 Te olete lõksus universumis, mida te pole loonud
+9 Getwarp ebaõnnestus
 10 Vigane warp
-11 Setwarp eba�nnestus
+11 Setwarp ebaõnnestus
 12 Vigane universum
 13 Tundmatu viga: %d
 14 sysname:  %s\n
@@ -28,7 +28,7 @@ $set 23
 25 getwd: Kataloogi "%s" atribuute ei saa lugeda (%s)
 26 getwd: Kataloogi "%s" ei saa avada (%s)
 27 getwd: Kataloogis ".." pole kataloogi "." (%s)
-28 Vigane s�steemi t��p
-29 S�steemi t��p ei ole m��ratud
+28 Vigane süsteemi tüüp
+29 Süsteemi tüüp ei ole määratud
 30 Liiga palju argumente
 31 Vigane argument
diff --git a/contrib/tcsh/nls/et/set24 b/contrib/tcsh/nls/et/set24
index 4c3e637..2050f72 100644
--- a/contrib/tcsh/nls/et/set24
+++ b/contrib/tcsh/nls/et/set24
@@ -1,4 +1,4 @@
-$ $tcsh: set24,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set24,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.sched.c
 $set 24 
-1 H�kk!
+1 Häkk!
diff --git a/contrib/tcsh/nls/et/set25 b/contrib/tcsh/nls/et/set25
index c35deb7..affff69 100644
--- a/contrib/tcsh/nls/et/set25
+++ b/contrib/tcsh/nls/et/set25
@@ -1,6 +1,6 @@
-$ $tcsh: set25,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set25,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
 2 viga: bsd_signal(%d) pole signaal\n
-3 viga: bsd_signal(%d) - sigaction eba�nnestus, errno = %d\n
+3 viga: bsd_signal(%d) - sigaction ebaõnnestus, errno = %d\n
diff --git a/contrib/tcsh/nls/et/set26 b/contrib/tcsh/nls/et/set26
index e5b3967..5a324d7 100644
--- a/contrib/tcsh/nls/et/set26
+++ b/contrib/tcsh/nls/et/set26
@@ -1,15 +1,15 @@
-$ $tcsh: set26,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set26,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.who.c
 $set 26 
-1 Ei saa lugeda %s atribuute.  Anna k�sk "unset watch".\n
-2 %s ei saa avada.  Anna k�sk "unset watch".\n
+1 Ei saa lugeda %s atribuute.  Anna käsk "unset watch".\n
+2 %s ei saa avada.  Anna käsk "unset watch".\n
 3 BUG! viimane element ei ole viimasena registreeritud!\n
 4 tagurpidi: 
 5 BUG! esimene element ei ole esimesena registreeritud!\n
 6 uus: %s/%s\n
 7 %n %a terminalil %l masinast %m.
 8 %n %a terminalil %l.
-9 t��tab
-10 l�petas t��
+9 töötab
+10 lõpetas töö
 11 asendas %s terminalil
 12 kohalik
diff --git a/contrib/tcsh/nls/et/set27 b/contrib/tcsh/nls/et/set27
index 57bd18f..8a2dbd4 100644
--- a/contrib/tcsh/nls/et/set27
+++ b/contrib/tcsh/nls/et/set27
@@ -1,8 +1,8 @@
-$ $tcsh: set27,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set27,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tw.comp.c
 $set 27 
-1 k�sk
+1 käsk
 2 eraldaja
 3 muster
 4 vahemik
-5 t�iendamine
+5 täiendamine
diff --git a/contrib/tcsh/nls/et/set3 b/contrib/tcsh/nls/et/set3
index 4c06d39..2a9f3f5 100644
--- a/contrib/tcsh/nls/et/set3
+++ b/contrib/tcsh/nls/et/set3
@@ -1,120 +1,120 @@
-$ $tcsh: set3,v 1.3 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set3,v 1.4 2011/02/04 18:19:33 christos Exp $
 $ Editor function descriptions
 $set 3 
-1 Liigu s�mbol tagasi
-2 Kustuta s�mbol kursori tagant
-3 L�ika jooksva s�na algusest kursorini - salvesta l�ikepuhvris
-4 L�ika rea algusest kursorini - salvesta l�ikepuhvris
-5 Liigu jooksva s�na algusse
+1 Liigu sümbol tagasi
+2 Kustuta sümbol kursori tagant
+3 Lõika jooksva sõna algusest kursorini - salvesta lõikepuhvris
+4 Lõika rea algusest kursorini - salvesta lõikepuhvris
+5 Liigu jooksva sõna algusse
 6 Liigu rea algusse
-7 T�hed kursorist kuni s�nal�puni suurteks
-8 Vi muuda kursori aluse s�mboli suurust ja liigu s�mbol edasi
-9 Vi muuda real�puni
-10 Puhasta ekraan j�ttes jooksva rea �lemiseks
-11 T�ienda jooksev s�na
-12 Vali t�iendusi liikudes nimekirjas edasi
-13 Vali t�iendusi liikudes nimekirjas tagasi
-14 T�ienda jooksev s�na, ignoreeri programmeeritud t�iendusi
-15 Kopeeri jooksev s�na kursorini
-16 Kopeeri ala m�rgist kursorini l�ikepuhvrisse
-17 Avalda eelneva s�nani, millele see on prefiks
-18 Kustuta s�mbol kursori alt
-19 Kustuta s�mbol kursori alt v�i teata t�hja rea korral failil�pust
-20 Kustuta s�mbol kursori alt v�i rea l�pu korral n�ita t�iendusi
-21 Kustuta s�mbol kursori alt, n�ita t�iendusi v�i teata failil�pust
-22 L�ika kursorist jooksva s�na l�puni - salvesta l�ikepuhvris
+7 Tähed kursorist kuni sõnalõpuni suurteks
+8 Vi muuda kursori aluse sümboli suurust ja liigu sümbol edasi
+9 Vi muuda realõpuni
+10 Puhasta ekraan jättes jooksva rea ülemiseks
+11 Täienda jooksev sõna
+12 Vali täiendusi liikudes nimekirjas edasi
+13 Vali täiendusi liikudes nimekirjas tagasi
+14 Täienda jooksev sõna, ignoreeri programmeeritud täiendusi
+15 Kopeeri jooksev sõna kursorini
+16 Kopeeri ala märgist kursorini lõikepuhvrisse
+17 Avalda eelneva sõnani, millele see on prefiks
+18 Kustuta sümbol kursori alt
+19 Kustuta sümbol kursori alt või teata tühja rea korral faililõpust
+20 Kustuta sümbol kursori alt või rea lõpu korral näita täiendusi
+21 Kustuta sümbol kursori alt, näita täiendusi või teata faililõpust
+22 Lõika kursorist jooksva sõna lõpuni - salvesta lõikepuhvris
 23 Kui alustatud, lisab argumendile, muidu lisab numbri
 24 Number, mis alustab argumenti
-25 Liigu j�rgmisele ajaloo reale
-26 S�mbolid v�iket�htedeks kursorist jooksva s�na l�puni
-27 N�ita failil�ppu
-28 Kursor real�ppu
-29 Vaheta kursor ja m�rk
-30 Avalda faili nimes metas�mbolid
-31 Avalda ajaloo k�sud
-32 Avalda real ajaloo k�sud
+25 Liigu järgmisele ajaloo reale
+26 Sümbolid väiketähtedeks kursorist jooksva sõna lõpuni
+27 Näita faililõppu
+28 Kursor realõppu
+29 Vaheta kursor ja märk
+30 Avalda faili nimes metasümbolid
+31 Avalda ajaloo käsud
+32 Avalda real ajaloo käsud
 33 Avalda muutujad
-34 Liigu s�mbol edasi
-35 Liigu edasi jooksva s�na l�ppu
-36 Vaheta kursori ees kaks s�mbolit
+34 Liigu sümbol edasi
+35 Liigu edasi jooksva sõna lõppu
+36 Vaheta kursori ees kaks sümbolit
 37 Otsi ajaloos tagasi jooksva rea algusega rida
 38 Otsi ajaloos edasi jooksva rea algusega rida
-39 Lisa eelmise k�su viimane element
+39 Lisa eelmise käsu viimane element
 40 Inkrementaalne edaspidi otsing
 41 Inkrementaalne tagurpidi otsing
 42 Puhasta rida
-43 L�ika real�puni ja salvesta l�ikepuhvris
-44 L�ika ala m�rgist kursorini ja salvesta l�ikepuhvris
-45 L�ika kogu rida ja salvesta l�ikepuhvris
-46 N�ita t�iendamise valikud
-47 N�ita t�iendamise valikuid ignoreerides programmeeritud t�iendusi
-48 N�ita faili nimes metas�mbolite leide
-49 N�ita t�iendamise valikuid v�i teavita t�hja rea korral failil�pust
-50 N�ita masina koormust ja jooksva protsessi olekut
-51 Avalda ajaloo k�sud ja lisa t�hik
-52 T�ida k�sklus
+43 Lõika realõpuni ja salvesta lõikepuhvris
+44 Lõika ala märgist kursorini ja salvesta lõikepuhvris
+45 Lõika kogu rida ja salvesta lõikepuhvris
+46 Näita täiendamise valikud
+47 Näita täiendamise valikuid ignoreerides programmeeritud täiendusi
+48 Näita faili nimes metasümbolite leide
+49 Näita täiendamise valikuid või teavita tühja rea korral faililõpust
+50 Näita masina koormust ja jooksva protsessi olekut
+51 Avalda ajaloo käsud ja lisa tühik
+52 Täida käsklus
 53 Avalda failiteed, eemaldades algusest . ja ..
-54 Avalda k�sk failiteeks v�i aliaseks
-55 L�lita lisamis- v�i �lekirjutamismood
-56 Lisa j�rgmisele kirjutatavale s�mbolile kaheksas bitt
-57 Lisa j�rgmine kirjutatav s�mbol reale kvoodituna
-58 N�ita k�ik uuesti
-59 Taask�ivita peatatud toimeti
-60 Esita jooksva k�su abiinfo
-61 See s�mbol lisatakse reale
-62 See s�mbol on s�mbolj�rjendis esimene
-63 Sea m�rk
-64 Paranda jooksva s�na �igekirja
-65 Paranda terve rea �igekirja
-66 Saada s�mbol terminalile vahendusmoodis
-67 L�lita ajaloo literaalne v�i leksiline mood
-68 Vaheta kursori alune ja kursorist vasakul asuvad s�mbolid
-69 Vaheta kursori ees kaks s�mbolit
-70 Tty viivitusega peatamine s�mbol
-71 Tty t�hjenda v�ljund s�mbol
-72 Tty katkesta s�mbol
-73 Tty v�lju s�mbol
-74 Tty peata s�mbol
-75 Tty luba v�ljund s�mbol
-76 Tty keela v�ljund s�mbol
-77 T�histab sidumata s�mbolit
+54 Avalda käsk failiteeks või aliaseks
+55 Lülita lisamis- või ülekirjutamismood
+56 Lisa järgmisele kirjutatavale sümbolile kaheksas bitt
+57 Lisa järgmine kirjutatav sümbol reale kvoodituna
+58 Näita kõik uuesti
+59 Taaskäivita peatatud toimeti
+60 Esita jooksva käsu abiinfo
+61 See sümbol lisatakse reale
+62 See sümbol on sümboljärjendis esimene
+63 Sea märk
+64 Paranda jooksva sõna õigekirja
+65 Paranda terve rea õigekirja
+66 Saada sümbol terminalile vahendusmoodis
+67 Lülita ajaloo literaalne või leksiline mood
+68 Vaheta kursori alune ja kursorist vasakul asuvad sümbolid
+69 Vaheta kursori ees kaks sümbolit
+70 Tty viivitusega peatamine sümbol
+71 Tty tühjenda väljund sümbol
+72 Tty katkesta sümbol
+73 Tty välju sümbol
+74 Tty peata sümbol
+75 Tty luba väljund sümbol
+76 Tty keela väljund sümbol
+77 Tähistab sidumata sümbolit
 78 Emacsi universaalne argument (argument korda 4)
 79 Liigu eelmisele ajaloo reale
-80 S�mbolid suurt�htedeks kursorist jooksva s�na l�puni
-81 Vi liigu j�rgmise s�na algusse
+80 Sümbolid suurtähtedeks kursorist jooksva sõna lõpuni
+81 Vi liigu järgmise sõna algusse
 82 Vi sisene peale kursorit lisamismoodi
-83 Vi sisene rea l�pus lisamismoodi
-84 Vi muuda kursori aluse s�mboli suurust ja liigu �he s�mboli v�rra edasi
-85 Vi muuda prefiks k�sklust
-86 Vi muuda real�puni
-87 Sisene vi k�sumoodi (kasuta alternatiivseid klahvi seoseid)
-88 Vi k�su mood t�ienda jooksev s�na
-89 Vi liigu eelmisele s�mbolile (backspace)
-90 Vi kustuta prefiks k�sklus
-91 Vi liigu jooksva t�hikuga eraldatud s�na l�ppu
-92 Vi liigu jooksva s�na l�ppu
-93 Vi liigu tagasi m��ratud s�mbolini
-94 Vi liigu edasi m��ratud s�mbolini
-95 Vi liigu tagasi m��ratud s�mbolile
-96 Vi liigu edasi m��ratud s�mbolile
+83 Vi sisene rea lõpus lisamismoodi
+84 Vi muuda kursori aluse sümboli suurust ja liigu ühe sümboli võrra edasi
+85 Vi muuda prefiks käsklust
+86 Vi muuda realõpuni
+87 Sisene vi käsumoodi (kasuta alternatiivseid klahvi seoseid)
+88 Vi käsu mood täienda jooksev sõna
+89 Vi liigu eelmisele sümbolile (backspace)
+90 Vi kustuta prefiks käsklus
+91 Vi liigu jooksva tühikuga eraldatud sõna lõppu
+92 Vi liigu jooksva sõna lõppu
+93 Vi liigu tagasi määratud sümbolini
+94 Vi liigu edasi määratud sümbolini
+95 Vi liigu tagasi määratud sümbolile
+96 Vi liigu edasi määratud sümbolile
 97 Sisene vi lisamismoodi
 98 Sisene rea alguses vi lisamismoodi
-99 Vi korda antud s�mboli otsimist samas suunas
-100 Vi korda antud s�mboli otsimist vastupidises suunas
+99 Vi korda antud sümboli otsimist samas suunas
+100 Vi korda antud sümboli otsimist vastupidises suunas
 101 Vi korda antud otsimist samas suunas
 102 Vi korda antud otsimist vastupidises suunas
-103 Vi asenda kursori alt s�mbol j�rgmisena kirjutatava s�mboliga
-104 Vi asendusre�iim 
+103 Vi asenda kursori alt sümbol järgmisena kirjutatava sümboliga
+104 Vi asendusre¸iim 
 105 Vi otsi ajaloost tagurpidi
 106 Vi otsi ajaloost edaspidi
-107 Vi asenda kursori alune s�mbol ja mine sisesamisre�iimi
+107 Vi asenda kursori alune sümbol ja mine sisesamisre¸iimi
 108 Vi asenda kogu rida
-109 Vi mine eelmise s�na juurde
-110 Vi mine j�rgmise s�na juurde
+109 Vi mine eelmise sõna juurde
+110 Vi mine järgmise sõna juurde
 111 Vi taasta viimane muutus
 112 Vi mine rea algusse
-113 K�ivita jooksval s�nal k�sk which
-114 Kleebi l�ikepuhver alates kursori positsioonist
+113 Käivita jooksval sõnal käsk which
+114 Kleebi lõikepuhver alates kursori positsioonist
 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
diff --git a/contrib/tcsh/nls/et/set30 b/contrib/tcsh/nls/et/set30
index f629dc8..e34aa85 100644
--- a/contrib/tcsh/nls/et/set30
+++ b/contrib/tcsh/nls/et/set30
@@ -1,4 +1,4 @@
-$ $tcsh: set30,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set30,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
@@ -7,7 +7,7 @@ $set 30
 4 %s: Internal match error.\n
 5 elementi
 6 veergu
-7 Leidsin %d %s, n�itan neid? [e/j] 
+7 Leidsin %d %s, näitan neid? [e/j] 
 8 looking = %d\n
 9 \n%s sisemine viga: Ma ei tea, mida ma otsin!\n
 10 pole kataloog
diff --git a/contrib/tcsh/nls/et/set4 b/contrib/tcsh/nls/et/set4
index 3ec5b44..8a1f6d9 100644
--- a/contrib/tcsh/nls/et/set4
+++ b/contrib/tcsh/nls/et/set4
@@ -1,45 +1,45 @@
-$ $tcsh: set4,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set4,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ Termcap strings
 $set 4
-1 lisa uus t�hi rida
+1 lisa uus tühi rida
 2 kuuldav kell
-3 puhasta p�hjani
-4 puhasta rea l�puni
+3 puhasta põhjani
+4 puhasta rea lõpuni
 5 kursori horisontaal positsioon
 6 ekraani puhastamine
-7 s�mboli kustutamine
+7 sümboli kustutamine
 8 rea kustutamine
 9 alusta kustutamis mood
-10 l�peta kustutamis mood
-11 l�peta vahelekirjutamise mood
+10 lõpeta kustutamis mood
+11 lõpeta vahelekirjutamise mood
 12 kursor olekurealt
 13 kursor koju
-14 lisa s�mbol
+14 lisa sümbol
 15 alusta vahelekirjutamise mood
-16 lisa t�ide
+16 lisa täide
 17 saadab kursori alla
 18 saadab kursori vasakule
 19 saadab kursori paremale
-20 saadab kursori �les
+20 saadab kursori üles
 21 alusta rasvast
-22 atribuutide l�pp
-23 mitte-purustav t�hik
-24 l�peta r�hutatud
-25 alusta r�hutatud
+22 atribuutide lõpp
+23 mitte-purustav tühik
+24 lõpeta rõhutatud
+25 alusta rõhutatud
 26 kursor olekureale
-27 kursor �he v�rra �les
+27 kursor ühe võrra üles
 28 alusta allajoonimist
-29 l�peta allajoonimine
-30 n�htav kell
-31 kustuta mitu s�mbolit
+29 lõpeta allajoonimine
+30 nähtav kell
+31 kustuta mitu sümbolit
 32 kursor korduvalt alla
-33 lisa mitu s�mbolit
+33 lisa mitu sümbolit
 34 kursor korduvalt vasakule
 35 kursor korduvalt paremale
-36 kursor korduvalt �les
-37 Omab automaatseid ��ri
-38 Saab kasutada f��silist tabulaatorit
+36 kursor korduvalt üles
+37 Omab automaatseid ääri
+38 Saab kasutada füüsilist tabulaatorit
 39 Ridade arv
 40 Veergude arv
 41 Omab meta klahvi
-42 Parem ��r ignoreerib uut rida
+42 Parem äär ignoreerib uut rida
diff --git a/contrib/tcsh/nls/et/set5 b/contrib/tcsh/nls/et/set5
index aecf6e8..ddaf4be 100644
--- a/contrib/tcsh/nls/et/set5
+++ b/contrib/tcsh/nls/et/set5
@@ -1,4 +1,4 @@
-$ $tcsh: set5,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set5,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ ed.chared.c
 $set 5
-1 T��j�rjekorra koormuse info puudub\n
+1 Tööjärjekorra koormuse info puudub\n
diff --git a/contrib/tcsh/nls/et/set6 b/contrib/tcsh/nls/et/set6
index 3b6c6cd..a1ce3ea 100644
--- a/contrib/tcsh/nls/et/set6
+++ b/contrib/tcsh/nls/et/set6
@@ -1,11 +1,11 @@
-$ $tcsh: set6,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set6,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ ed.inputl.c
 $set 6
-1 VIGA: vigane k�sk klahvilt 0%o\r\n
+1 VIGA: vigane käsk klahvilt 0%o\r\n
 2 jah\n
 3 paranda\n
 4 katkesta\n
 5 ei\n
-6 Pole sellist k�sku\n
-7 Arusaamatu k�sk\n
+6 Pole sellist käsku\n
+7 Arusaamatu käsk\n
 8 *** toimeti fataalne VIGA ***\r\n\n
diff --git a/contrib/tcsh/nls/et/set7 b/contrib/tcsh/nls/et/set7
index f1da7b3..4cb2c75 100644
--- a/contrib/tcsh/nls/et/set7
+++ b/contrib/tcsh/nls/et/set7
@@ -1,30 +1,30 @@
-$ $tcsh: set7,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set7,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh arvab, et teie terminal omab\n
-2 \tj�rgnevaid omadusi:\n\n
+2 \tjärgnevaid omadusi:\n\n
 3 \tTal on %d veergu ja %d rida\n
 4 \tTa %s meta klahvi\n
 5 omab
 6 ei oma
 7 \tTal on%s tabulaatori omadus\n
 8  puudu
-9 \tTa %s automaatseid ��ri\n
+9 \tTa %s automaatseid ääri\n
 10 omab
 11 ei oma
-12 \tTa %s maagilisi ��ri\n
-13 (t�hi)
+12 \tTa %s maagilisi ääri\n
+13 (tühi)
 14 jah
 15 ei
 16 VIGA: ei saa kustutada\r\n
-17 DeleteChars: num on m�ttetu: %d\r\n
+17 DeleteChars: num on mõttetu: %d\r\n
 18 VIGA: cannot insert\r\n
-19 StartInsert: num on m�ttetu: %d\r\n
+19 StartInsert: num on mõttetu: %d\r\n
 20 %s: Ei saa avada /etc/termcap.\n
-21 %s: Terminali t��bil "%s" puudub kirje\n
+21 %s: Terminali tüübil "%s" puudub kirje\n
 22 %s: kasutan rumala terminali seadeid.\n
-23 %s: HOIATUS: Teie terminal ei saa liikuda �les.\n
-24 Pikkade ridade toimetamine v�ib olla kummaline.\n
+23 %s: HOIATUS: Teie terminal ei saa liikuda üles.\n
+24 Pikkade ridade toimetamine võib olla kummaline.\n
 25 puudub puhasta EOL omadus.\n
-26 puudub kustuta s�mbol omadus.\n
-27 puudub lisa s�mbol omadus.\n
+26 puudub kustuta sümbol omadus.\n
+27 puudub lisa sümbol omadus.\n
diff --git a/contrib/tcsh/nls/et/set8 b/contrib/tcsh/nls/et/set8
index 0ac4be4..6e5d25f 100644
--- a/contrib/tcsh/nls/et/set8
+++ b/contrib/tcsh/nls/et/set8
@@ -1,5 +1,5 @@
-$ $tcsh: set8,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set8,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ ed.term.c
 $set 8
-1 Tundmatu v�ti
+1 Tundmatu võti
 2 Vigane argument
diff --git a/contrib/tcsh/nls/et/set9 b/contrib/tcsh/nls/et/set9
index f8e157a..1e0cebf 100644
--- a/contrib/tcsh/nls/et/set9
+++ b/contrib/tcsh/nls/et/set9
@@ -1,12 +1,12 @@
-$ $tcsh: set9,v 1.2 2006/03/02 18:46:45 christos Exp $
+$ $tcsh: set9,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null pikkusega laiend-klahv ei ole lubatud.\n
-2 AddXkey: k�suni viiv j�rjend pole lubatud\n
+2 AddXkey: käsuni viiv järjend pole lubatud\n
 3 DeleteXkey: Null pikkusega laiend-klahv ei ole lubatud.\n
 4 Sidumata laiendatud klahv "%S"\n
-5 M�ned laiendatud klahvid on sisemise tr�kipuhvri jaoks liiga pikad
+5 Mõned laiendatud klahvid on sisemise trükipuhvri jaoks liiga pikad
 6 Enumerate: BUG!! Null viit anti\n!
 7 sisendit pole
-8 Midagi peab j�rgnema: %c\n
-9 kaheksand-konstant ei mahu s�mbolisse.\n
+8 Midagi peab järgnema: %c\n
+9 kaheksand-konstant ei mahu sümbolisse.\n
diff --git a/contrib/tcsh/nls/finnish/charset b/contrib/tcsh/nls/finnish/charset
index 0b13559..81f1b66 100644
--- a/contrib/tcsh/nls/finnish/charset
+++ b/contrib/tcsh/nls/finnish/charset
@@ -1,3 +1,3 @@
-$ codeset=ISO-8859-1
+$ codeset=UTF-8
 $set 255
-1 ISO-8859-1
+1 UTF-8
diff --git a/contrib/tcsh/nls/finnish/set1 b/contrib/tcsh/nls/finnish/set1
index 98c89b3..b829525 100644
--- a/contrib/tcsh/nls/finnish/set1
+++ b/contrib/tcsh/nls/finnish/set1
@@ -1,140 +1,140 @@
-$ $tcsh: set1,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set1,v 1.4 2011/02/04 18:19:34 christos Exp $
 $ Error messages
 $set 1 
 1 Kielioppivirhe
 2 %s ei ole sallittu
-3 Liian pitk� sana
-4 $< rivi liian pitk�
+3 Liian pitkä sana
+4 $< rivi liian pitkä
 5 Puuttuva tiedosto $0
 6 Vajavainen [] muunnos
-7 $ -laajennuksen on p��tytt�v� ennen ']'-merkki�
+7 $ -laajennuksen on päätyttävä ennen ']'-merkkiä
 8 Virheellinen : -muunnos $ (%c)
 9 Indeksivirhe
 10 Virheellinen numero
-11 Liian v�h�n sanoja
+11 Liian vähän sanoja
 12 Puuttuva tiedoston nimi
-13 Sis�inen laajennusvirhe (glob)
-14 K�sky� ei l�ydy
-15 Liian v�h�n argumentteja
+13 Sisäinen laajennusvirhe (glob)
+14 Käskyä ei löydy
+15 Liian vähän argumentteja
 16 Liian monta argumenttia
 17 Vaarallinen alias
-18 Tyhj� ehto (if)
+18 Tyhjä ehto (if)
 19 Soveltumaton seuraus (then)
-20 Sanat eiv�t ole suluissa
-21 %s ei l�ydy
+20 Sanat eivät ole suluissa
+21 %s ei löydy
 22 Soveltumaton maski
 23 Rajoite tuntematon
 24 Liian suuri argumentti
 25 Soveltumaton tai tuntematon muunnoskerroin
-26 M��rittelem�t�n muuttuja
+26 Määrittelemätön muuttuja
 27 Hakemistopino on matalampi
 28 Virheellinen signaalin numero
 29 Tuntematon signaali; kill -l tulostaa signaalit
 30 Muutujan nimi on aloitettava kirjaimella
-31 Liian pitk� muuttuja nimi
+31 Liian pitkä muuttuja nimi
 32 Muuttujan nimi on koostuttava kirjaimista ja numeroista
-33 T�ss� komentotulkissa ei ole t�iden hallintaa
+33 Tässä komentotulkissa ei ole töiden hallintaa
 34 Lauseke virheellinen
 35 Kotihakemisto puuttuu
 36 Siirtyminen kotihakemistoon ei onnistu
-37 Tyhj� k�sky
+37 Tyhjä käsky
 38 Sijoituksesta puuttuu lauseke
 39 Tuntematon operaattori
 40 Tulkinnanvarainen
 41 %s: Tiedosto ei ole uusi
-42 Parametrin -c argumentti p��tty takakenoviivaan (\\)
+42 Parametrin -c argumentti päätty takakenoviivaan (\\)
 43 Keskeytetty
 44 Indeksi viittaa rajojen ulkopuollelle
 45 Rivin ylivuoto
-46 Olematon ty�
-47 Ei onnistu p��tteelt�
+46 Olematon työ
+47 Ei onnistu päätteeltä
 48 Silmukan (while/foreach) ulkopuolella
-49 Lis�� prosesseja ei voida luoda
+49 Lisää prosesseja ei voida luoda
 50 Ei vastaavuuksia (match)
 51 Puuttuva %c
-52 Ylim��r�inen/pariton %c
+52 Ylimääräinen/pariton %c
 53 Muisti loppu
 54 Putkea ei voida luoda
 55 %s: %s
 56 %s
-57 K�ytt�: jobs [ -l ]
-58 Argumenttien on oltava t�iden tai prosessien tunnisteita
-59 Ei t�m�nhetkist� ty�t�
-60 Ei edellist� ty�t�
-61 Mik��n ty� ei vastaa mallia
-62 Sis�kk�inen prosessin luonti (fork) > %d; mahdollisesti `...` silmukka
-63 Alemman tason komentotulkeissa ei ole t�idenhallintaa
-64 Synkronointivirhe: Prosessia %d ei l�ydy
-65 %sTilap�isesti keskeytettyj� t�it�
-66 %sPys�htyneen� olevia t�it�
+57 Käyttö: jobs [ -l ]
+58 Argumenttien on oltava töiden tai prosessien tunnisteita
+59 Ei tämänhetkistä työtä
+60 Ei edellistä työtä
+61 Mikään työ ei vastaa mallia
+62 Sisäkkäinen prosessin luonti (fork) > %d; mahdollisesti `...` silmukka
+63 Alemman tason komentotulkeissa ei ole töidenhallintaa
+64 Synkronointivirhe: Prosessia %d ei löydy
+65 %sTilapäisesti keskeytettyjä töitä
+66 %sPysähtyneenä olevia töitä
 67 Toinen hakemisto puuttuu
-68 Hakemistopino on tyhj�
+68 Hakemistopino on tyhjä
 69 Virheellinen hakemisto
-70 K�ytt�: %s [-%s]%s
+70 Käyttö: %s [-%s]%s
 71 Lipulle -h ei ole argumenttia
-72 T�m� ei ole ensimm�isen tason komentotulkki (login shell)
+72 Tämä ei ole ensimmäisen tason komentotulkki (login shell)
 73 Jako 0:lla
-74 Jakoj��nn�s 0:lla
+74 Jakojäännös 0:lla
 75 Virheellinen muunnoskerroin; tarkoititko "%s"?
-76 Ensimm�isen tason komentotulkkia ei voi keskeytt�� (viel�)
-77 Tuntematon k�ytt�j�: %s
+76 Ensimmäisen tason komentotulkkia ei voi keskeyttää (vielä)
+77 Tuntematon käyttäjä: %s
 78 Muuttujaa $home ei ole asetettu
-79 K�ytt�: history [-%s] [# tapahtumien/k�skyjen lukum��r�]
-80 $, ! tai < ei ole sallittu $# eik� $? yhteydess�
-81 Muuttujan nimi sis�lt�� rivin vaihdon
-82 * ei ole sallittu $# eik� $? yhteydess�
+79 Käyttö: history [-%s] [# tapahtumien/käskyjen lukumäärä]
+80 $, ! tai < ei ole sallittu $# eikä $? yhteydessä
+81 Muuttujan nimi sisältää rivin vaihdon
+82 * ei ole sallittu $# eikä $? yhteydessä
 83 $?<numero> tai $#<numero> ei ole sallittu
 84 Soveltumaton muuttujan nimi
-85 Rivin vaihto muutujan indeksiss�
+85 Rivin vaihto muutujan indeksissä
 86 Laajennuspuskurin ylivuoto
 87 Muuttujassa kielioppivirhe
 88 Virheellinen ! -muoto
-89 Edellist� korvaavaa merkkijonoa ei ole
+89 Edellistä korvaavaa merkkijonoa ei ole
 90 Virheellinen korvaava merkkijono
-91 Edellist� vasemmanpuolista merkkijonoa ei ole
-92 Oikeanpuolinen merkkijono on liian pitk�
+91 Edellistä vasemmanpuolista merkkijonoa ei ole
+92 Oikeanpuolinen merkkijono on liian pitkä
 93 Virheellinen ! -muunnos: %c
-94 Muunnos ep�onnistui
+94 Muunnos epäonnistui
 95 Korvauspuskurin ylivuoto
 96 Virheellinen ! argumenttivalitsin
-97 Edellist� hakua ei ole
-98 %s: Tapahtumaa/k�sky� ei l�ydy
+97 Edellistä hakua ei ole
+98 %s: Tapahtumaa/käskyä ei löydy
 99 Liian paljon loppusulkuja ')'
 100 Liian paljon alkusulkuja '('
 101 Virheellisesti sijoitettu alkusulku '('
 102 Uudelleen ohjauksesta puuttuu nimi
 103 Tulkinnanvarainen tulostuksen ohjaus
-104 Ohjaus << ei onnistu sulkujen '()' sis�ll�
-105 Tulkinnanvarainen sy�tteen ohjaus
+104 Ohjaus << ei onnistu sulkujen '()' sisällä
+105 Tulkinnanvarainen syötteen ohjaus
 106 Virheelisesti sijoitetut sulut '()'
-107 Silmukka alias-m��rittelyiss�
+107 Silmukka alias-määrittelyissä
 108 Muuttujaa $watch ei ole asetettu
 109 Jonossa ei ole tapahtumia
-110 K�ytt�: sched -<tapahtumien lukum��r�>.\nK�ytt�: sched [+]tt:mm <k�sky>
+110 Käyttö: sched -<tapahtumien lukumäärä>.\nKäyttö: sched [+]tt:mm <käsky>
 111 Jonotettuja tapahtumia ei ole niin monta
-112 Suoritettava k�sky puuttuu
+112 Suoritettava käsky puuttuu
 113 Virheellinen tapahtuma-aika
-114 Suhteellinen ajan m��re ei sovellu k�ytett�v�ksi am/pm yhteydess�
-115 P��tetyypin kuvaukselle (termcap) ei ole tarpeeksi tilaa
-116 K�ytt�: settc %s [yes|no]
+114 Suhteellinen ajan määre ei sovellu käytettäväksi am/pm yhteydessä
+115 Päätetyypin kuvaukselle (termcap) ei ole tarpeeksi tilaa
+116 Käyttö: settc %s [yes|no]
 117 Tuntematon toiminne `%s'
-118 Tuntematon p��tetyypin (termcap) parameteri `%%%c'
-119 Liian paljon argumentteja k�skylle `%s' (%d)
-120 `%s' edellytt�� %d argumenttia
-121 K�ytt�: echotc [-v|-s] [<toiminne> [<argumentit>]]
-122 %s: %s. V��r� laitearkkitehtuuri
+118 Tuntematon päätetyypin (termcap) parameteri `%%%c'
+119 Liian paljon argumentteja käskylle `%s' (%d)
+120 `%s' edellyttää %d argumenttia
+121 Käyttö: echotc [-v|-s] [<toiminne> [<argumentit>]]
+122 %s: %s. Väärä laitearkkitehtuuri
 123 !# Silmukka komentohistoriassa
 124 Virheellinen tiedostotesti
 125 Valitsimen ylivuoto
-126 Tuntematon valitsin: `-%s'\nK�ytt�: %s [ -bcdefilmnqstvVxX -Dnimi[=arvo] ] [ argumentti ... ]
-127 Tuntematon valitsin: `-%s'\nK�ytt�: %s [ -bcdefFilmnqstvVxX ] [ argumentti ... ]
-128 Tuntematon valitsin: `-%s'\nK�ytt�: %s [ -bcdefilmnqstvVxX ] [ argumentti ... ]
-129 \nSoveltumaton t�ydennys: "%s"
+126 Tuntematon valitsin: `-%s'\nKäyttö: %s [ -bcdefilmnqstvVxX -Dnimi[=arvo] ] [ argumentti ... ]
+127 Tuntematon valitsin: `-%s'\nKäyttö: %s [ -bcdefFilmnqstvVxX ] [ argumentti ... ]
+128 Tuntematon valitsin: `-%s'\nKäyttö: %s [ -bcdefilmnqstvVxX ] [ argumentti ... ]
+129 \nSoveltumaton täydennys: "%s"
 130 \nSoveltumaton %s: '%c'
-131 \nErotin '%c' puuttuu %s "%s" j�ljest�
+131 \nErotin '%c' puuttuu %s "%s" jäljestä
 132 \nVajaa %s: "%s"
 133 Valitsimelle -m ei ole kohdeargumenttia
-134 K�ytt�: unlimit [-fh] [rajoitteet (limits)]
+134 Käyttö: unlimit [-fh] [rajoitteet (limits)]
 135 Muuttujalle $%S ei voida asettaa arvoa
-136 Viitattua ty�t� ei ole
+136 Viitattua työtä ei ole
 137 Tuntematon colorls-muuttuja `%c%c'
diff --git a/contrib/tcsh/nls/finnish/set10 b/contrib/tcsh/nls/finnish/set10
index 7d1a72e..662b21e 100644
--- a/contrib/tcsh/nls/finnish/set10
+++ b/contrib/tcsh/nls/finnish/set10
@@ -1,8 +1,8 @@
-$ $tcsh: set10,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set10,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: Virheellinen komento '%s'.\n
-2 setpath: Argumentit ovat riitt�m�tt�mi� komennolle '%s'.\n
-3 setpath: Arvoa ei l�ydy hakupolusta '%s'\n
-4 setpath: %s ei l�ydy paikasta %s\n
-5 setpath: %d ei ole hyv�ksytt�v� sijainti paikassa %s\n
+2 setpath: Argumentit ovat riittämättömiä komennolle '%s'.\n
+3 setpath: Arvoa ei löydy hakupolusta '%s'\n
+4 setpath: %s ei löydy paikasta %s\n
+5 setpath: %d ei ole hyväksyttävä sijainti paikassa %s\n
diff --git a/contrib/tcsh/nls/finnish/set11 b/contrib/tcsh/nls/finnish/set11
index dc1617e..8d1eca6 100644
--- a/contrib/tcsh/nls/finnish/set11
+++ b/contrib/tcsh/nls/finnish/set11
@@ -1,10 +1,10 @@
-$ $tcsh: set11,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set11,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ sh.c
 $set 11 
-1 Varoitus: ei yhteytt� p��tteeseen (%s).\n
-2 Niinp� t�ss� komentotulkissa ei ole t�iden hallintaa.\n
-3 Sinulla on %d s�hk�postiviesti�.\n
-4 Sinulla on %d viesti� tiedostossa %s.\n
+1 Varoitus: ei yhteyttä päätteeseen (%s).\n
+2 Niinpä tässä komentotulkissa ei ole töiden hallintaa.\n
+3 Sinulla on %d sähköpostiviestiä.\n
+4 Sinulla on %d viestiä tiedostossa %s.\n
 5 Sinulla on %spostia.\n
 6 uutta 
 7 Sinulla on %spostia tiedostossa %s.\n
diff --git a/contrib/tcsh/nls/finnish/set12 b/contrib/tcsh/nls/finnish/set12
index 87bf07a..4548efd 100644
--- a/contrib/tcsh/nls/finnish/set12
+++ b/contrib/tcsh/nls/finnish/set12
@@ -1,4 +1,4 @@
-$ $tcsh: set12,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set12,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ sh.dir.c
 $set 12 
-1 %s: Yritet��n k�ynnist�� hakemistosta "%s"\n
+1 %s: Yritetään käynnistää hakemistosta "%s"\n
diff --git a/contrib/tcsh/nls/finnish/set13 b/contrib/tcsh/nls/finnish/set13
index 08a9f4c..18b4e66 100644
--- a/contrib/tcsh/nls/finnish/set13
+++ b/contrib/tcsh/nls/finnish/set13
@@ -1,13 +1,13 @@
-$ $tcsh: set13,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set13,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
-2 %d hajautusluokkaa, joista jokaisessa %d bitti�\n
+2 %d hajautusluokkaa, joista jokaisessa %d bittiä\n
 3 debug mask = 0x%08x\n
 4 %d osumia, %d harhoja, %d%%\n
-5 %S: Komentotulkin sis�inen komento.\n
-6 %S: Komentoa ei l�ydy.\n
-7 where: / k�skyss� on mahdoton ajatus\n
+5 %S: Komentotulkin sisäinen komento.\n
+6 %S: Komentoa ei löydy.\n
+7 where: / käskyssä on mahdoton ajatus\n
 8 %S on alias komennolle 
-9 %S on komentotulkin sis�inen komento\n
+9 %S on komentotulkin sisäinen komento\n
 10 hajautusharha: 
diff --git a/contrib/tcsh/nls/finnish/set14 b/contrib/tcsh/nls/finnish/set14
index 23fefed..3645ec8 100644
--- a/contrib/tcsh/nls/finnish/set14
+++ b/contrib/tcsh/nls/finnish/set14
@@ -1,6 +1,6 @@
-$ $tcsh: set14,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set14,v 1.4 2011/02/04 18:19:34 christos Exp $
 $ sh.file.c
 $set 14 
 1 \nAuts!! Liian monta %s!!\n
-2 nime� k�ytt�j�tietokannassa
+2 nimeä käyttäjätietokannassa
 3 tiedostoa
diff --git a/contrib/tcsh/nls/finnish/set16 b/contrib/tcsh/nls/finnish/set16
index 4a61d02..191b6b9 100644
--- a/contrib/tcsh/nls/finnish/set16
+++ b/contrib/tcsh/nls/finnish/set16
@@ -1,8 +1,8 @@
-$ $tcsh: set16,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set16,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ sh.lex.c
 $set 16 
-1 P��tteen prosessiryhm� vaihdettu arvosta %d %d:ksi.\n
-2 \nSano "logout" kirjoittautuaksesi ulos j�rjestelm�st�.\n
+1 Päätteen prosessiryhmä vaihdettu arvosta %d %d:ksi.\n
+2 \nSano "logout" kirjoittautuaksesi ulos järjestelmästä.\n
 3 \nSano "exit" lopettaaksesi %s:n\n
 4 seek to eval %x %x\n
 5 seek to alias %x %x\n
diff --git a/contrib/tcsh/nls/finnish/set17 b/contrib/tcsh/nls/finnish/set17
index 4657343..6d497b2 100644
--- a/contrib/tcsh/nls/finnish/set17
+++ b/contrib/tcsh/nls/finnish/set17
@@ -1,9 +1,9 @@
-$ $tcsh: set17,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set17,v 1.4 2011/02/04 18:19:34 christos Exp $
 $ sh.proc.c
 $set 17 
-1 VIKA: taustaty�t�!\n
+1 VIKA: taustatyötä!\n
 2 Paluuarvo %d\n
-3 VIKA: prosessi on h�vitetty jo kertaalleen
+3 VIKA: prosessi on hävitetty jo kertaalleen
 4 Ajossa 
 5 Signaali 
 6 Paluuarvo %-25d
@@ -13,5 +13,5 @@ $set 17
 10 \040(hakemisto:
 11 hakemisto nyt: 
 12 %S: On jo keskeytetty\n
-13 %S: On jo pys�ytetty\n
+13 %S: On jo pysäytetty\n
 14 %S: Badly formed number\n
diff --git a/contrib/tcsh/nls/finnish/set18 b/contrib/tcsh/nls/finnish/set18
index d29d38d..367e77a 100644
--- a/contrib/tcsh/nls/finnish/set18
+++ b/contrib/tcsh/nls/finnish/set18
@@ -1,4 +1,4 @@
-$ $tcsh: set18,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set18,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ sh.set.c
 $set 18 
-1 Varoitus: Kohtuuttoman pitk� hakupolku (PATH) katkaistu.\n
+1 Varoitus: Kohtuuttoman pitkä hakupolku (PATH) katkaistu.\n
diff --git a/contrib/tcsh/nls/finnish/set19 b/contrib/tcsh/nls/finnish/set19
index 8e6621f..59c6fec 100644
--- a/contrib/tcsh/nls/finnish/set19
+++ b/contrib/tcsh/nls/finnish/set19
@@ -1,15 +1,23 @@
-$ $tcsh: set19,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set19,v 1.5 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Muisti loppu\n
-2 free(%lx) kutsuttu ennen kuin mit��n on varattu.
-3 free(%lx) arvo on sallitun muistialueen yl�puolella.
+2 free(%lx) kutsuttu ennen kuin mitään on varattu.
+3 free(%lx) arvo on sallitun muistialueen yläpuolella.
 4 free(%lx) arvo on sallitun muistialueen alapuolella.
 5 free(%lx) Virheellinen/viallinen lohko.
 6 free(%lx) Lohko ei ole dynaamisesti varatulla alueella.
 7 free(%lx) Virheellinen lohkon indeksi.
-8 %s t�m�nhetkinen muistin varauksien tila:\nvapaana:\t
-9 \nk�yt�ss�:\t
-10 \n\tYhteens� k�yt�ss�: %d, yhteens� vapaana: %d\n
+8 %s tämänhetkinen muistin varauksien tila:\nvapaana:\t
+9 käytössä
+10 \n\tYhteensä käytössä: %d, yhteensä vapaana: %d\n
 11 \tVarattu muisti alueella 0x%lx .. 0x%lx.  Todellinen huippu 0x%lx\n
 12 Varattu muisti alueella 0x%lx .. 0x%lx (%ld).\n
+13 %s current memory allocation:\n
+14 Total space allocated from system: %d\n
+15 Number of non-inuse chunks: %d\n
+16 Number of mmapped regions: %d\n
+17 Total space in mmapped regions: %d\n
+18 Total allocated space: %d\n
+19 Total non-inuse space: %d\n
+20 Top-most, releasable space: %d\n
diff --git a/contrib/tcsh/nls/finnish/set2 b/contrib/tcsh/nls/finnish/set2
index e3bc86e..92bdb48 100644
--- a/contrib/tcsh/nls/finnish/set2
+++ b/contrib/tcsh/nls/finnish/set2
@@ -1,94 +1,94 @@
-$ $tcsh: set2,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set2,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ Signal names
 $set 2 
 1 Null-signaali
 2 Yhteyden katkaisu
 3 Keskeytys
 4 Lopetus
-5 Virheellinen konek�sky
+5 Virheellinen konekäsky
 6 Seuranta-ansa (BPT)
-7 H�t�keskeytys
-8 Sy�tt�-/tulostusansa
-9 J�rjestelm�n alasajo odotettavissa
-10 Virheellinen p��ttyminen
-11 J�ljittelyansa (EMT)
+7 Hätäkeskeytys
+8 Syöttö-/tulostusansa
+9 Järjestelmän alasajo odotettavissa
+10 Virheellinen päättyminen
+11 Jäljittelyansa (EMT)
 12 Liukulukupoikkeus
 13 Tapettu
-14 K�ytt�j�n signaal1 1
-15 K�ytt�j�n signaali 2
-16 V��r� muistilohko
-17 V�yl�virhe
+14 Käyttäjän signaal1 1
+15 Käyttäjän signaali 2
+16 Väärä muistilohko
+17 Väylävirhe
 18 Viittaus ohjelma-alueen ulkopuolelle
 19 Data sallittujen arvojen ulkopuolella
-20 Tuntematon j�rjestelm�kutsu
+20 Tuntematon järjestelmäkutsu
 21 Murtunut putki
-22 Her�tyskello
-23 P��tetty
+22 Herätyskello
+23 Päätetty
 24 Poikasen tila muuttunut
 25 Poikanen kuollut
 26 Apollon laitekohtainen virhe
-27 Poikanen pys�htynyt tai poistunut
+27 Poikanen pysähtynyt tai poistunut
 28 Poikanen poistunut
-29 Tehonsy�tt� pett�nyt
+29 Tehonsyöttö pettänyt
 30 Resurssi menetetty
 31 Break (Ctrl-Break)
-32 Sy�te/tulostus mahdollista
-33 Ep�synkroninen sy�te/tulostus (select)
-34 Kiireellinen sy�te-/tulostustapahtuma
-35 Her�tys moniajossa
+32 Syöte/tulostus mahdollista
+33 Epäsynkroninen syöte/tulostus (select)
+34 Kiireellinen syöte-/tulostustapahtuma
+35 Herätys moniajossa
 36 Tappaminen moniajossa
-37 Fortranin ep�synkroninen sy�te/tulostus valmis
+37 Fortranin epäsynkroninen syöte/tulostus valmis
 38 Toipuminen
 39 Korjauskelvoton muistivirhe
-40 Keskusyksikk�ajan raja ylitetty
-41 J�rjestelm�n sulkeminen odotettavissa
-42 Pienoisteht�v�ryhm�n ei-her�tyst� lippu asetettu
-43 S�ievirhe - (yksityiskohtaisempia tietoja k�skyll� cord -T)
+40 Keskusyksikköajan raja ylitetty
+41 Järjestelmän sulkeminen odotettavissa
+42 Pienoistehtäväryhmän ei-herätystä lippu asetettu
+43 Säievirhe - (yksityiskohtaisempia tietoja käskyllä cord -T)
 44 rekisterin pariteettivirhe (CRAY Y-MP)
-45 Tiedotepyynt�
+45 Tiedotepyyntö
 46 Keskeytetty (signaali)
-47 Pys�ytetty (signaali)
+47 Pysäytetty (signaali)
 48 Keskeytetty
-49 Pys�ytetty
+49 Pysäytetty
 50 Suoritus jatkuu
-51 Keskeytetty (p��tesy�te)
-52 Pys�ytetty (p��tetulostus)
-53 Keskeytetty (p��tetulostus)
-54 Pys�ytetty (p��tetulostus)
+51 Keskeytetty (päätesyöte)
+52 Pysäytetty (päätetulostus)
+53 Keskeytetty (päätetulostus)
+54 Pysäytetty (päätetulostus)
 55 Ikkunan tila muuttunut
 56 Ikkunan koko muuttunut
 57 Puhelinlinjan tila muuttunut
-58 Keskusyksikk�ajan raja ylitetty
+58 Keskusyksikköajan raja ylitetty
 59 Tiedostokoon raja ylitetty
-60 K�ytt�kelpoisen ajan ajastin laukesi
-61 Ohjelman ajank�yt�nseurannan ajastin laukesi
+60 Käyttökelpoisen ajan ajastin laukesi
+61 Ohjelman ajankäytönseurannan ajastin laukesi
 62 DIL-signaali
 63 Tutkittava tapahtuma (poll)
 64 Prosessin kevytprosessit  Process's lwps are blocked
 65 Erityinen kevytprossisignaali (LWP)
 66 Erityinen CPR-signaali
 67 Erityinen CPR-signaali
-68 Ensimm�inen tosiaikasignaali
+68 Ensimmäinen tosiaikasignaali
 69 Toinen tosiaikasignaali
 70 Kolmas tosiaikasignaali
-71 Nelj�s tosiaikasignaali
-72 Nelj�nneksi viimeinen tosiaikasignaali
+71 Neljäs tosiaikasignaali
+72 Neljänneksi viimeinen tosiaikasignaali
 73 Kolmanneksi viimeinen tosiaikasignaali
 74 Toiseksi viimeinen tosiaikasignaali
 75 Viimeinen tosiaikasignaali
-76 Paikallisverkko (ep�synkroninen sy�te/tulostus)
-77 N�enn�isp��te (sy�te/tulostus valmiina)
-78 Sy�te-/tulostustoimenpidett� edellytet��n
+76 Paikallisverkko (epäsynkroninen syöte/tulostus)
+77 Näennäispääte (syöte/tulostus valmiina)
+78 Syöte-/tulostustoimenpidettä edellytetään
 79 HFT seurantatila luovutettu
 80 HFT seurantatila vapautettava
-81 HFT ��nenhallinta valmis
+81 HFT äänenhallinta valmis
 82 Uutta dataa HFT-rengaspuskurissa
 83 Muuta prosessi
-84 Turvallinen huomion�pp�in
+84 Turvallinen huomionäppäin
 85 Vuorottelutarve
 86 SS$_DEBUG -signaali
 87 Etusija muuttunut (priority)
 88 Todellinen lukkiintumistila
-89 Uusi merkki sy�tteess�
+89 Uusi merkki syötteessä
 90 Pinon raja ylitetty
-91 K�ytt�m�t�n signaali
+91 Käyttämätön signaali
diff --git a/contrib/tcsh/nls/finnish/set20 b/contrib/tcsh/nls/finnish/set20
index 4bbc86a..6a79eb2 100644
--- a/contrib/tcsh/nls/finnish/set20
+++ b/contrib/tcsh/nls/finnish/set20
@@ -1,4 +1,4 @@
-$ $tcsh: set20,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set20,v 1.4 2011/02/04 18:19:34 christos 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 n�pp�inm��rittelyt\n
-7 Vaihtoehtoiset n�pp�inm��rittelyt\n
-8 Monimerkkiset m��rittelyt\n
-9 Nuolin�pp�inm��rittelyt\n
-10 %-15s->  ei ole m��ritelty\n
-11 VIKA!!! %s ei ole m��ritelty mihink��n n�pp�imeen.\n
-12 K�ytt�: bindkey [valitsimet] [--] [N�PP�IN [KOMENTO]]\n
+6 Standard näppäinmäärittelyt\n
+7 Vaihtoehtoiset näppäinmäärittelyt\n
+8 Monimerkkiset määrittelyt\n
+9 Nuolinäppäinmäärittelyt\n
+10 %-15s->  ei ole määritelty\n
+11 VIKA!!! %s ei ole määritelty mihinkään näppäimeen.\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 Ilman N�PP�INT� tai KOMENTOA tulostetaan kaikki m��rittelyt\n
-26 Ilman KOMENTOA tulostetaan N�PP�IMEN m��rittely.\n
+25 Ilman NÄPPÄINTÄ tai KOMENTOA tulostetaan kaikki määrittelyt\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 K�ytt�: bind [N�PP�IN | KOMENTO N�PP�IN | "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
diff --git a/contrib/tcsh/nls/finnish/set22 b/contrib/tcsh/nls/finnish/set22
index f0b3abf..dcd0caf 100644
--- a/contrib/tcsh/nls/finnish/set22
+++ b/contrib/tcsh/nls/finnish/set22
@@ -1,17 +1,17 @@
-$ $tcsh: set22,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set22,v 1.4 2011/02/04 18:19:34 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t on alias komennolle 
-2 \nTunnussana ei ole k�ytt�j�n %s\n
+2 \nTunnussana ei ole käyttäjän %s\n
 3 Virheellinen alias 'precmd' poistettu.\n
 4 Virheellinen alias 'cwdcmd' poistettu.\n
 5 Virheellinen alias 'beepcmd' poistettu.\n
 6 Virheellinen alias 'periodic' poistettu.\n
-7 J�sennet��n komentorivi�\n
+7 Jäsennetään komentoriviä\n
 8 Haluatko todella tuhota kaikki tiedostot? [e/k] 
 9 Ohitetaan tiedostojen tuhoaminen!\n
 10 Komentorivi on nyt:\n
-11 J�sennet��n komentorivi�\n
-12 on yhdell� listoista\n
+11 Jäsennetään komentoriviä\n
+12 on yhdellä listoista\n
 13 Komentorivi on nyt:\n
 14 YyKk
diff --git a/contrib/tcsh/nls/finnish/set23 b/contrib/tcsh/nls/finnish/set23
index 0bf9797..07556e4 100644
--- a/contrib/tcsh/nls/finnish/set23
+++ b/contrib/tcsh/nls/finnish/set23
@@ -1,17 +1,17 @@
-$ $tcsh: set23,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set23,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ tc.os.c
 $set 23 
 1 Virheellinen solmun nimi
-2 Solmun polku liian pitk�
+2 Solmun polku liian pitkä
 3 tuntematon
 4 solmu: %s\n
-5 %d: Solmua ei l�ydy\n
+5 %d: Solmua ei löydy\n
 6 setlocal: %s: %s\n
-7 Solmua ei l�ydy
-8 Olet ansassa maailmassa (universe), mit� et itse luonut.
-9 Getwarp ep�onnistui
+7 Solmua ei löydy
+8 Olet ansassa maailmassa (universe), mitä et itse luonut.
+9 Getwarp epäonnistui
 10 Virheellinen warp
-11 Setwarp ep�onnistui
+11 Setwarp epäonnistui
 12 Virheellinen maailma (universe)
 13 Tuntematon virhe: %d
 14 sysname:  %s\n
@@ -20,15 +20,15 @@ $set 23
 17 version:  %s\n
 18 machine:  %s\n
 19 getwd: Avaus ei onnistu ".." (%s)
-20 getwd: En voi siirty� hakemistoon ".." (%s)
+20 getwd: En voi siirtyä hakemistoon ".." (%s)
 21 getwd: Virhe luettaessa hakemistoa ".." (%s)
-22 getwd: En voi siirty� takaisin hakemistoon "." (%s)
+22 getwd: En voi siirtyä takaisin hakemistoon "." (%s)
 23 getwd: En voi testata (stat) hakemistoa "/" (%s)
 24 getwd: En voi testata (stat) hakemistoa "." (%s)
 25 getwd: En voi testata (stat) hakemistoa "%s" (%s)
 26 getwd: En voi avata hakemistoa "%s" (%s)
-27 getwd: Hakemisto "." ei l�ydy hakemistosta ".." (%s)
-28 Virheellinen j�rjestelm�n tyyppi
-29 J�rjestelm�n tyyppi� ei asetettu
+27 getwd: Hakemisto "." ei löydy hakemistosta ".." (%s)
+28 Virheellinen järjestelmän tyyppi
+29 Järjestelmän tyyppiä ei asetettu
 30 Liian monta argumenttia
 31 Virheellinen argumentti
diff --git a/contrib/tcsh/nls/finnish/set25 b/contrib/tcsh/nls/finnish/set25
index 9e6a008..a6dc779 100644
--- a/contrib/tcsh/nls/finnish/set25
+++ b/contrib/tcsh/nls/finnish/set25
@@ -1,6 +1,6 @@
-$ $tcsh: set25,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set25,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
 2 virhe: bsd_signal(%d) signaali on sallitun arvoalueen ulkopuolella\n
-3 virhe: bsd_signal(%d) - sigaction ep�onnistui, errno %d\n
+3 virhe: bsd_signal(%d) - sigaction epäonnistui, errno %d\n
diff --git a/contrib/tcsh/nls/finnish/set26 b/contrib/tcsh/nls/finnish/set26
index d20e9f7..e991bb0 100644
--- a/contrib/tcsh/nls/finnish/set26
+++ b/contrib/tcsh/nls/finnish/set26
@@ -1,15 +1,15 @@
-$ $tcsh: set26,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set26,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ tc.who.c
 $set 26 
-1 Testaaminen ei onnistu: stat(%s).  Ole hyv� ja suorita "unset watch".\n
-2 %s ei avaudu.  Ole hyv� ja suorita "unset watch".\n
+1 Testaaminen ei onnistu: stat(%s).  Ole hyvä ja suorita "unset watch".\n
+2 %s ei avaudu.  Ole hyvä ja suorita "unset watch".\n
 3 VIKA! viimeinen osa ei ole whotail!\n
 4 takaperin: 
-5 VIKA! ensimm�inen osa ei ole whohead!\n
+5 VIKA! ensimmäinen osa ei ole whohead!\n
 6 uusi: %s/%s\n
 7 %n on %a %l koneelta %m.
 8 %n on %a %l.
-9 kirjoittautunut sis��n linjalle
+9 kirjoittautunut sisään linjalle
 10 kirjoittautunut ulos linjalta
 11 korvannut tunnuksen %s linjalla
 12 localhost
diff --git a/contrib/tcsh/nls/finnish/set27 b/contrib/tcsh/nls/finnish/set27
index decc69a..150cf9e 100644
--- a/contrib/tcsh/nls/finnish/set27
+++ b/contrib/tcsh/nls/finnish/set27
@@ -1,8 +1,8 @@
-$ $tcsh: set27,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set27,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ tw.comp.c
 $set 27 
 1 komento
 2 erotin
 3 malli
 4 arvojoukko
-5 t�ydennys
+5 täydennys
diff --git a/contrib/tcsh/nls/finnish/set29 b/contrib/tcsh/nls/finnish/set29
index 7ccd214..e610108 100644
--- a/contrib/tcsh/nls/finnish/set29
+++ b/contrib/tcsh/nls/finnish/set29
@@ -1,4 +1,4 @@
-$ $tcsh: set29,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set29,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ tw.help.c
 $set 29 
-1 Ei l�ydy aputiedostoa komennolle %S\n
+1 Ei löydy aputiedostoa komennolle %S\n
diff --git a/contrib/tcsh/nls/finnish/set3 b/contrib/tcsh/nls/finnish/set3
index 3ce02ba..625221b 100644
--- a/contrib/tcsh/nls/finnish/set3
+++ b/contrib/tcsh/nls/finnish/set3
@@ -1,120 +1,120 @@
-$ $tcsh: set3,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set3,v 1.4 2011/02/04 18:19:34 christos Exp $
 $ Editor function descriptions
 $set 3 
-1 Siirry taaksep�in yksi merkki
-2 Poista kursoria edelt�v� merkki
+1 Siirry taaksepäin yksi merkki
+2 Poista kursoria edeltävä merkki
 3 Leikkaa sanan alusta kursoriin - talleteta leikkauspuskuriin
 4 Leikkaa rivin alusta kursoriin - talleteta leikkauspuskuriin
 5 Siirry sanan alkuun
 6 Siirry rivin alkuun
 7 Vaihda isoiksi kirjaimiksi kursorista sanan loppuun
-8 Vi: Vaihda kirjain kursorin alla ison ja pienen v�lill�, ja etene merkki
+8 Vi: Vaihda kirjain kursorin alla ison ja pienen välillä, ja etene merkki
 9 Vi: muuta rivin loppuun
-10 Puhdista kuvaruutu j�tt�en keskener�inen rivi ylimm�ksi
-11 T�ydenn� sana
-12 Etene tiedostojen l�pi yksi kerrallaan
-13 Peruuta tiedostojen l�pi yksi kerrallaan
-14 T�ydenn� sana huomioimatta ohjelmoitavia t�ydennyksi�
+10 Puhdista kuvaruutu jättäen keskeneräinen rivi ylimmäksi
+11 Täydennä sana
+12 Etene tiedostojen läpi yksi kerrallaan
+13 Peruuta tiedostojen läpi yksi kerrallaan
+14 Täydennä sana huomioimatta ohjelmoitavia täydennyksiä
 15 Kopioi sana kursoriin saakka
-16 Kopioi leikkauspuskuriin alue merkist� kursoriin
-17 Laajenna edelliseksi sanaksi, miss� on t�m� alkuosa
+16 Kopioi leikkauspuskuriin alue merkistä kursoriin
+17 Laajenna edelliseksi sanaksi, missä on tämä alkuosa
 18 Poista merkki kursorin alta
-19 Poista merkki kursorin alta ja ilmoita tiedoston loppu tyhj�ll� rivill�
-20 Poista merkki kursorin alta ja n�yt� t�ydennykset, mik�li rivin lopussa
-21 Poista merkki kursorin alta ja ilmoita t�ydennykset tai tiedoston loppu
+19 Poista merkki kursorin alta ja ilmoita tiedoston loppu tyhjällä rivillä
+20 Poista merkki kursorin alta ja näytä täydennykset, mikäli rivin lopussa
+21 Poista merkki kursorin alta ja ilmoita täydennykset tai tiedoston loppu
 22 Leikkaa kursorista sanan loppuun - talleteta leikkauspuskuriin
-23 Lis�� argumenttiin, mik�li sekvenssi on aloitettu tai kyseess� on numero
-24 Numero, mik� aloittaa argumentin
+23 Lisää argumenttiin, mikäli sekvenssi on aloitettu tai kyseessä on numero
+24 Numero, mikä aloittaa argumentin
 25 Siirry seuraavalle riville historiassa
 26 Muuta pieniksi kirjaimiksi kursorista sanan loppuun
 27 Ilmoita tiedoston loppu
-28 Siirr� kursori rivin loppuun
+28 Siirrä kursori rivin loppuun
 29 Vaihda kursorin ja merkin paikkaa
 30 Laajenna tiedoston nimen jokerimerkit
 31 Laajenna viittaukset komentohistoriaan
 32 Laajenna viittaukset komentohistoriaan suoraan paikallaan
 33 Laajenna muuttujat
-34 Siirry eteenp�in yksi merkki
-35 Siirry eteenp�in sanan loppuun
-36 Vaihda kesken��n kursoria edelt�v�t kaksi merkki�
-37 Etsi historiasta taaksep�in rivi�, mik� alkaa kuten t�m�
-38 Etsi historiasta eteenp�in rivi�, mik� alkaa kuten t�m�
-39 Lis�� viimeisen komennon viimeinen osa
-40 T�smentyv� haku eteenp�in
-41 T�smentyv� haku taaksep�in
-42 Tyhjenn� rivi
+34 Siirry eteenpäin yksi merkki
+35 Siirry eteenpäin sanan loppuun
+36 Vaihda keskenään kursoria edeltävät kaksi merkkiä
+37 Etsi historiasta taaksepäin riviä, mikä alkaa kuten tämä
+38 Etsi historiasta eteenpäin riviä, mikä alkaa kuten tämä
+39 Lisää viimeisen komennon viimeinen osa
+40 Täsmentyvä haku eteenpäin
+41 Täsmentyvä haku taaksepäin
+42 Tyhjennä rivi
 43 Leikkaa kursorista rivin loppuun ja talleta leikkauspuskuriin
-44 Leikkaa alue merkist� kursoriin ja talleta leikkauspuskuriin
+44 Leikkaa alue merkistä kursoriin ja talleta leikkauspuskuriin
 45 Leikkaa koko rivi ja talleta leikkauspuskuriin
-46 N�yt� t�ydennysvaihtoehdot
-47 N�yt� t�ydennysvaihtoehdot ohittaen ohjelmoitavat taydennykset
-48 N�yt� tiedostojen nimien jokerimerkkivastaavuudet
-49 N�yt� t�ydennysvaihtoehdot tai ilmoita tiedoston loppu, jos rivi on tyhj�
-50 N�yt� kuormituskeskiarvot ja t�m�nhetkisen prosessin tila
-51 Laajenna historiaviittaukset ja lis�� v�lily�nti
+46 Näytä täydennysvaihtoehdot
+47 Näytä täydennysvaihtoehdot ohittaen ohjelmoitavat taydennykset
+48 Näytä tiedostojen nimien jokerimerkkivastaavuudet
+49 Näytä täydennysvaihtoehdot tai ilmoita tiedoston loppu, jos rivi on tyhjä
+50 Näytä kuormituskeskiarvot ja tämänhetkisen prosessin tila
+51 Laajenna historiaviittaukset ja lisää välilyönti
 52 Suorita komento
-53 Laajenna hakupolut ja korvaa tai taydenn� jokainen '.' ja '..'
+53 Laajenna hakupolut ja korvaa tai taydennä jokainen '.' ja '..'
 54 Laajenna komennot kokonaisiksi hakupoluiksi tai alias-vastineiksi
-55 Vaihda toimintatilaa lis�yksen ja p��llekirjoituksen v�lill�
-56 Lis�� 8. bitti seuraavaan merkkiin (meta)
-57 Lis�� seuraava merkki riville sellaisenaan ilman tulkintaa
-58 N�yt� kaikki uudestaan
-59 Jatka pys�ytetty� tekstink�sittely�
-60 Etsi aputietoja t�st� komennosta
-61 T�m� merkki lis�t��n riville
-62 T�m� merkki aloittaa merkkisarjan
+55 Vaihda toimintatilaa lisäyksen ja päällekirjoituksen välillä
+56 Lisää 8. bitti seuraavaan merkkiin (meta)
+57 Lisää seuraava merkki riville sellaisenaan ilman tulkintaa
+58 Näytä kaikki uudestaan
+59 Jatka pysäytettyä tekstinkäsittelyä
+60 Etsi aputietoja tästä komennosta
+61 Tämä merkki lisätään riville
+62 Tämä merkki aloittaa merkkisarjan
 63 Aseta merkki kursorin kohdalle
 64 Korjaa sanan kirjoitusasu
 65 Korjaa koko rivin kirjoitusasu
-66 L�het� merkki p��tteelle erikoismerkkien tulkinnan ja muunnoksien j�lkeen
-67 Vaihda esityst� raa'an ja t�ydennetyn historiarivin v�lill�
-68 Vaihda kursoria edelt�v� merkki ja kursorin alla oleva merkki kesken��n
-69 Vaihda kursoria edelt�v�t kaksi merkki� kesken��n
-70 Tty viiv�stetty pys�ytysmerkki (TSTP)
-71 Tty tulosteen h�vitt�mismerkki
+66 Lähetä merkki päätteelle erikoismerkkien tulkinnan ja muunnoksien jälkeen
+67 Vaihda esitystä raa'an ja täydennetyn historiarivin välillä
+68 Vaihda kursoria edeltävä merkki ja kursorin alla oleva merkki keskenään
+69 Vaihda kursoria edeltävät kaksi merkkiä keskenään
+70 Tty viivästetty pysäytysmerkki (TSTP)
+71 Tty tulosteen hävittämismerkki
 72 Tty keskeytysmerkki (INT)
 73 Tty lopetusmerkki (QUIT)
-74 Tty pys�ytysmerkki (STOP)
+74 Tty pysäytysmerkki (STOP)
 75 Tty salli tulostus -merkki
-76 Tty est� tulostus -merkki
-77 Ilmoitus sitomattomasta merkist�
+76 Tty estä tulostus -merkki
+77 Ilmoitus sitomattomasta merkistä
 78 Emacs-tyylin toistettava argumentti (4 kertaa argumentti)
 79 Siirry edelliselle historiariville
 80 Muuta kirjaimet kursorista sanan loppuun isoiksi
 81 Vi: siirry seuraavan sanan alkuun
-82 Vi: vaihda lis�ystilaan kursorin j�lkeen
-83 Vi: vaihda lis�ystilaan rivin lopussa
-84 Vi: vaihda kirjain kursorin alla ison ja pienen v�lill�, ja etene merkki
+82 Vi: vaihda lisäystilaan kursorin jälkeen
+83 Vi: vaihda lisäystilaan rivin lopussa
+84 Vi: vaihda kirjain kursorin alla ison ja pienen välillä, ja etene merkki
 85 Vi: vaihda (sanan) alkuliite/-osa
 86 Vi: vaihda kursorista rivin loppuun
-87 Vaihda vi:n komentotilaan (vaihtoehtoisin n�pp�inm��rittelyin)
-88 Vi: komentotilan t�ydenn� sana
-89 Vi: siirry edelliseen merkkiin (backspace, v�lily�nti taaksep�in)
+87 Vaihda vi:n komentotilaan (vaihtoehtoisin näppäinmäärittelyin)
+88 Vi: komentotilan täydennä sana
+89 Vi: siirry edelliseen merkkiin (backspace, välilyönti taaksepäin)
 90 Vi: poista (sanan) alkuliite/-osa
-91 Vi: siirry seuraavaan v�lily�nnin rajoittamaan sanan loppuun
+91 Vi: siirry seuraavaan välilyönnin rajoittamaan sanan loppuun
 92 Vi: siirry seuraavaan sanan loppuun
 93 Vi: siirry edelliseen annetun mallin mukaiseen merkkiin
 94 Vi: siirry seuraavaan annetun mallin mukaiseen merkkiin
-95 Vi: siirry edelliseen annetun mallin mukaisen merkin j�lkeiseen merkkiin
-96 Vi: siirry seuraavaan annetun mallin mukaista merkki� edelt�v��n merkkiin
+95 Vi: siirry edelliseen annetun mallin mukaisen merkin jälkeiseen merkkiin
+96 Vi: siirry seuraavaan annetun mallin mukaista merkkiä edeltävään merkkiin
 97 Vaihda vi-tilaan
-98 Vaihda vi:n lis�ystilaan rivin alussa
-99 Vi: toista viimeinen merkkihaku jatkaen etsint�� samaan suuntaan
-100 Vi: toista viimeinen merkkihaku jatkaen etsint�� p�invastaiseen suuntaan
-101 Vi: toista viimeinen haku jatkaen etsint�� samaan suuntaan
-102 Vi: toista viimeinen haku jatkaen etsint�� p�invastaiseen suuntaan
-103 Vi: vaihda kursorin alla oleva merkki seuraavaan n�pp�iltyyn merkkiin
+98 Vaihda vi:n lisäystilaan rivin alussa
+99 Vi: toista viimeinen merkkihaku jatkaen etsintää samaan suuntaan
+100 Vi: toista viimeinen merkkihaku jatkaen etsintää päinvastaiseen suuntaan
+101 Vi: toista viimeinen haku jatkaen etsintää samaan suuntaan
+102 Vi: toista viimeinen haku jatkaen etsintää päinvastaiseen suuntaan
+103 Vi: vaihda kursorin alla oleva merkki seuraavaan näppäiltyyn merkkiin
 104 Vi: korvaustila
-105 Vi: etsi historiasta taaksep�in
-106 Vi: etsi historiasta eteenp�in
-107 Vi: korvaa kursorin alla oleva merkki ja siirry lis�ystilaan
+105 Vi: etsi historiasta taaksepäin
+106 Vi: etsi historiasta eteenpäin
+107 Vi: korvaa kursorin alla oleva merkki ja siirry lisäystilaan
 108 Vi: korvaa koko rivi
 109 Vi: siirry edelliseen sanaan
 110 Vi: siirry seuraavaan sanaan
 111 Vi: peruuta muutos
 112 Vi: siirry rivin alkuun
-113 Suorita 'which' t�lle komennolle
-114 Liimaa/lis�� leikkauspuskurin sis�lt� kursorin paikalle
+113 Suorita 'which' tälle komennolle
+114 Liimaa/lisää leikkauspuskurin sisältö kursorin paikalle
 115 Korvaa viimeksi liimattu teksti aikaisemmalla leikkauksella
 116 (WIN32 only) Copy cut buffer to system clipboard
 117 (WIN32 only) Paste clipboard buffer at cursor position
diff --git a/contrib/tcsh/nls/finnish/set6 b/contrib/tcsh/nls/finnish/set6
index f26af6f..3657227 100644
--- a/contrib/tcsh/nls/finnish/set6
+++ b/contrib/tcsh/nls/finnish/set6
@@ -1,11 +1,11 @@
-$ $tcsh: set6,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set6,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ ed.inputl.c
 $set 6
-1 VIKA: Virheellinen komento n�pp�imelt� 0%o\r\n
-2 kyll�\n
+1 VIKA: Virheellinen komento näppäimeltä 0%o\r\n
+2 kyllä\n
 3 muokkaa\n
-4 keskeyt�\n
+4 keskeytä\n
 5 ei\n
 6 Ei malliin sopivaa komentoa\n
 7 Tulkinnanvarainen komento\n
-8 *** kohtalokas VIKA tekstink�sittelyss� ***\r\n\n
+8 *** kohtalokas VIKA tekstinkäsittelyssä ***\r\n\n
diff --git a/contrib/tcsh/nls/finnish/set7 b/contrib/tcsh/nls/finnish/set7
index 954a75e..8e3e52c 100644
--- a/contrib/tcsh/nls/finnish/set7
+++ b/contrib/tcsh/nls/finnish/set7
@@ -1,30 +1,30 @@
-$ $tcsh: set7,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set7,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ ed.screen.c
 $set 7
-1 \n\tTcsh:n mielest� p��tteell�si on\n
+1 \n\tTcsh:n mielestä päätteelläsi on\n
 2 \tseuraavat ominaisuudet:\n\n
-3 \tSiin� on %d palstaa ja %d rivi�.\n
-4 \tMeta-n�pp�in %s k�ytett�viss�.\n
+3 \tSiinä on %d palstaa ja %d riviä.\n
+4 \tMeta-näppäin %s käytettävissä.\n
 5 on
 6 ei ole
-7 \tSe %sosaa hy�dynt�� tabulaattorimerkkej�.\n
+7 \tSe %sosaa hyödyntää tabulaattorimerkkejä.\n
 8 not
-9 \tSiin� %s luottaa automaattisiin marginaaleihin.\n
+9 \tSiinä %s luottaa automaattisiin marginaaleihin.\n
 10 voi
 11 ei voi
-12 \tSiin� %s luottaa taikamarginaaleihin. (magic margin)\n
+12 \tSiinä %s luottaa taikamarginaaleihin. (magic margin)\n
 13 (empty)
 14 yes
 15 no
-16 VIRHE: Ei pysty tuhoamaan merkkej�.\r\n
+16 VIRHE: Ei pysty tuhoamaan merkkejä.\r\n
 17 DeleteChars: Numeroarvo on naurettava: %d\r\n
-18 VIRHE: Ei pysty lis��m��n merkkej� keskelle rivi�.\r\n
+18 VIRHE: Ei pysty lisäämään merkkejä keskelle riviä.\r\n
 19 StartInsert: Numeroarvo on naurettava: %d\r\n
-20 %s: Ei pystyt� avaamaan tiedostoa /etc/termcap.\n
-21 %s: P��tetyypille "%s" ei l�ydy m��rittely\n
-22 %s: K�yt�n tyhm�n (dumb) p��tteen asetuksia.\n
-23 %s: VAROITUS: P��tteesi ei osaa siirt�� kursoria yl�sp�in.\n
-24 Pitkill� riveill� tekstink�sittely voi olla liev�sti outoa.\n
-25 P��tteest�si puuttuu toiminto "tuhoa rivin loppuun".\n
-26 P��tteest�si puuttuu toiminto "tuhoa merkki".\n
-27 P��tteest�si puuttuu toiminto "lis�� merkki aiempien v�liin".\n
+20 %s: Ei pystytä avaamaan tiedostoa /etc/termcap.\n
+21 %s: Päätetyypille "%s" ei löydy määrittely\n
+22 %s: Käytän tyhmän (dumb) päätteen asetuksia.\n
+23 %s: VAROITUS: Päätteesi ei osaa siirtää kursoria ylöspäin.\n
+24 Pitkillä riveillä tekstinkäsittely voi olla lievästi outoa.\n
+25 Päätteestäsi puuttuu toiminto "tuhoa rivin loppuun".\n
+26 Päätteestäsi puuttuu toiminto "tuhoa merkki".\n
+27 Päätteestäsi puuttuu toiminto "lisää merkki aiempien väliin".\n
diff --git a/contrib/tcsh/nls/finnish/set9 b/contrib/tcsh/nls/finnish/set9
index befc4a8..c814c49 100644
--- a/contrib/tcsh/nls/finnish/set9
+++ b/contrib/tcsh/nls/finnish/set9
@@ -1,12 +1,12 @@
-$ $tcsh: set9,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set9,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null extended-key not allowed.\n
 2 AddXkey: sequence-lead-in command not allowed\n
 3 DeleteXkey: Null extended-key not allowed.\n
-4 Sitomaton laajennettu n�pp�in "%S"\n
-5 Jotkin laajennetut n�pp�imet ovat liian pitki� sis�iseen tulostuspuskurille
-6 Enumerate: VIKA!! V�litetty null-osoitin\n!
-7 ei sy�tett�
+4 Sitomaton laajennettu näppäin "%S"\n
+5 Jotkin laajennetut näppäimet ovat liian pitkiä sisäiseen tulostuspuskurille
+6 Enumerate: VIKA!! Välitetty null-osoitin\n!
+7 ei syötettä
 8 Jotain on seurattava: %c\n
 9 Oktaalivakio ei mahdu char-tyypin muuttujaan.\n
diff --git a/contrib/tcsh/nls/french/charset b/contrib/tcsh/nls/french/charset
index 0b13559..81f1b66 100644
--- a/contrib/tcsh/nls/french/charset
+++ b/contrib/tcsh/nls/french/charset
@@ -1,3 +1,3 @@
-$ codeset=ISO-8859-1
+$ codeset=UTF-8
 $set 255
-1 ISO-8859-1
+1 UTF-8
diff --git a/contrib/tcsh/nls/french/set1 b/contrib/tcsh/nls/french/set1
index 111cfed..cfb13f2 100644
--- a/contrib/tcsh/nls/french/set1
+++ b/contrib/tcsh/nls/french/set1
@@ -1,8 +1,8 @@
-$ $tcsh: set1,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set1,v 1.5 2011/02/04 18:19:35 christos Exp $
 $ Messages d 'erreur
 $set 1 
 1 Erreur de syntaxe
-2 %s n'est pas autoris�
+2 %s n'est pas autorisé
 3 Mot trop long
 4 $< ligne trop longue
 5 Pas de fichier pour $0
@@ -10,130 +10,130 @@ $set 1
 7 $ l'expansion doit se terminer avant ]
 8 Mauvais : modificateur dans $ (%c)
 9 Erreur d'indice
-10 Num�ro mal form�
+10 Numéro mal formé
 11 Plus de mots
 12 Nom de fichier manquant
 13 Erreur globale interne
 14 Commande introuvable
 15 Trop peu d'arguments
 16 Trop d'arguments
-17 Trop dangereux d'attribuer un alias � cela
+17 Trop dangereux d'attribuer un alias à cela
 18 `If' vide
 19 `Then' incorrect
-20 Les mots ne sont pas plac�s entre parenth�ses
+20 Les mots ne sont pas placés entre parenthèses
 21 %s introuvable
 22 Masque incorrect
 23 Pas de limite de ce type
 24 Argument trop long
-25 Facteur d'�chelle incorrect ou inconnu
-26 Variable pas d�finie
-27 La pile de r�pertoires n'a pas cette taille
-28 Mauvais num�ro de signal
+25 Facteur d'échelle incorrect ou inconnu
+26 Variable pas définie
+27 La pile de répertoires n'a pas cette taille
+28 Mauvais numéro de signal
 29 Signal inconnu; "kill -l" permet de lister les signaux
 30 Le nom de la variable doit commencer par une lettre
 31 Le nom de la variable est trop long
-32 Le nom de la variable ne doit contenir que des caract�res alphanum�riques
+32 Le nom de la variable ne doit contenir que des caractères alphanumériques
 33 Pas de gestion des travaux dans ce shell
 34 Syntaxe de l'expression
-35 Pas de r�pertoire personnel
-36 Impossible de passer dans le r�pertoire personnel
+35 Pas de répertoire personnel
+36 Impossible de passer dans le répertoire personnel
 37 Commande nulle incorrecte
 38 Il manque l'affectation dans l'expression
-39 Op�rateur inconnu
+39 Opérateur inconnu
 40 ambigu
 41 %s: Le fichier existe
 42 L'argument pour -c se termine avec un anti-slash
 43 Interrompu
 44 Indice hors limites
-45 D�passement de capacit� de ligne
+45 Dépassement de capacité de ligne
 46 Pas de travail de ce type
-47 Impossible � partir d'un terminal
-48 Vous n'�tes pas dans une boucle while ou foreach
+47 Impossible à partir d'un terminal
+48 Vous n'êtes pas dans une boucle while ou foreach
 49 Plus de processus
 50 Pas de correspondance
 51 %c manquant
 52 %c sans correspondance
-53 M�moire insuffisante
-54 Impossible de cr�er un tube
+53 Mémoire insuffisante
+54 Impossible de créer un tube
 55 %s: %s
 56 %s
 57 Syntaxe: jobs [ -l ]
-58 Les arguments doivent �tre des ID de processus ou des num�ros de travaux
+58 Les arguments doivent être des ID de processus ou des numéros de travaux
 59 Pas de travail en cours
-60 Pas de travail pr�c�dent
+60 Pas de travail précédent
 61 Pas de travail de cette forme
-62 Embo�tement des `Fork' > %d; peut-�tre une boucle `...`
+62 Emboîtement des `Fork' > %d; peut-être une boucle `...`
 63 Pas de gestion des travaux dans les sous-shells
-64 Faute `Sync': Processus %d pas trouv�
+64 Faute `Sync': Processus %d pas trouvé
 65 %s Il y a des travaux interrompus
-66 %s Il y a des travaux arr�t�s
-67 Pas d'autre r�pertoire
-68 La pile de r�pertoires est vide
-69 R�pertoire incorrect
+66 %s Il y a des travaux arrêtés
+67 Pas d'autre répertoire
+68 La pile de répertoires est vide
+69 Répertoire incorrect
 70 Syntaxe: %s [-%s]%s
-71 Pas d'op�rande pour l'indicateur -h
+71 Pas d'opérande pour l'indicateur -h
 72 Ce n'est pas un shell de connexion
-73 Division par z�ro
-74 Modulo par z�ro
-75 Mise � l'�chelle incorrecte ; cela signifie-t-il ``%s'' ?
+73 Division par zéro
+74 Modulo par zéro
+75 Mise à l'échelle incorrecte ; cela signifie-t-il ``%s'' ?
 76 Impossible d'interrompre un shell de connexion
 77 Utilisateur inconnu : %s
-78 Pas de variable `$home' d�finie
-79 Syntaxe: history [-%s] [# nombre d'�v�nements]
-80 $, ! ou < pas autoris�s avec $# or $?
+78 Pas de variable `$home' définie
+79 Syntaxe: history [-%s] [# nombre d'évènements]
+80 $, ! ou < pas autorisés avec $# or $?
 81 Retour-chariot dans un nom de variable
-82 * pas autoris� avec $# or $?
-83 $?<digit> ou $#<digit> pas autoris�
+82 * pas autorisé avec $# or $?
+83 $?<digit> ou $#<digit> pas autorisé
 84 Nom de variable incorrect
 85 Retour-chariot dans l'index de variable
-86 D�passement de capacit� de la m�moire tampon d'expansion
+86 Dépassement de capacité de la mémoire tampon d'expansion
 87 Syntaxe de variable
 88 Forme ! incorrecte
-89 Pas de remplacement pr�c�dent
+89 Pas de remplacement précédent
 90 Remplacement incorrect
-91 Pas de partie gauche pr�c�dente
+91 Pas de partie gauche précédente
 92 Partie droite trop longue
 93 Modificateur ! incorrect: %c
 94 Echec du modificateur
-95 D�passement de capacit� de la m�moire tampon de substitution
-96 S�lecteur d'argument ! incorrect
-97 Pas de recherche pr�c�dente
-98 %s: �v�nement introuvable
-99 Trop de caract�res )
-100 Trop de caract�res (
-101 Caract�re ( mal plac�
+95 Dépassement de capacité de la mémoire tampon de substitution
+96 Sélecteur d'argument ! incorrect
+97 Pas de recherche précédente
+98 %s: événement introuvable
+99 Trop de caractères )
+100 Trop de caractères (
+101 Caractère ( mal placé
 102 Il manque un nom pour rediriger
 103 Redirection de sortie ambigue
-104 Pas de << entre les caract�res ( et )
-105 Redirection d'entr�e ambigue
-106 Caract�res () mal plac�s
+104 Pas de << entre les caractères ( et )
+105 Redirection d'entrée ambigue
+106 Caractères () mal placés
 107 Boucle dans les alias
-108 Pas de variable `$watch' d�finie
-109 Pas d'�v�nement pr�vu
-110 Syntaxe: sched -<#num�ro>.\nSyntaxe: sched [+]hh:mm <commande>
-111 Pas tant d'�v�nements pr�vus
-112 Pas de commande � lancer
-113 Temps incorrect pour l'�v�nement
+108 Pas de variable `$watch' définie
+109 Pas d'évènement prévu
+110 Syntaxe: sched -<#numéro>.\nSyntaxe: sched [+]hh:mm <commande>
+111 Pas tant d'évènements prévus
+112 Pas de commande à lancer
+113 Temps incorrect pour l'évènement
 114 Temps relatif incompatible avec am/pm
 115 Pas assez de place pour la chaine termcap
 116 Syntaxe: settc %s [yes|no]
-117 Capacit� `%s' inconnue
-118 Param�tre termcap inconnu `%%%c'
+117 Capacité `%s' inconnue
+118 Paramètre termcap inconnu `%%%c'
 119 Trop d'arguments pour `%s' (%d)
-120 `%s' n�cessite %d arguments
-121 Syntaxe: echotc [-v|-s] [<capacit�> [<args>]]
+120 `%s' nécessite %d arguments
+121 Syntaxe: echotc [-v|-s] [<capacité> [<args>]]
 122 %s: %s. Mauvaise Architecture
 123 !# Boucle dans l'historique
 124 Mauvaise recherche de fichier
-125 D�passement de capacit� de s�lecteur
+125 Dépassement de capacité de sélecteur
 126 Option inconnue: `-%s'\nSyntaxe: %s [ -bcdefilmnqstvVxX -Dnom[=valeur] ] [ argument ... ]
 127 Option inconnue: `-%s'\nSyntaxe: %s [ -bcdefFilmnqstvVxX ] [ argument ... ]
 128 Option inconnue: `-%s'\nSyntaxe: %s [ -bcdefilmnqstvVxX ] [ argument ... ]
-129 \nCompl�ment incorrect: "%s"
+129 \nComplément incorrect: "%s"
 130 \n%s incorrect: '%c'
-131 \nIl manque le s�parateur '%c' apr�s %s "%s"
+131 \nIl manque le séparateur '%c' après %s "%s"
 132 \n%s incomplet: "%s" 
-133 Pas d'op�rande pour l'indicateur -m
+133 Pas d'opérande pour l'indicateur -m
 134 Syntaxe: unlimit [-fh] [limites]
 135 $%S est en lecture seule
 136 Pas de travail de ce type
diff --git a/contrib/tcsh/nls/french/set10 b/contrib/tcsh/nls/french/set10
index 8df42bd..9a9a30d 100644
--- a/contrib/tcsh/nls/french/set10
+++ b/contrib/tcsh/nls/french/set10
@@ -1,8 +1,8 @@
-$ $tcsh: set10,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set10,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: commande incorrecte '%s'.\n
 2 setpath: pas assez d'arguments pour la commande '%s'.\n
-3 setpath: donn�e manquante dans le chemin '%s'\n
-4 setpath: %s pas trouv� dans %s\n
+3 setpath: donnée manquante dans le chemin '%s'\n
+4 setpath: %s pas trouvé dans %s\n
 5 setpath: %d pas une position correcte dans %s\n
diff --git a/contrib/tcsh/nls/french/set11 b/contrib/tcsh/nls/french/set11
index 1f58163..6545c9e 100644
--- a/contrib/tcsh/nls/french/set11
+++ b/contrib/tcsh/nls/french/set11
@@ -1,8 +1,8 @@
-$ $tcsh: set11,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set11,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ sh.c
 $set 11 
-1 Attention: pas d'acc�s au tty (%s).\n
-2 Ainsi pas de contr�le de job dans ce shell.\n
+1 Attention: pas d'accès au tty (%s).\n
+2 Ainsi pas de contrôle de job dans ce shell.\n
 3 Vous avez %d messages courrier (mail).\n
 4 Vous avez %d messages courrier (mail) dans %s.\n
 5 Vous avez du %scourrier.\n
diff --git a/contrib/tcsh/nls/french/set12 b/contrib/tcsh/nls/french/set12
index 8b04a6a..5f1226b 100644
--- a/contrib/tcsh/nls/french/set12
+++ b/contrib/tcsh/nls/french/set12
@@ -1,4 +1,4 @@
-$ $tcsh: set12,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set12,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ sh.dir.c
 $set 12 
-1 %s: Essaie de d�marrer � partir de "%s"\n
+1 %s: Essaie de démarrer à partir de "%s"\n
diff --git a/contrib/tcsh/nls/french/set13 b/contrib/tcsh/nls/french/set13
index fd768ab..ecede2d 100644
--- a/contrib/tcsh/nls/french/set13
+++ b/contrib/tcsh/nls/french/set13
@@ -1,13 +1,13 @@
-$ $tcsh: set13,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set13,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
 2 %d groupes de hashage de %d bits chacun\n
-3 masque de d�boguage = 0x%08x\n
-4 %d r�ussis, %d manqu�s, %d%%\n
-5 %S: commande int�gr�e au shell.\n
-6 %S: Commande pas trouv�e.\n
-7 o�: / dans la commande n'a pas de sens\n
+3 masque de déboguage = 0x%08x\n
+4 %d réussis, %d manqués, %d%%\n
+5 %S: commande intégrée au shell.\n
+6 %S: Commande pas trouvée.\n
+7 où: / dans la commande n'a pas de sens\n
 8 %S est un alias avec 
-9 %S est int�gr�(e) au shell\n
-10 hashage manqu�s: 
+9 %S est intégré(e) au shell\n
+10 hashage manqués: 
diff --git a/contrib/tcsh/nls/french/set15 b/contrib/tcsh/nls/french/set15
index 9d40044..b77b62e 100644
--- a/contrib/tcsh/nls/french/set15
+++ b/contrib/tcsh/nls/french/set15
@@ -1,7 +1,7 @@
-$ $tcsh: set15,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set15,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: ne peut %s la limite%s\n
 2 enlever
 3 positionner
-4  mat�rielle
+4  matérielle
diff --git a/contrib/tcsh/nls/french/set16 b/contrib/tcsh/nls/french/set16
index e5a18c6..e5871af 100644
--- a/contrib/tcsh/nls/french/set16
+++ b/contrib/tcsh/nls/french/set16
@@ -1,8 +1,8 @@
-$ $tcsh: set16,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set16,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ sh.lex.c
 $set 16 
-1 R�initialise le groupe de processus des terminaux de %d � %d\n
-2 \nUtilisez "logout" pour vous d�connecter.\n
+1 Réinitialise le groupe de processus des terminaux de %d à %d\n
+2 \nUtilisez "logout" pour vous déconnecter.\n
 3 \nUtilisez "exit" pour quitter %s.\n
 4 seek to eval %x %x\n
 5 seek to alias %x %x\n
diff --git a/contrib/tcsh/nls/french/set17 b/contrib/tcsh/nls/french/set17
index ad57470..e6db518 100644
--- a/contrib/tcsh/nls/french/set17
+++ b/contrib/tcsh/nls/french/set17
@@ -1,17 +1,17 @@
-$ $tcsh: set17,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set17,v 1.5 2011/02/04 18:19:35 christos Exp $
 $ sh.proc.c
 $set 17 
-1 BUG: attente de travail en t�che de fond !\n
+1 BUG: attente de travail en tâche de fond !\n
 2 Sortie %d\n
-3 BUG: processus vid� deux fois
+3 BUG: processus vidé deux fois
 4 Tourne 
 5 Signal 
 6 Sortie %-25d
 7 Fait
-8 BUG: �tat=%-9o
+8 BUG: état=%-9o
 9 \040(core dumped)
 10 \040(wd:
 11 wd maintenant: 
-12 %S: D�j� suspendu\n
-13 %S: D�j� arr�t�\n
+12 %S: Déjà suspendu\n
+13 %S: Déjà arrêté\n
 14 %S: Badly formed number\n
diff --git a/contrib/tcsh/nls/french/set18 b/contrib/tcsh/nls/french/set18
index c0caa26..09f98cb 100644
--- a/contrib/tcsh/nls/french/set18
+++ b/contrib/tcsh/nls/french/set18
@@ -1,4 +1,4 @@
-$ $tcsh: set18,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set18,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ sh.set.c
 $set 18 
-1 Attention: le PATH exag�r�ment long est tronqu�\n
+1 Attention: le PATH exagérément long est tronqué\n
diff --git a/contrib/tcsh/nls/french/set19 b/contrib/tcsh/nls/french/set19
index cafc960..d37facf 100644
--- a/contrib/tcsh/nls/french/set19
+++ b/contrib/tcsh/nls/french/set19
@@ -1,15 +1,23 @@
-$ $tcsh: set19,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set19,v 1.6 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
-1 nbytes=%d: Plus de m�moire\n
-2 free(%lx) appel� avant allocation.
-3 free(%lx) au del� de la limite memoire.
-4 free(%lx) en de�� de la limite memoire.
+1 nbytes=%d: Plus de mémoire\n
+2 free(%lx) appelé avant allocation.
+3 free(%lx) au delà de la limite memoire.
+4 free(%lx) en deçà de la limite memoire.
 5 free(%lx) mauvais bloc.
 6 free(%lx) limites incorrectes.
 7 free(%lx) index de bloc incorrect.
-8 %s allocation m�moire actuelle:\nfree:\t
-9 \nutilis�:\t
-10 \n\tTotal utilis�: %d, total libre: %d\n
-11 \tM�moire allou�e de 0x%lx � 0x%lx.  Limite r�elle sup�rieure � 0x%lx\n
-12 M�moire allou�e de 0x%lx � 0x%lx (%ld).\n
+8 %s allocation mémoire actuelle:\nfree:\t
+9 utilisé
+10 \n\tTotal utilisé: %d, total libre: %d\n
+11 \tMémoire allouée de 0x%lx à 0x%lx.  Limite réelle supérieure à 0x%lx\n
+12 Mémoire allouée de 0x%lx à 0x%lx (%ld).\n
+13 %s current memory allocation:\n
+14 Total space allocated from system: %d\n
+15 Number of non-inuse chunks: %d\n
+16 Number of mmapped regions: %d\n
+17 Total space in mmapped regions: %d\n
+18 Total allocated space: %d\n
+19 Total non-inuse space: %d\n
+20 Top-most, releasable space: %d\n
diff --git a/contrib/tcsh/nls/french/set2 b/contrib/tcsh/nls/french/set2
index c6b0eeb..1922ab1 100644
--- a/contrib/tcsh/nls/french/set2
+++ b/contrib/tcsh/nls/french/set2
@@ -1,94 +1,94 @@
-$ $tcsh: set2,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set2,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ Messages Signaux
 $set 2
 1 Signal nul
 2 Interrompu
-3 Arr�t�
+3 Arrêté
 4 Sortie
 5 Instruction interdite
-6 Pi�ge Trace/BPT
+6 Piège Trace/BPT
 7 Abandon
-8 Pi�ge IOT
-9 Plantage syst�me imminent
+8 Piège IOT
+9 Plantage système imminent
 10 Sortie erreur
-11 Pi�ge EMT
+11 Piège EMT
 12 Exception de calcul en virgule flottante
-13 Supprim�
+13 Supprimé
 14 Signal utilisateur 1
 15 Signal utilisateur 2
 16 Incident de segmentation
 17 Erreur de bus
 18 Program range error
 19 Operand range error
-20 Appel syst�me incorrect
-21 Tube d�truit
+20 Appel système incorrect
+21 Tube détruit
 22 Alarme
-23 Termin�
-24 L'�tat du fils a chang�
+23 Terminé
+24 L'état du fils a changé
 25 Mort du fils
-26 Faute sp�cifique Apollo
-27 Fils arr�t� ou sorti
+26 Faute spécifique Apollo
+27 Fils arrêté ou sorti
 28 Fils sorti
 29 Coupure d'alimentation
 30 Ressource perdue
 31 Break (Ctrl-Break)
 32 Signal d'E-S possible
-33 Entr�e-Sortie asynchrone (select)
+33 Entrée-Sortie asynchrone (select)
 34 Condition urgente sur canal d'E-S
-35 Reprise multi-t�che
-36 Terminaison multi-t�che
-37 Ach�vement d'E-S asynchrone Fortran
+35 Reprise multi-tâche
+36 Terminaison multi-tâche
+37 Achèvement d'E-S asynchrone Fortran
 38 Reprise
-39 Erreur m�moire irr�cup�rable
-40 Limite temps CPU d�pass�e
-41 Arr�t du syst�me imminent
-42 Groupe micro-tasking-pas d'option de r�veil d�finie
+39 Erreur mémoire irrécupérable
+40 Limite temps CPU dépassée
+41 Arrêt du système imminent
+42 Groupe micro-tasking-pas d'option de réveil définie
 43 Erreur de thread - (utilisez cord -T pour plus d'infos)
-44 Erreur de parit� de registre du CRAY Y-MP
+44 Erreur de parité de registre du CRAY Y-MP
 45 Demande d'information
 46 Interrompu (Signal)
-47 Stopp� (Signal)
+47 Stoppé (Signal)
 48 Interrompu
-49 Stopp�
+49 Stoppé
 50 Continue
-51 Entr�e tty suspendue
-52 Entr�e tty arr�t�e
+51 Entrée tty suspendue
+52 Entrée tty arrêtée
 53 Sortie tty suspendue
-54 Sortie tty arr�t�e
-55 Etat de la fen�tre modifi�
-56 Taille de la fen�tre modifi�e
-57 Etat du t�l�phone modifi�
-58 Limite temps CPU d�pass�e
-59 Taille limite de fichier d�pass�e
+54 Sortie tty arrêtée
+55 Etat de la fenêtre modifié
+56 Taille de la fenêtre modifiée
+57 Etat du téléphone modifié
+58 Limite temps CPU dépassée
+59 Taille limite de fichier dépassée
 60 Signal de l'horloge virtuelle
 61 Signal de profil
 62 Signal DIL
-63 Un �v�nement � scruter est arriv�
+63 Un évènement à scruter est arrivé
 64 Process's lwps are blocked
 65 Signal Special LWP
 66 Signal Special CPR
 67 Signal Special CPR
-68 Premier signal temps r�el
-69 Deuxi�me signal temps r�el
-70 Troisi�me signal temps r�el
-71 Quatri�me signal temps r�el
-72 Quatri�me signal temps r�el avant la fin
-73 Ant�p�nulti�me signal temps r�el
-74 Avant-dernier signal temps r�el
-75 Dernier signal temps r�el
+68 Premier signal temps réel
+69 Deuxième signal temps réel
+70 Troisième signal temps réel
+71 Quatrième signal temps réel
+72 Quatrième signal temps réel avant la fin
+73 Antépénultième signal temps réel
+74 Avant-dernier signal temps réel
+75 Dernier signal temps réel
 76 E-S asynchrone LAN
 77 Lecture/Ecriture PTY disponible
-78 Intervention E-S n�cessaire
-79 Mode moniteur HFT accord�
-80 Le mode moniteur HFT doit �tre abandonn�
-81 Le contr�le du son HFT est termin�
-82 Donn�es en buffer circulaire HFT
+78 Intervention E-S nécessaire
+79 Mode moniteur HFT accordé
+80 Le mode moniteur HFT doit être abandonné
+81 Le contrôle du son HFT est terminé
+82 Données en buffer circulaire HFT
 83 Processus de transfert
-84 Touche d'attention s�curis�e
-85 Re-s�quencement
+84 Touche d'attention sécurisée
+85 Re-séquencement
 86 Signal SS$_DEBUG
-87 Priorit� modifi�e
-88 detect�
-89 Nouveau caract�re d'entr�e
+87 Priorité modifiée
+88 detecté
+89 Nouveau caractère d'entrée
 90 Stack limit exceeded
 91 Unused signal
diff --git a/contrib/tcsh/nls/french/set20 b/contrib/tcsh/nls/french/set20
index 2595d06..0e41253 100644
--- a/contrib/tcsh/nls/french/set20
+++ b/contrib/tcsh/nls/french/set20
@@ -1,41 +1,41 @@
-$ $tcsh: set20,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set20,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Nom de touche incorrect `%S'\n
 2 Mauvais nom de touche: %S\n
 3 Mauvais nom de commande: %S\n
-4 Mauvaise touche sp�cifi�e %S\n
-5 Chaine nulle sp�cifi�e\n
-6 D�finition de touches standard\n
-7 D�finition de touches alternatives\n
-8 D�finition Multi-caract�res\n
-9 D�finition des touches de direction\n
-10 %-15s->  n'est pas d�fini\n
-11 BUG!!! %s n'est li� � rien.\n
+4 Mauvaise touche spécifiée %S\n
+5 Chaine nulle spécifiée\n
+6 Définition de touches standard\n
+7 Définition de touches alternatives\n
+8 Définition Multi-caractères\n
+9 Définition des touches de direction\n
+10 %-15s->  n'est pas défini\n
+11 BUG!!! %s n'est lié à rien.\n
 12 Usage: bindkey [options] [--] [TOUCHE [COMMANDE]]\n
-13     -a   liste ou d�finit la TOUCHE dans la table des touches alternatives\n
-14     -b   interpr�te TOUCHE comme un nom de touche C-, M-, F- or X-\n
-15     -s   interpr�te COMMANDE comme une chaine litt�rale devant �tre sortie\n
-16     -c   interpr�te COMMANDE comme une commande int�gr�e ou externe\n
-17     -v   red�finit toutes les touches pour vi\n
-18     -e   red�finit toutes les touches pour emacs\n
-19     -d   red�finit toutes les touches pour de l'�diteur par defaut\n
-20     -l   liste les commandes de l'�diteur avec descriptions\n
-21     -r   enl�ve la correspondance pour la TOUCHE\n
-22     -k   interpr�te TOUCHE comme un nom de touche de direction symbolique\n
-23     --   force un arr�t dans le traitement de l'option\n
+13     -a   liste ou définit la TOUCHE dans la table des touches alternatives\n
+14     -b   interprète TOUCHE comme un nom de touche C-, M-, F- or X-\n
+15     -s   interprète COMMANDE comme une chaine littérale devant être sortie\n
+16     -c   interprète COMMANDE comme une commande intégrée ou externe\n
+17     -v   redéfinit toutes les touches pour vi\n
+18     -e   redéfinit toutes les touches pour emacs\n
+19     -d   redéfinit toutes les touches pour de l'éditeur par defaut\n
+20     -l   liste les commandes de l'éditeur avec descriptions\n
+21     -r   enlève la correspondance pour la TOUCHE\n
+22     -k   interprète TOUCHE comme un nom de touche de direction symbolique\n
+23     --   force un arrêt dans le traitement de l'option\n
 24     -u   (ou toute option incorrecte) ce message\n
 25 Sans TOUCHE ni COMMANDE, imprime toutes les associations\n
 26 Sans COMMANDE, imprime l'association pour TOUCHE.\n
-27 mauvaise sp�cification de touche -- chaine nulle\n
-28 mauvaise sp�cification de touche -- chaine vide\n
-29 mauvaise sp�cification de touche de fonction.  Touche nulle pas autoris�\n
-30 mauvaise sp�cification de touche -- nombre hexa mal form�\n
-31 mauvaise sp�cification de touche -- nombre octal mal form�\n
-32 mauvaise sp�cification de touche -- nombre d�cimal mal form�\n
-33 Mauvaise sp�cification de touche de fonction.\n
-34 Touche nulle pas autoris�\n
-35 Mauvaise sp�cification de touche -- nom inconnu "%S"\n
+27 mauvaise spécification de touche -- chaine nulle\n
+28 mauvaise spécification de touche -- chaine vide\n
+29 mauvaise spécification de touche de fonction.  Touche nulle pas autorisé\n
+30 mauvaise spécification de touche -- nombre hexa mal formé\n
+31 mauvaise spécification de touche -- nombre octal mal formé\n
+32 mauvaise spécification de touche -- nombre décimal mal formé\n
+33 Mauvaise spécification de touche de fonction.\n
+34 Touche nulle pas autorisé\n
+35 Mauvaise spécification de touche -- nom inconnu "%S"\n
 36 Syntaxe: bind [TOUCHE | COMMANDE TOUCHE | "emacs" | "vi" | "-a"]\n
 37 Fonction incorrecte
-38  %s\t\tn'est pas d�fini\n
+38  %s\t\tn'est pas défini\n
diff --git a/contrib/tcsh/nls/french/set21 b/contrib/tcsh/nls/french/set21
index 670e9e5..c1a8c4d 100644
--- a/contrib/tcsh/nls/french/set21
+++ b/contrib/tcsh/nls/french/set21
@@ -1,5 +1,5 @@
-$ $tcsh: set21,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set21,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tc.disc.c
 $set 21 
-1 ne peut obtenir les caract�res locaux.\n
-2 ne peut d�finir les catact�res locaux.\n
+1 ne peut obtenir les caractères locaux.\n
+2 ne peut définir les catactères locaux.\n
diff --git a/contrib/tcsh/nls/french/set22 b/contrib/tcsh/nls/french/set22
index c59fe97..7b91351 100644
--- a/contrib/tcsh/nls/french/set22
+++ b/contrib/tcsh/nls/french/set22
@@ -1,17 +1,17 @@
-$ $tcsh: set22,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set22,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t a comme alias 
 2 \nMot de passe incorrect pour %s\n
-3 Erreur alias 'precmd' enlev�.\n
-4 Erreur alias 'cwdcmd' enlev�.\n
-5 Erreur alias 'beepcmd' enlev�.\n
-6 Erreur alias 'periodic' enlev�.\n
-7 �tude de la ligne de commande\n
+3 Erreur alias 'precmd' enlevé.\n
+4 Erreur alias 'cwdcmd' enlevé.\n
+5 Erreur alias 'beepcmd' enlevé.\n
+6 Erreur alias 'periodic' enlevé.\n
+7 étude de la ligne de commande\n
 8 Voulez vous vraiment supprimer tous les fichiers? [n/y] 
 9 passe la suppression des fichiers!\n
 10 la ligne de commande est maintenant :\n
-11 �tude de la ligne de commande\n
+11 étude de la ligne de commande\n
 12 dans une des listes\n
 13 la ligne de commande est maintenant :\n
 14 OoyY
diff --git a/contrib/tcsh/nls/french/set23 b/contrib/tcsh/nls/french/set23
index 5fb6339..064b9ce 100644
--- a/contrib/tcsh/nls/french/set23
+++ b/contrib/tcsh/nls/french/set23
@@ -1,17 +1,17 @@
-$ $tcsh: set23,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set23,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ tc.os.c
 $set 23 
 1 Mauvais nom de cpu/site
 2 Chemin du site trop mong
 3 inconnu
 4 site: %s\n
-5 %d: Site pas trouv�\n
+5 %d: Site pas trouvé\n
 6 setlocal: %s: %s\n
-7 Site pas trouv�
-8 Vous �tes pi�g� dans un univers que vous n'avez jamais cr��
-9 Getwarp a �chou�
+7 Site pas trouvé
+8 Vous êtes piégé dans un univers que vous n'avez jamais créé
+9 Getwarp a échoué
 10 warp invalide
-11 Setwarp a �chou�
+11 Setwarp a échoué
 12 Univers incorrect
 13 Erreur inconnue : %d
 14 sysname:  %s\n
@@ -22,13 +22,13 @@ $set 23
 19 getwd: Ne peut ouvrir ".." (%s)
 20 getwd: Ne peut effectuer chdir vers ".." (%s)
 21 getwd: Erreur en lecture dans ".." (%s)
-22 getwd: Ne peut revenir � "." (%s)
+22 getwd: Ne peut revenir à "." (%s)
 23 getwd: Ne peut effectuer stat "/" (%s)
 24 getwd: Ne peut effectuer stat "." (%s)
-25 getwd: Ne peut effectuer stat sur r�pertoire "%s" (%s)
-26 getwd: Ne peut ouvrir le r�pertoire "%s" (%s)
+25 getwd: Ne peut effectuer stat sur répertoire "%s" (%s)
+26 getwd: Ne peut ouvrir le répertoire "%s" (%s)
 27 getwd: Ne peut trouver "." dans ".." (%s)
-28 Type de syst�me incorrect
-29 Le type de syst�me n'est pas d�fini
+28 Type de système incorrect
+29 Le type de système n'est pas défini
 30 XXX: Too many arguments 
 31 XXX: Invalid argument
diff --git a/contrib/tcsh/nls/french/set25 b/contrib/tcsh/nls/french/set25
index 7bf62ac..2d7c80b 100644
--- a/contrib/tcsh/nls/french/set25
+++ b/contrib/tcsh/nls/french/set25
@@ -1,6 +1,6 @@
-$ $tcsh: set25,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set25,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tc.sig.c
 $set 25 
 1 notre attente %d\n
 2 erreur: bsd_signal(%d) signal hors limites\n
-3 erreur: bsd_signal(%d) - sigaction a �chou�, errno %d\n
+3 erreur: bsd_signal(%d) - sigaction a échoué, errno %d\n
diff --git a/contrib/tcsh/nls/french/set26 b/contrib/tcsh/nls/french/set26
index b5139e7..d495487 100644
--- a/contrib/tcsh/nls/french/set26
+++ b/contrib/tcsh/nls/french/set26
@@ -1,15 +1,15 @@
-$ $tcsh: set26,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set26,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tc.who.c
 $set 26 
 1 ne peut effectuer stat %s.  S.V.P effectuez "unset watch".\n
-2 %s ne peut �tre ouvert.  S.V.P effectuez "unset watch".\n
-3 BUG! le dernier �l�ment n'est pas whotail!\n
-4 arri�re: 
-5 BUG! le premier �l�ment n'est pas whohead!\n
+2 %s ne peut être ouvert.  S.V.P effectuez "unset watch".\n
+3 BUG! le dernier élément n'est pas whotail!\n
+4 arrière: 
+5 BUG! le premier élément n'est pas whohead!\n
 6 nouveau: %s/%s\n
 7 %n a %a %l from %m.
 8 %n a %a %l.
-9 connect�
-10 d�connect�
-11 remplac� %s
+9 connecté
+10 déconnecté
+11 remplacé %s
 12 local
diff --git a/contrib/tcsh/nls/french/set27 b/contrib/tcsh/nls/french/set27
index e86b26c..a27112f 100644
--- a/contrib/tcsh/nls/french/set27
+++ b/contrib/tcsh/nls/french/set27
@@ -1,8 +1,8 @@
-$ $tcsh: set27,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set27,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tw.comp.c
 $set 27 
 1 commande
-2 s�parateur
+2 séparateur
 3 motif
 4 intervalle
-5 compl�ment
+5 complément
diff --git a/contrib/tcsh/nls/french/set3 b/contrib/tcsh/nls/french/set3
index 797524a..8abbb01 100644
--- a/contrib/tcsh/nls/french/set3
+++ b/contrib/tcsh/nls/french/set3
@@ -1,120 +1,120 @@
-$ $tcsh: set3,v 1.3 2006/03/02 18:46:46 christos Exp $
-$ Description des fonctions �diteur
+$ $tcsh: set3,v 1.4 2011/02/04 18:19:35 christos Exp $
+$ Description des fonctions éditeur
 $set 3 
-1 Recule d'un caract�re
-2 Efface le caract�re derri�re le curseur
-3 Coupe depuis le d�but du mot jusqu'au curseur - sauvegard� dans le tampon de copie
-4 Coupe depuis le d�but de la ligne jusqu'au curseur - sauvegard� dans le tampon de copie
-5 Va au d�but du mot courant
-6 Va au d�but de la ligne
-7 Met en majuscules les caract�res depuis le curseur jusqu'� la fin du mot
-8 Vi change la casse du caract�re sous le curseur et avance d'un caract�re
-9 Vi change jusqu'� la fin de la ligne
-10 Efface l'�cran en laissant la ligne courant au dessus
-11 Compl�te le mot courant
+1 Recule d'un caractère
+2 Efface le caractère derrière le curseur
+3 Coupe depuis le début du mot jusqu'au curseur - sauvegardé dans le tampon de copie
+4 Coupe depuis le début de la ligne jusqu'au curseur - sauvegardé dans le tampon de copie
+5 Va au début du mot courant
+6 Va au début de la ligne
+7 Met en majuscules les caractères depuis le curseur jusqu'à la fin du mot
+8 Vi change la casse du caractère sous le curseur et avance d'un caractère
+9 Vi change jusqu'à la fin de la ligne
+10 Efface l'écran en laissant la ligne courant au dessus
+11 Complète le mot courant
 12 Tab avance parmi les fichiers
 13 Tab recule parmi les fichiers
-14 Compl�te le mot courant en ignorant les compl�ments programmables
+14 Complète le mot courant en ignorant les compléments programmables
 15 Copie le mot courant jusqu'au curseur
 16 Copie la zone entre la marque et le curseur dans le tampon de copie
-17 D�veloppe vers le mot pr�c�dent pour lequel c'est un pr�fixe
-18 Efface le caract�re sous le curseur
-19 Efface le caract�re sous le curseur, ou signale la fin de fichier si ligne vide
-20 Efface le caract�re sous le curseur, ou liste les compl�ments si fin de ligne
-21 Efface le caract�re sous le curseur, liste les compl�ments ou signale la fin de fichier
-22 Coupe depuis le curseur jusqu'� la fin du mot courant - sauvegard� dans le tampon de copie
-23 Ajoute aux arguments si d�marr� ou entre le chiffre
-24 Chiffre au d�but de l'argument
-25 Va � la prochaine ligne de l'historique
-26 Met en minuscules les caract�res depuis le curseur jusqu'� la fin du mot
+17 Développe vers le mot précédent pour lequel c'est un préfixe
+18 Efface le caractère sous le curseur
+19 Efface le caractère sous le curseur, ou signale la fin de fichier si ligne vide
+20 Efface le caractère sous le curseur, ou liste les compléments si fin de ligne
+21 Efface le caractère sous le curseur, liste les compléments ou signale la fin de fichier
+22 Coupe depuis le curseur jusqu'à la fin du mot courant - sauvegardé dans le tampon de copie
+23 Ajoute aux arguments si démarré ou entre le chiffre
+24 Chiffre au début de l'argument
+25 Va à la prochaine ligne de l'historique
+26 Met en minuscules les caractères depuis le curseur jusqu'à la fin du mot
 27 Indique la fin de fichier
-28 D�place le curseur � la fin de la ligne
+28 Déplace le curseur à la fin de la ligne
 29 Echange le curseur et la marque
-30 D�veloppe les jokers du nom de fichier
-31 D�veloppe les �chappements de l'historique
-32 D�veloppe les �chappements de l'historique en une ligne
-33 D�veloppe les variables
-34 Avance d'un caract�re
-35 Avance � la fin du mot courant
-36 Echange les deux caract�res avant le curseur
-37 Cherche en arri�re dans l'historique une ligne commen�ant comme la ligne courante
-38 Cherche en avant dans l'historique une ligne commen�ant comme la ligne courante
-39 Ins�re le dernier el�ment de la commande pr�c�dente
-40 Recherche en avant incr�mentale
-41 Recherche en arri�re incr�mentale
+30 Développe les jokers du nom de fichier
+31 Développe les échappements de l'historique
+32 Développe les échappements de l'historique en une ligne
+33 Développe les variables
+34 Avance d'un caractère
+35 Avance à la fin du mot courant
+36 Echange les deux caractères avant le curseur
+37 Cherche en arrière dans l'historique une ligne commençant comme la ligne courante
+38 Cherche en avant dans l'historique une ligne commençant comme la ligne courante
+39 Insère le dernier elément de la commande précédente
+40 Recherche en avant incrémentale
+41 Recherche en arrière incrémentale
 42 Efface la ligne
-43 Coupe jusqu'� la fin de la ligne et sauvegarde dans le tampon de copie
+43 Coupe jusqu'à la fin de la ligne et sauvegarde dans le tampon de copie
 44 Coupe la zone entre la marque et le curseur et sauvegarde dans le tampon de copie
 45 Coupe toute la ligne et sauvegarde dans le tampon de copie
-46 Liste les choix pour le compl�ment
-47 Liste les choix pour le compl�ment sur-d�finissant le compl�ment programmable
+46 Liste les choix pour le complément
+47 Liste les choix pour le complément sur-définissant le complément programmable
 48 Liste les correspondances pour le nom de fichier avec joker
-49 Liste les choix pour le compl�ment ou indique la fin de fichier si ligne vide
-50 Affiche la charge moyenne et l'�tat courant des processus
-51 D�veloppe les �chappements de l'historique et ins�re une espace
-52 Ex�cute la commande
-53 D�veloppe les nom de r�pertoires, �liminant les `.' et `..' en t�te
-54 D�veloppe les commandes pour le chemin ou l'alias r�sultant
+49 Liste les choix pour le complément ou indique la fin de fichier si ligne vide
+50 Affiche la charge moyenne et l'état courant des processus
+51 Développe les échappements de l'historique et insère une espace
+52 Exécute la commande
+53 Développe les nom de répertoires, éliminant les `.' et `..' en tête
+54 Développe les commandes pour le chemin ou l'alias résultant
 55 Passe du mode insertion au mode recouvrement et vice-versa
-56 Ajoute le 8i�me bit au prochain caract�re saisi
-57 Ajoute le prochain caract�re saisi � la ligne 
-58 R�affiche tout
-59 Red�marre l'�diteur
+56 Ajoute le 8ième bit au prochain caractère saisi
+57 Ajoute le prochain caractère saisi à la ligne 
+58 Réaffiche tout
+59 Redémarre l'éditeur
 60 Cherche de l'aide pour la commande courante
-61 Ce caract�re est ajout� � la ligne
-62 Ca caract�re est le premier dans une s�quence de caract�res
-63 D�finit la marque � la position du curseur
+61 Ce caractère est ajouté à la ligne
+62 Ca caractère est le premier dans une séquence de caractères
+63 Définit la marque à la position du curseur
 64 Corrige la syntaxe du mot courant
-65 Corrige la syntaxe de la ligne compl�te
-66 Envoie le caract�re au tty en mode 
-67 Bascule la ligne courante de l'historique entre le mode litt�ral et lexical
-68 Echange le caract�re � la gauche du curseur avec celui en dessous du curseur
-69 Echange les deux caract�res avant le curseur
-70 Caract�re tty de suspension diff�r�
-71 Caract�re tty de vidage de sortie
-72 Caract�re tty d'interruption
-73 Caract�re tty de sortie
-74 Caract�re tty de suspension
-75 Caract�re tty de validation de sortie
-76 Caract�re tty d'invalidation de sortie
-77 Indique un caract�re pas attach�
+65 Corrige la syntaxe de la ligne complète
+66 Envoie le caractère au tty en mode 
+67 Bascule la ligne courante de l'historique entre le mode littéral et lexical
+68 Echange le caractère à la gauche du curseur avec celui en dessous du curseur
+69 Echange les deux caractères avant le curseur
+70 Caractère tty de suspension différé
+71 Caractère tty de vidage de sortie
+72 Caractère tty d'interruption
+73 Caractère tty de sortie
+74 Caractère tty de suspension
+75 Caractère tty de validation de sortie
+76 Caractère tty d'invalidation de sortie
+77 Indique un caractère pas attaché
 78 Argument universel Emacs (argument x 4)
-79 Va � la ligne pr�c�dente de l'historique
-80 Met en majuscule les caract�res depuis le curseur jusqu'� la fin du mot courant
-81 Vi va au d�but du prochain mot
-82 Vi passe en mode insertion apr�s le curseur
-83 Vi passe en mode insertion � la fin de la ligne
-84 Vi change la casse du caract�re sous le curseur et avance d'un caract�re
+79 Va à la ligne précédente de l'historique
+80 Met en majuscule les caractères depuis le curseur jusqu'à la fin du mot courant
+81 Vi va au début du prochain mot
+82 Vi passe en mode insertion après le curseur
+83 Vi passe en mode insertion à la fin de la ligne
+84 Vi change la casse du caractère sous le curseur et avance d'un caractère
 85 Vi change la commande `prefix'
-86 Vi change jusqu'� la fin de la ligne
-87 Passe au mode de commande Vi (red�finition des touches alternatives)
-88 Le mode commande de Vi compl�te le mot courant
-89 Vi va au caract�re pr�c�dent (retour-arri�re)
+86 Vi change jusqu'à la fin de la ligne
+87 Passe au mode de commande Vi (redéfinition des touches alternatives)
+88 Le mode commande de Vi complète le mot courant
+89 Vi va au caractère précédent (retour-arrière)
 90 Vi efface la commande `prefix'
-91 Vi va � la fin du mot courant d�limit� par des espaces
-92 Vi va � la fin du mot courant
-93 Vi va vers le caract�re sp�cifi� avant
-94 Vi va vers le caract�re sp�cifi� apr�s
-95 Vi remonte vers le caract�re sp�cifi� avant
-96 Vi remonte vers le caract�re sp�cifi� apr�s
+91 Vi va à la fin du mot courant délimité par des espaces
+92 Vi va à la fin du mot courant
+93 Vi va vers le caractère spécifié avant
+94 Vi va vers le caractère spécifié après
+95 Vi remonte vers le caractère spécifié avant
+96 Vi remonte vers le caractère spécifié après
 97 Passe en mode insertion Vi
-98 Passe en mode insertion Vi au d�but de la ligne
-99 Vi r�p�te la recherche du caract�re en cours dans la m�me direction
-100 Vi r�p�te la recherche du caract�re en cours dans la direction oppos�e
-101 Vi r�p�te la recherche en cours dans la m�me direction
-102 Vi r�p�te la recherche en cours dans la direction oppos�e
-103 Vi remplace le caract�re sous le curseur avec le prochain caract�re saisi
+98 Passe en mode insertion Vi au début de la ligne
+99 Vi répète la recherche du caractère en cours dans la même direction
+100 Vi répète la recherche du caractère en cours dans la direction opposée
+101 Vi répète la recherche en cours dans la même direction
+102 Vi répète la recherche en cours dans la direction opposée
+103 Vi remplace le caractère sous le curseur avec le prochain caractère saisi
 104 Mode de remplacement Vi
-105 Vi cherche dans l'historique en arri�re
+105 Vi cherche dans l'historique en arrière
 106 Vi cherche dans l'historique en avant
-107 Vi remplace le caract�re sous le curseur et passe en mode insertion
-108 Vi remplace la ligne enti�re
-109 Vi va au mot pr�c�dent
+107 Vi remplace le caractère sous le curseur et passe en mode insertion
+108 Vi remplace la ligne entière
+109 Vi va au mot précédent
 110 Vi va au prochain mot
-111 Vi d�fait la derni�re modification
-112 Vi va au d�but de la ligne
-113 Ex�cute quelle commande en cours
-114 Colle le tampon de copie � la position du curseur
+111 Vi défait la dernière modification
+112 Vi va au début de la ligne
+113 Exécute quelle commande en cours
+114 Colle le tampon de copie à la position du curseur
 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
diff --git a/contrib/tcsh/nls/french/set30 b/contrib/tcsh/nls/french/set30
index e35a39a..e36afc0 100644
--- a/contrib/tcsh/nls/french/set30
+++ b/contrib/tcsh/nls/french/set30
@@ -1,16 +1,16 @@
-$ $tcsh: set30,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set30,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ tw.parse.c
 $set 30 
-1 d�marre une commande %d\n
+1 démarre une commande %d\n
 2 complete %d 
 3 complete %d %S\n
 4 %s: Erreur interne de correspondance.\n
-5 �l�ments
+5 éléments
 6 colonnes
-7 Il y a %d %s, les lister quand m�me ? [n/y] 
+7 Il y a %d %s, les lister quand même ? [n/y] 
 8 looking = %d\n
 9 \nerreur interne %s: Je ne sais pas ce que je recherche !\n
-10 pas un r�pertoire
-11 pas trouv�
+10 pas un répertoire
+11 pas trouvé
 12 pas lisible
 13 oOyY
diff --git a/contrib/tcsh/nls/french/set31 b/contrib/tcsh/nls/french/set31
index e63d2d4..c004696 100644
--- a/contrib/tcsh/nls/french/set31
+++ b/contrib/tcsh/nls/french/set31
@@ -1,7 +1,7 @@
-$ $tcsh: set31,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set31,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 Ne peut ouvrir TERMCAP: [%s]\n
 2 Ne peut ouvrir %s.\n
-3 Trouv� %s dans %s.\n
-4 Pas de correspondance trouv�e pour %s dans le fichier %s\n
+3 Trouvé %s dans %s.\n
+4 Pas de correspondance trouvée pour %s dans le fichier %s\n
diff --git a/contrib/tcsh/nls/french/set4 b/contrib/tcsh/nls/french/set4
index 8e63fb1..57dcd17 100644
--- a/contrib/tcsh/nls/french/set4
+++ b/contrib/tcsh/nls/french/set4
@@ -1,22 +1,22 @@
-$ $tcsh: set4,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set4,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ Termcap strings
 $set 4
 1 ajoute une nouvelle ligne vide
 2 bip audible
 3 efface jusqu'en bas
-4 efface jusqu'� la fin de la ligne
+4 efface jusqu'à la fin de la ligne
 5 curseur vers un position horizontale
-6 efface l'�cran
-7 efface un caract�re
+6 efface l'écran
+7 efface un caractère
 8 efface une ligne
 9 commence le mode d'effacement
 10 termine le mode d'effacement
 11 termine le mode d'insertion
-12 curseur de la ligne d'�tat
+12 curseur de la ligne d'état
 13 curseur origine
-14 ins�re caract�re
+14 insère caractère
 15 commence le mode insertion
-16 ins�re du remplissage
+16 insère du remplissage
 17 curseur vers le bas
 18 curseur vers la gauche
 19 curseur vers la droite
@@ -24,16 +24,16 @@ $set 4
 21 commence le gras
 22 fin attributs
 23 espaces non-destructives
-24 fin mise en �vidence
-25 commence mise en �vidence
-26 curseur � la ligne d'�tat
+24 fin mise en évidence
+25 commence mise en évidence
+26 curseur à la ligne d'état
 27 curseur d'une vers le haut
-28 commence soulign�
-29 fin soulign�
+28 commence souligné
+29 fin souligné
 30 bip `visible'
-31 efface plusiseurs caract�res
+31 efface plusiseurs caractères
 32 curseur vers le bas (plusieurs)
-33 insert plusieurs caract�res
+33 insert plusieurs caractères
 34 curseur vers la gauche (plusieurs)
 35 curseur vers la droite (plusieurs)
 36 curseur vers le haut (plusieurs)
@@ -42,4 +42,4 @@ $set 4
 39 Nombre de lignes
 40 Nombre de colonnes
 41 A les touches `alternatives'
-42 retoure-chariot ignor� � la droite de la marge
+42 retoure-chariot ignoré à la droite de la marge
diff --git a/contrib/tcsh/nls/french/set6 b/contrib/tcsh/nls/french/set6
index 886832e..a664d28 100644
--- a/contrib/tcsh/nls/french/set6
+++ b/contrib/tcsh/nls/french/set6
@@ -1,11 +1,11 @@
-$ $tcsh: set6,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set6,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ERREUR: commande interdite de la touche 0%o\r\n
 2 oui\n
 3 edit\n
-4 arr�te\n
+4 arrête\n
 5 non\n
 6 Pas de commande correspondante\n
 7 Commande ambigue\n
-8 *** ERREUR fatale de l'�diteur ***\r\n\n
+8 *** ERREUR fatale de l'éditeur ***\r\n\n
diff --git a/contrib/tcsh/nls/french/set7 b/contrib/tcsh/nls/french/set7
index 9971ea6..fed46a8 100644
--- a/contrib/tcsh/nls/french/set7
+++ b/contrib/tcsh/nls/french/set7
@@ -1,8 +1,8 @@
-$ $tcsh: set7,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set7,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ ed.screen.c
 $set 7
-1 \n\tTcsh a d�termin� que votre terminal a les\n
-2 \tcaract�ristiques suivantes :\n\n
+1 \n\tTcsh a déterminé que votre terminal a les\n
+2 \tcaractéristiques suivantes :\n\n
 3 \tIl a %d colonnes et %d lignes\n
 4 \tIl %s touche `alternative'\n
 5 a une
@@ -18,13 +18,13 @@ $set 7
 15 non
 16 ERREUR: ne peut pas effacer\r\n
 17 DeleteChars: num est ridicule: %d\r\n
-18 ERREUR: ne peut ins�rer\r\n
+18 ERREUR: ne peut insérer\r\n
 19 StartInsert: num est ridicule: %d\r\n
 20 %s: Ne peut ouvrir /etc/termcap.\n
-21 %s: Pas d'entr�e pour le type de terminal "%s"\n
+21 %s: Pas d'entrée pour le type de terminal "%s"\n
 22 %s: utilise la configuration d'un terminal banal.\n
-23 %s: ATTENTION: Votre terminal ne peut effectuer de d�placement vers le haut.\n
-24 L'�dition peut �tre incorrecte pour les longues lignes.\n
-25 pas de capacit� d'effacement jusqu'� fin de ligne.\n
-26 pas de capacit� d'effacement de caract�re.\n
-27 pas de capacit� d'insertion de caract�re.\n
+23 %s: ATTENTION: Votre terminal ne peut effectuer de déplacement vers le haut.\n
+24 L'édition peut être incorrecte pour les longues lignes.\n
+25 pas de capacité d'effacement jusqu'à fin de ligne.\n
+26 pas de capacité d'effacement de caractère.\n
+27 pas de capacité d'insertion de caractère.\n
diff --git a/contrib/tcsh/nls/french/set8 b/contrib/tcsh/nls/french/set8
index 4ab49b9..f591e15 100644
--- a/contrib/tcsh/nls/french/set8
+++ b/contrib/tcsh/nls/french/set8
@@ -1,5 +1,5 @@
-$ $tcsh: set8,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set8,v 1.3 2011/02/04 18:19:36 christos Exp $
 $ ed.term.c
 $set 8
-1 S�lecteur inconnu
+1 Sélecteur inconnu
 2 Argument incorrect
diff --git a/contrib/tcsh/nls/french/set9 b/contrib/tcsh/nls/french/set9
index a47cf62..bb073db 100644
--- a/contrib/tcsh/nls/french/set9
+++ b/contrib/tcsh/nls/french/set9
@@ -1,12 +1,12 @@
-$ $tcsh: set9,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set9,v 1.3 2011/02/04 18:19:36 christos Exp $
 $ ed.xmap.c
 $set 9
-1 AddXkey: touche d'extension nulle pas autoris�.\n
-2 AddXkey: commande s�quence d'introduction (sequence-lead-in) pas autoris�\n
-3 DeleteXkey: touche d'extension nulle pas autoris�.\n
-4 Touche d'extension pas d�finie "%S"\n
+1 AddXkey: touche d'extension nulle pas autorisé.\n
+2 AddXkey: commande séquence d'introduction (sequence-lead-in) pas autorisé\n
+3 DeleteXkey: touche d'extension nulle pas autorisé.\n
+4 Touche d'extension pas définie "%S"\n
 5 Certaines touches d'extension trop longues pour tampon d'impression interne
-6 Enumerate: BUG!! Pointeur Null pass�!\n
-7 pas d'entr�e
+6 Enumerate: BUG!! Pointeur Null passé!\n
+7 pas d'entrée
 8 Quelque chose doit suivre: %c\n
-9 Une constante Octale ne peut pas tenir dans un caract�re.\n
+9 Une constante Octale ne peut pas tenir dans un caractère.\n
diff --git a/contrib/tcsh/nls/german/charset b/contrib/tcsh/nls/german/charset
index 0b13559..81f1b66 100644
--- a/contrib/tcsh/nls/german/charset
+++ b/contrib/tcsh/nls/german/charset
@@ -1,3 +1,3 @@
-$ codeset=ISO-8859-1
+$ codeset=UTF-8
 $set 255
-1 ISO-8859-1
+1 UTF-8
diff --git a/contrib/tcsh/nls/german/set1 b/contrib/tcsh/nls/german/set1
index e6f75ad..f3a48fd 100644
--- a/contrib/tcsh/nls/german/set1
+++ b/contrib/tcsh/nls/german/set1
@@ -1,13 +1,13 @@
-$ $tcsh: set1,v 1.6 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set1,v 1.7 2011/02/04 18:19:36 christos Exp $
 $ Error messages
 $set 1
 1 Syntaxfehler
 2 %s nicht erlaubt
 3 Word zu lang
 4 $< Zeile zu lang
-5 Keine Datei f�r $0
-6 Unvollst�ndiger [] Modifizierer
-7 $ Ausweitung mu� vor ] enden
+5 Keine Datei für $0
+6 Unvollständiger [] Modifizierer
+7 $ Ausweitung muß vor ] enden
 8 Falscher : Modifizierer in $ (%c)
 9 Indexfehler
 10 Falsche Nummer
@@ -17,61 +17,61 @@ $set 1
 14 Befehl nicht gefunden
 15 Zu wenig Argumente
 16 Zu viele Argumente
-17 Zu gef�hrlich f�r ein Alias
+17 Zu gefährlich für ein Alias
 18 Leeres If
 19 Unpassendes Then
 20 Worte nicht in Klammern
 21 %s nicht gefunden
 22 Ungeeignete Maske
 23 Keine bekannte Begrenzung
-24 Argument zu gro�
-25 Ungeeigneter oder unbekannter Vergr��erungsfaktor
+24 Argument zu groß
+25 Ungeeigneter oder unbekannter Vergrößerungsfaktor
 26 Undefinierte Variable
 27 Verzeichnisstapel nicht so tief
 28 Falscher Signalname
 29 Unbekanntes Signal; kill -l listet Signale auf
-30 Variablenname mu� mit einem Buchstaben beginnen
+30 Variablenname muß mit einem Buchstaben beginnen
 31 Variablenname zu lang
-32 Variablenname mu� Buchstaben oder Ziffern enthalten
+32 Variablenname muß Buchstaben oder Ziffern enthalten
 33 Keine Jobkontrolle in dieser Shell
 34 Ausdruck nicht korrekt
 35 Kein Startverzeichnis
 36 Kann nicht in das Startverzeichnis wechseln
-37 Ung�ltiger leerer Befehl
+37 Ungültiger leerer Befehl
 38 Zuweisung ohne Ausdruck
 39 Unbekannter Operator
 40 Mehrdeutig
 41 %s: Datei existiert
-42 Argument f�r -c endet mit einem Backslash (\\)
+42 Argument für -c endet mit einem Backslash (\\)
 43 Abgebrochen
-44 Index nicht im g�ltigen Bereich
-45 Zeilen�berlauf
+44 Index nicht im gültigen Bereich
+45 Zeilenüberlauf
 46 Kein solcher Job
 47 Kann nicht vom Terminal
 48 Nicht in while/foreach
 49 Keine Prozesse mehr
 50 Kein Treffer
 51 Fehlendes %c
-52 �berfl�ssiges %c
+52 Überflüssiges %c
 53 Kein Speicher mehr
 54 Kann keine Pipe erzeugen
 55 %s: %s
 56 %s
 57 Benutzung: jobs [ -l ]
-58 Argumente k�nnen Job- oder Proze�-ID's sein
+58 Argumente können Job- oder Prozeß-ID's sein
 59 Kein aktueller Job
 60 Kein vorhergehender Job
 61 Kein Job entspricht dem Muster
 62 Fork-Ebene > %d; evtl. `...` Schleife?
 63 Keine Jobkontrolle in Unter-Shells
-64 Sync-Fehler: Proze� %d nicht gefunden
+64 Sync-Fehler: Prozeß %d nicht gefunden
 65 %sEs gibt noch angehaltene Jobs
 66 %sEs gibt noch angehaltene Jobs
 67 Kein anderes Verzeichnis
 68 Verzeichnisstapel leer
-69 Ung�ltiges Verzeichnis
+69 Ungültiges Verzeichnis
 70 Benutzung: %s [-%s]%s
-71 Kein Operand f�r -h
+71 Kein Operand für -h
 72 Nicht in einer Login-Shell
 73 Division durch 0
 74 Mod durch 0
@@ -84,9 +84,9 @@ $set 1
 81 Zeilenumbruch in Variablenname
 82 * nicht erlaubt bei $# or $?
 83 $?<digit> or $#<digit> nicht erlaubt
-84 Ung�ltiger Variablenname
+84 Ungültiger Variablenname
 85 Zeilenumbruch in Variablenindex
-86 �berlauf des Erweiterungspuffers
+86 Überlauf des Erweiterungspuffers
 87 Variablen-Syntax
 88 Falsche ! Form
 89 Keine vorhergehende Ersetzung
@@ -95,14 +95,14 @@ $set 1
 92 Rechte Seite zu lang
 93 Falscher ! Modifizierer: %c
 94 Modifizierer fehlgeschlagen
-95 �berlauf des Ersetzungspuffers
+95 Überlauf des Ersetzungspuffers
 96 Falscher ! Argumentbezeichner
 97 Keine vorhergehende Suche
 98 %s: Befehl nicht gefunden
 99 Zu viele ')'
 100 Zu viele '('
 101 Falsch plazierte '('
-102 Fehlender Name f�r Umlenkung
+102 Fehlender Name für Umlenkung
 103 Mehrdeutige Ausgabeumlenkung
 104 Kann keine << innerhalb von ()
 105 Mehrdeutige Eingabeumlenkung
@@ -112,28 +112,28 @@ $set 1
 109 Keine vorgemerkten Befehle
 110 Benutzung: sched -<item#>.\nBenutzung: sched [+]hh:mm <Befehl>
 111 Nicht so viele vorgemerkte Befehle
-112 Kein auszuf�hrender Befehl
-113 Ung�ltige Zeit f�r Befehl
+112 Kein auszuführender Befehl
+113 Ungültige Zeit für Befehl
 114 Relative Zeit inkonsistent mit am/pm
-115 Kein Platz mehr f�r Termcap-Eintrag
+115 Kein Platz mehr für Termcap-Eintrag
 116 Benutzung: settc %s [yes|no]
-117 Unbekannte F�higkeit `%s'
+117 Unbekannte Fähigkeit `%s'
 118 Unbekannter Termcap-Parameter `%%%c'
-119 Zu viele Argumente f�r `%s' (%d)
+119 Zu viele Argumente für `%s' (%d)
 120 `%s' erfordert %d Argumente
-121 Benutzung: echotc [-v|-s] [<F�higkeit> [<Argumente>]]
+121 Benutzung: echotc [-v|-s] [<Fähigkeit> [<Argumente>]]
 122 %s: %s. Falsche Architektur
 123 !# History-Schleife
 124 Falsche Dateianforderung
-125 Selector-�berlauf
+125 Selector-Überlauf
 126 Unbekannte Option: `-%s'\nBenutzung: %s [ -bcdefilmnqstvVxX -Dname[=Wert] ] [ Argument ... ]
 127 Unbekannte Option: `-%s'\nBenutzung: %s [ -bcdefFilmnqstvVxX ] [ Argument ... ]
 128 Unbekannte Option: `-%s'\nBenutzung: %s [ -bcdefilmnqstvVxX ] [ Argument ... ]
-129 \nUng�ltige Vervollst�ndigung: "%s"
-130 \nUng�ltiger %s: '%c'
+129 \nUngültige Vervollständigung: "%s"
+130 \nUngültiger %s: '%c'
 131 \nFehlende Trennung '%c' nach %s "%s"
-132 \nUnvollst�ndiger/-ges %s: "%s"
-133 Kein Operand f�r -m Option
+132 \nUnvollständiger/-ges %s: "%s"
+133 Kein Operand für -m Option
 134 Benutzung: unlimit [-fh] [Grenzen]
 135 $%S ist nur lesbar
 136 Kein solcher Job
diff --git a/contrib/tcsh/nls/german/set10 b/contrib/tcsh/nls/german/set10
index 185aa61..b4dadde 100644
--- a/contrib/tcsh/nls/german/set10
+++ b/contrib/tcsh/nls/german/set10
@@ -1,8 +1,8 @@
-$ $tcsh: set10,v 1.5 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set10,v 1.6 2011/02/04 18:19:36 christos Exp $
 $ ma.setp.c
 $set 10
-1 setpath: ung�ltiger Befehl '%s'.\n
-2 setpath: unzureichende Argumente f�r Befehl '%s'.\n
+1 setpath: ungültiger Befehl '%s'.\n
+2 setpath: unzureichende Argumente für Befehl '%s'.\n
 3 setpath: Wert fehlt in Pfad '%s'\n
 4 setpath: %s nicht in %s gefunden\n
-5 setpath: %d keine g�ltige Position in %s\n
+5 setpath: %d keine gültige Position in %s\n
diff --git a/contrib/tcsh/nls/german/set13 b/contrib/tcsh/nls/german/set13
index 5da0fd2..4aefa66 100644
--- a/contrib/tcsh/nls/german/set13
+++ b/contrib/tcsh/nls/german/set13
@@ -1,4 +1,4 @@
-$ $tcsh: set13,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set13,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ sh.exec.c
 $set 13
 1 hash=%-4d dir=%-2d prog=%s\n
@@ -8,6 +8,6 @@ $set 13
 5 %S: Befehl in Shell eingebaut.\n
 6 %S: Befehl nicht gefunden.\n
 7 where: / in Befehl ist nicht sinnvoll\n
-8 %S ist ein Alias f�r 
+8 %S ist ein Alias für 
 9 %S ist ein eingebauter Shell-Befehl\n
 10 Hash-Fehler: 
diff --git a/contrib/tcsh/nls/german/set15 b/contrib/tcsh/nls/german/set15
index bc215c8..a96d8aa 100644
--- a/contrib/tcsh/nls/german/set15
+++ b/contrib/tcsh/nls/german/set15
@@ -1,7 +1,7 @@
-$ $tcsh: set15,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set15,v 1.5 2011/02/04 18:19:36 christos Exp $
 $ sh.func.c
 $set 15
 1 %s: %s: Kann Begrenzung nicht %s%s\n
-2 l�schen
+2 löschen
 3 setzen
 4 \040(hard limit)
diff --git a/contrib/tcsh/nls/german/set16 b/contrib/tcsh/nls/german/set16
index bc26108..b8f572e 100644
--- a/contrib/tcsh/nls/german/set16
+++ b/contrib/tcsh/nls/german/set16
@@ -1,13 +1,13 @@
-$ $tcsh: set16,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set16,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ sh.lex.c
 $set 16
-1 Setze Proze�gruppe des Terminals von %d auf %d\n
+1 Setze Prozeßgruppe des Terminals von %d auf %d\n
 2 \nBitte "logout" zum Abmelden benutzen.\n
 3 \nBitte "exit" zum Verlassen der Tcsh benutzen.\n
 4 seek to eval %x %x\n
 5 seek to alias %x %x\n
 6 seek to file %x\n
-7 Falscher Typ f�r seek: %d\n
+7 Falscher Typ für seek: %d\n
 8 tell eval %x %x\n
 9 tell alias %x %x\n
 10 tell file %x\n
diff --git a/contrib/tcsh/nls/german/set17 b/contrib/tcsh/nls/german/set17
index e00de87..5c1c71e 100644
--- a/contrib/tcsh/nls/german/set17
+++ b/contrib/tcsh/nls/german/set17
@@ -1,10 +1,10 @@
-$ $tcsh: set17,v 1.5 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set17,v 1.6 2011/02/04 18:19:36 christos Exp $
 $ sh.proc.c
 $set 17
 1 FEHLER: Warte auf Hintergrund-Job!\n
 2 Exitcode %d\n
-3 FEHLER: Proze� "flushed" zum zweitenmal
-4 L�uft
+3 FEHLER: Prozeß "flushed" zum zweitenmal
+4 Läuft
 5 Signal 
 6 Exitcode %-25d
 7 Fertig
diff --git a/contrib/tcsh/nls/german/set18 b/contrib/tcsh/nls/german/set18
index 40e56d8..5bd6feb 100644
--- a/contrib/tcsh/nls/german/set18
+++ b/contrib/tcsh/nls/german/set18
@@ -1,4 +1,4 @@
-$ $tcsh: set18,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set18,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ sh.set.c
 $set 18
-1 Warnung: l�cherlich langer PATH abgeschnitten\n
+1 Warnung: lächerlich langer PATH abgeschnitten\n
diff --git a/contrib/tcsh/nls/german/set19 b/contrib/tcsh/nls/german/set19
index d852451..9b4004f 100644
--- a/contrib/tcsh/nls/german/set19
+++ b/contrib/tcsh/nls/german/set19
@@ -1,4 +1,4 @@
-$ $tcsh: set19,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set19,v 1.7 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19
 1 nbytes=%d: Out of memory\n
@@ -9,7 +9,15 @@ $set 19
 6 free(%lx) falscher Bereichs-Check.
 7 free(%lx) falscher Block-Index.
 8 Tcsh's augenblickliche Speicherbelegung:\nfrei:\t
-9 \nbenutzt:\t
+9 benutzt
 10 \n\tInsgesamt in Benutzung: %d, insgesamt frei: %d\n
 11 \tAllokierter Speicher von 0x%lx bis 0x%lx.  Wirklicher Anfang 0x%lx\n
 12 Allokierter Speicher von 0x%lx bis 0x%lx (%ld).\n
+13 Tcsh's augenblickliche Speicherbelegung:\n
+14 Gesamter vom System angeforderter Speicher: %d\n
+15 Anzahl nicht benutzter BlÃ¶cke:: %d\n
+16 Anzahl via mmap angeforderter Speicherbereiche: %d\n
+17 Via mmap angeforderter Speicher: %d\n
+18 Gesamter benutzer Speicher im Pool: %d\n
+19 Gesamter freier Speicher im Pool: %d\n
+20 Speicher der freigegeben werden kann: %d\n
diff --git a/contrib/tcsh/nls/german/set2 b/contrib/tcsh/nls/german/set2
index 6f36bc6..e7e4e47 100644
--- a/contrib/tcsh/nls/german/set2
+++ b/contrib/tcsh/nls/german/set2
@@ -1,4 +1,4 @@
-$ $tcsh: set2,v 1.5 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set2,v 1.6 2011/02/04 18:19:36 christos Exp $
 $ Signal names
 $set 2
 1 Null signal
@@ -12,7 +12,7 @@ $set 2
 9 Systemabsturz steht bevor
 10 Fehlerhaft beendet
 11 EMT trap
-12 Flie�kommafehler
+12 Fließkommafehler
 13 Abgebrochen
 14 Benutzersignal 1
 15 Benutzersignal 2
@@ -24,15 +24,15 @@ $set 2
 21 Ausgabeweitergabe abgebrochen
 22 Alarm clock
 23 Beendet
-24 Kindproze� hat Zustand ge�ndert
+24 Kindprozeß hat Zustand geändert
 25 Abbruch eines Kindprozesses
 26 Apollo-spezifischer Fehler
-27 Kindproze� angehalten oder beendet
-28 Kindproze� beendet
+27 Kindprozeß angehalten oder beendet
+28 Kindprozeß beendet
 29 Stromunterbrechung
 30 Ressource verloren
 31 Unterbrechung (Ctrl-Break)
-32 M�gliches Ein-/Ausgabesignal
+32 Mögliches Ein-/Ausgabesignal
 33 Asynchrone I/O (select)
 34 Dringende Anfrage von Ein-/Ausgabekanal
 35 Multitasking wake-up
@@ -40,7 +40,7 @@ $set 2
 37 Fortran asynchrones Ein-Ausgabeende
 38 Wiederaufsetzen
 39 Nicht korrigierbarer Speicherfehler
-40 CPU-Zeitbeschr�nkung �berschritten
+40 CPU-Zeitbeschränkung überschritten
 41 Systembeendigung absehbar
 42 micro-tasking group-no wakeup flag set
 43 Thread error - (use cord -T for detailed info)
@@ -55,11 +55,11 @@ $set 2
 52 Angehalten (Tty-Eingabe)
 53 Angehalten (Tty-Ausgabe)
 54 Angehalten (Tty-Ausgabe)
-55 Fensterzustand hat sich ge�ndert
-56 Fenstergr��e hat sich ge�ndert
+55 Fensterzustand hat sich geändert
+56 Fenstergröße hat sich geändert
 57 Phone status changed
-58 CPU-Zeitbeschr�nkung �berschritten
-59 Beschr�nkung der Dateigr��e �berschritten
+58 CPU-Zeitbeschränkung überschritten
+59 Beschränkung der Dateigröße überschritten
 60 Virtueller Zeitalarm
 61 Profiling time alarm
 62 DIL signal
diff --git a/contrib/tcsh/nls/german/set20 b/contrib/tcsh/nls/german/set20
index 638c00e..ff22d01 100644
--- a/contrib/tcsh/nls/german/set20
+++ b/contrib/tcsh/nls/german/set20
@@ -1,7 +1,7 @@
-$ $tcsh: set20,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set20,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ tc.bind.c
 $set 20
-1 Ung�ltiger Tastenname `%S'\n
+1 Ungültiger Tastenname `%S'\n
 2 Falsche Tastenname: %S\n
 3 Falsche Befehlsname: %S\n
 4 Falsche Tastenangabe %S\n
@@ -20,12 +20,12 @@ $set 20
 17     -v   initialisiere Belegungen mit Standard-Vi-Belegungen\n
 18     -e   initialisiere Belegungen mit Standard-Emacs-Belegungen\n
 19     -d   initialisiere Belegungen mit Standard-Belegungen\n
-20     -l   zeige verf�gbare Funktionen mit Beschreibungen an\n
+20     -l   zeige verfügbare Funktionen mit Beschreibungen an\n
 21     -r   entferne Belegung eines Tastes\n
 22     -k   belege Pfeiltaste mit Namen in In-String\n
 23     --   force a break from option processing\n
 24     -u   (or any invalid option) this message\n
-25 Wenn kein Out-String oder Befehl angegeben wurde, wir die Belegung f�r\n
+25 Wenn kein Out-String oder Befehl angegeben wurde, wir die Belegung für\n
 26 den In-String ausgegeben oder alle Belegungen, falls kein in-String gegeben.\n
 27 Falsche Tastenangabe -- nicht definierte Zeichenkette\n
 28 Falsche Tastenangabe -- leere Zeichenkette\n
@@ -37,5 +37,5 @@ $set 20
 34 Leere Taste nicht erlaubt\n
 35 Falsche Tastenangabe -- unbeannter Name "%S"\n
 36 Benutzung: bind [TASTE | BEFEHL TASTE | "emacs" | "vi" | "-a"]\n
-37 Ung�ltige Funktion
+37 Ungültige Funktion
 38  %s\t\tist undefiniert\n
diff --git a/contrib/tcsh/nls/german/set22 b/contrib/tcsh/nls/german/set22
index 0e93b38..13cf211 100644
--- a/contrib/tcsh/nls/german/set22
+++ b/contrib/tcsh/nls/german/set22
@@ -1,15 +1,15 @@
-$ $tcsh: set22,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set22,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ tc.func.c
 $set 22
-1 %S: \t ein Alias f�r 
-2 \nPasswort nicht korrekt f�r %s\n
+1 %S: \t ein Alias für 
+2 \nPasswort nicht korrekt für %s\n
 3 Fehlerhafter Alias 'precmd' entfernt.\n
 4 Fehlerhafter Alias 'cwdcmd' entfernt.\n
 5 Fehlerhafter Alias 'beepcmd' entfernt.\n
 6 Fehlerhafter Alias 'periodic' entfernt.\n
 7 zerteile Kommandozeile\n
-8 Wollen Sie wirklich alle Dateien l�schen? [n/j] 
-9 �bergehe das L�schen der Dateien!\n
+8 Wollen Sie wirklich alle Dateien löschen? [n/j] 
+9 Übergehe das Löschen der Dateien!\n
 10 Kommandozeile ist nun:\n
 11 zerteile Kommandozeile\n
 12 in einer der Listen\n
diff --git a/contrib/tcsh/nls/german/set23 b/contrib/tcsh/nls/german/set23
index 42a9cbd..bad50bd 100644
--- a/contrib/tcsh/nls/german/set23
+++ b/contrib/tcsh/nls/german/set23
@@ -1,4 +1,4 @@
-$ $tcsh: set23,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set23,v 1.5 2011/02/04 18:19:36 christos Exp $
 $ tc.os.c
 $set 23
 1 Falscher Cpu/Site-Name
@@ -8,27 +8,27 @@ $set 23
 5 %d: Site nicht gefunden\n
 6 setlocal: %s: %s\n
 7 Site nicht gefunden
-8 Sie sind in einem Universum gefangen, da� Sie nie gemacht haben
+8 Sie sind in einem Universum gefangen, daß Sie nie gemacht haben
 9 Getwarp fehlgeschlagen
-10 Ung�ltiger Warp
+10 Ungültiger Warp
 11 Setwarp fehlgeschlagen
-12 Ung�ltiges Universum
+12 Ungültiges Universum
 13 Unbekannter Fehler: %d
 14 sysname:  %s\n
 15 nodename: %s\n
 16 release:  %s\n
 17 version:  %s\n
 18 machine:  %s\n
-19 getwd: Kann ".." nicht �ffnen (%s)
+19 getwd: Kann ".." nicht öffnen (%s)
 20 getwd: Kann nicht in ".." wechseln (%s)
 21 getwd: Lesefehler in ".." (%s)
-22 getwd: Kann nicht zur�ck zu "." wechseln (%s)
+22 getwd: Kann nicht zurück zu "." wechseln (%s)
 23 getwd: Kann kein stat auf "/" machen (%s)
 24 getwd: Kann kein stat auf "." machen (%s)
 25 getwd: Kann kein stat auf Verzeichnis "%s" machen (%s)
-26 getwd: Kann Verzeichnis "%s" nicht �ffnen (%s)
+26 getwd: Kann Verzeichnis "%s" nicht öffnen (%s)
 27 getwd: Kann "." nicht in ".." finden (%s)
-28 Ung�ltiger Systemtyp
+28 Ungültiger Systemtyp
 29 Systemtyp ist nicht gesetzt
 30 Too many arguments
 31 Invalid argument
diff --git a/contrib/tcsh/nls/german/set25 b/contrib/tcsh/nls/german/set25
index a034603..f630825 100644
--- a/contrib/tcsh/nls/german/set25
+++ b/contrib/tcsh/nls/german/set25
@@ -1,6 +1,6 @@
-$ $tcsh: set25,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set25,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ tc.sig.c
 $set 25
 1 unser wait %d\n
-2 Fehler: bsd_signal(%d) Signal au�erhalb der Grenzen\n
+2 Fehler: bsd_signal(%d) Signal außerhalb der Grenzen\n
 3 Fehler: bsd_signal(%d) - sigaction fehlerhaft, errno %d\n
diff --git a/contrib/tcsh/nls/german/set26 b/contrib/tcsh/nls/german/set26
index c9d1270..849c3df 100644
--- a/contrib/tcsh/nls/german/set26
+++ b/contrib/tcsh/nls/german/set26
@@ -1,10 +1,10 @@
-$ $tcsh: set26,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set26,v 1.5 2011/02/04 18:19:36 christos Exp $
 $ tc.who.c
 $set 26
 1 Kein Zugriff auf %s.  Bitte "unset watch" eingeben.\n
-2 %s kann nicht ge�ffnet werden.  Bitte "unset watch" eingeben.\n
+2 %s kann nicht geöffnet werden.  Bitte "unset watch" eingeben.\n
 3 FEHLER! letztes Element ist nicht whotail!\n
-4 Zur�ck: 
+4 Zurück: 
 5 FEHLER! erstes Element ist nicht whohead!\n
 6 neu: %s/%s\n
 7 %n hat %a an %l von %m.
diff --git a/contrib/tcsh/nls/german/set27 b/contrib/tcsh/nls/german/set27
index 9ad802f..7ec2de2 100644
--- a/contrib/tcsh/nls/german/set27
+++ b/contrib/tcsh/nls/german/set27
@@ -1,8 +1,8 @@
-$ $tcsh: set27,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set27,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ tw.comp.c
 $set 27
 1 Befehl
 2 Trenner
 3 Muster
 4 Bereichs
-5 Vervollst�ndigung
+5 Vervollständigung
diff --git a/contrib/tcsh/nls/german/set29 b/contrib/tcsh/nls/german/set29
index 16ef38a..22f882c 100644
--- a/contrib/tcsh/nls/german/set29
+++ b/contrib/tcsh/nls/german/set29
@@ -1,4 +1,4 @@
-$ $tcsh: set29,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set29,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ tw.help.c
 $set 29
-1 Keine Hilfe-Datei f�r %S\n
+1 Keine Hilfe-Datei für %S\n
diff --git a/contrib/tcsh/nls/german/set3 b/contrib/tcsh/nls/german/set3
index f2b642c..a04a75f 100644
--- a/contrib/tcsh/nls/german/set3
+++ b/contrib/tcsh/nls/german/set3
@@ -1,31 +1,31 @@
-$ $tcsh: set3,v 1.6 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set3,v 1.7 2011/02/04 18:19:36 christos Exp $
 $ Editor function descriptions
 $set 3
-1 Ein Zeichen zur�ck
-2 L�sche Zeichen hinter Cursor
-3 L�sche vom Anfang des aktuellen Worts bis zum Cursor - in Cut-Puffer
-4 L�sche vom Anfang der Zeile bis zum Cursor - in Cut-Puffer
+1 Ein Zeichen zurück
+2 Lösche Zeichen hinter Cursor
+3 Lösche vom Anfang des aktuellen Worts bis zum Cursor - in Cut-Puffer
+4 Lösche vom Anfang der Zeile bis zum Cursor - in Cut-Puffer
 5 Gehe an den Anfang des aktuellen Worts
 6 Gehe zum Anfang der Zeile
-7 Wandele vom Cursor bis zum Ende des aktuellen Worts in Gro�buchstaben um
-8 Vi: �ndere Gro�/Kleinschreibung des Zeichen unter dem Cursor und bewege Cursor eins nach vorn
-9 Vi: �ndere bis zum Ende der Zeile
-10 L�sche Bildschirm (aktuelle Zeile oben)
-11 Vervollst�ndige aktuelles Wort
-12 Gehe mit Tab vorw�rts durch die Dateiliste
-13 Gehe mit Tab r�ckw�rts durch die Dateiliste
-14 Vervollst�ndige Wort (ignoriere programmierbare Vervollst�ndigungen)
+7 Wandele vom Cursor bis zum Ende des aktuellen Worts in Großbuchstaben um
+8 Vi: Ändere Groß/Kleinschreibung des Zeichen unter dem Cursor und bewege Cursor eins nach vorn
+9 Vi: Ändere bis zum Ende der Zeile
+10 Lösche Bildschirm (aktuelle Zeile oben)
+11 Vervollständige aktuelles Wort
+12 Gehe mit Tab vorwärts durch die Dateiliste
+13 Gehe mit Tab rückwärts durch die Dateiliste
+14 Vervollständige Wort (ignoriere programmierbare Vervollständigungen)
 15 Kopiere aktuelles Wort zum Cursor
 16 Kopiere Area zwischen Marke und Cursor in Cut-Puffer
-17 Erweitere zu fr�herem Wort f�r das dies ein Anfang ist
-18 L�sche Zeichen unter Cursor
-19 L�sche Zeichen unter Cursor oder gib EOF-Signal am Ende der Zeile
-20 L�sche Zeichen unter Cursor oder zeige Vervollst�ndigungen am Ende der Zeile an
-21 L�sche Zeichen unter Cursor oder zeige Vervollst�ndigungen oder gib EOF-Signal
-22 L�sche von Cursor bis zum Ende des aktuellen Worts - in Cut-Puffer
-23 F�ge Argument hinzu, wenn gestartet, oder gib zahl ein
+17 Erweitere zu früherem Wort für das dies ein Anfang ist
+18 Lösche Zeichen unter Cursor
+19 Lösche Zeichen unter Cursor oder gib EOF-Signal am Ende der Zeile
+20 Lösche Zeichen unter Cursor oder zeige Vervollständigungen am Ende der Zeile an
+21 Lösche Zeichen unter Cursor oder zeige Vervollständigungen oder gib EOF-Signal
+22 Lösche von Cursor bis zum Ende des aktuellen Worts - in Cut-Puffer
+23 Füge Argument hinzu, wenn gestartet, oder gib zahl ein
 24 Ziffer, die ein Argument beginnt
-25 Gehe zur n�chsten History-Zeile
+25 Gehe zur nächsten History-Zeile
 26 Wandele vom Cursor bis zum Ende des aktuellen Worts in Kleinbuchstaben um
 27 Melde Ende der Datei
 28 Gehe zum Ende der Zeile
@@ -37,31 +37,31 @@ $set 3
 34 Gehe ein Zeichen vor
 35 Gehe vor bis zum Ende des akutellen Worts
 36 Vertausche zwei Zeichen vor dem Cursor
-37 Suche r�ckw�rts in History nach Zeile mit gleichem Anfang
-38 Suche vorw�rts in History nach Zeile mit gleichem Anfang
+37 Suche rückwärts in History nach Zeile mit gleichem Anfang
+38 Suche vorwärts in History nach Zeile mit gleichem Anfang
 39 Setze letzten Teil des vorherigen Befehls ein
-40 Incrementelle Suche (vorw�rts)
-41 Incrementelle Suche (r�ckw�rts)
-42 L�sche Zeile
-43 L�sche bis zum Ende der Zeile - in Cut-Puffer
-44 L�sche Area zwischen Marke und Cursor - in Cut-Puffer
-45 L�sche gesamte Zeile - in Cut-Puffer
-46 Zeige M�glichkeiten der Vervollst�ndigung
-47 Zeige M�glichkeiten der Vervollst�ndigung (ignoriere programmierbare Vervollst�ndigungen)
+40 Incrementelle Suche (vorwärts)
+41 Incrementelle Suche (rückwärts)
+42 Lösche Zeile
+43 Lösche bis zum Ende der Zeile - in Cut-Puffer
+44 Lösche Area zwischen Marke und Cursor - in Cut-Puffer
+45 Lösche gesamte Zeile - in Cut-Puffer
+46 Zeige Möglichkeiten der Vervollständigung
+47 Zeige Möglichkeiten der Vervollständigung (ignoriere programmierbare Vervollständigungen)
 48 Zeige Treffer der Dateinamen-Wildcards
-49 Zeige M�glichkeiten der Vervollst�ndigung oder gib EOF, falls Zeile leer
-50 Zeige durchschnittliche Last und augenblickl. Proze�zustand
-51 Expandiere History-Escape und f�ge Leerzeichen ein
-52 F�hre Befehl aus
-53 Expandiere Pfadnamen, eliminiere f�hrende . und ..
+49 Zeige Möglichkeiten der Vervollständigung oder gib EOF, falls Zeile leer
+50 Zeige durchschnittliche Last und augenblickl. Prozeßzustand
+51 Expandiere History-Escape und füge Leerzeichen ein
+52 Führe Befehl aus
+53 Expandiere Pfadnamen, eliminiere führende . und ..
 54 Expandiere Befehle in den entsprechenden Pfadnamen oder Alias
-55 Schalte von Insert- auf Einf�gemodus oder umgekehrt
-56 F�ge das achte Bit zu dem n�chsten eingegebenen Zeichen hinzu
-57 F�ge das n�chste Eingabezeichen unver�ndert ein
+55 Schalte von Insert- auf Einfügemodus oder umgekehrt
+56 Füge das achte Bit zu dem nächsten eingegebenen Zeichen hinzu
+57 Füge das nächste Eingabezeichen unverändert ein
 58 Baue Anzeige neu auf
 59 Starte angehaltenen Editor wieder
-60 Suche nach Hilfe f�r den aktuellen Befehl
-61 Dieses Zeichen wird zur Zeile hinzugef�gt
+60 Suche nach Hilfe für den aktuellen Befehl
+61 Dieses Zeichen wird zur Zeile hinzugefügt
 62 Dieses Zeichen ist das erste einer Folge von Zeichen
 63 Setze die Marke an der Stelle des Cursors
 64 Korrigiere die Schreibweise des aktuellen Wortes
@@ -80,41 +80,41 @@ $set 3
 77 Indicates unbound Zeichen
 78 Emacs universelles Argument (Argument mal 4)
 79 Gehe zur vorhergehenden History-Zeile
-80 Wandele die Zeichen vom Cursor bis zum Ende des akt. Worts in Gro�buchst. um
-81 Vi gehe zum Anfang des n�chsten Wortes
-82 Vi gehe in Einf�gemodus hinter dem Cursor
-83 Vi gehe in Einf�gemodus am Ende der Zeile
-84 Vi �ndere Gro�/Kleinschreibung des Zeichens unter dem Cursor und gehe ien vor
-85 Vi �ndere Prefix-Befehl
-86 Vi �ndere bis zum Ende der Zeile
+80 Wandele die Zeichen vom Cursor bis zum Ende des akt. Worts in Großbuchst. um
+81 Vi gehe zum Anfang des nächsten Wortes
+82 Vi gehe in Einfügemodus hinter dem Cursor
+83 Vi gehe in Einfügemodus am Ende der Zeile
+84 Vi ändere Groß/Kleinschreibung des Zeichens unter dem Cursor und gehe ien vor
+85 Vi ändere Prefix-Befehl
+86 Vi ändere bis zum Ende der Zeile
 87 Vi gehe in Befehlsmodus (benutze alternative Tastenbelegung)
-88 Vi Befehlsmodus vervollst�ndige aktuelles Wort
+88 Vi Befehlsmodus vervollständige aktuelles Wort
 89 Vi gehe zum vorhergehenden Zeichen (Backspace)
-90 Vi l�sche Prefix-Befehl
+90 Vi lösche Prefix-Befehl
 91 Vi gehe zum Ende des aktuellen Worts (durch Leerzeichen begrenzt)
 92 Vi gehe zum Ende des aktuellen Worts
-93 Vi gehe zum angegebenen Zeichen r�ckw�rts
-94 Vi gehe zum angegebenen Zeichen vorw�rts
-95 Vi gehe hoch zum angegebenen Zeichen r�ckw�rts
-96 Vi gehe hoch zum angegebenen Zeichen vorw�rts
-97 Vi gehe in Einf�gemodus
-98 Vi gehe in Einf�gemodus am Anfang der Zeile
+93 Vi gehe zum angegebenen Zeichen rückwärts
+94 Vi gehe zum angegebenen Zeichen vorwärts
+95 Vi gehe hoch zum angegebenen Zeichen rückwärts
+96 Vi gehe hoch zum angegebenen Zeichen vorwärts
+97 Vi gehe in Einfügemodus
+98 Vi gehe in Einfügemodus am Anfang der Zeile
 99 Vi wiederhole aktuelle Suche in dieselbe Richtung
 100 Vi wiederhole aktuelle Suche in entgegengesetzte Richtung
 101 Vi wiederhole aktuelle Suche in dieselbe Richtung
 102 Vi wiederhole aktuelle Suche in entgegengesetzte Richtung
-103 Vi ersetze Zeichen unter dem Cursor mit dem n�chsten eingegebenen Zeichen
+103 Vi ersetze Zeichen unter dem Cursor mit dem nächsten eingegebenen Zeichen
 104 Vi Ersetzungsmodus
-105 Vi suche History vorw�rts
-106 Vi suche History r�ckw�rts
-107 Vi ersetze Zeichen unter dem Cursor und gehe in Einf�gemodus
+105 Vi suche History vorwärts
+106 Vi suche History rückwärts
+107 Vi ersetze Zeichen unter dem Cursor und gehe in Einfügemodus
 108 Vi ersetze gesamte Zeile
 109 Vi gehe zum verhergehenden Wort
-110 Vi gehe zum n�chsten Wort
-111 Vi mache letzte �nderung r�ckg�ngig
+110 Vi gehe zum nächsten Wort
+111 Vi mache letzte Änderung rückgängig
 112 Vi gehe zum Anfang der Zeile
 113 Mache ein 'which' von dem aktuellen Befehl
-114 F�ge den Cut-Puffer an der Cursor-Position ein
+114 Füge den Cut-Puffer an der Cursor-Position ein
 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
diff --git a/contrib/tcsh/nls/german/set30 b/contrib/tcsh/nls/german/set30
index 534886e..4312636 100644
--- a/contrib/tcsh/nls/german/set30
+++ b/contrib/tcsh/nls/german/set30
@@ -1,15 +1,15 @@
-$ $tcsh: set30,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set30,v 1.5 2011/02/04 18:19:37 christos Exp $
 $ tw.parse.c
 $set 30
 1 Anfangsbefehl %d\n
-2 vervollst�ndige %d 
-3 vervollst�ndige %d %S\n
+2 vervollständige %d 
+3 vervollständige %d %S\n
 4 %s: Interner Abgleichsfehler.\n
 5 Objekte
 6 Spalten
 7 Es gibt %d %s, trotzdem anzeigen? [n/j] 
 8 looking = %d\n
-9 \n%s interner Fehler: Ich wei� nicht, wonach ich suche!\n
+9 \n%s interner Fehler: Ich weiß nicht, wonach ich suche!\n
 10 kein Verzeichnis
 11 nicht gefunden
 12 nicht lesbar
diff --git a/contrib/tcsh/nls/german/set31 b/contrib/tcsh/nls/german/set31
index 9532256..beb4baa 100644
--- a/contrib/tcsh/nls/german/set31
+++ b/contrib/tcsh/nls/german/set31
@@ -1,7 +1,7 @@
-$ $tcsh: set31,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set31,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ vms.termcap.c
 $set 31
-1 Kann TERMCAP nicht �ffnen: [%s]\n
-2 Kann %s nicht �ffnen.\n
+1 Kann TERMCAP nicht öffnen: [%s]\n
+2 Kann %s nicht öffnen.\n
 3 Fand %s in %s.\n
-4 Kein Eintrag f�r %s in Datei %s gefunden\n
+4 Kein Eintrag für %s in Datei %s gefunden\n
diff --git a/contrib/tcsh/nls/german/set4 b/contrib/tcsh/nls/german/set4
index baee552..a8233e0 100644
--- a/contrib/tcsh/nls/german/set4
+++ b/contrib/tcsh/nls/german/set4
@@ -1,29 +1,29 @@
-$ $tcsh: set4,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set4,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ Termcap strings
 $set 4 
-1 f�ge neue, leere Zeile hinzu
-2 h�rbare Pieps
-3 l�sche bis zum Ende der Anzeige
-4 l�sche bis zum Ende der Zeile
+1 füge neue, leere Zeile hinzu
+2 hörbare Pieps
+3 lösche bis zum Ende der Anzeige
+4 lösche bis zum Ende der Zeile
 5 Cursor zu horizontaler Position
-6 l�sche Bildschirm
-7 l�sche ein Zeichen
-8 l�sche eine Zeile
-9 starte L�schemodus
-10 beende L�schmodus
-11 beende Einf�gemodus
+6 lösche Bildschirm
+7 lösche ein Zeichen
+8 lösche eine Zeile
+9 starte Löschemodus
+10 beende Löschmodus
+11 beende Einfügemodus
 12 Cursor aus Statuszeile
 13 Cursor in Ursprungsposition
-14 f�ge Zeichen ein
-15 starte Einf�gemodus
-16 setze F�llzeichen ein
+14 füge Zeichen ein
+15 starte Einfügemodus
+16 setze Füllzeichen ein
 17 Cursor nach unten
 18 Cursor nach links
 19 Cursor nach rechts
 20 Cursor nach oben
 21 starte Fettschrift
 22 beende Attribute
-23 nicht zerst�rendes Leerzeichen
+23 nicht zerstörendes Leerzeichen
 24 beende hervorgehobene Darstellung
 25 beginne hervorgehobene Darstellung
 26 Cursor in Statuszeile
@@ -31,13 +31,13 @@ $set 4
 28 beginne Unterstreichung
 29 beende Unterstreichung
 30 sichtbarer Pieps
-31 l�sche mehrere Zeichen
+31 lösche mehrere Zeichen
 32 Cursor mehrere Zeichen nach unten
-33 f�ge mehrere Zeichen ein
+33 füge mehrere Zeichen ein
 34 Cursor mehrere Zeichen nach links
 35 Cursor mehrere Zeichen nach rechts
 36 Cursor mehrere Zeichen nach oben
-37 hat automatische R�nder
+37 hat automatische Ränder
 38 kann physikalische Tabulatoren benutzen
 39 Anzahl Zeilen
 40 Anzahl Spalten
diff --git a/contrib/tcsh/nls/german/set5 b/contrib/tcsh/nls/german/set5
index 2161749..a2bd567 100644
--- a/contrib/tcsh/nls/german/set5
+++ b/contrib/tcsh/nls/german/set5
@@ -1,4 +1,4 @@
-$ $tcsh: set5,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set5,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ ed.chared.c
 $set 5
-1 Durchschnittliche Last nicht verf�gbar\n
+1 Durchschnittliche Last nicht verfügbar\n
diff --git a/contrib/tcsh/nls/german/set6 b/contrib/tcsh/nls/german/set6
index 350b1d0..8af387c 100644
--- a/contrib/tcsh/nls/german/set6
+++ b/contrib/tcsh/nls/german/set6
@@ -1,10 +1,10 @@
-$ $tcsh: set6,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set6,v 1.4 2011/02/10 00:13:36 christos Exp $
 $ ed.inputl.c
 $set 6
 1 FEHLER: Illegaler Befehl von Taste 0%o\r\n
 2 ja\n
-3 ediere\n
-4 brich ab\n
+3 editieren\n
+4 abbrechen\n
 5 nein\n
 6 Kein entsprechender Befehl\n
 7 Mehrdeutiger Befehl\n
diff --git a/contrib/tcsh/nls/german/set7 b/contrib/tcsh/nls/german/set7
index 8aee38d..23cc436 100644
--- a/contrib/tcsh/nls/german/set7
+++ b/contrib/tcsh/nls/german/set7
@@ -1,7 +1,7 @@
-$ $tcsh: set7,v 1.5 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set7,v 1.6 2011/02/04 18:19:37 christos Exp $
 $ ed.screen.c
 $set 7
-1 \n\tTcsh meint, Ihr Endger�t hat die\n
+1 \n\tTcsh meint, Ihr Endgerät hat die\n
 2 \tfolgenden Eigenschaften:\n\n
 3 \tEs hat %d Spalten und %d Zeilen\n
 4 \tEs hat %s Meta-Taste\n
@@ -9,22 +9,22 @@ $set 7
 6 keine
 7 \tEs kann%s Tabulatoren benutzen\n
 8 \040keine
-9 \tEs %s automatische R�nder\n
+9 \tEs %s automatische Ränder\n
 10 hat
 11 hat nicht
-12 \tEs %s magische R�nder\n
+12 \tEs %s magische Ränder\n
 13 (leer)
 14 ja
 15 nein
-16 FEHLER: kann nicht l�schen\r\n
-17 DeleteChars: num ist l�cherlich: %d\r\n
-18 FEHLER: kann nicht einf�gen\r\n
-19 StartInsert: num ist l�cherlich: %d\r\n
-20 %s: Kann /etc/termcap nicht �ffnen.\n
-21 %s: Kein Eintrag f�r Terminaltyp "%s"\n
+16 FEHLER: kann nicht löschen\r\n
+17 DeleteChars: num ist lächerlich: %d\r\n
+18 FEHLER: kann nicht einfügen\r\n
+19 StartInsert: num ist lächerlich: %d\r\n
+20 %s: Kann /etc/termcap nicht öffnen.\n
+21 %s: Kein Eintrag für Terminaltyp "%s"\n
 22 %s: benutze minimale Terminaleigenschaften.\n
-23 %s: WARNUNG: Ihr Terminal kann den Cursor nicht aufw�rts bewegen.\n
-24 Lange Zeilen k�nnten etwas komisch aussehen.\n
-25 keine F�higkeit, bis Zeilenende zu l�schen.\n
-26 keine F�higkeit, Zeichen zu l�schen.\n
-27 keine F�higkeit, Zeichen einzuf�gen.\n
+23 %s: WARNUNG: Ihr Terminal kann den Cursor nicht aufwärts bewegen.\n
+24 Lange Zeilen könnten etwas komisch aussehen.\n
+25 keine Fähigkeit, bis Zeilenende zu löschen.\n
+26 keine Fähigkeit, Zeichen zu löschen.\n
+27 keine Fähigkeit, Zeichen einzufügen.\n
diff --git a/contrib/tcsh/nls/german/set8 b/contrib/tcsh/nls/german/set8
index 4e09b22..858bcef 100644
--- a/contrib/tcsh/nls/german/set8
+++ b/contrib/tcsh/nls/german/set8
@@ -1,5 +1,5 @@
-$ $tcsh: set8,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set8,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ ed.term.c
 $set 8
 1 Unbekannter Schalter
-2 Ung�ltiges Argument
+2 Ungültiges Argument
diff --git a/contrib/tcsh/nls/german/set9 b/contrib/tcsh/nls/german/set9
index e8607a3..72fdfbb 100644
--- a/contrib/tcsh/nls/german/set9
+++ b/contrib/tcsh/nls/german/set9
@@ -1,4 +1,4 @@
-$ $tcsh: set9,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set9,v 1.5 2011/02/04 18:19:37 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null extended-key not allowed.\n
@@ -8,5 +8,5 @@ $set 9
 5 Some extended keys too long for internal print buffer
 6 Enumerate: BUG!! Null ptr passed\n!
 7 keine Eingabe
-8 Es mu� noch etwas folgen: %c\n
-9 Oktal-Konstante pa�t nicht in ein Zeichen.\n
+8 Es muß noch etwas folgen: %c\n
+9 Oktal-Konstante paßt nicht in ein Zeichen.\n
diff --git a/contrib/tcsh/nls/greek/charset b/contrib/tcsh/nls/greek/charset
index 6d1ef11..81f1b66 100644
--- a/contrib/tcsh/nls/greek/charset
+++ b/contrib/tcsh/nls/greek/charset
@@ -1,3 +1,3 @@
-$ codeset=ISO-8859-7
+$ codeset=UTF-8
 $set 255
-1 ISO-8859-7
+1 UTF-8
diff --git a/contrib/tcsh/nls/greek/set1 b/contrib/tcsh/nls/greek/set1
index 3599c34..d05c14d 100644
--- a/contrib/tcsh/nls/greek/set1
+++ b/contrib/tcsh/nls/greek/set1
@@ -1,140 +1,140 @@
-$ $tcsh: set1,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set1,v 1.5 2011/02/04 18:19:37 christos Exp $
 $ Error messages
 $set 1 
-1 ����� �������
-2 T� %s ��� �����������
-3 ���������� ������ ����
-4 $< ���������� ������ ������
-5 ��� ������� ������ ��� �� $0
-6 ������� ����������� []
-7 � �������� ��� $ ������ �� ��������� ���� �� ]
-8 ����� ����������� : ��� $ (%c)
-9 ����� ������
-10 ����������������� �������
-11 ��� �������� ����� ������
-12 ���� ����� �������
-13 ��������� ����� globbing
-14 � ������ �� �������
-15 ���������� ���� ��������
-16 ���������� ����� ��������
-17 ���������� ���������� ���������
-18 ����� if
-19 ���������� then
-20 �� ������ ��� ����� ����� �����������
-21 T� %s ��� �������
-22 ���������� �����
-23 ��� ������� ������ ����
-24 ���������� ������ ������
-25 ����������� � �������� ���������� ��������
-26 �� �������� ���������
-27 T� stack ��������� ��� ����� ���� ����
-28 ����� ������� signal
-29 ������� signal������ kill -l ��� ����� signals
-30 T� ������� ���������� ������ �� �������� �� ������
-31 ���������� ������ ����� ����������
-32 T� ������� ���������� ������ �� ��������� ��������������� ����������
-33 ��� ������� ������� �������� �� ���� �� shell
-34 ����� ������� ��������
-35 ��� ������� ���������� ��������� (home directory)
-36 ��� ����� �� ���������� ��� ��������� �������� (home directory)
-37 ����� ���� ������
-38 �������� ����� �������
-39 �������� ��������
-40 �����������
-41 %s: �� ������ �������
-42 T� ������ ��� -c ��������� �� backslash
-43 �������
-44 ������� ����� �����
-45 ����������� �������
-46 ��� ������� ������ �������
-47 ��� ������� ��� �� ���������
-48 ����� while/foreach
-49 ��� �������� ����� ����������
-50 ��� ������� ���������
-51 ���� %c
-52 �� ����������� %c
-53 ��� ������� ���� �����
-54 ��� ����� �� ����������� pipe
+1 Λάθος σύνταξη
+2 Tο %s δεν επιτρέπεται
+3 Υπερβολικά μεγάλη λέξη
+4 $< Υπερβολικά μεγάλη γραμμή
+5 Δεν υπάρχει αρχείο γιά το $0
+6 Ελλιπής μετατροπέας []
+7 Η ανάπτυξη του $ πρέπει να τελειώνει πριν το ]
+8 Λάθος μετατροπέας : στο $ (%c)
+9 Λάθος όρισμα
+10 Κακοσχηματισμένος αριθμός
+11 Δεν υπάρχουν άλλες λέξεις
+12 Απόν όνομα αρχείου
+13 Εσωτερικό λάθος globbing
+14 Η εντολή δε βρέθηκε
+15 Υπερβολικά λίγα ορίσματα
+16 Υπερβολικά πολλά ορίσματα
+17 Υπερβολικά επικίνδυνο ψευδώνυμο
+18 Αδειο if
+19 Ακατάλληλο then
+20 Οι λέξεις δεν είναι εντός παρενθέσεων
+21 Tο %s δεν βρέθηκε
+22 Ακατάλληλη μάσκα
+23 Δεν υπάρχει τέτοιο όριο
+24 Υπερβολικά μεγάλο όρισμα
+25 Ακατάλληλος ή άγνωστος παράγοντας μεγέθους
+26 Μη ορισμένη μεταβλητή
+27 Tο stack καταλόγων δεν είναι τόσο βαθύ
+28 Λάθος αριθμός signal
+29 Άγνωστο signal·δώστε kill -l γιά λίστα signals
+30 Tα ονόματα μεταβλητών πρέπει να αρχίζουν με γράμμα
+31 Υπερβολικά μεγάλο όνομα μεταβλητής
+32 Tα ονόματα μεταβλητών πρέπει να περιέχουν αλφαρηθμητικούς χαρακτήρες
+33 Δεν υπάρχει έλεγχος εργασιών σε αυτό το shell
+34 Λάθος σύνταξη έκφρασης
+35 Δεν υπάρχει προσωπικός κατάλογος (home directory)
+36 Δεν μπορώ να προσπελάσω τον προσωπικό κατάλογο (home directory)
+37 Ακυρη κενή εντολή
+38 Εκχώρηση χωρίς έκφραση
+39 Αγνωστος τελεστής
+40 Διφορούμενο
+41 %s: το αρχείο υπάρχει
+42 Tο όρισμα του -c τελειώνει σε backslash
+43 Διακοπή
+44 Δείκτης εκτός ορίων
+45 Υπερχείλιση γραμμής
+46 Δεν υπάρχει τέτοια εργασία
+47 Δεν γίνεται από το τερματικό
+48 Εκτός while/foreach
+49 Δεν υπάρχουν άλλες διεργασίες
+50 Δεν υπάρχει ταίριασμα
+51 Απόν %c
+52 Μη ταιριασμένο %c
+53 Δεν υπάρχει άλλη μνήμη
+54 Δεν μπορώ να δημιουργήσω pipe
 55 %s: %s
 56 %s
-57 �����: jobs [ -l ]
-58 T� �������� ������ �� ����� �������� � ���������� ����������
-59 ��� ������� �������� �������
-60 ��� ������� ����������� �������
-61 ������ ������� ��� ��������� �� �� pattern
-62 T� fork nesting ����� ���������� ��� %d; ������ `...` loop
-63 � ������� �������� ��� ����� ���������� ��� �������� shells
-64 ����� sunc: � ��������� %d �� �������
-65 %s�������� ������������ ��������
-66 %s�������� ������������ ��������
-67 ��� ������� ����� ���������
-68 T� stack ��������� ����� �����
-69 ����� ���������
-70 �����: %s [-%s]%s
-71 ��� ������� ������ ��� �� flag -h
-72 ��� ���� ����� login �� ���� �� shell
-73 �������� �� 0
-74 Modulo �� 0
-75 ����� ��������� ���������� "%s"?
-76 ��� ����� (�����) �� ������� �� login shell
-77 �������� �������: %s
-78 ��� ���� ����� ���� ��� ��������� $home
-79 �����: history [-%s] [# ������� �������]
-80 T� $, ! ��� < ��� ������������ �� �� $# ��� $?
-81 ������ ������� �� ����� ����������
-82 T� * ��� ����������� �� �� $# ��� $?
-83 T� $?<�����> ��� $#<�����> ��� ������������
-84 ����� ����� ����������
-85 ������ ������� �� ������ ����������
-86 ����������� buffer ���������
-87 ����� �������� ����������
-88 ����� ����� !
-89 ��� ������� ����������� �������������
-90 ����� �������������
-91 ��� ������� ����������� �������� �����
-92 T� ���� ����� ����� ���� ������
-93 ����� ����������� !: %c
-94 � ����������� �������
-95 ����������� ��� buffer ���������������
-96 ����� ��������� ��������� !
-97 ��� ������� ����������� ���������
-98 %s: � ������ �� �������
-99 ���������� ������ )
-100 ���������� ������ (
-101 ����� ������������ (
-102 ��������� �������� ��� �������������
-103 ����������� ������������� ������
-104 ��� ������� << ���� �� ()
-105 ����������� ������������� �������
-106 ����� ������������� ()
-107 ������ ����������
-108 ��� ���� ����� ���� ��� ��������� $watch
-109 ��� �������� �������������� �������
-110 �����: sched -<#������������>.\n�����: sched [+]��:�� <������>
-111 ��� �������� ����� �������������� �������
-112 ��� ������� ������ ��� ��������
-113 ������ ������ ��� ��� ������
-114 � �������� ������ ��� ����� ������� �� �� am/pm
-115 ��� ������� ����� ��� �� termcap string 
-116 �����: settc %s [yes|no]
-117 ������� ��������� `%s'
-118 ������� ���������� ��� termcap `%%%c'
-119 ���������� ����� �������� ��� �� `%s' (%d)
-120 T� `%s' ������� %d ��������
-121 �����: echotc [-v|-s] [<���������> [<��������>]]
-122 %s: %s. ����� �������������
-123 !# ������ �������� �������
-124 ���������������� ������� ��� ������
-125 ����������� ���������
-126 ������� �������: `-%s'\n�����: %s [ -bcdefilmnqstvVxX -Dname[=value] ] [ ������ ... ]
-127 ������� �������: `-%s'\nUsage: %s [ -bcdefFilmnqstvVxX ] [ ������ ... ]
-128 ������� �������: `-%s'\nUsage: %s [ -bcdefilmnqstvVxX ] [ ������ ... ]
-129 \n����� ����������: "%s"
-130 \n����� %s: '%c'
-131 \n�������� ���������� '%c' ���� �� %s "%s"
-132 \n�� ������ %s: "%s"
-133 ��� ������� ������ ��� �� flag -m
-134 �����: unlimit [-fh] [����]
-135 T� $%S ����� ���� ��� ��������
-136 ��� ������� ������ �������
+57 Χρήση: jobs [ -l ]
+58 Tα ορίσματα πρέπει να είναι εργασίες ή ταυτότητες διεργασιών
+59 Δεν υπάρχει τρέχουσα εργασία
+60 Δεν υπάρχει προηγούμενη εργασία
+61 Καμμιά εργασία δεν ταιριάζει με το pattern
+62 Tο fork nesting είναι μεγαλύτερο από %d; πιθανό `...` loop
+63 Ο έλεγχος εργασιών δεν είναι διαθέσιμος στα κατώτερα shells
+64 Λάθος sunc: η διεργασία %d δε βρέθηκε
+65 %sΥπάρχουν αναβληθείσες εργασίες
+66 %sΥπάρχουν σταματημένες εργασίες
+67 Δεν υπάρχει άλλος κατάλογος
+68 Tο stack καταλόγων είναι άδειο
+69 Λάθος κατάλογος
+70 Χρήση: %s [-%s]%s
+71 Δεν υπάρχει όρισμα γιά το flag -h
+72 Δεν έχει γίνει login με αυτό το shell
+73 Διαίρεση με 0
+74 Modulo με 0
+75 Λάθος μεγέθυνση· εννοούσατε "%s"?
+76 Δεν μπορώ (ακόμα) να αναβάλω το login shell
+77 Αγνωστος χρήστης: %s
+78 Δεν έχει δοθεί τιμή στη μεταβλητή $home
+79 Χρήση: history [-%s] [# αριθμός εντολών]
+80 Tα $, ! και < δεν επιτρέπονται με τα $# και $?
+81 Αλλαγή γραμμής σε όνομα μεταβλητής
+82 Tο * δεν επιτρέπεται με τα $# και $?
+83 Tα $?<ψηφίο> και $#<ψηφίο> δεν επιτρέπονται
+84 Ακυρο όνομα μεταβλητής
+85 Αλλαγή γραμμής σε δείκτη μεταβλητής
+86 Υπερχείλιση buffer επέκτασης
+87 Λάθος σύνταξης μεταβλητής
+88 Λάθος μορφή !
+89 Δεν υπάρχει προηγούμενη αντικατάσταση
+90 Λάθος αντικατάσταση
+91 Δεν υπάρχει προηγούμενο αριστερό μέρος
+92 Tο δεξί μέρος είναι πολύ μεγάλο
+93 Κακός μετατροπέας !: %c
+94 Ο μετατροπέας απέτυχε
+95 Υπερχείλιση του buffer αντικαταστάσεων
+96 Λάθος επιλογέας ορίσματος !
+97 Δεν υπάρχει προηγούμενη αναζήτηση
+98 %s: η εντολή δε βρέθηκε
+99 Υπερβολικά πολλές )
+100 Υπερβολικά πολλές (
+101 Λάθος τοποθετημένη (
+102 Παράλειψη ονόματος γιά ανακατεύθυνση
+103 Διφορούμενη ανακατεύθυνση εξόδου
+104 Δεν γίνεται << μέσα σε ()
+105 Διφορούμενη ανακατεύθυνση εισόδου
+106 Λάθος τοποθετημένες ()
+107 Βρόχος ψευδωνύμων
+108 Δεν έχει δοθεί τιμή στη μεταβλητή $watch
+109 Δεν υπάρχουν δρομολογημένες εντολές
+110 Χρήση: sched -<#αντικειμένου>.\nΧρήση: sched [+]ωω:λλ <εντολή>
+111 Δεν υπάρχουν τόσες δρομολογημένες εντολές
+112 Δεν υπάρχει εντολή γιά εκτέλεση
+113 Ακυρος χρόνος γιά την εντολή
+114 Ο σχετικός χρόνος δεν είναι συνεπής με το am/pm
+115 Δεν υπάρχει χώρος γιά το termcap string 
+116 Χρήση: settc %s [yes|no]
+117 Αγνωστη ικανότητα `%s'
+118 Αγνωστη παράμετρος του termcap `%%%c'
+119 Υπερβολικά πολλά ορίσματα γιά το `%s' (%d)
+120 Tο `%s' απαιτεί %d ορίσματα
+121 Χρήση: echotc [-v|-s] [<ικανότητα> [<ορίσματα>]]
+122 %s: %s. Λάθος Αρχιτεκτονική
+123 !# βρόχος Ιστορίας εντολών
+124 Κακοσχηματισμένη ερώτηση γιά αρχείο
+125 Υπερχείλιση επιλογέων
+126 Αγνωστη επιλογή: `-%s'\nΧρήση: %s [ -bcdefilmnqstvVxX -Dname[=value] ] [ όρισμα ... ]
+127 Αγνωστη επιλογή: `-%s'\nUsage: %s [ -bcdefFilmnqstvVxX ] [ όρισμα ... ]
+128 Αγνωστη επιλογή: `-%s'\nUsage: %s [ -bcdefilmnqstvVxX ] [ όρισμα ... ]
+129 \nΛάθος συμπλήρωση: "%s"
+130 \nΛάθος %s: '%c'
+131 \nΠαράληψη διαχωριστή '%c' μετά το %s "%s"
+132 \nΜη πλήρες %s: "%s"
+133 Δεν υπάρχει όρισμα γιά το flag -m
+134 Χρήση: unlimit [-fh] [όρια]
+135 Tο $%S είναι μόνο γιά διάβασμα
+136 Δεν υπάρχει τέτοια εργασία
 137 Unknown colorls variable `%c%c'
diff --git a/contrib/tcsh/nls/greek/set10 b/contrib/tcsh/nls/greek/set10
index a215d49..6cce0b4 100644
--- a/contrib/tcsh/nls/greek/set10
+++ b/contrib/tcsh/nls/greek/set10
@@ -1,8 +1,8 @@
-$ $tcsh: set10,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set10,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ ma.setp.c
 $set 10 
-1 setpath: ����� ������ '%s'.\n
-2 setpath: ��������� ������� ��������� ��� ��� ������ '%s'.\n
-3 setpath: ������ ���� ������ ��� path '%s'\n
-4 setpath: �� %s �� ������� ��� %s\n
-5 setpath: � ���� %d ��� ������ ��� %s\n
+1 setpath: άκυρη εντολή '%s'.\n
+2 setpath: ανεπαρκής αριθμός ορισμάτων γιά την εντολή '%s'.\n
+3 setpath: κάποια τιμή λείπει στο path '%s'\n
+4 setpath: το %s δε βρέθηκε στο %s\n
+5 setpath: η θέση %d δεν ισχύει στο %s\n
diff --git a/contrib/tcsh/nls/greek/set11 b/contrib/tcsh/nls/greek/set11
index 82c1888..940a390 100644
--- a/contrib/tcsh/nls/greek/set11
+++ b/contrib/tcsh/nls/greek/set11
@@ -1,10 +1,10 @@
-$ $tcsh: set11,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set11,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ sh.c
 $set 11 
-1 �������������: ��� ����� �� ���������� �� tty (%s).\n
-2 �������, ��� �� ������� ������� �������� �� ���� �� shell.\n
-3 ����� %d �������� mail.\n
-4 ����� %d �������� mail ��� %s.\n
-5 ����� %smail.\n
-6 ��� 
-7 ����� %smail ��� %s.\n
+1 Προειδοποίηση: δεν μπορώ να προσπελάσω το tty (%s).\n
+2 Συνεπώς, δεν θα υπάρχει έλεγχος εργασιών σε αυτό το shell.\n
+3 Έχετε %d μηνύματα mail.\n
+4 Εχετε %d μηνύματα mail στο %s.\n
+5 Εχετε %smail.\n
+6 νέο 
+7 Εχετε %smail στο %s.\n
diff --git a/contrib/tcsh/nls/greek/set12 b/contrib/tcsh/nls/greek/set12
index 379ae78..f8d9dfa 100644
--- a/contrib/tcsh/nls/greek/set12
+++ b/contrib/tcsh/nls/greek/set12
@@ -1,4 +1,4 @@
-$ $tcsh: set12,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set12,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ sh.dir.c
 $set 12 
-1 %s: �������� �� ������ ��� �� "%s"\n
+1 %s: προσπαθώ να αρχίσω από το "%s"\n
diff --git a/contrib/tcsh/nls/greek/set13 b/contrib/tcsh/nls/greek/set13
index 9ec55e1..5da2dbc 100644
--- a/contrib/tcsh/nls/greek/set13
+++ b/contrib/tcsh/nls/greek/set13
@@ -1,13 +1,13 @@
-$ $tcsh: set13,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set13,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
-2 %d hash buckets �� %d bits �� ������\n
-3 ����� debug = 0x%08x\n
-4 %d ���������, %d ���������, %d%%\n
-5 %S: ��������� ������ ��� shell.\n
-6 %S: � ������ �� �������.\n
-7 where: �� / ���� ������ ��� ���� �����\n
-8 T� %S ����� ��������� ��� ��� ������ 
-9 T� %S ����� ��������� ������ ��� shell\n
-10 �������� ��� hash: 
+2 %d hash buckets με %d bits το καθένα\n
+3 μάσκα debug = 0x%08x\n
+4 %d επιτυχίες, %d αποτυχίες, %d%%\n
+5 %S: εσωτερική εντολή του shell.\n
+6 %S: η εντολή δε βρέθηκε.\n
+7 where: το / στην εντολή δεν έχει νόημα\n
+8 Tο %S είναι ψευδώνυμο γιά την εντολή 
+9 Tο %S είναι εσωτερική εντολή του shell\n
+10 αποτυχία του hash: 
diff --git a/contrib/tcsh/nls/greek/set14 b/contrib/tcsh/nls/greek/set14
index 0547940..981c5dd 100644
--- a/contrib/tcsh/nls/greek/set14
+++ b/contrib/tcsh/nls/greek/set14
@@ -1,6 +1,6 @@
-$ $tcsh: set14,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set14,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ sh.file.c
 $set 14 
-1 \n����!! ���������� ����� %s!!\n
-2 ������� ��� password file
-3 ������
+1 \nΠφφφ!! Υπερβολικά πολλά %s!!\n
+2 ονόματα στο password file
+3 αρχεία
diff --git a/contrib/tcsh/nls/greek/set15 b/contrib/tcsh/nls/greek/set15
index ff17a6e..5e530b8 100644
--- a/contrib/tcsh/nls/greek/set15
+++ b/contrib/tcsh/nls/greek/set15
@@ -1,7 +1,7 @@
-$ $tcsh: set15,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set15,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ sh.func.c
 $set 15 
-1 %s: %s: �� ����� �� %s��%s ����\n
-2 ��������
-3 ����
-4 \040�������
+1 %s: %s: δε μπορώ να %sτο%s όριο\n
+2 μηδενίσω
+3 θέσω
+4 \040αυστηρό
diff --git a/contrib/tcsh/nls/greek/set16 b/contrib/tcsh/nls/greek/set16
index e4dcca8..df47f44 100644
--- a/contrib/tcsh/nls/greek/set16
+++ b/contrib/tcsh/nls/greek/set16
@@ -1,9 +1,9 @@
-$ $tcsh: set16,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set16,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ sh.lex.c
 $set 16 
-1 ���������� ��� ������ ���������� ��� tty ��� %d �� %d\n
-2 \n����� "logout" ��� �� ������.\n
-3 \n����� "exit" ��� �� ����������� �� %s.\n
+1 Μηδενισμός του γκρουπ διεργασιών του tty από %d σε %d\n
+2 \nΔώστε "logout" γιά να βγείτε.\n
+3 \nΔώστε "exit" γιά να τερματίσετε το %s.\n
 4 seek to eval %x %x\n
 5 seek to alias %x %x\n
 6 seek to file %x\n
diff --git a/contrib/tcsh/nls/greek/set17 b/contrib/tcsh/nls/greek/set17
index 4ac0106..71c9f68 100644
--- a/contrib/tcsh/nls/greek/set17
+++ b/contrib/tcsh/nls/greek/set17
@@ -1,17 +1,17 @@
-$ $tcsh: set17,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set17,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ sh.proc.c
 $set 17 
-1 BUG: wait ��� ������� ��� ������ ��� ����������!\n
-2 ������ �� status %d\n
-3 BUG: � ��������� ���������� ��� �����
-4 ������ 
-5 ���� 
-6 ������ �� status %-25d
-7 ������������
+1 BUG: wait γιά εργασία που τρέχει στο παρασκήνιο!\n
+2 Εξοδος με status %d\n
+3 BUG: η διεργασία εκκενώθηκε δυό φορές
+4 Τρέχει 
+5 Σήμα 
+6 Εξοδος με status %-25d
+7 Ολοκληρώθηκε
 8 BUG: status=%-9o
-9 \040(������� ������� core)
+9 \040(εγγραφή αρχείου core)
 10 \040(wd: 
-11 ������ wd: 
-12 %S: ���� ��� ���������\n
-13 %S: ���� ��� ����������\n
+11 τωρινο wd: 
+12 %S: έχει ήδη αναβληθεί\n
+13 %S: έχει ήδη σταματήσει\n
 14 %S: Badly formed number\n
diff --git a/contrib/tcsh/nls/greek/set18 b/contrib/tcsh/nls/greek/set18
index ffd82b6..093c405 100644
--- a/contrib/tcsh/nls/greek/set18
+++ b/contrib/tcsh/nls/greek/set18
@@ -1,4 +1,4 @@
-$ $tcsh: set18,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set18,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ sh.set.c
 $set 18 
-1 �������������: PATH �� �������� �������, ����������\n
+1 Προειδοποίηση: PATH με τεράστιο μέγεθος, περικόπηκε\n
diff --git a/contrib/tcsh/nls/greek/set19 b/contrib/tcsh/nls/greek/set19
index 718b43f..99c93a0 100644
--- a/contrib/tcsh/nls/greek/set19
+++ b/contrib/tcsh/nls/greek/set19
@@ -1,15 +1,23 @@
-$ $tcsh: set19,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set19,v 1.5 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
-1 nbytes=%d: � ����� ��������\n
-2 free(%lx) ������� ���� �� ��������� �����.
-3 free(%lx) ���� ��� ���� ��� ������.
-4 free(%lx) ���� �� ����� ��� ������.
-5 free(%lx) ��������� block.
-6 free(%lx) ��������� ������� check.
-7 free(%lx) ���������� ������� block.
-8 ������� �������� ������ ��� %s:\nfree:\t
-9 \n���������������:\t
-10 \n\t�������� ���������������: %d, �������� ��������: %d\n
-11 \t���� ��������� ����� ��� 0x%lx �� 0x%lx. ���������� ���� 0x%lx\n
-12 ���� ��������� ����� ��� 0x%lx �� 0x%lx (%ld).\n
+1 nbytes=%d: η μνήμη τελείωσε\n
+2 free(%lx) κλήθηκε πρίν να εκχωρηθεί μνήμη.
+3 free(%lx) πριν την αρχή της μνήμης.
+4 free(%lx) μετά το τέλος της μνήμης.
+5 free(%lx) εσφαλμένο block.
+6 free(%lx) εσφαλμένη κλίμακα check.
+7 free(%lx) εσφαλμένος δείκτης block.
+8 Παρούσα εκχώρηση μνήμης του %s:\nfree:\t
+9 χρησιμοποιείται
+10 \n\tΣυνολικά χρησιμοποιείται: %d, συνολική ελεύθερη: %d\n
+11 \tΕχει εκχωρηθεί μνήμη από 0x%lx ως 0x%lx. Πραγματική αρχή 0x%lx\n
+12 Εχει εκχωρηθεί μνήμη από 0x%lx ως 0x%lx (%ld).\n
+13 %s current memory allocation:\n
+14 Total space allocated from system: %d\n
+15 Number of non-inuse chunks: %d\n
+16 Number of mmapped regions: %d\n
+17 Total space in mmapped regions: %d\n
+18 Total allocated space: %d\n
+19 Total non-inuse space: %d\n
+20 Top-most, releasable space: %d\n
diff --git a/contrib/tcsh/nls/greek/set2 b/contrib/tcsh/nls/greek/set2
index d54db2f..7fb7985 100644
--- a/contrib/tcsh/nls/greek/set2
+++ b/contrib/tcsh/nls/greek/set2
@@ -1,94 +1,94 @@
-$ $tcsh: set2,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set2,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ Signal names
 $set 2 
-1 �������� signal
-2 ������� ������� (hangup)
-3 ������� (interrupt)
-4 ��������� (quit)
-5 �������� ������ (Illegal instruction)
+1 Μηδενικό signal
+2 Διακοπή γραμμής (hangup)
+3 Διακοπή (interrupt)
+4 Παραίτηση (quit)
+5 Παράνομη εντολή (Illegal instruction)
 6 Trace/BPT trap
 7 Abort
 8 IOT trap
-9 ���������� ���������� ����������
-10 T���������� �� �����
+9 Επικείμενη κατάρρευση συστήματος
+10 Tερματισμός με λάθος
 11 EMT trap
-12 �������� ����������� ������� ������������
-13 ���������
+12 Εξαίρεση αριθμητικής κινητής υποδιαστολής
+13 Σκοτώθηκε
 14 User signal 1
 15 User signal 2
-16 ����� Segmentation
-17 ����� Bus
-18 ����� ������ ����� ������������
-19 ����� ������ ����� ���������
-20 ��������� system call
-21 �������� pipe
-22 ���� alarm
-23  T�����������
-24 ������ ���������� ����������-�������
-25 ������� ����������-�������
-26 ������ Apollo
-27 � ���������-����� ��������� � ���������
-28 � ���������-����� ���������
-29 ������� �����
-30 ������� �����
+16 Λάθος Segmentation
+17 Λάθος Bus
+18 Λάθος πεδίου τιμών προγράμματος
+19 Λάθος πεδίου τιμών ορίσματος
+20 Ανύπαρκτο system call
+21 Σπασμένο pipe
+22 Σήμα alarm
+23  Tερματίστηκε
+24 Αλλαγή κατάστασης διεργασίας-παιδιού
+25 Θάνατος διεργασίας-παιδιού
+26 Σφάλμα Apollo
+27 Η διεργασία-παιδί σταμάτησε ή τερμάτισε
+28 Η διεργασία-παιδί τερμάτισε
+29 Διακοπή τάσης
+30 Απώλεια πόρου
 31 Break (Ctrl-Break)
-32 ���� ����������� input/output
-33 ��������� I/O (select)
-34 ��������� ��������� �� ������ I/O
+32 Σήμα δυνατότητας input/output
+33 Ασύγχρονο I/O (select)
+34 Επείγουσα κατάσταση σε δίαυλο I/O
 35 Multitasking wake-up
 36 Multitasking kill
-37 �������� ���������� I/O ��� fortran
-38 ��������
-39 �� ������������ ������ ������
-40 �������� ����� ������ CPU
-41 ���������� shutdown ����������
-42 T� wakeup flag ��� ����. ������ micro-tasking ����� set
-43 �������� thread - (�������������� cord -T ��� ����������� �����������)
-44 ������ ���������� ���������� CRAY Y-MP
-45 ������ �����������
-46 ������� (����l)
-47 ����� (����)
-48 �������
-49 �����
-50 ��������
-51 ������� (������� ��� ���������)
-52 ����� (������� ��� ���������)
-53 ������� (������ �� ���������)
-54 ����� (������ �� ���������)
-55 � ��������� ��� ��������� ������
-56 T� ������� ��� ��������� ������
-57 � ��������� ��� ����������� ������� ������
-58 �������� ����� ������ CPU
-59 �������� ����� �������� �������
-60 ���� alarm ��������� ������
-61 ���� alarm ������ Profiling
-62 ���� DIL
-63 �������� pollable event
-64 T� lwp's ��� ���������� ����� �������������
-65 ������ ���� LWP
-66 ������ ���� CPR
-67 ������ ���� CPR
-68 ����� ���� ����������� ������
-69 ������� ���� ����������� ������
-70 T���� ���� ����������� ������
-71 T������ ���� ����������� ������
-72 T������ ��� �� ����� ���� ����������� ������
-73 T���� ��� �� ����� ���� ����������� ������
-74 ������� ��� �� ����� ���� ����������� ������
-75 T�������� ���� ����������� ������
-76 ��������� I/O ������� �������
-77 ������������� PTY ��� ��������/�������
-78 ���������� ��������� ��� I/O
-79 � ���������� HFT monitor ������������
-80 � ���������� HFT monitor ������ �� �����������
-81 � ������� ���� HFT ���� ���������
-82 �������� ���� HFT ring buffer
-83 ������������� ����������
-84 ������� attention key
-85 ����������������
-86 ���� SS$_DEBUG
-87 ������ ��������������
-88 ����������� ���������� ��������
-89 ���� ���������� �������
+37 Περάτωση ασύγχρονου I/O της fortran
+38 Ανάκαμψη
+39 Μη επανορθώσιμο σφάλμα μνήμης
+40 Υπέρβαση ορίου χρόνου CPU
+41 Επικείμενο shutdown συστήματος
+42 Tο wakeup flag του αριθ. ομάδας micro-tasking έγινε set
+43 Πρόβλημα thread - (χρησιμοποιήστε cord -T γιά λεπτομερείς πληροφορίες)
+44 Σφάλμα αρτιότητας καταχωρητή CRAY Y-MP
+45 Αίτηση πληροφορίας
+46 Αναβολή (σήμαl)
+47 Παύση (σήμα)
+48 Αναβολή
+49 Παύση
+50 Συνέχιση
+51 Αναβολή (είσοδος από τερματικό)
+52 Παύση (είσοδος από τερματικό)
+53 Αναβολή (έξοδος σε τερματικό)
+54 Παύση (έξοδος σε τερματικό)
+55 Η κατάσταση του παραθύρου άλλαξε
+56 Tο μέγεθος του παραθύρου άλλαξε
+57 Η κατάσταση της τηλεφωνικής γραμμής άλλαξε
+58 Υπέρβαση ορίου χρόνου CPU
+59 Υπέρβαση ορίου μεγέθους αρχείου
+60 Σήμα alarm εικονικού χρόνου
+61 Σήμα alarm χρόνου Profiling
+62 Σήμα DIL
+63 Προέκυψε pollable event
+64 Tα lwp's της διεργασίας είναι μπλοκαρισμένα
+65 Ειδικό σήμα LWP
+66 Ειδικό σήμα CPR
+67 Ειδικό σήμα CPR
+68 Πρώτο σήμα Πραγματικού Χρόνου
+69 Δεύτερο σήμα Πραγματικού Χρόνου
+70 Tρίτο σήμα Πραγματικού Χρόνου
+71 Tέταρτο σήμα Πραγματικού Χρόνου
+72 Tέταρτο από το τέλος σήμα Πραγματικού Χρόνου
+73 Tρίτο από το τέλος σήμα Πραγματικού Χρόνου
+74 Δεύτερο από το τέλος σήμα Πραγματικού Χρόνου
+75 Tελευταίο σήμα Πραγματικού Χρόνου
+76 Ασύγχρονο I/O τοπικού δικτύου
+77 Διαθεσιμότητα PTY γιά ανάγνωση/γράψιμο
+78 Απαιτείται παρέμβαση στο I/O
+79 Η λειτουργία HFT monitor παραχωρήθηκε
+80 Η λειτουργία HFT monitor πρέπει να παραχωρηθεί
+81 Ο έλεγχος ήχου HFT έχει περατωθεί
+82 Δεδομένα στον HFT ring buffer
+83 Μετανάσστευση διεργασίας
+84 Ασφαλές attention key
+85 Επαναδρομολόγηση
+86 Σήμα SS$_DEBUG
+87 Αλλαγή προτεραιότητας
+88 Ανιχνεύθηκε πραγματικό αδιέξοδο
+89 Νέος χαρακτήρας εισόδου
 90 Stack limit exceeded
 91 Unused signal
diff --git a/contrib/tcsh/nls/greek/set20 b/contrib/tcsh/nls/greek/set20
index 077a3a0..18638df 100644
--- a/contrib/tcsh/nls/greek/set20
+++ b/contrib/tcsh/nls/greek/set20
@@ -1,41 +1,41 @@
-$ $tcsh: set20,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set20,v 1.5 2011/02/04 18:19:37 christos Exp $
 $ tc.bind.c
 $set 20 
-1 ����� ����� �������� `%S'\n
-2 ��������� ����� ��������: %S\n
-3 ��������� ����� �������: %S\n
-4 ��������� ��������� �������� %S\n
-5 �������� ��������� string\n
-6 Standard ����������� ��������\n
-7 ������������ ����������� ��������\n
-8 ����������� ��������� ����������\n
-9 ����������� �������� ������\n
-10 %-15s->  ��� ���� �������\n
-11 BUG!!! �� %s ��� ����� ������������ �� ������.\n
-12 �����: bindkey [��������] [--] [������� [������]]\n
-13     -a   �������� � ��������� �������� ���� ����������� ����� ��������\n
-14     -b   �������� �������� �� C-, M-, F- or X- ����� ��������\n
-15     -s   �������� ������� �� ������������� string ��� ��������\n
-16     -c   �������� ������� �� ���������� � ���������� �������\n
-17     -v   ��������� ���� ��� �������� �� ����������� vi\n
-18     -e   ��������� ���� ��� �������� �� ����������� emacs\n
-19     -d   ��������� ���� ��� �������� ���� default ��� editor\n
-20     -l   �������� ��� ������� ��� editor �� ����������\n
-21     -r   ��������� ���������� ��� ��������\n
-22     -k   �������� �������� �� ��������� ����� �������� ������\n
-23     --   ����� ������������ ��������\n
-24     -u   (� ����������� ����� �������) ���� �� ������\n
-25 ����� ������� � ������, ��������� ���� ��� �����������\n
-26 ����� ������, ��������� �� ��������� ��� �� �������.\n
-27 ��������� ��������� �������� -- �������� string\n
-28 ��������� ��������� �������� -- ����� string\n
-29 ��������� ��������� �������� function. �� �������� string ������������\n
-30 ��������� ��������� �������� -- ����������������� ������������ �������\n
-31 ��������� ��������� �������� -- ����������������� ��������� �������\n
-32 ��������� ��������� �������� -- ����������������� ��������� �������\n
-33 ��������� ��������� �������� function.\n
-34 �� �������� ������� ��� �����������\n
-35 ��������� ��������� �������� -- ������� ����� "%S"\n
-36 �����: bind [������� | ������� ������� | "emacs" | "vi" | "-a"]\n
-37 ����� ����������
-38 T� %s\t\t��� ����� ��������\n
+1 Ακυρο όνομα πλήκτρου `%S'\n
+2 Εσφαλμένο όνομα πλήκτρου: %S\n
+3 Εσφαλμένο όνομα εντολής: %S\n
+4 Εσφαλμένη περιγραφή πλήκτρου %S\n
+5 Μηδενική περιγραφή string\n
+6 Standard συσχετίσεις πλήκτρων\n
+7 Εναλλακτικές συσχετίσεις πλήκτρων\n
+8 Συσχετίσεις πολλαπλών χαρακτήρων\n
+9 Συσχετίσεις πλήκτρων βέλους\n
+10 %-15s->  δεν έχει οριστεί\n
+11 BUG!!! το %s δεν είναι συσχετισμένο με τίποτα.\n
+12 Χρήση: bindkey [επιλογές] [--] [ΠΛΗΚΤΡΟ [ΕΝΤΟΛΗ]]\n
+13     -a   εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\n
+14     -b   ερμηνεία ΠΛΗΚΤΡΟυ ως C-, M-, F- or X- όνομα πλήκτρου\n
+15     -s   ερμηνεία ΕΝΤΟΛΗς ως κυριολεκτικού string γιά εμφάνιση\n
+16     -c   ερμηνεία ΕΝΤΟΛΗς ως εσωτερικής ή εξωτερικής εντολής\n
+17     -v   συσχέτιση όλων των πλήκτρων σε αντιστοιχία vi\n
+18     -e   συσχέτιση όλων των πλήκτρων σε αντιστοιχία emacs\n
+19     -d   συσχέτιση όλων των πλήκτρων στην default του editor\n
+20     -l   εμφάνιση των εντολών του editor με περιγραφές\n
+21     -r   κατάργηση συσχέτισης του ΠΛΗΚΤΡΟυ\n
+22     -k   ερμηνεία ΠΛΗΚΤΡΟυ ως συμβολικό όνομα πλήκτρου βέλους\n
+23     --   τέλος επεξεργασίας επιλογών\n
+24     -u   (ή οποιαδήποτε άκυρη επιλογή) αυτό το μήνυμα\n
+25 Χωρίς ΠΛΗΚΤΡΟ ή ΕΝΤΟΛΗ, εμφανίζει όλες τις συσχετίσεις\n
+26 Χωρίς ΕΝΤΟΛΗ, εμφανίζει τη συσχέτιση γιά το ΠΛΗΚΤΡΟ.\n
+27 εσφαλμένη περιγραφή πλήκτρου -- μηδενικό string\n
+28 εσφαλμένη περιγραφή πλήκτρου -- άδειο string\n
+29 Εσφαλμένη περιγραφή πλήκτρου function. Το μηδενικό string απαγορεύεται\n
+30 εσφαλμένη περιγραφή πλήκτρου -- κακοσχηματισμένος δεκαεξαδικός αριθμός\n
+31 εσφαλμένη περιγραφή πλήκτρου -- κακοσχηματισμένος οκταδικός αριθμός\n
+32 εσφαλμένη περιγραφή πλήκτρου -- κακοσχηματισμένος δεκαδικός αριθμός\n
+33 Εσφαλμένη περιγραφή πλήκτρου function.\n
+34 Το μηδενικό πλήκτρο δεν επιτρέπεται\n
+35 εσφαλμένη περιγραφή πλήκτρου -- άγνωστο όνομα "%S"\n
+36 χρήση: bind [ΠΛΗΚΤΡΟ | ΠΛΗΚΤΡΟ ΕΝΤΟΛΗΣ | "emacs" | "vi" | "-a"]\n
+37 Ακυρη λειτουργία
+38 Tο %s\t\tδεν είναι ορισμένο\n
diff --git a/contrib/tcsh/nls/greek/set21 b/contrib/tcsh/nls/greek/set21
index 3ef206b..1a215dd 100644
--- a/contrib/tcsh/nls/greek/set21
+++ b/contrib/tcsh/nls/greek/set21
@@ -1,5 +1,5 @@
-$ $tcsh: set21,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set21,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ tc.disc.c
 $set 21 
-1 �� ����� �� ������� �� local chars.\n
-2 �� ����� �� ����� �� local chars.\n
+1 Δε μπορώ να διαβάσω τα local chars.\n
+2 Δε μπορώ να γράψω τα local chars.\n
diff --git a/contrib/tcsh/nls/greek/set22 b/contrib/tcsh/nls/greek/set22
index 2395031..4620121 100644
--- a/contrib/tcsh/nls/greek/set22
+++ b/contrib/tcsh/nls/greek/set22
@@ -1,18 +1,18 @@
-$ $tcsh: set22,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set22,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ tc.func.c
 $set 22
-1 %S: \t ��������� ��� ��
-2 \n����� password ��� �� %s\n
-3 T� ��������� ��������� 'precmd' ����������.\n
-4 �� ��������� ��������� 'cwdcmd' ����������.\n
-5 �� ��������� ��������� 'beepcmd' ����������.\n
-6 �� ��������� ��������� 'periodic' ����������.\n
-7 ������� �������� �������\n
-8 ������ ���������� �� ������� ��� �� ������? [n/y]
-9 ������� ���������� �������!\n
-10 � ������ ���� �����:\n
-11 ������� �������� �������\n
-12 �� ���� ��� ���� ����������\n
-13 � ������ ���� �����:\n
+1 %S: \t ψευδώνυμο γιά το
+2 \nΛάθος password γιά το %s\n
+3 Tο εσφαλμένο ψευδώνυμο 'precmd' αφαιρέθηκε.\n
+4 Το εσφαλμένο ψευδώνυμο 'cwdcmd' αφαιρέθηκε.\n
+5 Το εσφαλμένο ψευδώνυμο 'beepcmd' αφαιρέθηκε.\n
+6 Το εσφαλμένο ψευδώνυμο 'periodic' αφαιρέθηκε.\n
+7 έλεγχος σύνταξης γραμμής\n
+8 Θέλετε πραγματικά να σβήσετε όλα τα αρχεία? [n/y]
+9 ακύρωση σβησίματος αρχείων!\n
+10 η γραμμή τώρα έγινε:\n
+11 έλεγχος σύνταξης γραμμής\n
+12 σε έναν από τους καταλόγους\n
+13 η γραμμή τώρα έγινε:\n
 14 yY
 
diff --git a/contrib/tcsh/nls/greek/set23 b/contrib/tcsh/nls/greek/set23
index 813c2b1..610b65e 100644
--- a/contrib/tcsh/nls/greek/set23
+++ b/contrib/tcsh/nls/greek/set23
@@ -1,31 +1,31 @@
-$ $tcsh: set23,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set23,v 1.4 2011/02/04 18:19:38 christos Exp $
 $ tc.os.c
 $set 23 
-1 ����� ����� cpu/site
-2 �� site path ����� ���������� �����
-3 �������
+1 Ακυρο όνομα cpu/site
+2 Το site path είναι υπερβολικά μακρύ
+3 άγνωστο
 4 site: %s\n
-5 %d: �� site �� �������\n
+5 %d: το site δε βρέθηκε\n
 6 setlocal: %s: %s\n
-7 T� site �� �������
-8 ����� ������������ �� ��� ������ ��� ��� ����� ������������
-9 T� getwarp �������
-10 ����� warp
-11 T� setwarp �������
-12 ����� ������
-13 ������� �����: %d
-14 ����� ����������:  %s\n
-15 ����� ������: %s\n
+7 Tο site δε βρέθηκε
+8 Είστε παγιδευμένος σε ένα σύμπαν που δεν έχετε κατασκευάσει
+9 Tο getwarp απέτυχε
+10 Ακυρο warp
+11 Tο setwarp απέτυχε
+12 Ακυρο σύμπαν
+13 Αγνωστο λάθος: %d
+14 όνομα συστήματος:  %s\n
+15 όνομα κόμβου: %s\n
 16 release:  %s\n
 17 version:  %s\n
 18 machine:  %s\n
-19 getwd: �� ����� �� ������ �� ".." (%s)
-20 getwd: �� ����� �� ������ ��� �������� �� ".." (%s)
-21 getwd: ������ ���� �������� ��� ".." (%s)
-22 getwd: �� ����� �� ��������� ��� �������� �� "." (%s)
-23 getwd: �� ����� �� ���� stat �� "/" (%s)
-24 getwd: �� ����� �� ���� stat ��� �������� "%s" (%s)
-25 getwd: �� ����� �� ������ ��� �������� "%s" (%s)
-26 getwd: �� ����� �� ��� �� "." ��� ".." (%s)
-27 ������ ����� ����������
-28 ��� ���� ����� ���� ���� ���� ����������
+19 getwd: δε μπορώ να ανοίξω το ".." (%s)
+20 getwd: δε μπορώ να αλλάξω τον κατάλογο σε ".." (%s)
+21 getwd: σφάλμα στην ανάγνωση του ".." (%s)
+22 getwd: δε μπορώ να ξαναλλάξω τον κατάλογο σε "." (%s)
+23 getwd: δε μπορώ να κάνω stat το "/" (%s)
+24 getwd: δε μπορώ να κάνω stat τον κατάλογο "%s" (%s)
+25 getwd: δε μπορώ να ανοίξω τον κατάλογο "%s" (%s)
+26 getwd: δε μπορώ να βρώ το "." στο ".." (%s)
+27 Ακυρος τύπος συστήματος
+28 Δεν έχει δοθεί τιμή στον τύπο συστήματος
diff --git a/contrib/tcsh/nls/greek/set25 b/contrib/tcsh/nls/greek/set25
index 406d710..ba7891f 100644
--- a/contrib/tcsh/nls/greek/set25
+++ b/contrib/tcsh/nls/greek/set25
@@ -1,6 +1,6 @@
-$ $tcsh: set25,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set25,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
-2 ������: �� bsd_signal(%d) ����� �����\n
-3 ������: � sigaction ������� ��� �� bsd_signal(%d), errno %d\n
+2 σφάλμα: το bsd_signal(%d) εκτός ορίων\n
+3 σφάλμα: η sigaction απέτυχε γιά το bsd_signal(%d), errno %d\n
diff --git a/contrib/tcsh/nls/greek/set26 b/contrib/tcsh/nls/greek/set26
index d081bbc..2564ecb 100644
--- a/contrib/tcsh/nls/greek/set26
+++ b/contrib/tcsh/nls/greek/set26
@@ -1,15 +1,15 @@
-$ $tcsh: set26,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set26,v 1.4 2011/02/04 18:19:38 christos Exp $
 $ tc.who.c
 $set 26 
-1 �� ����� �� ���� stat �� %s. �������� ����� "unset watch".\n
-2 T� %s �� ������ �� ��������.  �������� ����� "unset watch".\n
-3 BUG! �� ��������� �������� ��� ����� whotail!\n
-4 ���� �� ����: 
-5 BUG! �� ��������� �������� ��� ����� whohead!\n
-6 ���: %s/%s\n
-7 � ������� %n ����� %a ��� ��������� %l ��� %m.
-8 � ������� %n ����� %a ��� ��������� %l.
+1 δε μπορώ να κάνω stat το %s. Παρακαλώ δώστε "unset watch".\n
+2 Tο %s δε μπορεί να ανοιχτεί.  Παρακαλώ δώστε "unset watch".\n
+3 BUG! το τελευταίο στοιχείο δεν είναι whotail!\n
+4 προς τα πίσω: 
+5 BUG! το τελευταίο στοιχείο δεν είναι whohead!\n
+6 νέο: %s/%s\n
+7 Ο χρήστης %n έκανε %a στο τερματικό %l από %m.
+8 Ο χρήστης %n έκανε %a στο τερματικό %l.
 9 login
 10 logout
-11 ������������� ��� %s ��� ���������
-12 ������
+11 αντικατέστησε τον %s στο τερματικό
+12 τοπικό
diff --git a/contrib/tcsh/nls/greek/set27 b/contrib/tcsh/nls/greek/set27
index 4e91416..6854e6f 100644
--- a/contrib/tcsh/nls/greek/set27
+++ b/contrib/tcsh/nls/greek/set27
@@ -1,8 +1,8 @@
-$ $tcsh: set27,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set27,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ tw.comp.c
 $set 27 
-1 ������
+1 εντολή
 2 separator
 3 pattern
-4 ������� �����
-5 ����������
+4 κλίμακα τιμών
+5 συμπλήρωση
diff --git a/contrib/tcsh/nls/greek/set29 b/contrib/tcsh/nls/greek/set29
index cf0b9eb..d749230 100644
--- a/contrib/tcsh/nls/greek/set29
+++ b/contrib/tcsh/nls/greek/set29
@@ -1,4 +1,4 @@
-$ $tcsh: set29,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set29,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ tw.help.c
 $set 29 
-1 ��� ������� ������ �� ������� ��� �� %S\n
+1 Δεν υπάρχει αρχείο με βοήθεια γιά το %S\n
diff --git a/contrib/tcsh/nls/greek/set3 b/contrib/tcsh/nls/greek/set3
index b66cc1a..9e2ad8d 100644
--- a/contrib/tcsh/nls/greek/set3
+++ b/contrib/tcsh/nls/greek/set3
@@ -1,120 +1,120 @@
-$ $tcsh: set3,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set3,v 1.5 2011/02/04 18:19:38 christos Exp $
 $ Editor function descriptions
 $set 3 
-1 ���������� ��� ��������� �������
-2 �������� ��������� �������� ��� ������
-3 ������� ��� ��� ���� ��� ��������� ����� �� �� ������ - ������ ��� cut buffer
-4 ������� ��� ��� ���� ��� ������� - ������ ��� cut buffer
-5 ���������� ���� ���� ��� ��������� �����
-6 ���������� ���� ���� �������
-7 ��������� �� �������� ��� �� ������ �� �� ����� ��� ��������� �����
-8 (Vi) ������ ���������/������ ��� ���� ��� ������ ��� ���������� ��� ����
-9 (Vi) ������ ���������/������ �� �� ����� ��� �������
-10 ��������� ������ �� �������� ��� ��������� ������ ��� ���� �����
-11 ���������� ��������� �����
-12 Tab forward ������ �������
-13 Tab backward ������ �������
-14 ���������� ��������� ����� ��������� ��� ������������������ ������������
-15 ��������� ��������� ����� ���� ���� ��� ������
-16 ��������� �������� ������ �������� ��� ������ ��� cut buffer
-17 �������� �� ����������� ���� �� ���� �������
-18 �������� ��������� ��� ���� ��� ������
-19 �������� ��������� ��� ���� ��� ������ � end of file (��� ����� ������)
-20 �������� ��������� ��� ���� ��� ������ � ������������ (��� ����� �������)
-21 �������� ��������� ��� ���� ��� ������, ������������ � end of file
-22 ������� ��� �� ������ �� �� ����� ��� ����� - ������ ��� cut buffer
-23 �������� �� ������ ���� ���� � ������� ������
-24 ����� ��� ������� ������
-25 ���������� ���� ������� ������ ��������
-26 ��������� �� ����� ��� �� ������ �� �� ����� ��� �����
-27 ������� end of file
-28 ���������� ������ ��� ����� ��� �������
-29 ������������ ������ - ��������
-30 �������� wildcards ��� ����� �������
-31 �������� escapes ��������
-32 �������� escapes �������� �� ��� ������
-33 �������� ����������
-34 ���������� ������ ��� ���� ������
-35 ���������� �� �� ����� ��� �����
-36 ������������ ��� ��� ���������� ���� �� ������
-37 ��������� ������������ ������� ��� �������� ��� �� ������� ���� � ������
-38 ��������� �������� ������� ��� �������� ��� �� ������� ���� � ������
-39 �������� ���������� �������� ������������ �������
-40 �������� ��������� ��� �������
-41 �������� ��������� ��� �����������
-42 ������� �������
-43 ������� �� �� ����� ��� ������� ��� ������ ��� cut buffer
-44 ������� ��� �� ������ �� �� ������ ��� ������ ��� cut buffer
-45 ������� ��������� ��� ������� ��� ������ ��� cut buffer
-46 �������� �������� �����������
-47 �������� �������� ����������� ��������� ��� ����������������� ����������
-48 �������� �������� ������� ��� ���������� �� �� wildcard
-49 �������� �������� ����������� � end of file (�� ����� ������)
-50 �������� ����� ���� ������� ��� ���������� ����������
-51 �������� escapes �������� ��� ��������� ���� space
-52 �������� �������
-53 �������� pathnames, �� �������� ��� ������� . ��� ..
-54 �������� ������� ��� ������� pathname � ���������
-55 �������� ��� ��������� ���������� �� ������������� ��� ����������
-56 �������� 8�� bit ���� ������� ��������� ��� ���������������
-57 �������� ��� ������ ��� �������� ��������� ����� �������� (���. �������)
-58 ������������
-59 ������������ ������������ editor
-60 ��������� �������� ��� ��� �������� ������
-61 � ���������� ����� ����������� ��� ������
-62 � ���������� ����� ����� � ������ ���� ���������� ����������
-63 T��������� �������� ��� ���� ��� ������
-64 �������� ����������� ��� ��������� �����
-65 �������� ����������� ���� ��� �������
-66 �������� ��������� ��� ��������� �� cooked mode
-67 �������� ������ ����������� ��� �������� ������ ������� ��������
-68 �������� ��� ��������� ��� ���� ��� ������ �� ��� �������
-69 �������� ��� ��� ���������� �������� ��� ������
-70 ���������� ���������� ��� ������������� ������� ����������
-71 ���������� ���������� ��� �������� output
-72 ���������� ���������� ��� �������� input
-73 ���������� ���������� ��� ��������� (quit)
-74 ���������� ���������� ��� �������
-75 ���������� ���������� ��� ������������ output
-76 ���������� ���������� ��� �������������� output
-77 ������� ��������� ����� ������������
-78 Universal ������ ��� emcas (������ ��� 4)
-79 ���������� ���� ����������� ������ ��������
-80 ��������� �� �������� ��� �� ���� ��� ������ �� �� ����� ��� �����
-81 (Vi) ���������� ���� ���� ��� �������� �����
-82 (Vi) �������� �� ����� ���������� ���������� ���� �� ������
-83 (Vi) �������� �� ����� ���������� ���������� ��� ����� ��� �������
-84 (Vi) ��������� ���������/������ ��� ���� ������ ��� ���������� �����
-85 (Vi) ������ ������� ����������
-86 (Vi) ������ �� �� ����� ��� �������
-87 �������� ���� ����� ������� vi
-88 (Vi) �� ����� �������, ���������� �����
-89 (Vi) ���������� ���� ����������� ��������� (backspace)
-90 (Vi) ������ ��������� ����������
-91 (Vi) ���������� ��� ����� ��� ��������� ����� (���������� ��� space)
-92 (Vi) ���������� ��� ����� ��� ��������� �����
-93 (Vi) ���������� ���� �� ���� �� ��� ����������� ���������
-94 (Vi) ���������� ���� �� ������ �� ��� ����������� ���������
-95 (Vi) ���������� ���� �� ���� �� ��� ��� ����������� ���������
-96 (Vi) ���������� ���� �� ������ �� ��� ��� ����������� ���������
-97 �������� ���� ����� ���������� ��� vi
-98 �������� ���� ����� ���������� ��� vi ���� ���� ��� �������
-99 (Vi) ��������� ������������ ���������� ��������� ���� ���� ����������
-100 (Vi) ��������� ������������ ���������� ��������� ���� �������� ����������
-101 (Vi) ��������� ������������ ���������� ���� ���� ����������
-102 (Vi) ��������� ������������ ���������� ���� �������� ����������
-103 (Vi) ������������� �������� ��������� �� ��� ������� ����������������
-104 (Vi) ������ ��������������
-105 (Vi) ��������� �������� ���� �� ����
-106 (Vi) ��������� �������� ���� �� �������
-107 (Vi) ������������� �������� ��������� ��� �������� �� ����� ����������
-108 (Vi) ������������� ��������� ��� �������
-109 (Vi) ���������� ���� ����������� ����
-110 (Vi) ���������� ���� ������� ����
-111 (Vi) �������� ������������ �������
-112 (Vi) ���������� ���� ���� ��� �������
-113 �������� "which" ��� ��������� �������
-114 ���������� ��� cut buffer ���� �������� ����
+1 Μετακίνηση ένα χαρακτήρα όπισθεν
+2 Διαγραφή χαρακτήρα αριστερά του δρομέα
+3 Αποκοπή από την αρχή της τρέχουσας λέξης ως το δρομέα - φύλαξη στο cut buffer
+4 Αποκοπή από την αρχή της γραμμής - φύλαξη στο cut buffer
+5 Μετακίνηση στην αρχή της τρέχουσας λέξης
+6 Μετακίνηση στην αρχή γραμμής
+7 Μετατροπή σε κεφαλαία από το δρομέα ως το τέλος της τρέχουσας λέξης
+8 (Vi) αλλαγή κεφαλαίων/μικρών στη θέση του δρομέα και μετακίνηση μιά θέση
+9 (Vi) αλλαγή κεφαλαίων/μικρών ως το τέλος της γραμμής
+10 Καθάρισμα οθόνης με παραμονή της τρέχουσας γραμής στο πάνω μέρος
+11 Συμπλήρωση τρέχουσας λέξης
+12 Tab forward μεταξύ αρχείων
+13 Tab backward μεταξύ αρχείων
+14 Συμπλήρωση τρέχουσας λέξης αγνοώντας τις προγραμματιζόμενες συμπληρώσεις
+15 Αντιγραφή τρέχουσας λέξης στην θέση του δρομέα
+16 Αντιγραφή περιοχής μεταξύ σημαδιού και δρομέα στο cut buffer
+17 Ανάπτυξη σε προηγούμενη λέξη με ίδιο πρόθεμα
+18 Διαγραφή χαρακτήρα στη θέση του δρομέα
+19 Διαγραφή χαρακτήρα στη θέση του δρομέα ή end of file (γιά άδεια γραμμή)
+20 Διαγραφή χαρακτήρα στη θέση του δρομέα ή συμπληρώσεις (στο τέλος γραμμής)
+21 Διαγραφή χαρακτήρα στη θέση του δρομέα, συμπληρώσεις ή end of file
+22 Αποκοπή από το δρομέα ως το τέλος της λέξης - φύλαξη στο cut buffer
+23 Πρόσθεση σε όρισμα στην αρχή ή είσοδος ψηφίου
+24 Ψηφίο που αρχίζει όρισμα
+25 Μετακίνηση στην επόμενη γραμμή Ιστορίας
+26 Μετατροπή σε μικρά από το δρομέα ως το τέλος της λέξης
+27 Ενδειξη end of file
+28 Μετακίνηση δρομέα στο τέλος της γραμμής
+29 Αντιμετάθεση δρομέα - σημαδιού
+30 Ανάπτυξη wildcards στο όνομα αρχείου
+31 Ανάπτυξη escapes Ιστορίας
+32 Ανάπτυξη escapes Ιστορίας σε μιά γραμμή
+33 Ανάπτυξη μεταβλητών
+34 Μετακίνηση δρομέα μιά θέση εμπρός
+35 Μετακίνηση ως το τέλος της λέξης
+36 Αντιμετάθεση των δύο χαρακτήρων πριν το δρομέα
+37 Αναζήτηση προηγούμενης γραμμής της Ιστορίας που να αρχίζει όπως η τωρινή
+38 Αναζήτηση επόμενης γραμμής της Ιστορίας που να αρχίζει όπως η τωρινή
+39 Εισαγωγή τελευταίου τμήματος προηγούμενης εντολής
+40 Σταδιακή αναζήτηση στα επόμενα
+41 Σταδιακή αναζήτηση στα προηγούμενα
+42 Σβήσιμο γραμμής
+43 Αποκοπή ως το τέλος της γραμμής και φύλαξη στο cut buffer
+44 Αποκοπή από το σημάδι ως το δρομέα και φύλαξη στο cut buffer
+45 Αποκοπή ολόκληρης της γραμμής και φύλαξη στο cut buffer
+46 Εμφάνιση επιλογών συμπλήρωσης
+47 Εμφάνιση επιλογών συμπλήρωσης αγνοώντας την προγραμματιζόμενη συμπλήρωση
+48 Εμφάνιση ονομάτων αρχείων που ταιριάζουν με το wildcard
+49 Εμφάνιση επιλογών συμπλήρωσης ή end of file (σε άδεια γραμμή)
+50 Εμφάνιση μέσου όρου φορτίου και κατάστασης διεργασιών
+51 Ανάπτυξη escapes Ιστορίας και παρεμβολή ενός space
+52 Εκτέλεση εντολής
+53 Ανάπτυξη pathnames, με αφαίρεση των αρχικών . και ..
+54 Ανάπτυξη εντολών στο σχετικό pathname ή ψευδώνυμο
+55 Εναλλαγή από παρεμβολή χαρακτήρων σε αντικατάσταση και αντίστροφα
+56 Πρόσθεση 8ου bit στον επόμενο χαρακτήρα που πληκτρολογείται
+57 Πρόσθεση στη γραμμή του επόμενου χαρακτήρα χωρίς ερμηνεία (χαρ. ελέγχου)
+58 Επανεμφάνιση
+59 Επανεκκίνηση σταματημένου editor
+60 Αναζήτηση βοήθειας γιά την τρέχουσα γραμμή
+61 Ο χαρακτήρας αυτός προστίθεται στη γραμμή
+62 Ο χαρακτήρας αυτός είναι ο πρώτος μιάς ακολουθίας χαρακτήρων
+63 Tοποθέτηση σημαδιού στη θέση του δρομέα
+64 Διόρθωση ορθογραφίας της τρέχουσας λέξης
+65 Διόρθωση ορθογραφίας όλης της γραμμής
+66 Αποστολή χαρακτήρα στο τερματικό σε cooked mode
+67 Εναλλαγή μεταξύ κυριολεξίας και λεκτικής μορφής γραμμής Ιστορίας
+68 Εναλλαγή του χαρακτήρα στη θέση του δρομέα με τον επόμενο
+69 Εναλλαγή των δύο χαρακτήρων αριστερά του δρομέα
+70 Χαρακτήρας τερματικού για καθυστερημένη αναβολή διεργασίας
+71 Χαρακτήρας τερματικού γιά εκκένωση output
+72 Χαρακτήρας τερματικού γιά εκκένωση input
+73 Χαρακτήρας τερματικού γιά παραίτηση (quit)
+74 Χαρακτήρας τερματικού γιά αναβολή
+75 Χαρακτήρας τερματικού γιά ενεργοποίηση output
+76 Χαρακτήρας τερματικού γιά απενεργοποίηση output
+77 Ενδειξη χαρακτήρα χωρίς αντιστοίχιση
+78 Universal όρισμα του emcas (όρισμα επί 4)
+79 Μετακίνηση στην προηγούμενη γραμμή Ιστορίας
+80 Μετατροπή σε κεφαλαία από τη θέση του δρομέα ως το τέλος της λέξης
+81 (Vi) μετακίνηση στην αρχή της επόμενης λέξης
+82 (Vi) μετάβαση σε τρόπο παρεμβολής χαρακτήρων μετά το δρομέα
+83 (Vi) μετάβαση σε τρόπο παρεμβολής χαρακτήρων στο τέλος της γραμμής
+84 (Vi) μετατροπή κεφαλαίων/μικρών στη θέση δρομέα και μετακίνηση δεξιά
+85 (Vi) εντολή αλλαγής προθέματος
+86 (Vi) αλλαγή ως το τέλος της γραμμής
+87 Μετάβαση στον τρόπο εντολών vi
+88 (Vi) σε τρόπο εντολών, συμπλήρωση λέξης
+89 (Vi) μετακίνηση στον προηγούμενο χαρακτήρα (backspace)
+90 (Vi) εντολή διαγραφής προθέματος
+91 (Vi) μετακίνηση στο τέλος της τρέχουσας λέξης (χωρισμένης απο space)
+92 (Vi) μετακίνηση στο τέλος της τρέχουσας λέξης
+93 (Vi) μετακίνηση προς τα πίσω ως τον καθορισμένο χαρακτήρα
+94 (Vi) μετακίνηση προς τα εμπρός ως τον καθορισμένο χαρακτήρα
+95 (Vi) μετακίνηση προς τα πίσω ως και τον καθορισμένο χαρακτήρα
+96 (Vi) μετακίνηση προς τα εμπρός ως και τον καθορισμένο χαρακτήρα
+97 Μετάβαση στον τρόπο παρεμβολής του vi
+98 Μετάβαση στον τρόπο παρεμβολής του vi στην αρχή της γραμμής
+99 (Vi) επανάληψη προηγούμενης αναζήτησης χαρακτήρα στην ίδια κατεύθυνση
+100 (Vi) επανάληψη προηγούμενης αναζήτησης χαρακτήρα στην αντίθετη κατεύθυνση
+101 (Vi) επανάληψη προηγούμενης αναζήτησης στην ίδια κατεύθυνση
+102 (Vi) επανάληψη προηγούμενης αναζήτησης στην αντίθετη κατεύθυνση
+103 (Vi) αντικατάσταση τρέχοντα χαρακτήρα με τον επόμενο πληκτρολογούμενο
+104 (Vi) τρόπος αντικατάστασης
+105 (Vi) αναζήτηση Ιστορίας προς τα πίσω
+106 (Vi) αναζήτηση Ιστορίας προς τα μπροστά
+107 (Vi) αντικατάσταση τρέχοντα χαρακτήρα και μετάβαση σε τρόπο παρεμβολής
+108 (Vi) αντικατάσταση ολόκληρης της γραμμής
+109 (Vi) μετακίνηση στην προηγούμενη λέξη
+110 (Vi) μετακίνηση στην επόμενη λέξη
+111 (Vi) αναίρεση προηγούμενης αλλαγής
+112 (Vi) μετακίνηση στην αρχή της γραμμής
+113 Εκτέλεση "which" της τρέχουσας εντολής
+114 Επικόλληση του cut buffer στην τρέχουσα θέση
 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
diff --git a/contrib/tcsh/nls/greek/set30 b/contrib/tcsh/nls/greek/set30
index 473f331..a5b2fe0 100644
--- a/contrib/tcsh/nls/greek/set30
+++ b/contrib/tcsh/nls/greek/set30
@@ -1,16 +1,16 @@
-$ $tcsh: set30,v 1.2 2006/03/02 18:46:46 christos Exp $
+$ $tcsh: set30,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
-2 ���������� %d 
-3 ���������� %d %S\n
-4 %s: ��������� ����� ������������.\n
-5 �����������items
-6 ������)
-7 �������� %d %s, �� �� �������� ����� � �����? [n/y] 
+2 συμπλήρωση %d 
+3 συμπλήρωση %d %S\n
+4 %s: εσωτερικό λάθος ταιριάσματος.\n
+5 αντικείμεναitems
+6 σειρές)
+7 Υπάρχουν %d %s, να τα εμφανίσω ούτως ή άλλως? [n/y] 
 8 looking = %d\n
-9 \n��������� ������ ��� %s: ��� ���� �� �������!\n
-10 ��� ����� ��������� �������
-11 �� �������
-12 �� ����������
+9 \nεσωτερικό σφάλμα του %s: δεν ξέρω τι αναζητώ!\n
+10 δεν είναι κατάλογος αρχείων
+11 δε βρέθηκε
+12 μη αναγνώσιμο
 13 yY
diff --git a/contrib/tcsh/nls/greek/set31 b/contrib/tcsh/nls/greek/set31
index d23de88..64e5b13 100644
--- a/contrib/tcsh/nls/greek/set31
+++ b/contrib/tcsh/nls/greek/set31
@@ -1,7 +1,7 @@
-$ $tcsh: set31,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set31,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ vms.termcap.c
 $set 31 
-1 �� ����� �� ������ �� TERMCAP: [%s]\n
-2 �� ����� �� ������ �� %s.\n
-3 ����� �� %s ��� %s.\n
-4 �� ����� ���� ��� �� ��������� �� �� %s ��� ������ %s\n
+1 Δε μπορώ να ανοίξω το TERMCAP: [%s]\n
+2 Δε μπορώ να ανοίξω το %s.\n
+3 Βρήκα το %s στο %s.\n
+4 Δε βρήκα κάτι που να ταιριάζει με το %s στο αρχείο %s\n
diff --git a/contrib/tcsh/nls/greek/set4 b/contrib/tcsh/nls/greek/set4
index 84fbc92..5763b88 100644
--- a/contrib/tcsh/nls/greek/set4
+++ b/contrib/tcsh/nls/greek/set4
@@ -1,45 +1,45 @@
-$ $tcsh: set4,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set4,v 1.4 2011/02/04 18:19:38 christos Exp $
 $ Termcap strings
 $set 4
-1 �������� ���� ����� �������
-2 ������� ����
-3 ��������� �� �� ����� ������
-4 ��������� �� �� ����� �������
-5 ������� �� ��������� ����
-6 ��������� ������
-7 �������� ���� ���������
-8 �������� ���� �������
-9 ������ ������ ���������
-10 ����������� ������ ���������
-11 ����������� ������ ����������
-12 ������� ��� ������ ����������
-13 ������� ���� ����
-14 �������� ���������
-15 ������ ������ ����������
-16 ��������� padding
-17 �������� ����
-18 �������� ��������
-19 �������� �����
-20 �������� �����
-21 ������ bold
-22 ����� ��������� ����������
-23 �� ������������� space
-24 ����� �������
-25 ���� �������
-26 � ������� ��� ������ ����������
-27 � ������� ��� ���� �����
-28 ������ ������������
-29 ����� ������������
-30 ����� ����
-31 �������� ��������� ����������
-32 ������� ��������� ������ ����
-33 ��������� ��������� ����������
-34 ������� ��������� ������ ��������
-35 ������� ��������� ������ �����
-36 ������� ��������� ������ �����
-37 ���������� ��������� ����������
-38 ���������� ������ ������� tabs
-39 ������� �������
-40 ������� ������
-41 ������ "����"-��������
-42 �� newline ��������� ��� ���� ���������
+1 πρόσθεση νέας κενής γραμμής
+2 ηχητικό σήμα
+3 καθάρισμα ως το τέλος οθόνης
+4 καθάρισμα ως το τέλος γραμμής
+5 δρομέας σε οριζόντια θέση
+6 καθάρισμα οθόνης
+7 διαγραφή ενός χαρακτήρα
+8 διαγραφή μιάς γραμμής
+9 έναρξη τρόπου διαγραφής
+10 τερματισμός τρόπου διαγραφής
+11 τερματισμός τρόπου παρεμβολής
+12 δρομέας από γραμμή κατάστασης
+13 δρομέας στην αρχή
+14 εισαγωγή χαρακτήρα
+15 έναρξη τρόπου παρεμβολής
+16 παρεμβολή padding
+17 αποστολή Κάτω
+18 αποστολή Αριστερά
+19 αποστολή Δεξιά
+20 αποστολή Επάνω
+21 έναρξη bold
+22 τέλος ιδιοτήτων χαρακτήρων
+23 μη καταστρεπτικό space
+24 τέλος έμφασης
+25 αρχή έμφασης
+26 ο δρομέας στη γραμμή κατάστασης
+27 ο δρομέας μιά θέση επάνω
+28 έναρξη υπογράμμισης
+29 τέλος υπογράμμισης
+30 ορατό σήμα
+31 διαγραφή πολλαπλών χαρακτήρων
+32 δρομέας πολλαπλές θέσεις κάτω
+33 παρεμβολή πολλαπλών χαρακτήρων
+34 δρομέας πολλαπλές θέσεις αριστερά
+35 δρομέας πολλαπλές θέσεις δεξιά
+36 δρομέας πολλαπλές θέσεις επάνω
+37 Δυνατότητα αυτόματων περιθωρίων
+38 Δυνατότητα χρήσης φυσικών tabs
+39 Αριθμός γραμμών
+40 Αριθμός στηλών
+41 Υπαρξη "μετα"-πλήκτρου
+42 Το newline αγνοείται στο δεξί περιθώριο
diff --git a/contrib/tcsh/nls/greek/set5 b/contrib/tcsh/nls/greek/set5
index 1125e85..91b6833 100644
--- a/contrib/tcsh/nls/greek/set5
+++ b/contrib/tcsh/nls/greek/set5
@@ -1,4 +1,4 @@
-$ $tcsh: set5,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set5,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ ed.chared.c
 $set 5
-1 � ����� ���� ������� ��� ����� ����������\n
+1 Ο μέσος όρος φορτίου δεν είναι διαθέσιμος\n
diff --git a/contrib/tcsh/nls/greek/set6 b/contrib/tcsh/nls/greek/set6
index 0a494c1..80a0950 100644
--- a/contrib/tcsh/nls/greek/set6
+++ b/contrib/tcsh/nls/greek/set6
@@ -1,11 +1,11 @@
-$ $tcsh: set6,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set6,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ ed.inputl.c
 $set 6
-1 ������: ����� ������ ��� �� ������� 0%o\r\n
-2 ���\n
+1 ΣΦΑΛΜΑ: άκυρη εντολή απο το πλήκτρο 0%o\r\n
+2 ναι\n
 3 edit\n
 4 abort\n
-5 ���\n
-6 ��� ������� ������ ��� �� ���������\n
-7 ����������� ������\n
-8 *** ������� ������ editor ***\r\n\n
+5 όχι\n
+6 Δεν υπάρχει εντολή που να ταιριάζει\n
+7 Διφορούμενη εντολή\n
+8 *** μοιραίο ΣΦΑΛΜΑ editor ***\r\n\n
diff --git a/contrib/tcsh/nls/greek/set7 b/contrib/tcsh/nls/greek/set7
index b88d2ff..8cd8e35 100644
--- a/contrib/tcsh/nls/greek/set7
+++ b/contrib/tcsh/nls/greek/set7
@@ -1,30 +1,30 @@
-$ $tcsh: set7,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set7,v 1.4 2011/02/04 18:19:38 christos Exp $
 $ ed.screen.c
 $set 7
-1 \n\t�� %s ����� ��� �� ��������� ��� ��\n
-2 \t���� ��������������:\n\n
-3 \t���� %d ������ ��� %d �������\n
-4 \t%s��� "����"-�������\n
-5 �
-6 ��� �
-7 \t%s������ �� �������������� tabs\n
-8 ��� 
-9 \t%s �������� ���������\n
-10 ����
-11 ��� ����
-12 \t%s "������" ���������\n
-13 (�����)
-14 ���
-15 ���
-16 ������: �� ����� �� �����\r\n
-17 DeleteChars: � ������� ����� ��������: %d\r\n
-18 ������: �� ����� �� ���������\r\n
-19 StartInsert: � ������� ����� ��������: %d\r\n
-20 %s: �� ����� �� ������ �� /etc/termcap.\n
-21 %s: ��� ������� ������� ��� ��� ���� ���������� "%s"\n
-22 %s: �� ������������� �������������� "�����" ����������.\n
-23 %s: �������������: �� ��������� ��� ������ �� ����������� �����.\n
-24 �� editing ������ �� ����� �������� ��� ������� �������.\n
-25 ��� ������� ���������� ���������� �� �� ����� �������.\n
-26 ��� ������� ���������� ��������� ���������.\n
-27 ��� ������� ���������� ���������� ���������.\n
+1 \n\tΤο %s ξέρει γιά το τερματικό σας τα\n
+2 \tεξής χαρακτηριστικά:\n\n
+3 \tΕχει %d στήλες και %d γραμμές\n
+4 \t%sχει "μετα"-πλήκτρο\n
+5 Ε
+6 Δεν έ
+7 \t%sμπορεί να χρησιμοποιήσει tabs\n
+8 Δεν 
+9 \t%s αυτόματα περιθώρια\n
+10 Εχει
+11 Δεν έχει
+12 \t%s "μαγικά" περιθώρια\n
+13 (άδειο)
+14 ναι
+15 όχι
+16 ΣΦΑΛΜΑ: δε μπορώ να σβήσω\r\n
+17 DeleteChars: ο αριθμός είναι απίθανος: %d\r\n
+18 ΣΦΑΛΜΑ: δε μπορώ να παρεμβάλω\r\n
+19 StartInsert: ο αριθμός είναι απίθανος: %d\r\n
+20 %s: Δε μπορώ να ανοίξω το /etc/termcap.\n
+21 %s: Δεν υπάρχει εγγραφή για τον τύπο τερματικού "%s"\n
+22 %s: θα χρησιμοποιήσω χαρακτηριστικά "χαζού" τερματικού.\n
+23 %s: ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Το τερματικό δεν μπορεί να μετακινήσει επάνω.\n
+24 Το editing μπορεί να είναι περίεργο γιά μεγάλες γραμμές.\n
+25 δεν υπάρχει δυνατότητα καθαρισμού ως το τέλος γραμμής.\n
+26 δεν υπάρχει δυνατότητα διαγραφής χαρακτήρα.\n
+27 δεν υπάρχει δυνατότητα παρεμβολής χαρακτήρα.\n
diff --git a/contrib/tcsh/nls/greek/set8 b/contrib/tcsh/nls/greek/set8
index 23fb6c8..ebe2e8e 100644
--- a/contrib/tcsh/nls/greek/set8
+++ b/contrib/tcsh/nls/greek/set8
@@ -1,5 +1,5 @@
-$ $tcsh: set8,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set8,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ ed.term.c
 $set 8
-1 ������� switch
-2 ����� ������
+1 Αγνωστο switch
+2 Ακυρο όρισμα
diff --git a/contrib/tcsh/nls/greek/set9 b/contrib/tcsh/nls/greek/set9
index 9ed5f7c..00c0a86 100644
--- a/contrib/tcsh/nls/greek/set9
+++ b/contrib/tcsh/nls/greek/set9
@@ -1,12 +1,12 @@
-$ $tcsh: set9,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set9,v 1.4 2011/02/04 18:19:38 christos Exp $
 $ ed.xmap.c
 $set 9
-1 AddXkey: ��� ����������� �������� extended-key.\n
-2 AddXkey: � ������ �� ����� ��� ������ ��������� ��� �����������\n
-3 DeleteXkey: ��� ����������� �������� extended-key.\n
-4 ����������� extended key "%S"\n
-5 ������ extended keys ����� ���� ������ ��� ��� ��������� print buffer
-6 Enumerate: BUG!! ������� ��������� pointer!\n
-7 ��� ������� �������
-8 ���� ������ �� ���������: %c\n
-9 � �������� ������� �� ������ ��� ������� ���� char.\n
+1 AddXkey: δεν επιτρέπεται μηδενικό extended-key.\n
+2 AddXkey: η εντολή με αυτήν την αρχική ακολουθία δεν επιτρέπεται\n
+3 DeleteXkey: δεν επιτρέπεται μηδενικό extended-key.\n
+4 Ασυσχέτιστο extended key "%S"\n
+5 Μερικά extended keys είναι πολύ μεγάλα γιά τον εσωτερικό print buffer
+6 Enumerate: BUG!! Πέρασμα μηδενικού pointer!\n
+7 δεν υπάρχει είσοδος
+8 Κάτι πρέπει να ακολουθεί: %c\n
+9 Η οκταδική σταθερά δε χωράει στο μέγεθος ενός char.\n
diff --git a/contrib/tcsh/nls/italian/charset b/contrib/tcsh/nls/italian/charset
index 0b13559..81f1b66 100644
--- a/contrib/tcsh/nls/italian/charset
+++ b/contrib/tcsh/nls/italian/charset
@@ -1,3 +1,3 @@
-$ codeset=ISO-8859-1
+$ codeset=UTF-8
 $set 255
-1 ISO-8859-1
+1 UTF-8
diff --git a/contrib/tcsh/nls/italian/set1 b/contrib/tcsh/nls/italian/set1
index de09941..c7ad88e 100644
--- a/contrib/tcsh/nls/italian/set1
+++ b/contrib/tcsh/nls/italian/set1
@@ -1,8 +1,8 @@
-$ $tcsh: set1,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set1,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ Error messages
 $set 1 
 1 Errore di Sintassi
-2 %s non � permesso
+2 %s non è permesso
 3 Parola troppo lunga
 4 $< linea troppo lunga
 5 Nessun file per $0
@@ -17,7 +17,7 @@ $set 1
 14 Comando non trovato
 15 Troppi pochi argomenti
 16 Troppi argomenti
-17 � troppo pericoloso creare un alias in questo caso
+17 È troppo pericoloso creare un alias in questo caso
 18 `if' vuoto
 19 `then' sbagliato
 20 Parola non tra parentesi
@@ -27,11 +27,11 @@ $set 1
 24 Argomento troppo lungo
 25 Fattore di scala sbagliato o sconosciuto
 26 Variabile non definita
-27 Pila delle directory non cos� profonda
+27 Pila delle directory non così profonda
 28 Numero di segnale non corretto
 29 Segnale sconosciuto; utilizza kill -l per elencare i segnali
 30 Il nome della variabile deve iniziare con una lettera
-31 Il nome della variabile � troppo lungo
+31 Il nome della variabile è troppo lungo
 32 Il nome della variabile deve contenere caratteri alfanumerici
 33 Non ho il controllo dei lavori in questa shell
 34 Errore di sintassi nell'espressione
@@ -111,17 +111,17 @@ $set 1
 108 Variabile $watch non definita
 109 Nessun evento programmato
 110 Utilizzo: sched -<elemento#>.\nUtilizzo: sched [+]hh:mm <comando>
-111 Non ci sono cos� tanti eventi programmati
+111 Non ci sono così tanti eventi programmati
 112 Nessun comando da eseguire
 113 Istante non corretto per l'evento
 114 Istante relativo non consistente con am/pm
 115 Al di fuori dello spazio stringa del termcap
 116 Utilizzo: settc %s [yes|no]
-117 Capacit� `%s' sconosciuta
+117 Capacità `%s' sconosciuta
 118 Parametro del termcap `%%%c' sconosciuto
 119 Troppi argomenti per `%s' (%d)
 120 `%s' richiede %d argomenti
-121 Utilizzo: echotc [-v|-s] [<capacit�> [<argomenti>]]
+121 Utilizzo: echotc [-v|-s] [<capacità> [<argomenti>]]
 122 %s: %s. Architettura non corretta
 123 !# Ciclo chiuso nello storico
 124 Richiesta di file formulata incorrettamente
@@ -135,6 +135,6 @@ $set 1
 132 \n%s incompleto: "%s"
 133 Manca l'operando dell'opzione -m
 134 Utilizzo: unlimit [-fh] [limiti]
-135 $%S � a sola lettura
+135 $%S è a sola lettura
 136 Non esiste il lavoro
 137 Variabile `%c%c colorls' sconosciuta
diff --git a/contrib/tcsh/nls/italian/set11 b/contrib/tcsh/nls/italian/set11
index 70a5192..54629cd 100644
--- a/contrib/tcsh/nls/italian/set11
+++ b/contrib/tcsh/nls/italian/set11
@@ -1,8 +1,8 @@
-$ $tcsh: set11,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set11,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ sh.c
 $set 11 
 1 Attenzione: accesso negato al terminale (%s).\n
-2 Quindi il controllo dei lavori in questa shell non � possibile.\n
+2 Quindi il controllo dei lavori in questa shell non è possibile.\n
 3 Hai %d messaggi di posta elettronica.\n
 4 Hai %d messaggi di posta elettronica in %s.\n
 5 Hai %smessaggi di posta elettronica.\n
diff --git a/contrib/tcsh/nls/italian/set13 b/contrib/tcsh/nls/italian/set13
index ed5f797..a3781af 100644
--- a/contrib/tcsh/nls/italian/set13
+++ b/contrib/tcsh/nls/italian/set13
@@ -1,4 +1,4 @@
-$ $tcsh: set13,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set13,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
@@ -8,6 +8,6 @@ $set 13
 5 %S: comando interno della shell.\n
 6 %S: comando non trovato.\n
 7 where: / non ha senso all'interno di un comando\n
-8 %S � un alias per 
-9 %S � un comando interno\n
+8 %S è un alias per 
+9 %S è un comando interno\n
 10 errore di hash: 
diff --git a/contrib/tcsh/nls/italian/set15 b/contrib/tcsh/nls/italian/set15
index 3db0bc3..a78d850 100644
--- a/contrib/tcsh/nls/italian/set15
+++ b/contrib/tcsh/nls/italian/set15
@@ -1,7 +1,7 @@
-$ $tcsh: set15,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set15,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ sh.func.c
 $set 15 
-1 %s: %s: non si pu� %s il limite%s\n
+1 %s: %s: non si può %s il limite%s\n
 2 eliminare
 3 modificare
 4 \040fisico
diff --git a/contrib/tcsh/nls/italian/set17 b/contrib/tcsh/nls/italian/set17
index 40e2868..1076cab 100644
--- a/contrib/tcsh/nls/italian/set17
+++ b/contrib/tcsh/nls/italian/set17
@@ -1,9 +1,9 @@
-$ $tcsh: set17,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set17,v 1.4 2011/02/04 18:19:39 christos Exp $
 $ sh.proc.c
 $set 17 
 1 BACO: sto aspettando un lavoro in background!\n
 2 Uscito %d\n
-3 BACO: il processo � stato svuotato due volte
+3 BACO: il processo è stato svuotato due volte
 4 In esecuzione 
 5 Segnale 
 6 Uscito %-25d
@@ -12,6 +12,6 @@ $set 17
 9 \040(creato file core)
 10 \040(directory di lavoro: 
 11 directory di lavoro corrente: 
-12 %S: gi� sospeso\n
-13 %S: gi� fermato\n
+12 %S: già sospeso\n
+13 %S: già fermato\n
 14 %S: Badly formed number\n
diff --git a/contrib/tcsh/nls/italian/set19 b/contrib/tcsh/nls/italian/set19
index 9226ef6..061ba4f 100644
--- a/contrib/tcsh/nls/italian/set19
+++ b/contrib/tcsh/nls/italian/set19
@@ -1,4 +1,4 @@
-$ $tcsh: set19,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set19,v 1.4 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Memoria esaurita\n
@@ -9,7 +9,15 @@ $set 19
 6 free(%lx) intervallo di controllo sbagliato.
 7 free(%lx) indice di blocco sbagliato.
 8 %s attuale allocazione di memoria:\nlibera:\t
-9 \nutilizzata:\t
+9 utilizzata
 10 \n\tTotale utilizzata: %d, totale libera: %d\n
 11 \tAllocata memoria da 0x%lx a 0x%lx.  Limite superiore effettivo a 0x%lx\n
 12 Allocata memoria da 0x%lx a 0x%lx (%ld).\n
+13 %s current memory allocation:\n
+14 Total space allocated from system: %d\n
+15 Number of non-inuse chunks: %d\n
+16 Number of mmapped regions: %d\n
+17 Total space in mmapped regions: %d\n
+18 Total allocated space: %d\n
+19 Total non-inuse space: %d\n
+20 Top-most, releasable space: %d\n
diff --git a/contrib/tcsh/nls/italian/set2 b/contrib/tcsh/nls/italian/set2
index cbf9a05..c080671 100644
--- a/contrib/tcsh/nls/italian/set2
+++ b/contrib/tcsh/nls/italian/set2
@@ -1,4 +1,4 @@
-$ $tcsh: set2,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set2,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ Signal names
 $set 2 
 1 Segnale nullo
@@ -44,7 +44,7 @@ $set 2
 41 Spegnimento del sistema imminente
 42 micro-tasking group-no wakeup flag settato
 43 Errore di thread - (usa cord -T per avere informazioni dettagliate)
-44 Errore di parit� di registro del CRAY Y-MP
+44 Errore di parità di registro del CRAY Y-MP
 45 Richiesta di informazioni
 46 Sospeso (segnale)
 47 Fermato (segnale)
@@ -63,7 +63,7 @@ $set 2
 60 Allarme dell'orologio virtuale
 61 Allarme di tempo di profiling
 62 Segnale DIL 
-63 Si � verificato un evento interrogabile
+63 Si è verificato un evento interrogabile
 64 Gli lwps del processo sono bloccati
 65 Segnale speciale LWP
 66 Segnale speciale CPR
@@ -77,17 +77,17 @@ $set 2
 74 Penultimo segnale di tempo reale
 75 Ultimo segnale di tempo reale
 76 I/O asincrono di LAN
-77 Disponibilit� di lettura/scrittura su pseudoterminale
+77 Disponibilità di lettura/scrittura su pseudoterminale
 78 Richiesta di I/O
-79 Modalit� di monitoraggio HFT disponibile
-80 La modalit� di monitoraggio HFT deve essere abbandonata
-81 Il controllo sonoro HFT � stato completato
+79 Modalità di monitoraggio HFT disponibile
+80 La modalità di monitoraggio HFT deve essere abbandonata
+81 Il controllo sonoro HFT è stato completato
 82 Dati nel buffer circolare HFT
 83 Migrate process
 84 Tasto di attenzione assicurata
 85 Rischedulamento
 86 Segnale di SS$_DEBUG
-87 Cambio di priorit�
+87 Cambio di priorità
 88 Identificato uno stallo
 89 Nuovo carattere in ingresso
 90 Oltrepassato lo spazio disponibile di stack
diff --git a/contrib/tcsh/nls/italian/set20 b/contrib/tcsh/nls/italian/set20
index 5d33cca..ec628f9 100644
--- a/contrib/tcsh/nls/italian/set20
+++ b/contrib/tcsh/nls/italian/set20
@@ -1,4 +1,4 @@
-$ $tcsh: set20,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set20,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Nome di tasto non corretto `%S'\n
@@ -8,10 +8,10 @@ $set 20
 5 Stringa di specificazione sbagliata\n
 6 Definizione dei tasti standard\n
 7 Definizione dei tasti alternativi\n
-8 Definizione delle combinazioni di pi� tasti\n
+8 Definizione delle combinazioni di più tasti\n
 9 Definizione dei tasti freccia\n
-10 %-15s->  non � definita\n
-11 BACO!!! %s non � definita da nessuna parte.\n
+10 %-15s->  non è definita\n
+11 BACO!!! %s non è definita da nessuna parte.\n
 12 Utilizzo: bindkey [opzioni] [--] [TASTO [COMANDO]]\n
 13     -a   elenca o definisce un tasto nella tabella dei tasti alternativi\n
 14     -b   interpreta TASTO come C-, M-, F- o X- tasto\n
@@ -29,13 +29,13 @@ $set 20
 26 Senza COMANDO, stampa la definizione di TASTO.\n
 27 specificazione di tasto sbagliata -- stringa nulla\n
 28 specificazione di tasto sbagliata -- stringa vuota\n
-29 Specificazione di tasto funzione sbagliata.  Il tasto nullo non si pu� usare\n
+29 Specificazione di tasto funzione sbagliata.  Il tasto nullo non si può usare\n
 30 specificazione di tasto sbagliata -- numero esadecimale non corretto\n
 31 specificazione di tasto sbagliata -- numero ottale non corretto\n
 32 specificazione di tasto sbagliata -- numero decimale non corretto\n
 33 Specificazione di tasto funzione sbagliata.\n
-34 Il tasto nullo non si pu� usare\n
+34 Il tasto nullo non si può usare\n
 35 specificazione di tasto sbagliata -- nome "%S" sconosciuto\n
 36 utilizzo: bind [TASTO | COMANDO TASTO | "emacs" | "vi" | "-a"]\n
 37 Funzione non corretta
-38  %s\t\tnon � definita\n
+38  %s\t\tnon è definita\n
diff --git a/contrib/tcsh/nls/italian/set22 b/contrib/tcsh/nls/italian/set22
index ab94433..ba38979 100644
--- a/contrib/tcsh/nls/italian/set22
+++ b/contrib/tcsh/nls/italian/set22
@@ -1,7 +1,7 @@
-$ $tcsh: set22,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set22,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ tc.func.c
 $set 22 
-1 %S: \t � un alias per 
+1 %S: \t è un alias per 
 2 \nPassword non corretta per %s\n
 3 Alias non corretto 'precmd' rimosso.\n
 4 Alias non corretto 'cwdcmd' rimosso.\n
@@ -10,8 +10,8 @@ $set 22
 7 sto esaminando la linea di comando\n
 8 Vuoi realmente cancellare tutti i file? [s/n] 
 9 sto saltando la cancellazione dei file!\n
-10 la linea di comando adesso �:\n
+10 la linea di comando adesso è:\n
 11 sto esaminando la linea di comando\n
 12 in uno degli elenchi\n
-13 la linea di comando ora �:\n
+13 la linea di comando ora è:\n
 14 sS
diff --git a/contrib/tcsh/nls/italian/set23 b/contrib/tcsh/nls/italian/set23
index 8b71649..7388491 100644
--- a/contrib/tcsh/nls/italian/set23
+++ b/contrib/tcsh/nls/italian/set23
@@ -1,4 +1,4 @@
-$ $tcsh: set23,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set23,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ tc.os.c
 $set 23 
 1 Nome di cpu/macchina non corretto
@@ -29,6 +29,6 @@ $set 23
 26 getwd: non posso aprire la directory "%s" (%s)
 27 getwd: non riesco a trovare "." in ".." (%s)
 28 Tipo di sistema non corretto
-29 Il tipo di sistema non � stato definito
+29 Il tipo di sistema non è stato definito
 30 Troppi argomenti
 31 Argomento non corretto
diff --git a/contrib/tcsh/nls/italian/set26 b/contrib/tcsh/nls/italian/set26
index 911cb6c..40db5f6 100644
--- a/contrib/tcsh/nls/italian/set26
+++ b/contrib/tcsh/nls/italian/set26
@@ -1,15 +1,15 @@
-$ $tcsh: set26,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set26,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ tc.who.c
 $set 26 
-1 non posso usare stat per %s.  Per piet� dai un "unset watch".\n
-2 Non riesco ad aprire %s.  Per piet� dai un "unset watch".\n
-3 BACO! l'ultimo elemento non � whotail!\n
+1 non posso usare stat per %s.  Per pietà dai un "unset watch".\n
+2 Non riesco ad aprire %s.  Per pietà dai un "unset watch".\n
+3 BACO! l'ultimo elemento non è whotail!\n
 4 all'indietro: 
-5 BACO! il primo elemento non � whohead!\n
+5 BACO! il primo elemento non è whohead!\n
 6 nuova entrata: %s/%s\n
 7 %n %a %l da %m.
 8 %n %a %l.
-9 si � loggato su
-10 si � sloggato da
+9 si è loggato su
+10 si è sloggato da
 11 ha rimpiazzato %s su
 12 console
diff --git a/contrib/tcsh/nls/italian/set3 b/contrib/tcsh/nls/italian/set3
index eaff36a..f3fd8a3 100644
--- a/contrib/tcsh/nls/italian/set3
+++ b/contrib/tcsh/nls/italian/set3
@@ -1,4 +1,4 @@
-$ $tcsh: set3,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set3,v 1.4 2011/02/04 18:19:39 christos Exp $
 $ Editor function descriptions
 $set 3 
 1 Retrocede di un carattere
@@ -14,10 +14,10 @@ $set 3
 11 Completa la parola corrente
 12 Avanza con il tabulatore tra i file
 13 Retrocede con il tabulatore tra i file
-14 Completa la parola corrente ignorando le modalit� di completamento programmabili
+14 Completa la parola corrente ignorando le modalità di completamento programmabili
 15 Copia la parola corrente nella posizione del cursore
 16 Copia la zona tra il cursore e il segno nel buffer
-17 Espande nella precedente parola di cui questa � la parte iniziale
+17 Espande nella precedente parola di cui questa è la parte iniziale
 18 Cancella il carattere sotto il cursore
 19 Cancella il carattere sotto il cursore o segnala la fine del file in una linea vuota
 20 Cancella il carattere sotto il cursore o elenca i completamenti se alla fine di una linea
@@ -47,7 +47,7 @@ $set 3
 44 Taglia la zona tra il cursore e il segno e la salva nel buffer
 45 Taglia l'intera linea salvandola nel buffer
 46 Elenca le possibili scelte per il completamento
-47 Elenca le possibili scelte per il completamento ignorando le modalit� di completamento programmabili
+47 Elenca le possibili scelte per il completamento ignorando le modalità di completamento programmabili
 48 Elenca i file che corrispondono ai caratteri jolly
 49 Elenca le possibili scelte per il completamento o segnala la fine del file nel caso di linea vuota
 50 Mostra la media di carico macchina e lo stato del processo corrente
@@ -55,18 +55,18 @@ $set 3
 52 Esegue un comando
 53 Espande i percorsi eliminando i '.' e '..' iniziali
 54 Espande i comandi con il relativo percorso o alias
-55 Commuta tra le modalit� di inserimento e di sovrascrittura
+55 Commuta tra le modalità di inserimento e di sovrascrittura
 56 Aggiunge l'ottavo bit al successivo carattere inserito
-57 Aggiunge nella linea il successivo carattere cos� com'�
+57 Aggiunge nella linea il successivo carattere così com'è
 58 Ridisegna tutto
 59 Fa ripartire l'editor sospeso
 60 Cerca le spiegazioni del comando corrente
-61 Questo carattere � aggiunto alla linea
-62 Questo carattere � il primo in una sequenza di caratteri
+61 Questo carattere è aggiunto alla linea
+62 Questo carattere è il primo in una sequenza di caratteri
 63 Fissa il segno nella posizione del cursore
 64 Corregge la sintassi della parola corrente
 65 Corregge la sintassi dell'intera linea
-66 Invia il carattere sul terminale in modalit� `cooked'
+66 Invia il carattere sul terminale in modalità `cooked'
 67 Commuta tra la corrente linea letterale e lessicale dello storico
 68 Scambia il carattere alla sinistra del cursore con quello sotto
 69 Scambia i due caratteri prima del cursore
@@ -82,13 +82,13 @@ $set 3
 79 Si sposta sulla precedente linea dello storico
 80 Converte in maiuscole le lettere dal cursore fino alla fine della parola corrente
 81 Vi: vai all'inizio della prossima parola
-82 Vi: commuta in modalit� di inserimento dopo il cursore
-83 Vi: commuta in modalit� di inserimento alla fine della linea
+82 Vi: commuta in modalità di inserimento dopo il cursore
+83 Vi: commuta in modalità di inserimento alla fine della linea
 84 Vi: cambia in da o in maiuscolo la lettera sotto il cursore e avanza di una posizione
 85 Vi: cambia il comando di prefisso
 86 Vi: modifica alla fine della linea
-87 Entra in modalit� di comando vi (utilizza le definizioni di tasti alternative)
-88 Vi: modalit� di comando a completamento di parola
+87 Entra in modalità di comando vi (utilizza le definizioni di tasti alternative)
+88 Vi: modalità di comando a completamento di parola
 89 Vi: si sposta sul precedente carattere (backspace)
 90 Vi: cancella il comando di prefisso
 91 Vi: avanza sul primo carattere che precede uno spazio
@@ -97,17 +97,17 @@ $set 3
 94 Vi: avanza al carattere indicato
 95 Vi: si sposta sopra il carattere indicato all'indietro
 96 Vi: si sposta sopra il carattere indicato in avanti
-97 Commuta in modalit� di inserimento vi
-98 Commuta in modalit� di inserimento vi all'inizio della linea
+97 Commuta in modalità di inserimento vi
+98 Commuta in modalità di inserimento vi all'inizio della linea
 99 Vi: ripete la ricerca del carattere nella stessa direzione
 100 Vi: ripete la ricerca del carattere nella direzione opposta
 101 Vi: ripete la ricerca nella stessa direzione
 102 Vi: ripete la ricerca nella direzione opposta
 103 Vi: rimpiazza il carattere sotto il cursore con quello successivamente introdotto
-104 Vi: modalit� di rimpiazzo
+104 Vi: modalità di rimpiazzo
 105 Vi: ricerca nello storico all'indietro
 106 Vi: ricerca nello storico in avanti
-107 Vi: rimpiazza il carattere sotto il cursore e commuta in modalit� di inserimento
+107 Vi: rimpiazza il carattere sotto il cursore e commuta in modalità di inserimento
 108 Vi: rimpiazza l'intera linea
 109 Vi: si sposta alla parola precedente
 110 Vi: si sposta alla parola successiva
diff --git a/contrib/tcsh/nls/italian/set30 b/contrib/tcsh/nls/italian/set30
index b118429..9ea8558 100644
--- a/contrib/tcsh/nls/italian/set30
+++ b/contrib/tcsh/nls/italian/set30
@@ -1,4 +1,4 @@
-$ $tcsh: set30,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set30,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ tw.parse.c
 $set 30 
 1 inizio_il_comando %d\n
@@ -10,7 +10,7 @@ $set 30
 7 Ci sono %d %selenco ugualmente? [n/s] 
 8 sembra = %d\n
 9 \nerrore interno della tcsh: Non mi ricordo cosa stavo facendo!\n
-10 non � una directory
+10 non è una directory
 11 non trovato
 12 non leggibile
 13 sS
diff --git a/contrib/tcsh/nls/italian/set4 b/contrib/tcsh/nls/italian/set4
index 5e96ba3..d86b10e 100644
--- a/contrib/tcsh/nls/italian/set4
+++ b/contrib/tcsh/nls/italian/set4
@@ -1,4 +1,4 @@
-$ $tcsh: set4,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set4,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ Termcap strings
 $set 4
 1 aggiunge una linea vuota
@@ -9,13 +9,13 @@ $set 4
 6 cancella lo schermo
 7 cancella un carattere
 8 cancella una riga
-9 mette in modalit� di cancellazione
-10 fine della modalit� di cancellazione
-11 fine della modalit� di inserimento
+9 mette in modalità di cancellazione
+10 fine della modalità di cancellazione
+11 fine della modalità di inserimento
 12 cursore dalla linea di stato
 13 cursore nella posizione iniziale
 14 inserisce un carattere
-15 mette in modalit� di inserimento
+15 mette in modalità di inserimento
 16 inserisce un carattere di riallineamento
 17 muove il cursore verso il basso
 18 muove il cursore verso sinistra
@@ -31,14 +31,14 @@ $set 4
 28 inizio sottolineatura
 29 fine sottolineatura
 30 segnale ottico
-31 cancella pi� caratteri
-32 cursore verso il basso pi� volte
-33 inserisce pi� caratteri
-34 cursore verso sinistra pi� volte
-35 cursore verso destra pi� volte
-36 cursore verso l'alto pi� volte
+31 cancella più caratteri
+32 cursore verso il basso più volte
+33 inserisce più caratteri
+34 cursore verso sinistra più volte
+35 cursore verso destra più volte
+36 cursore verso l'alto più volte
 37 Ha margini automatizzati
-38 Pu� usare tabulatori fisici
+38 Può usare tabulatori fisici
 39 Numero di linee
 40 Numero di colonne
 41 Ha il tasto meta
diff --git a/contrib/tcsh/nls/italian/set6 b/contrib/tcsh/nls/italian/set6
index 68994a6..2c4ad8c 100644
--- a/contrib/tcsh/nls/italian/set6
+++ b/contrib/tcsh/nls/italian/set6
@@ -1,8 +1,8 @@
-$ $tcsh: set6,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set6,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ERRORE: comando illegale per il tasto 0%o\r\n
-2 s�\n
+2 sì\n
 3 modificare\n
 4 annullare\n
 5 no\n
diff --git a/contrib/tcsh/nls/italian/set7 b/contrib/tcsh/nls/italian/set7
index 0e843a7..e0d851b 100644
--- a/contrib/tcsh/nls/italian/set7
+++ b/contrib/tcsh/nls/italian/set7
@@ -1,4 +1,4 @@
-$ $tcsh: set7,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set7,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tLa tcsh ipotizza che il tuo terminale abbia\n
@@ -7,24 +7,24 @@ $set 7
 4 \t%s tasto meta\n
 5 il
 6 nessun
-7 \t%s pu� usare i tabulatori\n
+7 \t%s può usare i tabulatori\n
 8 non
 9 \t%s i margini automatici\n
 10 ha
 11 non ha
 12 \t%s i margini magici\n
 13 (vuoto)
-14 s�
+14 sì
 15 no
 16 ERRORE: non posso cancellare\r\n
-17 DeleteChars: il valore num � ridicolo: %d\r\n
+17 DeleteChars: il valore num è ridicolo: %d\r\n
 18 ERRORE: non posso inserire\r\n
-19 StartInsert: il valore num � ridicolo: %d\r\n
+19 StartInsert: il valore num è ridicolo: %d\r\n
 20 %s: Non riesco ad aprire /etc/termcap.\n
 21 %s: Nessuna definizione per un terminale di tipo "%s"\n
 22 %s: sto usando i settaggi relativi ad un terminale veramente stupido.\n
-23 %s: ATTENZIONE: Il terminale non pu� scrollare verso l'alto.\n
+23 %s: ATTENZIONE: Il terminale non può scrollare verso l'alto.\n
 24 La modifica delle linee lunghe potrebbe essere difficoltosa.\n
-25 non � possibile cancellare fino alla fine della linea.\n
-26 non � possibile cancellare caratteri.\n
-27 non � possibile inserire caratteri.\n
+25 non è possibile cancellare fino alla fine della linea.\n
+26 non è possibile cancellare caratteri.\n
+27 non è possibile inserire caratteri.\n
diff --git a/contrib/tcsh/nls/ja/charset b/contrib/tcsh/nls/ja/charset
index 74cc93e..81f1b66 100644
--- a/contrib/tcsh/nls/ja/charset
+++ b/contrib/tcsh/nls/ja/charset
@@ -1,3 +1,3 @@
-$ codeset=EUC-JP
+$ codeset=UTF-8
 $set 255
-1 EUC-JP
+1 UTF-8
diff --git a/contrib/tcsh/nls/ja/set1 b/contrib/tcsh/nls/ja/set1
index c53da1d..eb227bf 100644
--- a/contrib/tcsh/nls/ja/set1
+++ b/contrib/tcsh/nls/ja/set1
@@ -1,140 +1,140 @@
-$ $tcsh: set1,v 1.5 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set1,v 1.6 2011/02/04 18:19:39 christos Exp $
 $ Error messages
 $set 1 
-1 ʸˡ���ְ�äƤ��ޤ�
-2 %s �ϳ�����Ƥ��Ƥ��ޤ���
-3 ʸ����Ĺ�����ޤ�
-4 $< �ιԤ�Ĺ�����ޤ�
-5 $0 �ѤΥե����뤬����ޤ���
-6 [] �����Ҥ��Դ����Ǥ�
-7 $ Ÿ���� ] �����˽����ɬ�פ�����ޤ�
-8 $ ��� : �����Ҥ��ְ�äƤ��ޤ� (%c)
-9 �����ź�������ְ�äƤ��ޤ�
-10 �ֹ椬�������񼰤ˤʤäƤ��ޤ���
-11 ʸ����Ϥ⤦����ޤ���
-12 �ե�����̾���ְ�äƤ��뤫�ե����뤬¸�ߤ��ޤ���
-13 glob���������顼�Ǥ�
-14 ���ޥ�ɤ����Ĥ���ޤ���
-15 �����������Ƥ��ޤ�
-16 ������¿�᤮�ޤ�
-17 �����ʥ����ꥢ������Ǥ�
-18 ifʸ����˾�郎����ޤ���
-19 �ְ�ä�then�Ǥ�
-20 ʸ���󤬳����ˤ���ޤ���
-21 %s �����Ĥ���ޤ���
-22 �ְ�ä�mask�Ǥ�
-23 ���Τ褦��limit�ͤϤ���ޤ���
-24 ������Ĺ�����ޤ�
-25 ���ץ����ñ�̤��������ְ�äƤ��ޤ�
-26 �������Ƥ��ʤ��ѿ��Ǥ�
-27 �ǥ��쥯�ȥ꡼�����å��λ��꤬���᤮�ޤ�
-28 �����ʥ��ֹ椬�ְ�äƤ��ޤ�
-29 �����ʥ��̾�����ְ�äƤ��ޤ� "kill -l"�Ǹ����������ޤ�
-30 �ѿ�̾�ϱѻ��ǻϤ��ɬ�פ�����ޤ�
-31 �ѿ���̾����Ĺ�����ޤ�
-32 �ѿ�̾�ϱѿ��������ǹ�������ɬ�פ�����ޤ�
-33 ����shell�Ǥϥ���֥���ȥ�����ϻ��ѤǤ��ޤ���
-34 ����ʸ?
-35 �ۡ���ǥ��쥯�ȥ꡼������ޤ���
-36 �ۡ���ǥ��쥯�ȥ꡼���ѹ��Ǥ��ޤ���
-37 �����ʥ̥륳�ޥ�ɤǤ�
-38 ���������礱�Ƥ���ս꤬����ޤ�
-39 �������Ƥ��ʤ��黻�ҤǤ�
-40 ۣ��Ǥ�
-41 %s�ȸ����ե�����Ϥ��Ǥ�¸�ߤ��ޤ�
-42 -c�Ѥΰ����ϥХå�����å���ǽ����ޤ�
-43 �����ߤ�����ޤ���
-44 ����������ź�������ϰϤ�Ķ���Ƥ��ޤ�
-45 �ԤΥ����С��ե����Ǥ�
-46 ���Τ褦�ʥ���֤Ϥ���ޤ���
-47 ü������ϤǤ��ޤ���
-48 while/foreach����ǤϤ���ޤ���
-49 �ץ������������Ǥ��ޤ���
-50 �ȹ�ѥ�����˹礤�ޤ���
-51 %c ���礱�Ƥ���ս꤬����ޤ�
-52 %c ���б����ޤ���
-53 ���꤬�����Ƥ��ޤ�
-54 �ѥ��פ���ޤ���
+1 文法が間違っています
+2 %s は割り当てられていません
+3 文字列が長すぎます
+4 $< の行が長すぎます
+5 $0 用のファイルがありません
+6 [] 修飾子が不完全です
+7 $ 展開は ] の前に終わる必要があります
+8 $ 内の : 修飾子が間違っています (%c)
+9 配列の添え字が間違っています
+10 番号が正しい書式になっていません
+11 文字列はもうありません
+12 ファイル名が間違っているかファイルが存在しません
+13 globの内部エラーです
+14 コマンドが見つかりません
+15 引数が不足しています
+16 引数が多過ぎます
+17 危険なエイリアス定義です
+18 if文の中に条件がありません
+19 間違ったthenです
+20 文字列が括弧内にありません
+21 %s が見つかりません
+22 間違ったmaskです
+23 そのようなlimit値はありません
+24 引数が長すぎます
+25 オプション単位が不明か間違っています
+26 定義されていない変数です
+27 ディレクトリースタックの指定が深過ぎます
+28 シグナル番号が間違っています
+29 シグナルの名前が間違っています "kill -l"で見る事が出来ます
+30 変数名は英字で始める必要があります
+31 変数の名前が長すぎます
+32 変数名は英数字だけで構成する必要があります
+33 このshellではジョブコントロールは使用できません
+34 式構文?
+35 ホームディレクトリーがありません
+36 ホームディレクトリーに変更できません
+37 不正なヌルコマンドです
+38 代入式が欠けている箇所があります
+39 定義されていない演算子です
+40 曖昧です
+41 %sと言うファイルはすでに存在します
+42 -c用の引数はバックスラッシュで終わります
+43 割り込みが入りました
+44 配列に入れる添え字が範囲を超えています
+45 行のオーバーフローです
+46 そのようなジョブはありません
+47 端末からはできません
+48 while/foreachの中ではありません
+49 プロセスを生成できません
+50 照合パターンに合いません
+51 %c が欠けている箇所があります
+52 %c が対応しません
+53 メモリが不足しています
+54 パイプを作れません
 55 %s: %s
 56 %s
-57 ����: jobs [ -l ]
-58 ����������Ȥϥ���֤��ץ�����ID�Ǥ�.
-59 �����Ȥ�job�Ϥ���ޤ���
-60 ����job�Ϥ���ޤ���
-61 ����֤��ѥ�����˰��פ��ޤ���
-62 Fork�ο����� %d��Ķ���ޤ���; �����餯``�Υͥ��Ȥ���������٤Ǥ���
-63 ����subshell�Ǥϥ���֥���ȥ�����ϻ��ѤǤ��ޤ���
-64 sync����: �ץ����� %d �����Ĥ���ޤ���
-65 %s���Ǥ���job���ĤäƤ��ޤ�
-66 %s�ߤޤä�job���ĤäƤ��ޤ�
-67 ¾�Υǥ��쥯�ȥ꡼�Ϥ���ޤ���
-68 �ǥ��쥯�ȥ꡼�����å��϶��Ǥ�
-69 �ǥ��쥯�ȥ꡼̾���ְ�äƤ��ޤ�
-70 ����: %s [-%s]%s
-71 -h�ե饰�ѤΥ��ڥ��ɤ�����ޤ���
-72 �������󥷥���ǤϤ���ޤ���
-73 0�ǳ�껻���ޤ���
-74 0�ǳ�껻���ޤ���(;��׻�)
-75 �ְ�ä����ץ����ñ�̤Ǥ�: "%s"�ǤϤ���ޤ���?
-76 �������󥷥���ʤΤ����ǤǤ��ޤ���
-77 %s�Ȥ����桼������¸�ߤ��ޤ���
-78 �ѿ�$home�����ꤵ��Ƥ��ޤ���
-79 ����: history [-%s] [���٥���ֹ�]
-80 $�� ! �⤷���� < �� $# �⤷���� $? �Ȱ��ˤϻ��ѤǤ��ޤ���
-81 �ѿ�̾�˲��Ԥ����äƤ��ޤ�
-82 * �� $# �⤷���� $? �Ȱ��ˤϻ��ѤǤ��ޤ���
-83 $?<����> �⤷���� $#<����> �ϻ��ѤǤ��ޤ���
-84 �ѿ�̾�������Ǥ�
-85 �ѿ�����ǥå����˲��Ԥ����äƤ��ޤ�
-86 Ÿ���ѥХåե��������С��ե���
-87 �ѿ���ʸ?
-88 �ְ�ä� ! �ν񼰤Ǥ�
-89 �����ִ��Ϥ���ޤ���
-90 �������ִ��Ǥ�
-91 ľ���κ������ɤ�����ޤ���
-92 �������ɤ�Ĺ�᤮�ޤ�
-93 �ְ�ä� ! �����ҤǤ�: %c
-94 �����Ҥμ��ԤǤ�
-95 �ִ��Хåե��������С��ե������ޤ���
-96 �ְ�ä� ! �����Υ��쥯�����Ǥ�
-97 ���θ�����̤Ϥ���ޤ���
-98 %s: ���٥�Ȥ����Ĥ���ޤ���
-99 ")"��¿�����ޤ�
-100 "("��¿�����ޤ�
-101 ( �ξ�꤬�ְ�äƤ��ޤ�
-102 ������쥯�����̾�����礱�Ƥ��ޤ�
-103 ۣ��ʽ��ϥ�����쥯�ȤǤ�
-104 () ����� << �ϻȤ��ޤ���
-105 ۣ������ϥ�����쥯�ȤǤ�
-106 () �ξ�꤬�ְ�äƤ��ޤ�
-107 �����ꥢ�����롼�פ��Ƥ��ޤ�
-108 �ѿ�"$watch"�����ꤵ��Ƥ��ޤ���
-109 �������塼�뤵�줿���٥�ȤϤ���ޤ���
-110 ����: sched -<�����ֹ�>.\n����: sched [+]hh:mm <���ޥ��>
-111 �������塼�뤵�줿���٥�ȤϤ���ޤ���
-112 �¹ԤǤ��륳�ޥ�ɤϤ���ޤ���
-113 �����ʥ��٥�ȳ��ϻ��֤Ǥ�
-114 am/pm���������Ū�ʻ��ֻ���ϤǤ��ޤ���
-115 termcap��ʸ�����ΰ����Ǥ�
-116 ����: settc %s [yes|no]
-117 �Τ�ʤ�capability `%s'
-118 �Τ�ʤ�termcap�ѥ�᥿ `%%%c'
-119 `%s' ���Ф��������¿�᤮�ޤ� (%d)
-120 `%s' �ˤ� %d ������ɬ�פǤ�
-121 ����: echotc [-v|-s] [<capability> [<args>]]
-122 %s: %s. �ְ�ä��������ƥ�����Ǥ�
-123 !# �ҥ��ȥ꡼�Υ롼��
-124 �Դ����ʥե���������å��Ǥ�
-125 ���쥯���� �����С��ե���
-126 �������ץ����: `-%s'\nUsage: %s [ -bcdefilmnqstvVxX -Dname[=value] ] [ argument ... ]
-127 �������ץ����: `-%s'\nUsage: %s [ -bcdefFilmnqstvVxX ] [ argument ... ]
-128 �������ץ����: `-%s'\nUsage: %s [ -bcdefilmnqstvVxX ] [ argument ... ]
-129 \n�������䴰: "%s"
-130 \n������ %s: '%c'
-131 \n'%c' ( %s �θ��)�ϴְ�ä����ѥ졼�����Ǥ� "%s"
-132 \n�Դ����� %s: "%s"
-133 -m�ե饰�ѤΥ��ڥ��ɤ�����ޤ���
-134 ����: unlimit [-fh] [limits]
-135 $%S ���ɼ����ѤǤ�
-136 job�����Ĥ���ޤ���
-137 ������colorls�ѿ��Ǥ� `%c%c'
+57 形式: jobs [ -l ]
+58 アーギュメントはジョブかプロセスIDです.
+59 カレントのjobはありません
+60 前のjobはありません
+61 ジョブがパターンに一致しません
+62 Forkの深さが %dを超えました; おそらく``のネストが深すぎる為です。
+63 このsubshellではジョブコントロールは使用できません
+64 sync失敗: プロセス %d が見つかりません
+65 %s中断したjobが残っています
+66 %s止まったjobが残っています
+67 他のディレクトリーはありません
+68 ディレクトリースタックは空です
+69 ディレクトリー名が間違っています
+70 形式: %s [-%s]%s
+71 -hフラグ用のオペランドがありません
+72 ログインシェルではありません
+73 0で割り算しました
+74 0で割り算しました(余り計算)
+75 間違ったオプション単位です: "%s"ではありませんか?
+76 ログインシェルなので中断できません
+77 %sというユーザーは存在しません
+78 変数$homeが設定されていません
+79 形式: history [-%s] [イベント番号]
+80 $、 ! もしくは < は $# もしくは $? と一緒には使用できません
+81 変数名に改行が入っています
+82 * は $# もしくは $? と一緒には使用できません
+83 $?<数字> もしくは $#<数字> は使用できません
+84 変数名が不正です
+85 変数インデックスに改行が入っています
+86 展開用バッファーオーバーフロー
+87 変数構文?
+88 間違った ! の書式です
+89 前の置換はありません
+90 不正な置換です
+91 直前の左サイドがありません
+92 右サイドが長過ぎます
+93 間違った ! 修飾子です: %c
+94 修飾子の失敗です
+95 置換バッファがオーバーフローしました
+96 間違った ! 引数のセレクターです
+97 前の検索結果はありません
+98 %s: イベントが見つかりません
+99 ")"が多すぎます
+100 "("が多すぎます
+101 ( の場所が間違っています
+102 リダイレクト先の名前が欠けています
+103 曖昧な出力リダイレクトです
+104 () の中で << は使えません
+105 曖昧な入力リダイレクトです
+106 () の場所が間違っています
+107 エイリアスがループしています
+108 変数"$watch"が設定されていません
+109 スケジュールされたイベントはありません
+110 形式: sched -<項目番号>.\n形式: sched [+]hh:mm <コマンド>
+111 スケジュールされたイベントはありません
+112 実行できるコマンドはありません
+113 不正なイベント開始時間です
+114 am/pm指定で相対的な時間指定はできません
+115 termcapの文字列領域不足です
+116 形式: settc %s [yes|no]
+117 知らないcapability `%s'
+118 知らないtermcapパラメタ `%%%c'
+119 `%s' に対する引数が多過ぎます (%d)
+120 `%s' には %d 引数が必要です
+121 形式: echotc [-v|-s] [<capability> [<args>]]
+122 %s: %s. 間違ったアーキテクチャです
+123 !# ヒストリーのループ
+124 不完全なファイルチェックです
+125 セレクター オーバーフロー
+126 不明オプション: `-%s'\nUsage: %s [ -bcdefilmnqstvVxX -Dname[=value] ] [ argument ... ]
+127 不明オプション: `-%s'\nUsage: %s [ -bcdefFilmnqstvVxX ] [ argument ... ]
+128 不明オプション: `-%s'\nUsage: %s [ -bcdefilmnqstvVxX ] [ argument ... ]
+129 \n不正な補完: "%s"
+130 \n不正な %s: '%c'
+131 \n'%c' ( %s の後ろ)は間違ったセパレーターです "%s"
+132 \n不完全な %s: "%s"
+133 -mフラグ用のオペランドがありません
+134 形式: unlimit [-fh] [limits]
+135 $%S は読取専用です
+136 jobが見つかりません
+137 不明のcolorls変数です `%c%c'
diff --git a/contrib/tcsh/nls/ja/set10 b/contrib/tcsh/nls/ja/set10
index e09a8e5..8c2991d 100644
--- a/contrib/tcsh/nls/ja/set10
+++ b/contrib/tcsh/nls/ja/set10
@@ -1,8 +1,8 @@
-$ $tcsh: set10,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set10,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ ma.setp.c
 $set 10 
-1 setpath: ���ޥ�ɤ������Ǥ� '%s'.\n
-2 setpath: '%s' ���ޥ�ɤΤ���Υ���������Ȥ������Ƥ��ޤ�.\n
-3 setpath: �ѥ� '%s'�����Ƥ��ְ�äƤ��ޤ�\n
-4 setpath: %s �� %s ����ˤ���ޤ���\n
-5 setpath: %d �� %s ����Ǥ�,�ְ�ä����֤Ǥ�\n
+1 setpath: コマンドが不正です '%s'.\n
+2 setpath: '%s' コマンドのためのアーギュメントが不足しています.\n
+3 setpath: パス '%s'の内容が間違っています\n
+4 setpath: %s が %s の中にありません\n
+5 setpath: %d は %s の中では,間違った位置です\n
diff --git a/contrib/tcsh/nls/ja/set11 b/contrib/tcsh/nls/ja/set11
index bc00dbf..55a998b 100644
--- a/contrib/tcsh/nls/ja/set11
+++ b/contrib/tcsh/nls/ja/set11
@@ -1,10 +1,10 @@
-$ $tcsh: set11,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set11,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ sh.c
 $set 11 
-1 �ٹ�: tty�˥����������Ǥ��ޤ��� (%s).\n
-2 ���Τ����,����shell�ˤϥ���֥���ȥ����뤬����ޤ���.\n
-3 ���ʤ��� %d �̤Υ᡼���å�����������ޤ�.\n
-4 ���ʤ��� %d �̤Υ᡼���å������� %s �ˤ���ޤ�.\n
-5 ���ʤ��� %s�᡼�뤬����ޤ�.\n
-6 ������
-7 ���ʤ��� %s�᡼�뤬 %s�ˤ���ޤ�.\n
+1 警告: ttyにアクセスができません (%s).\n
+2 このために,このshellにはジョブコントロールがありません.\n
+3 あなたに %d 通のメールメッセージがあります.\n
+4 あなたに %d 通のメールメッセージが %s にあります.\n
+5 あなたに %sメールがあります.\n
+6 新しい
+7 あなたに %sメールが %sにあります.\n
diff --git a/contrib/tcsh/nls/ja/set12 b/contrib/tcsh/nls/ja/set12
index d3a3318..05e6445 100644
--- a/contrib/tcsh/nls/ja/set12
+++ b/contrib/tcsh/nls/ja/set12
@@ -1,4 +1,4 @@
-$ $tcsh: set12,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set12,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ sh.dir.c
 $set 12 
-1 %s: "%s"����μ¹Ԥ��ޤ�\n
+1 %s: "%s"からの実行を試します\n
diff --git a/contrib/tcsh/nls/ja/set13 b/contrib/tcsh/nls/ja/set13
index cc8c20f..7870880 100644
--- a/contrib/tcsh/nls/ja/set13
+++ b/contrib/tcsh/nls/ja/set13
@@ -1,12 +1,12 @@
-$ $tcsh: set13,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set13,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
-2 %d �Υϥå����ΰ� (%d �ӥå���)\n
-3 �ǥХå��ޥ��� = 0x%08x\n
-4 %d ����, %d ����, %d%%\n
-5 %S: ����������äƤ��륳�ޥ�ɤǤ�.\n
-6 %S: ���ޥ�ɤ����Ĥ���ޤ���\n
-7 where: / �����äƤ�����ϻȤ��ޤ���\n
-8 %S �ϥ����ꥢ�������ԤäƤ��ޤ�:
-9 %S �ϥ���������äƤ��ޤ�.\n
+2 %d のハッシュ領域 (%d ビット毎)\n
+3 デバッグマスク = 0x%08x\n
+4 %d 成功, %d 失敗, %d%%\n
+5 %S: シェルに入っているコマンドです.\n
+6 %S: コマンドが見つかりません\n
+7 where: / が入っている場合は使えません\n
+8 %S はエイリアス定義を行っています:
+9 %S はシェルに入っています.\n
diff --git a/contrib/tcsh/nls/ja/set15 b/contrib/tcsh/nls/ja/set15
index 5cfb860..28b334f 100644
--- a/contrib/tcsh/nls/ja/set15
+++ b/contrib/tcsh/nls/ja/set15
@@ -1,7 +1,7 @@
-$ $tcsh: set15,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set15,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ sh.func.c
 $set 15 
-1 %s: %s: %s ����ޤ���. (%s ����)\n
-2 ���
-3 ����
-4 \040�ϡ���
+1 %s: %s: %s 出来ません. (%s 制限)\n
+2 解除
+3 設定
+4 \040ハード
diff --git a/contrib/tcsh/nls/ja/set16 b/contrib/tcsh/nls/ja/set16
index 7edcc43..c329b29 100644
--- a/contrib/tcsh/nls/ja/set16
+++ b/contrib/tcsh/nls/ja/set16
@@ -1,13 +1,13 @@
-$ $tcsh: set16,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set16,v 1.4 2011/02/04 18:19:40 christos Exp $
 $ sh.lex.c
 $set 16 
-1 tty pgrp �� %d ���� %d�˺����ꤷ�ޤ�\n
-2 \n���������Ȥ�"logout"����Ѥ��Ʋ�����\n
-3 \n%s��λ��"exit"����Ѥ��Ʋ�����\n
+1 tty pgrp を %d から %dに再設定します\n
+2 \nログアウトは"logout"を使用して下さい\n
+3 \n%s終了は"exit"を使用して下さい\n
 4 seek to eval %x %x\n
 5 seek to alias %x %x\n
 6 seek to file %x\n
-7 �ְ�ä� seek �����פǤ� %d\n
+7 間違った seek タイプです %d\n
 8 tell eval %x %x\n
 9 tell alias %x %x\n
 10 tell file %x\n
diff --git a/contrib/tcsh/nls/ja/set17 b/contrib/tcsh/nls/ja/set17
index bf9de54..d748bc7 100644
--- a/contrib/tcsh/nls/ja/set17
+++ b/contrib/tcsh/nls/ja/set17
@@ -1,16 +1,16 @@
-$ $tcsh: set17,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set17,v 1.4 2011/02/04 18:19:40 christos Exp $
 $ sh.proc.c
 $set 17 
-1 �㳲: �Хå����饦��ɥ���֤��ԤäƤ��ޤ�\n
-2 %d�ǽ�λ���ޤ���\n
-3 �㳲: �ץ������ե�å��夬���ټ¹Ԥ���ޤ���
-4 �¹���Ǥ�
-5 �����ʥ� 
-6 %-d�ǽ�λ���ޤ��� 
-7 ��λ
-8 �㳲: ����=%-9o
-9 \040(core����Ϥ��ޤ���)
+1 障害: バッググラウンドジョブを待っています\n
+2 %dで終了しました\n
+3 障害: プロセスフラッシュが二度実行されました
+4 実行中です
+5 シグナル 
+6 %-dで終了しました 
+7 終了
+8 障害: 状態=%-9o
+9 \040(coreを出力しました)
 10 \040(wd: 
-12 %S: ���Ǥ����Ǥ��Ƥ��ޤ�\n
-13 %S: ���Ǥ���ߤ��Ƥ��ޤ�\n
+12 %S: すでに中断しています\n
+13 %S: すでに停止しています\n
 14 %S: Badly formed number\n
diff --git a/contrib/tcsh/nls/ja/set18 b/contrib/tcsh/nls/ja/set18
index b9364ac..ef4715d 100644
--- a/contrib/tcsh/nls/ja/set18
+++ b/contrib/tcsh/nls/ja/set18
@@ -1,4 +1,4 @@
-$ $tcsh: set18,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set18,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ sh.set.c
 $set 18 
-1 �ٹ�: �Լ�����Ĺ�� PATH ���ڤ�ΤƤ��ޤ�\n
+1 警告: 不自然に長い PATH は切り捨てられます\n
diff --git a/contrib/tcsh/nls/ja/set2 b/contrib/tcsh/nls/ja/set2
index 34e780c..59ce407 100644
--- a/contrib/tcsh/nls/ja/set2
+++ b/contrib/tcsh/nls/ja/set2
@@ -1,94 +1,94 @@
-$ $tcsh: set2,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set2,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ Signal names
 $set 2 
-1 �̥륷���ʥ�
-2 �ϥ󥰥��å�
-3 ������
-4 ���
-5 �����ʵ������̿��
-6 �ȥ졼�����֥졼���ݥ���ȥȥ�å�
-7 ���ܡ���
-8 IOT�ȥ�å�
-9 �����ƥ९��å����ǽ����
-10 ���顼��λ
-11 ���ߥ�졼�����ȥ�å�
-12 �黻�㳰
-13 ������λ
-14 �桼���������ʥ�1
-15 �桼���������ʥ�2
-16 �������ȥ��顼
-17 �Х����顼
-18 �ץ�������ϰϥ��顼
-19 ���ڥ����ϰϥ��顼
-20 ���������ƥॳ����
-21 �ѥ����˲�
-22 ���顼�ॷ���ʥ�
-23 ��λ
-24 �ҥץ������ξ����ѹ�
-25 �ҥץ�������˴
-26 Apollo���ꥨ�顼
-27 �ҥץ�������ߤ⤷���Ͻ�λ
-28 �ҥץ�������λ
-29 �Ÿ��۾�
-30 �꥽��������
-31 �֥졼�� (Ctrl-Break)
-32 ������ ��ǽ�����ʥ�
-33 ��Ʊ�� I/O (select)
-34 �����åȶ۵��׵�
-35 ¿�ť�����wake-up
-36 ¿�ť�����kill
-37 Fortran��Ʊ��I/O��λ
-38 �ꥫ�Х�
-39 �����ʥ��꡼���顼
-40 CPU �������¥����С�
-41 �����ƥ���� ��ǽ����
-42 �ޥ������������� group-no wakeup �ե饰����
-43 ����åɥ��顼 - (cord -T ����Ѥ��ƾܺپ���򻲾Ȥ��Ʋ�����)
-44 CRAY Y-MP �쥸�����ѥ�ƥ������顼
-45 �����׵�
-46 ����(�����ʥ�)
-47 ���(�����ʥ�)
-48 ����
-49 ���
-50 ��³
-51 ����(tty����)
-52 ���(tty����)
-53 ����(tty����)
-54 ���(tty����)
-55 ������ɥ������ѹ�
-56 ������ɥ��������ѹ�
-57 ���ò��������ѹ�
-58 CPU�������¥����С�
-59 �ե����륵�������¥����С�
-60 ���ۻ��֥��顼��
-61 �ץ��ե�����󥰻��֥��顼��
-62 DIL�����ʥ�
-63 �ƻ��ǽ���٥��ȯ��
-64 �ץ�������LWPS���֥��å�����ޤ���
-65 ���� LWP �����ʥ�
-66 ���� CPR �����ʥ�
-67 ���� CPR �����ʥ�
-68 �裱 �ꥢ�륿���ॷ���ʥ�
-69 �裲 �ꥢ�륿���ॷ���ʥ�
-70 �裳 �ꥢ�륿���ॷ���ʥ�
-71 �裴 �ꥢ�륿���ॷ���ʥ�
-72 �裴 �ǽ��ꥢ�륿���ॷ���ʥ�
-73 �裳 �ǽ��ꥢ�륿���ॷ���ʥ�
-74 �裲 �ǽ��ꥢ�륿���ॷ���ʥ�
-75 �ǽ��ꥢ�륿���ॷ���ʥ�
-76 LAN ��Ʊ�� I/O
-77 PTY read/write ��ǽ
-78 I/O �����׵�
-79 HFT ��˥����⡼����Ϳ
-80 HFT ��˥����⡼�ɤ�relinguish?��ɬ��
-81 HFT ������ɥ���ȥ����봰λ
-82 HFT ring buffer�˥ǡ�������
-83 �ץ������ܹ�
-84 Secure ���ƥ󥷥�󥭡�
-85 �ƥ������塼��
-86 �����ʥ� SS$_DEBUG
-87 ͥ�����ѹ�
-88 ���ǥåɥ��å�����
-89 ������ʸ������
-90 �����å����¥����С�
-91 ̤���ѥ����ʥ�
+1 ヌルシグナル
+2 ハングアップ
+3 割り込み
+4 中止
+5 不正な機械語の命令
+6 トレース・ブレークポイントトラップ
+7 アボート
+8 IOTトラップ
+9 システムクラッシュ可能性増
+10 エラー終了
+11 エミュレーショントラップ
+12 演算例外
+13 強制終了
+14 ユーザーシグナル1
+15 ユーザーシグナル2
+16 セグメントエラー
+17 バスエラー
+18 プログラム範囲エラー
+19 オペランド範囲エラー
+20 不正システムコール
+21 パイプ破壊
+22 アラームシグナル
+23 終了
+24 子プロセスの状態変更
+25 子プロセス死亡
+26 Apollo限定エラー
+27 子プロセス停止もしくは終了
+28 子プロセス終了
+29 電源異常
+30 リソース消滅
+31 ブレーク (Ctrl-Break)
+32 入出力 可能シグナル
+33 非同期 I/O (select)
+34 ソケット緊急要求
+35 多重タスクwake-up
+36 多重タスクkill
+37 Fortran非同期I/O終了
+38 リカバリ
+39 不正なメモリーエラー
+40 CPU 時間制限オーバー
+41 システム停止 可能性増
+42 マイクロタスキング group-no wakeup フラグ設定
+43 スレッドエラー - (cord -T を使用して詳細情報を参照して下さい)
+44 CRAY Y-MP レジスタパリティーエラー
+45 情報要求
+46 中断(シグナル)
+47 停止(シグナル)
+48 中断
+49 停止
+50 継続
+51 中断(tty入力)
+52 停止(tty入力)
+53 中断(tty出力)
+54 停止(tty出力)
+55 ウィンドウ状態変更
+56 ウィンドウサイズ変更
+57 電話回線状態変更
+58 CPU時間制限オーバー
+59 ファイルサイズ制限オーバー
+60 仮想時間アラーム
+61 プロファイリング時間アラーム
+62 DILシグナル
+63 監視可能イベント発生
+64 プロセスのLWPSがブロックされました
+65 特別 LWP シグナル
+66 特別 CPR シグナル
+67 特別 CPR シグナル
+68 第１ リアルタイムシグナル
+69 第２ リアルタイムシグナル
+70 第３ リアルタイムシグナル
+71 第４ リアルタイムシグナル
+72 第４ 最終リアルタイムシグナル
+73 第３ 最終リアルタイムシグナル
+74 第２ 最終リアルタイムシグナル
+75 最終リアルタイムシグナル
+76 LAN 非同期 I/O
+77 PTY read/write 可能
+78 I/O 介入要求
+79 HFT モニターモード付与
+80 HFT モニターモードにrelinguish?が必要
+81 HFT サウンドコントロール完了
+82 HFT ring bufferにデータあり
+83 プロセス移行
+84 Secure アテンションキー
+85 再スケジュール
+86 シグナル SS$_DEBUG
+87 優先度変更
+88 真デッドロック検出
+89 新しい文字入力
+90 スタック制限オーバー
+91 未使用シグナル
diff --git a/contrib/tcsh/nls/ja/set21 b/contrib/tcsh/nls/ja/set21
index 9a7783e..995fb02 100644
--- a/contrib/tcsh/nls/ja/set21
+++ b/contrib/tcsh/nls/ja/set21
@@ -1,5 +1,5 @@
-$ $tcsh: set21,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set21,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ tc.disc.c
 $set 21 
-1 �������륭��������Ǥ��ޤ���.\n
-2 �������륭��������Ǥ��ޤ���.\n
+1 ローカルキャラを取得できません.\n
+2 ローカルキャラを設定できません.\n
diff --git a/contrib/tcsh/nls/ja/set29 b/contrib/tcsh/nls/ja/set29
index 9f67ef6..003e49d 100644
--- a/contrib/tcsh/nls/ja/set29
+++ b/contrib/tcsh/nls/ja/set29
@@ -1,4 +1,4 @@
-$ $tcsh: set29,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set29,v 1.4 2011/02/04 18:19:40 christos Exp $
 $ tw.help.c
 $set 29 
-1 %S �ѤΥإ�ץե����뤬����ޤ���\n
+1 %S 用のヘルプファイルがありません\n
diff --git a/contrib/tcsh/nls/ja/set3 b/contrib/tcsh/nls/ja/set3
index cc3dc3b..92f7986 100644
--- a/contrib/tcsh/nls/ja/set3
+++ b/contrib/tcsh/nls/ja/set3
@@ -1,124 +1,124 @@
 $ $tcsh: set3,v 1.4 2001/04/26 19:07:48 kim Exp $
 $ Editor function descriptions
 $set 3 
-1 1ʸ�����
-2 ����������֤�ʸ������
-3 ���ߤΥ�ɤ���Ƭ���饫������ޤǤ��� - ���åȥХåե�������¸
-4 ��Ƭ���饫������ޤǤ��� - ���åȥХåե�������¸
-5 ���ߤΥ�ɤ���Ƭ�˰�ư
-6 ��Ƭ�˰�ư
-7 ����������֤����ɤ������ޤǤ򥭥�ԥ��饤��
-8 ����������֤���ʸ����ʸ�����Ѵ�����1ʸ����ư(vi)
-9 �����ޤǤ��ѹ�(vi)
-10 ���̥��ꥢ���Ƹ��߹Ԥ���̤κǾ�Ԥ�
-11 ���ߤΥ�ɤ��䴰
+1 1文字戻る
+2 カーソル位置の文字を削除
+3 現在のワードの先頭からカーソルまでを削除 - カットバッファーに保存
+4 行頭からカーソルまでを削除 - カットバッファーに保存
+5 現在のワードの先頭に移動
+6 行頭に移動
+7 カーソル位置からワードの末尾までをキャピタライズ
+8 カーソル位置の大文字小文字を変換し、1文字移動(vi)
+9 行末までを変更(vi)
+10 画面クリアして現在行を画面の最上行に
+11 現在のワードを補完
 12 Tab forward through files
 13 Tab backward through files
-14 �ץ�������ǽ���䴰��Ȥ�ʤ����ߤΥ�ɤ��䴰
-15 ���ߤΥ�ɤΥ���������֤ޤǤ򥳥ԡ�
-16 �ޡ������֤��饫������ޤǤ��ΰ�򥫥åȥХåե����˥��ԡ�
+14 プログラム可能な補完を使わない現在のワードの補完
+15 現在のワードのカーソル位置までをコピー
+16 マーク位置からカーソルまでの領域をカットバッファーにコピー
 17 Expand to preceding word for which this is a prefix
-18 ����������֤�ʸ������
-19 ����������֤�ʸ�����������ԤǤ�end of file�򼨤�
-20 ����������֤�ʸ�������������Ǥ��䴰�������
-21 ����������֤�ʸ��������end of file��signal�⤷�����䴰�������
-22 ����������֤��鸽�ߤΥ�ɤ������ޤǤ��������åȥХåե�������¸��
+18 カーソル位置の文字を削除
+19 カーソル位置の文字を削除。空行ではend of fileを示す
+20 カーソル位置の文字を削除。行末では補完候補一覧
+21 カーソル位置の文字を削除。end of fileをsignalもしくは補完候補一覧
+22 カーソル位置から現在のワードの末尾までを削除。カットバッファーに保存。
 23 Adds to argument if started or enters digit
 24 Digit that starts argument
-25 ��������Ԥ˰�ư
-26 ����������֤��鸽�ߤΥ�ɤ������ޤǤ�ʸ���ˤ���
-27 �ե����뽪ü��ɽ��
-28 �����˥���������ư
-29 ��������ȥޡ����������ؤ���
-30 �ե�����̾�Υ磻��ɥ����ɤ�Ÿ��
-31 ���򥨥������פ�Ÿ��
-32 ��������򥨥������פ�Ÿ��
-33 �ѿ���Ÿ��
-34 1ʸ���ʤ�
-35 ���ߤΥ�����ޤǰ�ư
-36 �������������2ʸ���������ؤ���
-37 ���߹Ԥ�Ʊ���褦�˻Ϥޤ��Τ������椫���������˸���
-38 ���߹Ԥ�Ʊ���褦�˻Ϥޤ��Τ������椫���������˸���
-39 ���Υ��ޥ�ɤκǸ�ι��ܤ�����
-40 ���������󥯥��󥿥븡��
-41 ���������󥯥��󥿥븡��
-42 1�ԥ��ꥢ
-43 �����ޤǺ�����ƥ��åȥХåե�������¸
-44 �ޡ������֤��饫������ޤǤ��ΰ�������ƥ��åȥХåե�������¸
-45 1�����Τ������ƥ��åȥХåե�������¸
-46 �䴰����ΰ���
-47 �ץ�������ǽ���䴰����Ѥ��ʤ��䴰����ΰ���
-48 �磻��ɥ����ɤ˹��פ���ե�����̾�ΰ���
-49 �䴰����ΰ��������Ԥξ���end of file�򼨤���
-50 ʿ����٤ȸ��ߤΥץ������ξ��֤�ɽ��
-51 ���򥨥������פ�Ÿ�����ƶ��������
-52 ���ޥ�ɼ¹�
-53 �ѥ�̾��Ÿ��(.��..�ǻϤޤ��Τ����)
-54 ���ޥ�ɤ�ºݤΥѥ�̾����̾��Ÿ��
-55 �����⡼�ɤ����񤭥⡼�ɤؤ��ڤ��ؤ��⤷���Ϥ��ε�
-56 �����Ǥ�ʸ����8bit���Ω�Ƥ�
-57 �����Ǥ�ʸ����Ԥˤ��Τޤ޲ä���
-58 ���٤Ƥ������
-59 ��ߤ��Ƥ������ǥ�������Ƶ�ư
-60 ���ߤΥ��ޥ�ɤΥإ�פ�õ��
-61 ����ʸ���ϹԤ˲ä�����
-62 ����ʸ����ʸ���������󥹤���Ƭ
-63 ����������֤�ޡ�������
-64 ���ߤΥ�ɤ��֤������
-65 1�����Τ��֤������C
-66 ʸ����cocked�⡼�ɤ�tty������
+25 次の履歴行に移動
+26 カーソル位置から現在のワードの末尾までを小文字にする
+27 ファイル終端を表示
+28 行末にカーソルを移動
+29 カーソルとマークを入れ替える
+30 ファイル名のワイルドカードを展開
+31 履歴エスケイプを展開
+32 行中の履歴エスケイプを展開
+33 変数を展開
+34 1文字進む
+35 現在のワード末まで移動
+36 カーソルの前の2文字を入れ替える
+37 現在行と同じように始まるものを履歴中から後ろ向きに検索
+38 現在行と同じように始まるものを履歴中から前向きに検索
+39 前のコマンドの最後の項目を挿入
+40 順方向インクリメンタル検索
+41 逆方向インクリメンタル検索
+42 1行クリア
+43 行末まで削除してカットバッファーに保存
+44 マーク位置からカーソルまでの領域を削除してカットバッファーに保存
+45 1行全体を削除してカットバッファーに保存
+46 補完候補の一覧
+47 プログラム可能な補完を使用しない補完候補の一覧
+48 ワイルドカードに合致するファイル名の一覧
+49 補完候補の一覧。空行の場合はend of fileを示す。
+50 平均負荷と現在のプロセスの状態を表示
+51 履歴エスケイプを展開して空白を挿入
+52 コマンド実行
+53 パス名を展開(.や..で始まるものを除く)
+54 コマンドを実際のパス名や別名に展開
+55 挿入モードから上書きモードへの切り替えもしくはその逆
+56 次に打つ文字の8bitめを立てる
+57 次に打つ文字を行にそのまま加える
+58 すべてを再描画
+59 停止していたエディターを再起動
+60 現在のコマンドのヘルプを探す
+61 この文字は行に加えられる
+62 この文字は文字シーケンスの先頭
+63 カーソル位置をマークする
+64 現在のワードの綴りを訂正
+65 1行全体の綴りを訂正C
+66 文字をcockedモードでttyに送る
 67 Toggle between literal and lexical current history line
-68 ��������κ���ʸ����1�ľ�������Τˤ���
-69 �������������2�Ĥ�ʸ���������ؤ���
-70 delayed suspendʸ����
-71 flush outputʸ����
-72 interruptʸ����
-73 quitʸ����
-74 suspendʸ����
-75 allow outputʸ����
-76 disallowʸ����
-77 ������Ƥ��Ƥ��ʤ�ʸ����ɽ��
+68 カーソルの左の文字を1つ小さいものにする
+69 カーソルの前の2つの文字を入れ替える
+70 delayed suspend文字を試す
+71 flush output文字を試す
+72 interrupt文字を試す
+73 quit文字を試す
+74 suspend文字を試す
+75 allow output文字を試す
+76 disallow文字を試す
+77 割り当てられていない文字を表示
 78 Emacs universal argument (argument times 4)
-79 1����������Ԥ˰�ư
-80 ����������֤��鸽�ߤΥ�ɤ������ޤǤ���ʸ���ˤ���
-81 ���Υ�ɤ���Ƭ�ذ�ư(vi)
-82 ��������θ���������⡼�ɤذܹ�(vi)
-83 ����������֤������⡼�ɤذܹ�(vi)
-84 ����������֤���ʸ����ʸ�����Ѵ�����1ʸ���ʤ�(vi)
+79 1つ前の履歴行に移動
+80 カーソル位置から現在のワードの末尾までを大文字にする
+81 次のワードの先頭へ移動(vi)
+82 カーソルの後ろへ挿入モードへ移行(vi)
+83 カーソル位置に挿入モードへ移行(vi)
+84 カーソル位置の大文字小文字を変換し、1文字進む(vi)
 85 Vi change prefix command
-86 �����ޤǤ��ѹ�(vi)
-87 ���ޥ�ɥ⡼�ɤذܹ� (������������ѹ�)(vi)
-88 ���ޥ�ɥ⡼�ɤǤθ��ߤΥ�ɤ��䴰(vi)
-89 ����ʸ���˰�ư(�Хå����ڥ���)(vi)
+86 行末までを変更(vi)
+87 コマンドモードへ移行 (キー割り当て変更)(vi)
+88 コマンドモードでの現在のワードの補完(vi)
+89 前の文字に移動(バックスペイス)(vi)
 90 Vi delete prefix command
-91 ���ߤΥ�ɴ֤ζ���������˰�ư(vi)
-92 ���ߤΥ�ɤ������˰�ư(vi)
-93 �������λ��ꤵ�줿ʸ���˰�ư(vi)
-94 ����ˡ�λ��ꤵ�줿ʸ���˰�ư(vi)
-95 �������λ��ꤵ�줿ʸ����ľ���ޤǰ�ư(vi)
-96 �������λ��ꤵ�줿ʸ����ľ���ޤǰ�ư(vi)
-97 vi�������⡼�ɤ˰ܹ�
-98 ��Ƭ��vi�������⡼�ɤ˰ܹ�
-99 ���ߤ�1ʸ��������Ʊ�������˷����֤�(vi)
-100 ���ߤ�1ʸ��������ȿ�������˷����֤�(vi)
-101 ���ߤθ�����Ʊ�������˷����֤�(vi)
-102 ���ߤθ�����ȿ�������˷����֤�(vi)
-103 ���֤�1ʸ���򼡤��Ǥ�1ʸ�����ִ�(vi)
-104 �ִ��⡼��replace mode(vi)
-105 ���������򸡺�(vi)
-106 ���������򸡺�(vi)
-107 ����������֤�ʸ�����ִ����������⡼�ɤ˰ܹ�(vi)
-108 1�����ִ�(vi)
-109 ���Υ�ɤذ�ư(vi)
-110 ���Υ�ɤذܹ�(vi)
-111 ľ�����ѹ�����ä�(vi)
-112 �Ԥ���Ƭ�ذ�ư(vi)
+91 現在のワード間の空白の末尾に移動(vi)
+92 現在のワードの末尾に移動(vi)
+93 逆方向の指定された文字に移動(vi)
+94 順方法の指定された文字に移動(vi)
+95 逆方向の指定された文字の直前まで移動(vi)
+96 順方向の指定された文字の直前まで移動(vi)
+97 viの挿入モードに移行
+98 行頭でviの挿入モードに移行
+99 現在の1文字検索を同じ方向に繰り返す(vi)
+100 現在の1文字検索を反対方向に繰り返す(vi)
+101 現在の検索を同じ方向に繰り返す(vi)
+102 現在の検索を反対方向に繰り返す(vi)
+103 位置の1文字を次に打つ1文字と置換(vi)
+104 置換モードreplace mode(vi)
+105 逆方向履歴検索(vi)
+106 順方向履歴検索(vi)
+107 カーソル位置の文字を置換して挿入モードに移行(vi)
+108 1行全置換(vi)
+109 前のワードへ移動(vi)
+110 次のワードへ移行(vi)
+111 直前の変更を取り消す(vi)
+112 行の先頭へ移動(vi)
 113 Perform which of current command
-114 ���åȥХåե��������Ƥ򥫡�������֤�Ž���դ���
+114 カットバッファーの内容をカーソル位置に貼り付ける
 115 Replace just-yanked text with yank from earlier kill
-116 (WIN32�Τ�) ���åȥХåե��������Ƥ򥷥��ƥ�Υ���åץܡ��ɤ˥��ԡ�
-117 (WIN32�Τ�) ����åץܡ��ɤ����Ƥ򥫡�������֤�Ž���դ�
-118 (WIN32�Τ�) ���Υ�����'/'�򤹤٤�'\\\\'���Ѵ�
-119 (WIN32�Τ�) ���Υ�����'/'�򤹤٤�'\\\\'���Ѵ�
-120 (WIN32�Τ�) Page visible console window up
-121 (WIN32�Τ�) Page visible console window down
+116 (WIN32のみ) カットバッファーの内容をシステムのクリップボードにコピー
+117 (WIN32のみ) クリップボードの内容をカーソル位置に貼り付け
+118 (WIN32のみ) 次のワード中の'/'をすべて'\\\\'に変換
+119 (WIN32のみ) 前のワード中の'/'をすべて'\\\\'に変換
+120 (WIN32のみ) Page visible console window up
+121 (WIN32のみ) Page visible console window down
diff --git a/contrib/tcsh/nls/ja/set30 b/contrib/tcsh/nls/ja/set30
index d48bdc3..ffea304 100644
--- a/contrib/tcsh/nls/ja/set30
+++ b/contrib/tcsh/nls/ja/set30
@@ -1,16 +1,16 @@
-$ $tcsh: set30,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set30,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ tw.parse.c
 $set 30 
-1 ���ޥ�ɳ��� %d\n
-2 ��λ %d 
-3 ��λ %d %S\n
-4 %s: �����ޥå����顼.\n
+1 コマンド開始 %d\n
+2 完了 %d 
+3 完了 %d %S\n
+4 %s: 内部マッチエラー.\n
 5 items
 6 rows
-7 %d %s����ޤ�. �ꥹ�Ƚ��Ϥ�Ԥ��ޤ���? [n/y] 
-8 ɽ�� = %d\n
-9 \ntcsh �������顼: ����õ���Ƥ��뤫ʬ����ʤ��ʤäƤ��ޤä�!\n
-10 �ǥ��쥯�ȥ�ǤϤ���ޤ���
-11 ���Ĥ���ޤ���
-12 �ɤ߹��ळ�Ȥ��Ǥ��ޤ���
+7 %d %sあります. リスト出力を行いますか? [n/y] 
+8 表示 = %d\n
+9 \ntcsh 内部エラー: 何を探しているか分からなくなってしまった!\n
+10 ディレクトリではありません
+11 見つかりません
+12 読み込むことができません
 13 yY
diff --git a/contrib/tcsh/nls/ja/set4 b/contrib/tcsh/nls/ja/set4
index 3743178..718952f 100644
--- a/contrib/tcsh/nls/ja/set4
+++ b/contrib/tcsh/nls/ja/set4
@@ -1,45 +1,45 @@
 $ $tcsh: set4,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ Termcap strings
 $set 4
-1 ��������
-2 ��İ�٥�
-3 �������ޤǾõ�
-4 �����ޤǾõ�
-5 ���������ʿ��ư
-6 ���̾õ�
-7 1ʸ�����
-8 1�Ժ��
-9 ����⡼�ɳ���
-10 ����⡼�ɽ�λ
-11 �����⡼�ɽ�λ
-12 ���ơ������Ԥ��饫�����������
-13 ���������ۡ�����֤�
-14 ʸ������
-15 �����⡼�ɳ���
-16 �ѥǥ�������
-17 �������벼��ư
-18 �������뺸��ư
-19 �������뱦��ư
-20 ����������ư
-21 ��������
-22 °����λ
-23 ʬ��ػ߶���
-24 ��Ĵ��λ
-25 ��Ĵ����
-26 ��������򥹥ơ������Ԥ�
-27 ���������1�ľ��
-28 ��������
-29 ������λ
-30 �Ļ�٥�
-31 ʣ��ʸ�����
-32 �������벼��ư(multiple)
-33 ʣ��ʸ������
-34 ��������j����ư(multiple)
-35 �������뱦��ư(multiple)
-36 ����������ư(multiple)
-37 ��ư�ޡ������ǽ
-38 ʪ�����ֻ��Ѳ�ǽ
-39 �Կ�
-40 ���
-41 �᥿��������
-42 ���ޡ������̵�뤷������
+1 空行挿入
+2 可聴ベル
+3 画面末まで消去
+4 行末まで消去
+5 カーソル水平移動
+6 画面消去
+7 1文字削除
+8 1行削除
+9 削除モード開始
+10 削除モード終了
+11 挿入モード終了
+12 ステータス行からカーソルを復帰
+13 カーソルをホーム位置へ
+14 文字挿入
+15 挿入モード開始
+16 パディング挿入
+17 カーソル下移動
+18 カーソル左移動
+19 カーソル右移動
+20 カーソル上移動
+21 太字開始
+22 属性終了
+23 分割禁止空白
+24 強調終了
+25 強調開始
+26 カーソルをステータス行へ
+27 カーソルを1つ上へ
+28 下線開始
+29 下線終了
+30 可視ベル
+31 複数文字削除
+32 カーソル下移動(multiple)
+33 複数文字挿入
+34 カーソルj左移動(multiple)
+35 カーソル右移動(multiple)
+36 カーソル上移動(multiple)
+37 自動マージン可能
+38 物理タブ使用可能
+39 行数
+40 桁数
+41 メタキーあり
+42 右マージンを無視した改行
diff --git a/contrib/tcsh/nls/ja/set5 b/contrib/tcsh/nls/ja/set5
index 9241818..7a65e3f 100644
--- a/contrib/tcsh/nls/ja/set5
+++ b/contrib/tcsh/nls/ja/set5
@@ -1,4 +1,4 @@
-$ $tcsh: set5,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set5,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ ed.chared.c
 $set 5
-1 �����ƥ����ɽ���ϻ��ѤǤ��ޤ���\n
+1 システム負荷表示は使用できません\n
diff --git a/contrib/tcsh/nls/ja/set6 b/contrib/tcsh/nls/ja/set6
index 203f664..d390d65 100644
--- a/contrib/tcsh/nls/ja/set6
+++ b/contrib/tcsh/nls/ja/set6
@@ -1,11 +1,11 @@
-$ $tcsh: set6,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set6,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ ed.inputl.c
 $set 6
-1 ���顼: �����ʥ�������Υ��ޥ�� 0%o\r\n
-2 �Ϥ�\n
-3 �Խ�\n
-4 ���\n
-5 ������\n
-6 ���פ������ޥ�ɤ�����ޤ���\n
-7 ۣ��ʥ��ޥ�ɤǤ�\n
-8 *** ���ǥ���������̿Ū���顼 ***\r\n\n
+1 エラー: 不正なキーからのコマンド 0%o\r\n
+2 はい\n
+3 編集\n
+4 中止\n
+5 いいえ\n
+6 一致したコマンドがありません\n
+7 曖昧なコマンドです\n
+8 *** エディターの致命的エラー ***\r\n\n
diff --git a/contrib/tcsh/nls/ja/set7 b/contrib/tcsh/nls/ja/set7
index 911ad75..915942a 100644
--- a/contrib/tcsh/nls/ja/set7
+++ b/contrib/tcsh/nls/ja/set7
@@ -1,30 +1,30 @@
-$ $tcsh: set7,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set7,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ ed.screen.c
 $set 7
-1 \n\tTcsh �ο�¬�Ǥϡ����ʤ���ü����\n
-2 \t�ʲ�����������äƤ��ޤ�:\n\n
-3 \t%d �� %d ��\n
-4 \tmeta ������%s\n
-5 ���äƤ��ޤ�
-6 ���äƤ��ޤ���
-7 \ttab ��Ȥ�%s\n
-8 ���Ȥ��Ǥ��ޤ���
-9 \t��ư�ޡ������%s\n
-10 ���äƤ��ޤ�
-11 ���äƤ��ޤ���
-12 \t�ޥ��å��ޡ������%s\n
-13 (̤���)
-14 ����
-15 �ʤ�
-16 ���顼: ����Ǥ��ޤ���\r\n
-17 DeleteChars: ���ꤨ�ʤ����ͤǤ�: %d\r\n
-18 ���顼: �����Ǥ��ޤ���\r\n
-19 StartInsert: ���ꤨ�ʤ����ͤǤ�: %d\r\n
-20 %s: /etc/termcap �򳫤����Ȥ��Ǥ��ޤ���.\n
-21 %s: �����ߥʥ륿���� "%s" ����Ͽ����Ƥ��ޤ���\n
-22 %s: ����ü���������Ȥ��ޤ�\n
-23 %s: �ٹ�: ���ʤ���ü���� move up �Ǥ��ޤ���.\n
-24 Ĺ���ԤΤ����Խ������������ʤäƤ��ޤ�.\n
-25 �����ޤǾõ�뤿��ε�ǽ������ޤ���.\n
-26 ʸ������ε�ǽ������ޤ���.\n
-27 ʸ�������ε�ǽ������ޤ���.\n
+1 \n\tTcsh の推測では、あなたの端末は\n
+2 \t以下の特性を持っています:\n\n
+3 \t%d 桁 %d 行\n
+4 \tmeta キーを%s\n
+5 持っています
+6 持っていません
+7 \ttab を使う%s\n
+8 ことができません
+9 \t自動マージンを%s\n
+10 持っています
+11 持っていません
+12 \tマジックマージンを%s\n
+13 (未定義)
+14 ある
+15 ない
+16 エラー: 削除できません\r\n
+17 DeleteChars: ありえない数値です: %d\r\n
+18 エラー: 挿入できません\r\n
+19 StartInsert: ありえない数値です: %d\r\n
+20 %s: /etc/termcap を開くことができません.\n
+21 %s: ターミナルタイプ "%s" は登録されていません\n
+22 %s: ダム端末の設定を使います\n
+23 %s: 警告: あなたの端末は move up できません.\n
+24 長い行のため編集がおかしくなっています.\n
+25 行末まで消去するための機能がありません.\n
+26 文字削除の機能がありません.\n
+27 文字挿入の機能がありません.\n
diff --git a/contrib/tcsh/nls/ja/set8 b/contrib/tcsh/nls/ja/set8
index f979f4e..bc19a16 100644
--- a/contrib/tcsh/nls/ja/set8
+++ b/contrib/tcsh/nls/ja/set8
@@ -1,5 +1,5 @@
-$ $tcsh: set8,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set8,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ ed.term.c
 $set 8
-1 ������switch
-2 �����ʥ���������ȤǤ�
+1 不明なswitch
+2 不正なアーギュメントです
diff --git a/contrib/tcsh/nls/russian/charset b/contrib/tcsh/nls/russian/charset
index 59ed4cf..81f1b66 100644
--- a/contrib/tcsh/nls/russian/charset
+++ b/contrib/tcsh/nls/russian/charset
@@ -1,3 +1,3 @@
-$ codeset=KOI8-R
+$ codeset=UTF-8
 $set 255
-1 KOI8-R
+1 UTF-8
diff --git a/contrib/tcsh/nls/russian/set1 b/contrib/tcsh/nls/russian/set1
index 7acaf44..2ca7b81 100644
--- a/contrib/tcsh/nls/russian/set1
+++ b/contrib/tcsh/nls/russian/set1
@@ -1,140 +1,140 @@
-$ $tcsh: set1,v 1.4 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set1,v 1.5 2011/02/04 18:19:41 christos Exp $
 $ Error messages
 $set 1 
-1 �������������� ������
-2 %s �����������
-3 ����� ������� �������
-4 $< ������ ������� �������
-5 ��� ����� ��� $0
-6 �������ۣ���� ����������� []
-7 $ ���������� ������ ������������ ����� ]
-8 ������ ����������� � $ (%c)
-9 ������ ������������
-10 ����������� �������������� �����
-11 ��� ������ ����
-12 ����������� ��� �����
-13 ���������� ������ glob
-14 ������� �� �������
-15 ������� ���� ����������
-16 ������� ����� ����������
-17 ������� ������ �������������� ���
-18 ������ if
-19 �������� then
-20 ����� �� � �������
-21 %s �� �������
-22 �������� �������� mask
-23 ��� ������ �������
-24 �������� ������� �����
-25 �������� ��� ����������� ������ ����������
-26 �������������� ����������
-27 ���� ��������� �� ����� ��������
-28 �������� ����� �������
-29 ����������� ������; kill -l ������� ������ ��������
-30 ��� ���������� ������ ���������� � �����
-31 ������� ������� ��� ����������
-32 � ����� ���������� ������ ����������� ���������-�������� �������
-33 ���������� ��������� ����������� � ���� �����
-34 ��������� ���������
-35 ����������� �������� �������
-36 �� ���� ������� � �������� �������
-37 ��������� �������
-38 � ���������� ����������� ���������
-39 ����������� ��������
-40 ������������
-41 %s: ���� ����������
-42 �������� ��� -c �� ������ ������������ �� \
-43 ��������
-44 ������������ ������� �� �������
-45 ������������ ������
-46 ��� ������ �������
-47 �� ���� �� ���������
-48 �� ������ while/foreach
-49 ��� ������ ���������
-50 ��� ������������
-51 ����������� %c
-52 ��� ������������ ��� %c
-53 ��� ������
-54 �� ���� ������� ������������� �����
+1 Синтаксическая ошибка
+2 %s недопустимо
+3 Слово слишком длинное
+4 $< строка слишком длинная
+5 Нет файла для $0
+6 Незавершённый модификатор []
+7 $ расширение должно оканчиваться перед ]
+8 Плохой модификатор в $ (%c)
+9 Ошибка подпрограммы
+10 Неправильно сформированное число
+11 Нет больше слов
+12 Отсутствует имя файла
+13 Внутренняя ошибка glob
+14 Команда не найдена
+15 Слишком мало аргументов
+16 Слишком много аргументов
+17 Слишком опасно переопределять это
+18 Пустой if
+19 Неверный then
+20 Слова не в скобках
+21 %s не найдено
+22 Неверное значение mask
+23 Нет такого предела
+24 Аргумент слишком велик
+25 Неверный или неизвестный фактор увеличения
+26 Неопределенная переменная
+27 Стек каталогов не такой глубокий
+28 Неверный номер сигнала
+29 Неизвестный сигнал; kill -l выведет список сигналов
+30 Имя переменной должно начинаться с буквы
+31 Слишком длинное имя переменной
+32 В имени переменной должны содержаться алфавитно-цифровые символы
+33 Управление заданиями отсутствует в этом шелле
+34 Синтаксис выражения
+35 Отсутствует домашний каталог
+36 Не могу перейти в домашний каталог
+37 Пропущена команда
+38 В присвоении отсутствует выражение
+39 Неизвестный оператор
+40 Неоднозначно
+41 %s: Файл существует
+42 Аргумент для -c не должен оканчиваться на \
+43 Прервано
+44 Подпрограмма выходит за пределы
+45 Переполнение строки
+46 Нет такого задания
+47 Не могу из терминала
+48 Не внутри while/foreach
+49 Нет больше процессов
+50 Нет соответствий
+51 Отсутствует %c
+52 Нет соответствия для %c
+53 Нет памяти
+54 Не могу создать неименованный канал
 55 %s: %s
 56 %s
-57 �������������: jobs [ -l ]
-58 ��������� ������ �������� ���������������� ������� ��� ���������
-59 ��� �������� �������
-60 ��� ����������� �������
-61 ��������������� ������� ������� �����������
-62 ����������� fork > %d; �������� ��� ���� `...`
-63 ���������� ��������� ����������� � ���������
-64 ������ �������������: ������� %d �� ������
-65 %s���������� ���������� �������
-66 %s���������� ������������� �������
-67 ��� ������� ��������
-68 ���� ��������� ����
-69 �������� ��� ��������
-70 �������������: %s [-%s]%s
-71 ����������� ������� ��� ����� -h
-72 �� �������� login-������
-73 ������� �� 0
-74 ������� �� ������� �� 0
-75 ������ scaling; �� ������ � ���� "%s"?
-76 �� ���� �������� login-���� (����)
-77 ����������� ������������: %s
-78 ���������� $home �� �����������
-79 �������������: history [-%s] [# ����� �������]
-80 $, ! ��� < ��������� ������������ � $# ��� $?
-81 ������� ������ � ����� ����������
-82 * ��������� ������������ � $# ��� $?
-83 $?<�����> ��� $#<�����> ���������
-84 �������� ��� ����������
-85 ������� ������ � ������� ����������
-86 ������������ ������ ����������
-87 ��������� ����������
-88 �������� ����� !
-89 ����������� ���������� �����������
-90 ������ �����������
-91 ����������� ���������� ����� �������
-92 ������ ������� ������� �������
-93 ������ ����������� !: %c
-94 ������ ������������
-95 ������������ ������ �����������
-96 ������ �������� ��� ��������� !
-97 ��� ���������� ������ ������
-98 %s: ������� �� �������
-99 ������� ����� )
-100 ������� ����� (
-101 ������� ��������� (
-102 ����������� ��� ��� ���������������
-103 ������������� ��������������� ������
-104 ������ ������������ << � ()
-105 ������������� ��������������� �����
-106 ������� ��������� ()
-107 ������������ �����������
-108 ���������� $watch �� �����������
-109 ��� ��������������� �������
-110 �������������: sched -<����� ��������>.\n�������������: sched [+]��:�� <�������>
-111 �� ��� ����� ������� ��� ������� �� ����������
-112 ����������� ������� ��� ����������
-113 �������� ����� ��� �������
-114 ������������� ����� �� ������������� am/pm
-115 ������������ ������ termcap
-116 �������������: settc %s [yes|no]
-117 ����������� capability `%s'
-118 ����������� �������� termcap `%%%c'
-119 ������� ����� ���������� ��� `%s' (%d)
-120 `%s' ������� %d ����������
-121 �������������: echotc [-v|-s] [<capability> [<���������>]]
-122 %s: %s. �������� �����������
-123 !# ������������ ������ ������
-124 ����������� �������������� �������� ������
-125 ������������ ���������
-126 ����������� �����: `-%s'\n�������������: %s [ -bcdefilmnqstvVxX -D���[=��������] ] [ �������� ... ]
-127 ����������� �����: `-%s'\n�������������: %s [ -bcdefFilmnqstvVxX ] [ �������� ... ]
-128 ����������� �����: `-%s'\n�������������: %s [ -bcdefilmnqstvVxX ] [ �������� ... ]
-129 \n�������� ������������: "%s"
-130 \n�������� %s: '%c'
-131 \n����������� ��������� '%c' ����� %s "%s"
-132 \n%s �� �����: "%s"
-133 ����������� ������� ��� ����� -m
-134 �������������: unlimit [-fh] [�������]
-135 $%S ������ ��� ������
-136 ��� ������ �������
-137 ����������� �������� `%c%c' ���������� colorls
+57 Использование: jobs [ -l ]
+58 Аргументы должны являться идентификаторами заданий или процессов
+59 Нет текущего задания
+60 Нет предыдущего задания
+61 Соответствующее шаблону задание отсутствует
+62 Вложенность fork > %d; возможно это цикл `...`
+63 Управление заданиями отсутствует в сабшеллах
+64 Ошибка синхронизации: Процесс %d не найден
+65 %sСуществуют отложенные задания
+66 %sСуществуют остановленные задания
+67 Нет другого каталога
+68 Стек каталогов пуст
+69 Неверное имя каталога
+70 Использование: %s [-%s]%s
+71 Отсутствует операнд для флага -h
+72 Не является login-шеллом
+73 Деление на 0
+74 Остаток от деления на 0
+75 Плохой scaling; вы имеете в виду "%s"?
+76 Не могу отложить login-шелл (пока)
+77 Неизвестный пользователь: %s
+78 Переменная $home не установлена
+79 Использование: history [-%s] [# число событий]
+80 $, ! или < запрещено использовать с $# или $?
+81 Перевод строки в имени переменной
+82 * запрещено использовать с $# или $?
+83 $?<цифра> или $#<цифра> запрещено
+84 Неверное имя переменной
+85 Перевод строки в индексе переменной
+86 Переполнение буфера расширения
+87 Синтаксис переменной
+88 Неверная форма !
+89 Отсутствует предыдущая подстановка
+90 Плохая подстановка
+91 Отсутствует предыдущая левая сторона
+92 Правая сторона слишком длинная
+93 Плохой модификатор !: %c
+94 Ошибка модификатора
+95 Переполнение буфера подстановки
+96 Плохой селектор для аргумента !
+97 Нет предыдущей строки поиска
+98 %s: Событие не найдено
+99 Слишком много )
+100 Слишком много (
+101 Неверно указанная (
+102 Отсутствует имя для перенаправления
+103 Неоднозначное перенаправление вывода
+104 Нельзя использовать << в ()
+105 Неоднозначное перенаправление ввода
+106 Неверно указанные ()
+107 Зацикливание псевдонимов
+108 Переменная $watch не установлена
+109 Нет запланированных событий
+110 Использование: sched -<номер элемента>.\nИспользование: sched [+]ЧЧ:ММ <команда>
+111 Не так много событий для запуска по расписанию
+112 Отсутствует команда для исполнения
+113 Неверное время для события
+114 Относительное время не соответствует am/pm
+115 Переполнение строки termcap
+116 Использование: settc %s [yes|no]
+117 Неизвестная capability `%s'
+118 Неизвестный параметр termcap `%%%c'
+119 Слишком много аргументов для `%s' (%d)
+120 `%s' требует %d аргументов
+121 Использование: echotc [-v|-s] [<capability> [<аргументы>]]
+122 %s: %s. Неверная архитектура
+123 !# зацикливание памяти команд
+124 Неправильно сформированный файловый запрос
+125 Переполнение селектора
+126 Неизвестная опция: `-%s'\nИспользование: %s [ -bcdefilmnqstvVxX -Dимя[=значение] ] [ аргумент ... ]
+127 Неизвестная опция: `-%s'\nИспользование: %s [ -bcdefFilmnqstvVxX ] [ аргумент ... ]
+128 Неизвестная опция: `-%s'\nИспользование: %s [ -bcdefilmnqstvVxX ] [ аргумент ... ]
+129 \nНеверное достраивание: "%s"
+130 \nНеверный %s: '%c'
+131 \nОтсутствует сепаратор '%c' после %s "%s"
+132 \n%s не полно: "%s"
+133 Отсутствует операнд для флага -m
+134 Использование: unlimit [-fh] [пределы]
+135 $%S только для чтения
+136 Нет такого задания
+137 Неизвестное значение `%c%c' переменной colorls
diff --git a/contrib/tcsh/nls/russian/set10 b/contrib/tcsh/nls/russian/set10
index 273abd2..8215a25 100644
--- a/contrib/tcsh/nls/russian/set10
+++ b/contrib/tcsh/nls/russian/set10
@@ -1,8 +1,8 @@
-$ $tcsh: set10,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set10,v 1.4 2011/02/04 18:19:41 christos Exp $
 $ ma.setp.c
 $set 10 
-1 setpath: �������� ������� '%s'.\n
-2 setpath: ������������ ���������� ��� ������� '%s'.\n
-3 setpath: ����������� �������� � ���� '%s'\n
-4 setpath: %s �� ������� � %s\n
-5 setpath: %d �������� ������� � %s\n
+1 setpath: неверная команда '%s'.\n
+2 setpath: недостаточно аргументов для команды '%s'.\n
+3 setpath: отсутствует значение в пути '%s'\n
+4 setpath: %s не найдено в %s\n
+5 setpath: %d неверная позиция в %s\n
diff --git a/contrib/tcsh/nls/russian/set11 b/contrib/tcsh/nls/russian/set11
index b165bd7..4ea0f42 100644
--- a/contrib/tcsh/nls/russian/set11
+++ b/contrib/tcsh/nls/russian/set11
@@ -1,10 +1,10 @@
-$ $tcsh: set11,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set11,v 1.3 2011/02/04 18:19:41 christos Exp $
 $ sh.c
 $set 11 
-1 ��������������: ��� ������� � tty (%s).\n
-2 ������� ���������� ��������� � ���� ����� �����������.\n
-3 ��� ��� ���� %d �������� ���������(�).\n
-4 ��� ��� ���� %d �������� ���������(�) � %s.\n
-5 ��� ��� ���� %s�����.\n
-6 ����� 
-7 ��� ��� ���� %s����� � %s.\n
+1 Предупреждение: нет доступа к tty (%s).\n
+2 Поэтому управление заданиями в этом шелле отсутствует.\n
+3 Для вас есть %d почтовых сообщения(й).\n
+4 Для вас есть %d почтовых сообщения(й) в %s.\n
+5 Для вас есть %sпочта.\n
+6 новая 
+7 Для вас есть %sпочта в %s.\n
diff --git a/contrib/tcsh/nls/russian/set12 b/contrib/tcsh/nls/russian/set12
index b676c6c..9a7993c 100644
--- a/contrib/tcsh/nls/russian/set12
+++ b/contrib/tcsh/nls/russian/set12
@@ -1,4 +1,4 @@
-$ $tcsh: set12,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set12,v 1.3 2011/02/04 18:19:41 christos Exp $
 $ sh.dir.c
 $set 12 
-1 %s: ������� ������ � "%s"\n
+1 %s: Пытаюсь начать с "%s"\n
diff --git a/contrib/tcsh/nls/russian/set13 b/contrib/tcsh/nls/russian/set13
index 206ea89..5a8009e 100644
--- a/contrib/tcsh/nls/russian/set13
+++ b/contrib/tcsh/nls/russian/set13
@@ -1,13 +1,13 @@
-$ $tcsh: set13,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set13,v 1.4 2011/02/04 18:19:41 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 �������� mask ��� ������� = 0x%08x\n
-4 %d ����������(�), %d �������(��), %d%%\n
-5 %S: ���������� �������.\n
-6 %S: ������� �� �������.\n
-7 where: / � ������� �� ����� ������\n
-8 %S �������������� �� 
-9 %S �������� ���������� ��������\n
+3 значение mask для отладки = 0x%08x\n
+4 %d совпадения(й), %d промаха(ов), %d%%\n
+5 %S: внутренняя команда.\n
+6 %S: Команда не найдена.\n
+7 where: / в команде не имеет смысла\n
+8 %S переопределено на 
+9 %S является внутренней командой\n
 10 hash miss: 
diff --git a/contrib/tcsh/nls/russian/set14 b/contrib/tcsh/nls/russian/set14
index d9632d8..b79837a 100644
--- a/contrib/tcsh/nls/russian/set14
+++ b/contrib/tcsh/nls/russian/set14
@@ -1,6 +1,6 @@
-$ $tcsh: set14,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set14,v 1.3 2011/02/04 18:19:41 christos Exp $
 $ sh.file.c
 $set 14 
-1 \nYikes!! ������� ����� %s!!\n
-2 ���� � ����� �������
-3 �����
+1 \nYikes!! Слишком много %s!!\n
+2 имен в файле паролей
+3 файлы
diff --git a/contrib/tcsh/nls/russian/set15 b/contrib/tcsh/nls/russian/set15
index 60c2a36..62ea78d 100644
--- a/contrib/tcsh/nls/russian/set15
+++ b/contrib/tcsh/nls/russian/set15
@@ -1,7 +1,7 @@
-$ $tcsh: set15,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set15,v 1.3 2011/02/04 18:19:41 christos Exp $
 $ sh.func.c
 $set 15 
-1 %s: %s: �� ���� %s%s ������\n
-2 �������
-3 ����������
-4 \040�������
+1 %s: %s: Не могу %s%s предел\n
+2 удалить
+3 установить
+4 \040жесткий
diff --git a/contrib/tcsh/nls/russian/set16 b/contrib/tcsh/nls/russian/set16
index 877acbe..8ad2081 100644
--- a/contrib/tcsh/nls/russian/set16
+++ b/contrib/tcsh/nls/russian/set16
@@ -1,9 +1,9 @@
-$ $tcsh: set16,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set16,v 1.3 2011/02/04 18:19:41 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Reset tty pgrp from %d to %d\n
-2 \n����������� "logout" ��� ���������� ������.\n
-3 \n����������� "exit" ��� ������ �� %s.\n
+2 \nИспользуйте "logout" для завершения сессии.\n
+3 \nИспользуйте "exit" для выхода из %s.\n
 4 seek to eval %x %x\n
 5 seek to alias %x %x\n
 6 seek to file %x\n
diff --git a/contrib/tcsh/nls/russian/set17 b/contrib/tcsh/nls/russian/set17
index 8d7384da..1d114687 100644
--- a/contrib/tcsh/nls/russian/set17
+++ b/contrib/tcsh/nls/russian/set17
@@ -1,17 +1,17 @@
-$ $tcsh: set17,v 1.4 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set17,v 1.5 2011/02/04 18:19:41 christos Exp $
 $ sh.proc.c
 $set 17 
 1 BUG: waiting for background job!\n
-2 ����� %d\n
+2 Выход %d\n
 3 BUG: process flushed twice
-4 ����������� 
-5 ������ 
+4 Выполняется 
+5 Сигнал 
 6 Exit %-25d
-7 ��������
+7 Окончено
 8 BUG: status=%-9o
 9 \040(core dumped)
 10 \040(wd:
 11 wd now: 
-12 %S: ��� ��������\n
-13 %S: ��� �����������\n
+12 %S: Уже отложено\n
+13 %S: Уже остановлено\n
 14 %S: Badly formed number\n
diff --git a/contrib/tcsh/nls/russian/set18 b/contrib/tcsh/nls/russian/set18
index 277af0d..a3f46f3 100644
--- a/contrib/tcsh/nls/russian/set18
+++ b/contrib/tcsh/nls/russian/set18
@@ -1,4 +1,4 @@
-$ $tcsh: set18,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set18,v 1.4 2011/02/04 18:19:41 christos Exp $
 $ sh.set.c
 $set 18 
-1 ��������������: �������� ������� PATH �������\n
+1 Предупреждение: Чересчур длинный PATH обрезан\n
diff --git a/contrib/tcsh/nls/russian/set19 b/contrib/tcsh/nls/russian/set19
index 2824aba..e182a37 100644
--- a/contrib/tcsh/nls/russian/set19
+++ b/contrib/tcsh/nls/russian/set19
@@ -1,7 +1,7 @@
-$ $tcsh: set19,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set19,v 1.6 2011/02/25 23:58:08 christos Exp $
 $ tc.alloc.c
 $set 19 
-1 nbytes=%d: ��� ������\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.
@@ -9,7 +9,15 @@ $set 19
 6 free(%lx) bad range check.
 7 free(%lx) bad block index.
 8 %s current memory allocation:\nfree:\t
-9 \nused:\t
-10 \n\t����� ������������: %d, ����� ��������: %d\n
+9 used
+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
+13 %s current memory allocation:\n
+14 Total space allocated from system: %d\n
+15 Number of non-inuse chunks: %d\n
+16 Number of mmapped regions: %d\n
+17 Total space in mmapped regions: %d\n
+18 Total allocated space: %d\n
+19 Total non-inuse space: %d\n
+20 Top-most, releasable space: %d\n
diff --git a/contrib/tcsh/nls/russian/set2 b/contrib/tcsh/nls/russian/set2
index 1466e73..e076f60 100644
--- a/contrib/tcsh/nls/russian/set2
+++ b/contrib/tcsh/nls/russian/set2
@@ -1,51 +1,51 @@
-$ $tcsh: set2,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set2,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ Signal names
 $set 2 
-1 ������� ������
-2 ������ �����
-3 ����������
-4 �����
-5 �������� ����������
+1 Нулевой сигнал
+2 Разрыв связи
+3 Прерывание
+4 Выход
+5 Неверная инструкция
 6 Trace/BPT trap
-7 ��������� ����������
+7 Аварийное завершение
 8 IOT trap
 9 System Crash Imminent
-10 ����� �� ������
+10 Выход по ошибке
 11 EMT trap
-12 ������ �������� � ��������� ������
-13 ����
-14 ���������������� ������ 1
-15 ���������������� ������ 2
-16 ������ �����������
-17 ������ ��������� �� ����
+12 Ошибка операции с плавающей точкой
+13 Убит
+14 Пользовательский сигнал 1
+15 Пользовательский сигнал 2
+16 Ошибка сегментации
+17 Ошибка адресации на шине
 18 Program range error
 19 Operand range error
-20 �������� ��������� �����
+20 Неверный системный вызов
 21 Broken pipe
 22 Alarm clock
-23 ��������
-24 ��������� ��������� �������
-25 ������ �������
+23 Прервано
+24 Изменение состояния потомка
+25 Смерть потомка
 26 Apollo-specific fault
-27 ������� ����������� ��� ����������
-28 ������� ����������
-29 ���� �������
+27 Потомок остановился или завершился
+28 Потомок завершился
+29 Сбой питания
 30 Resource Lost
 31 Break (Ctrl-Break)
 32 Input/output possible signal
-33 ����������� ����/����� (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 ������������ ������ ������
+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
-45 ������ �� ����������
+44 Ошибка четности в регистре CRAY Y-MP
+45 Запрос на информацию
 46 Suspended (signal)
 47 Stopped (signal)
 48 Suspended
diff --git a/contrib/tcsh/nls/russian/set20 b/contrib/tcsh/nls/russian/set20
index d8df302..2023593 100644
--- a/contrib/tcsh/nls/russian/set20
+++ b/contrib/tcsh/nls/russian/set20
@@ -1,41 +1,41 @@
-$ $tcsh: set20,v 1.5 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set20,v 1.6 2011/02/04 18:19:42 christos Exp $
 $ tc.bind.c
 $set 20 
-1 �������� ��� ������� `%S'\n
-2 ������ ��� �������: %S\n
-3 ������ ��� �������: %S\n
-4 ������ ������������ ������� %S\n
-5 ������ ������\n
-6 ����������� �������� ������\n
-7 �������������� �������� ������\n
-8 �����-���������� ��������\n
-9 �������� ����������� ������\n
-10 %-15s->  �� ����������\n
-11 BUG!!! %s �� ������ �� � ���.\n
-12 �������������: bindkey [�����] [--] [������� [�������]]\n
-13     -a   ������� ��� ��������� ������� � �������������� ��������� ����������\n
-14     -b   ������������ ������� ��� C-, M-, F- ��� X- �������� �������\n
-15     -s   ������������ ������� ��� ������, ������� ����� �������\n
-16     -c   ������������ ������� ��� ���������� ��� ������� �������\n
-17     -v   ��������� ��� ������� � ������������ � ���������� vi\n
-18     -e   ��������� ��� ������� � ������������ � ���������� emacs\n
-19     -d   ��������� ��� ������� � ������������ � ���������� �� ���������\n
-20     -l   ������� ������ ������ ��������� � �� ��������\n
-21     -r   ������� �������� �������\n
-22     -k   ������������ ������� ��� ����� �������� ����������� �������\n
-23     --   �� ������������ ��� ����������� ��������� ��� �����\n
-24     -u   (��� ����� ������������ �����) ������� ���� �����\n
-25 ��� ������� ��� �������, ������� ��� ��������.\n
-26 ��� �������, ������� �������� �������\n.\n
-27 ������ ������������ ������� -- ������� ������\n
-28 ������ ������������ ������� -- ������ ������\n
-29 ������ ������������ �������������� �������. ������� ������� ���������\n
-30 ������ ������������ ������� -- �������� ����������������� �����\n
-31 ������ ������������ ������� -- �������� ������������ �����\n
-32 ������ ������������ ������� -- �������� ���������� �����\n
-33 ������ ������������ �������������� �������.\n
-34 ������� ������� ���������\n
-35 ������ ������������ ������� -- ����������� ��� "%S"\n
-36 �������������: bind [������� | ������� ������� | "emacs" | "vi" | "-a"]\n
-37 �������� �������
-38  %s\t\t�� ���������\n
+1 Неверное имя клавиши `%S'\n
+2 Плохое имя клавиши: %S\n
+3 Плохое имя команды: %S\n
+4 Плохая спецификация клавиши %S\n
+5 Пустая строка\n
+6 Стандартные привязки клавиш\n
+7 Альтернативные привязки клавиш\n
+8 Много-символьные привязки\n
+9 Привязки управляющих клавиш\n
+10 %-15s->  не определено\n
+11 BUG!!! %s не связан ни с чем.\n
+12 Использование: bindkey [опции] [--] [КЛАВИШа [КОМАНДа]]\n
+13     -a   вывести или привязать КЛАВИШу в альтернативной раскладке клавиатуры\n
+14     -b   воспринимать КЛАВИШу как C-, M-, F- или X- название клавиши\n
+15     -s   воспринимать КОМАНДу как строку, которую нужно вывести\n
+16     -c   воспринимать КОМАНДу как встроенную или внешнюю команду\n
+17     -v   привязать все клавиши в соответствии с редактором vi\n
+18     -e   привязать все клавиши в соответствии с редактором emacs\n
+19     -d   привязать все клавиши в соответствии с редактором по умолчанию\n
+20     -l   вывести список команд редактора и их описания\n
+21     -r   удалить привязку КЛАВИШи\n
+22     -k   воспринимать КЛАВИШу как явное название управляющей клавиши\n
+23     --   не воспринимать все последующие параметры как опции\n
+24     -u   (или любая неправильная опция) вывести этот текст\n
+25 Без КЛАВИШи или КОМАНДы, вывести все привязки.\n
+26 Без КОМАНДы, вывести привязку КЛАВИШи\n.\n
+27 плохая спецификация клавиши -- нулевая строка\n
+28 плохая спецификация клавиши -- пустая строка\n
+29 Плохая спецификация функциональной клавиши. Нулевая клавиша запрещена\n
+30 плохая спецификация клавиши -- неверный шестнадцатеричный номер\n
+31 плохая спецификация клавиши -- неверный восьмеричный номер\n
+32 плохая спецификация клавиши -- неверный десятичный номер\n
+33 Плохая спецификация функциональной клавиши.\n
+34 Нулевые клавиши запрещены\n
+35 плохая спецификация клавиши -- неизвестное имя "%S"\n
+36 использование: bind [КЛАВИШа | КОМАНДа КЛАВИШа | "emacs" | "vi" | "-a"]\n
+37 Неверная функция
+38  %s\t\tне определен\n
diff --git a/contrib/tcsh/nls/russian/set22 b/contrib/tcsh/nls/russian/set22
index 02b53f5..814957e 100644
--- a/contrib/tcsh/nls/russian/set22
+++ b/contrib/tcsh/nls/russian/set22
@@ -1,17 +1,17 @@
-$ $tcsh: set22,v 1.4 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set22,v 1.5 2011/02/04 18:19:42 christos Exp $
 $ tc.func.c
 $set 22 
-1 %S: \t �������������� � 
-2 \n�������� ������ ��� %s\n
-3 ��������� ��������������� 'precmd' �������.\n
-4 ��������� ��������������� 'cwdcmd' �������.\n
-5 ��������� ��������������� 'beepcmd' �������.\n
-6 ��������� ��������������� 'periodic' �������.\n
-7 ������ ��������� ������\n
-8 �� ������������� ������ ������� ��� �����? [n/y] 
-9 �������� ���� ������ ���������!\n
-10 ��������� ������ ������:\n
-11 ������ ��������� ������\n
-12 � ����� �� �������\n
-13 ��������� ������ ������:\n
+1 %S: \t переопределено в 
+2 \nНеверный пароль для %s\n
+3 Ошибочное переопределение 'precmd' удалено.\n
+4 Ошибочное переопределение 'cwdcmd' удалено.\n
+5 Ошибочное переопределение 'beepcmd' удалено.\n
+6 Ошибочное переопределение 'periodic' удалено.\n
+7 разбор командной строки\n
+8 Вы действительно хотите удалить все файлы? [n/y] 
+9 удаление всех файлов пропущено!\n
+10 командная строка теперь:\n
+11 разбор командной строки\n
+12 в одном из списков\n
+13 командная строка теперь:\n
 14 yY
diff --git a/contrib/tcsh/nls/russian/set23 b/contrib/tcsh/nls/russian/set23
index 7d77ab8..771e1f6 100644
--- a/contrib/tcsh/nls/russian/set23
+++ b/contrib/tcsh/nls/russian/set23
@@ -1,4 +1,4 @@
-$ $tcsh: set23,v 1.3 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set23,v 1.4 2011/02/04 18:19:42 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: �� ���� ������� ".." (%s)
-20 getwd: �� ���� ������� ������� �� ".." (%s)
-21 getwd: ������ ������ � ".." (%s)
-22 getwd: �� ���� ��������� ����� � "." (%s)
-23 getwd: �� ���� ��������� stat �� "/" (%s)
-24 getwd: �� ���� ��������� stat �� "." (%s)
-25 getwd: �� ���� ��������� stat �� ������� "%s" (%s)
-26 getwd: �� ���� ������� ������� "%s" (%s)
-27 getwd: �� ���� ����� "." � ".." (%s)
-28 �������� ��� �������
-29 ��� ������� �� ����������
-30 ������� ����� ����������
-31 �������� ��������
+19 getwd: Не могу открыть ".." (%s)
+20 getwd: Не могу сменить каталог на ".." (%s)
+21 getwd: Ошибка чтения в ".." (%s)
+22 getwd: Не могу вернуться назад в "." (%s)
+23 getwd: Не могу выполнить stat на "/" (%s)
+24 getwd: Не могу выполнить stat на "." (%s)
+25 getwd: Не могу выполнить stat на каталог "%s" (%s)
+26 getwd: Не могу открыть каталог "%s" (%s)
+27 getwd: Не могу найти "." в ".." (%s)
+28 Неверный тип системы
+29 Тип системы не установлен
+30 Слишком много аргументов
+31 Неверный аргумент
diff --git a/contrib/tcsh/nls/russian/set25 b/contrib/tcsh/nls/russian/set25
index ff9aab9..b1c22ab 100644
--- a/contrib/tcsh/nls/russian/set25
+++ b/contrib/tcsh/nls/russian/set25
@@ -1,6 +1,6 @@
-$ $tcsh: set25,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ $tcsh: set25,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
-2 ������: bsd_signal(%d) ������ ����� �� ������� ���������\n
-3 ������: bsd_signal(%d) - sigaction ���������� ��������, errno %d\n
+2 ошибка: bsd_signal(%d) сигнал вышел за пределы интервала\n
+3 ошибка: bsd_signal(%d) - sigaction завершился неудачно, errno %d\n
diff --git a/contrib/tcsh/nls/russian/set26 b/contrib/tcsh/nls/russian/set26
index 5aefd22..7a93f01 100644
--- a/contrib/tcsh/nls/russian/set26
+++ b/contrib/tcsh/nls/russian/set26
@@ -1,15 +1,15 @@
-$ $tcsh: set26,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set26,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ tc.who.c
 $set 26 
-1 �� ���� ��������� stat �� %s. ����������, ��������� "unset watch".\n
-2 %s �� ����� ���� ������. ����������, ��������� "unset watch".\n
-3 BUG! ��������� ������� �� �������� whotail!\n
-4 �����: 
-5 BUG! ������ ������� �� �������� whohead!\n
-6 �����: %s/%s\n
+1 не могу выполнить stat на %s. Пожалуйста, выполните "unset watch".\n
+2 %s не может быть открыт. Пожалуйста, выполните "unset watch".\n
+3 BUG! последний элемент не является whotail!\n
+4 назад: 
+5 BUG! первый элемент не является whohead!\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 ���������
+12 локальный
diff --git a/contrib/tcsh/nls/russian/set27 b/contrib/tcsh/nls/russian/set27
index a995389..5179fe0 100644
--- a/contrib/tcsh/nls/russian/set27
+++ b/contrib/tcsh/nls/russian/set27
@@ -1,8 +1,8 @@
-$ $tcsh: set27,v 1.4 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set27,v 1.5 2011/02/04 18:19:42 christos Exp $
 $ tw.comp.c
 $set 27 
-1 �������
-2 ���������
-3 ������
-4 ��������
-5 ����������
+1 команда
+2 сепаратор
+3 шаблон
+4 интервал
+5 завершение
diff --git a/contrib/tcsh/nls/russian/set29 b/contrib/tcsh/nls/russian/set29
index b7b4da9..24aee57 100644
--- a/contrib/tcsh/nls/russian/set29
+++ b/contrib/tcsh/nls/russian/set29
@@ -1,4 +1,4 @@
-$ $tcsh: set29,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set29,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ tw.help.c
 $set 29 
-1 ����������� ���� ������ ��� %S\n
+1 Отсутствует файл помощи для %S\n
diff --git a/contrib/tcsh/nls/russian/set30 b/contrib/tcsh/nls/russian/set30
index 7ac5fe6..be6f9aa 100644
--- a/contrib/tcsh/nls/russian/set30
+++ b/contrib/tcsh/nls/russian/set30
@@ -1,16 +1,16 @@
-$ $tcsh: set30,v 1.4 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set30,v 1.5 2011/02/04 18:19:42 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
 2 complete %d 
 3 complete %d %S\n
-4 %s: ���������� match error.\n
-5 ���������
-6 �����
-7 ������� %d %s, �� ������������� ������ ������� �� ����? [n/y] 
+4 %s: Внутренняя match error.\n
+5 элементов
+6 рядов
+7 Найдено %d %s, вы действительно хотите вывести их всех? [n/y] 
 8 looking = %d\n
-9 \n���������� ������ tcsh: � �� ����, ��� � ���!\n
-10 �� �������
-11 �� �������
-12 ���������
+9 \nвнутренняя ошибка tcsh: я не знаю, что я ищу!\n
+10 не каталог
+11 не найдено
+12 нечитаемо
 13 yY
diff --git a/contrib/tcsh/nls/russian/set31 b/contrib/tcsh/nls/russian/set31
index 908cb02..b9f8cae 100644
--- a/contrib/tcsh/nls/russian/set31
+++ b/contrib/tcsh/nls/russian/set31
@@ -1,7 +1,7 @@
-$ $tcsh: set31,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set31,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ vms.termcap.c
 $set 31 
-1 �� ���� ������� TERMCAP: [%s]\n
-2 �� ���� ������� %s.\n
-3 ������� %s � %s.\n
-4 ������������ ��� %s �� ������� � ����� %s\n
+1 Не могу открыть TERMCAP: [%s]\n
+2 Не могу открыть %s.\n
+3 Найдено %s в %s.\n
+4 Соответствий для %s не найдено в файле %s\n
diff --git a/contrib/tcsh/nls/russian/set4 b/contrib/tcsh/nls/russian/set4
index 58d8415..ad47bfb 100644
--- a/contrib/tcsh/nls/russian/set4
+++ b/contrib/tcsh/nls/russian/set4
@@ -1,26 +1,26 @@
-$ $tcsh: set4,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set4,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ Termcap strings
 $set 4
-1 �������� ����� ������ ������
-2 �������� ������
-3 �������� �� �����
-4 �������� �� ����� ������
-5 ������ �� �������������� �������
-6 �������� �����
-7 ������� ������
-8 ������� ������
-9 ������� � ����� ��������
-10 ����� �� ������ ��������
-11 ����� �� ������ �������
+1 добавить новую пустую строку
+2 звуковой звонок
+3 очистить до конца
+4 очистить до конца строки
+5 курсор на горизонтальную позицию
+6 очистить экран
+7 удалить символ
+8 удалить строку
+9 перейти в режим удаления
+10 выйти из режима удаления
+11 выйти из режима вставки
 12 cursor from status line
 13 home cursor
-14 �������� ������
-15 ������� � ����� �������
+14 вставить символ
+15 перейти в режим вставки
 16 insert padding
-17 ����������� ������ ����
-18 ����������� ������ �����
-19 ����������� ������ ������
-20 ����������� ������ �����
+17 переместить курсор вниз
+18 переместить курсор влево
+19 переместить курсор вправо
+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 ���������� ������
-31 ������� ��������� ��������
+30 визуальный звонок
+31 удалить несколько символов
 32 cursor down multiple
-33 �������� ��������� ��������
+33 вставить несколько символов
 34 cursor left multiple
 35 cursor right multiple
 36 cursor up multiple
 37 Has automatic margins
 38 Can use physical tabs
-39 ����� �����
-40 ����� ��������
+39 Число строк
+40 Чисто столбцов
 41 Has meta key
 42 Newline ignored at right margin
diff --git a/contrib/tcsh/nls/russian/set5 b/contrib/tcsh/nls/russian/set5
index 6e48898..0396065 100644
--- a/contrib/tcsh/nls/russian/set5
+++ b/contrib/tcsh/nls/russian/set5
@@ -1,4 +1,4 @@
-$ $tcsh: set5,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set5,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ ed.chared.c
 $set 5
-1 ������� �������� ����������\n
+1 Средняя загрузка недоступна\n
diff --git a/contrib/tcsh/nls/russian/set6 b/contrib/tcsh/nls/russian/set6
index bffc35e..532d657 100644
--- a/contrib/tcsh/nls/russian/set6
+++ b/contrib/tcsh/nls/russian/set6
@@ -1,11 +1,11 @@
-$ $tcsh: set6,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set6,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ ed.inputl.c
 $set 6
-1 ������: �������� ������� ����� 0%o\r\n
-2 ��\n
-3 �������������\n
-4 ��������\n
-5 ���\n
-6 ��� ��������������� �������\n
-7 ������������� �������\n
-8 *** ��������� ������ ��������� ***\r\n\n
+1 ОШИБКА: неверная команда ключа 0%o\r\n
+2 да\n
+3 редактировать\n
+4 прервать\n
+5 нет\n
+6 Нет соответствующей команды\n
+7 Неоднозначная команда\n
+8 *** фатальная ОШИБКА редактора ***\r\n\n
diff --git a/contrib/tcsh/nls/russian/set7 b/contrib/tcsh/nls/russian/set7
index 7f7cbc7..61a216e 100644
--- a/contrib/tcsh/nls/russian/set7
+++ b/contrib/tcsh/nls/russian/set7
@@ -1,4 +1,4 @@
-$ $tcsh: set7,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set7,v 1.4 2011/02/04 18:19:42 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 �����
-11 �� �����
+10 имеет
+11 не имеет
 12 \tIt %s magic margins\n
-13 (�����)
-14 ��
-15 ���
-16 ������: �� ���� �������\r\n
+13 (пусто)
+14 да
+15 нет
+16 ОШИБКА: не могу удалить\r\n
 17 DeleteChars: num is riduculous: %d\r\n
-18 ������: �� ���� ��������\r\n
+18 ОШИБКА: не могу вставить\r\n
 19 StartInsert: num is riduculous: %d\r\n
-20 %s: �� ���� ������� /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: ��������: 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
diff --git a/contrib/tcsh/nls/russian/set8 b/contrib/tcsh/nls/russian/set8
index 80bede0..266d0e7 100644
--- a/contrib/tcsh/nls/russian/set8
+++ b/contrib/tcsh/nls/russian/set8
@@ -1,5 +1,5 @@
-$ $tcsh: set8,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set8,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ ed.term.c
 $set 8
-1 ����������� �������������
-2 �������� ��������
+1 Неизвестный переключатель
+2 Неверный аргумент
diff --git a/contrib/tcsh/nls/russian/set9 b/contrib/tcsh/nls/russian/set9
index cef9379..bb2ce25 100644
--- a/contrib/tcsh/nls/russian/set9
+++ b/contrib/tcsh/nls/russian/set9
@@ -1,4 +1,4 @@
-$ $tcsh: set9,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set9,v 1.4 2011/02/04 18:19:42 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!! ������� ������� ���������!\n
-7 ��� �������� ������
+6 Enumerate: BUG!! Передан нулевой указатель!\n
+7 нет вводимых данных
 8 Something must follow: %c\n
-9 ������������ ��������� �� ��������� � char.\n
+9 Восьмеричная константа не умещается в char.\n
diff --git a/contrib/tcsh/nls/spanish/charset b/contrib/tcsh/nls/spanish/charset
index 0b13559..81f1b66 100644
--- a/contrib/tcsh/nls/spanish/charset
+++ b/contrib/tcsh/nls/spanish/charset
@@ -1,3 +1,3 @@
-$ codeset=ISO-8859-1
+$ codeset=UTF-8
 $set 255
-1 ISO-8859-1
+1 UTF-8
diff --git a/contrib/tcsh/nls/spanish/set1 b/contrib/tcsh/nls/spanish/set1
index 0accb67..ad8ec9c 100644
--- a/contrib/tcsh/nls/spanish/set1
+++ b/contrib/tcsh/nls/spanish/set1
@@ -1,140 +1,140 @@
-$ $tcsh: set1,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set1,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ Mensajes de Error
 $set 1 
 1 Error de sintaxis
-2 %s no est� permitido
+2 %s no está permitido
 3 Palabra demasiado larga
-4 $< l�nea demasiado larga
+4 $< línea demasiado larga
 5 No hay fichero para $0
 6 Modificador [] incompleto
-7 $ expansi�n debe terminar antes de ]
-8 Modificador err�neo : en $ (%c)
-9 Error de �ndice
-10 N�mero err�neamente formado
-11 No hay m�s palabras
+7 $ expansión debe terminar antes de ]
+8 Modificador erróneo : en $ (%c)
+9 Error de índice
+10 Número erróneamente formado
+11 No hay más palabras
 12 Falta nombre de fichero
 13 Error interno de glob
 14 Comando no encontrado
 15 Demasiado pocos argumentos
 16 Demasiados argumentos
 17 Es demasiado peligroso crear un alias para eso
-18 `If' vac�o
+18 `If' vacío
 19 `Then' incorrecto
-20 Las palabras no est�n entre par�ntesis
+20 Las palabras no están entre paréntesis
 21 No se encuentra %s
-22 M�scara incorrecta
-23 No existe l�mite de ese tipo
+22 Máscara incorrecta
+23 No existe límite de ese tipo
 24 Argumento demasiado grande
 25 Factor de escala incorrecto o desconocido
 26 Variable indefinida
 27 La pila de directorios no es tan profunda
-28 Mal n�mero de se�al
-29 Se�al desconocida; `kill -l' lista las se�ales
+28 Mal número de señal
+29 Señal desconocida; `kill -l' lista las señales
 30 El nombre de la variable debe comenzar con una letra
 31 El nombre de la variable es demasiado grande
-32 El nombre de la variable debe contener caracteres alfanum�ricos
+32 El nombre de la variable debe contener caracteres alfanuméricos
 33 No hay control de trabajos en esta shell
-34 Sintaxis de la expresi�n
-35 No est� el directorio personal
+34 Sintaxis de la expresión
+35 No está el directorio personal
 36 No se puede cambiar al directorio personal
-37 Comando nulo inv�lido
-38 Expresion carece de asignaci�n
+37 Comando nulo inválido
+38 Expresion carece de asignación
 39 Operador desconocido
 40 Ambiguo
 41 %s: Archivo existente
 42 El argumento para `-c' debe terminar en una barra invertida
 43 Interumpido
-44 �ndice fuera del rango v�lido
-45 Sobrepasada la capacidad de la l�nea
+44 Índice fuera del rango válido
+45 Sobrepasada la capacidad de la línea
 46 No existe ese trabajo
 47 No se puede desde una terminal
 48 No se encuentra en bucle while/foreach
-49 No hay m�s procesos
+49 No hay más procesos
 50 No existe correspondencia
 51 Falta %c
 52 No se ha hallado correspondencia con %c
 53 Memoria insuficiente
-54 No se puede crear la tuber�a
+54 No se puede crear la tubería
 55 %s: %s
 56 %s
 57 Uso: jobs [ -l ]
 58 Los argumentos deben ser trabajos o identificadores de proceso
 59 No hay trabajo en curso
 60 No hay trabajo previo
-61 No hay trabajo que corresponda con este patr�n
+61 No hay trabajo que corresponda con este patrón
 62 Llamadas a `fork' entrelazadas > %d; puede ser un bucle `...`
 63 No se puede gestionar trabajos en sub-shells 
-64 Fallo de sincronizaci�n: No se encuentra el proceso %d
+64 Fallo de sincronización: No se encuentra el proceso %d
 65 %shay trabajos interrumpidos
 66 %shay trabajos parados
-67 No hay m�s directorios
-68 Pila de directorios vac�a
-69 Directorio err�neo
+67 No hay más directorios
+68 Pila de directorios vacía
+69 Directorio erróneo
 70 Uso: %s [-%s]%s
 71 `-h' necesita operandos
 72 No es un shell de ingreso
-73 Divisi�n por 0
-74 M�dulo por 0
+73 División por 0
+74 Módulo por 0
 75 Error de escala: Seguro que era "%s"?
-76 No se puede suspender un shell de ingreso (a�n)
+76 No se puede suspender un shell de ingreso (aún)
 77 Usuario desconocido: %s
-78 La variable $home no est� definida
-79 Uso: history [-%s] [# n�mero de comandos]
+78 La variable $home no está definida
+79 Uso: history [-%s] [# número de comandos]
 80 No esta permitido el uso de $, ! o < con $# o $?
 81 Nombre de variable incluye un retorno de carro
 82 No esta permitido el uso de * con  $# o $?
-83 No esta permitido usar $?<d�gito> o $#<d�gito>
+83 No esta permitido usar $?<dígito> o $#<dígito>
 84 Nombre de variable ilegal
-85 Retorno de carro en el �ndice de variables
-86 Desborde en el buffer de expansi�n
+85 Retorno de carro en el índice de variables
+86 Desborde en el buffer de expansión
 87 Sintaxis de variable
 88 Forma ! incorrecta
 89 No existe sustituto previo
-90 Sustituto err�neo
+90 Sustituto erróneo
 91 No existe `lado izquierdo' previo
-92 Valor de asignaci�n demasiado largo
+92 Valor de asignación demasiado largo
 93 Modificador de ! incorrecto: %c
 94 Error de modificador
-95 Desborde el el buffer de sustituci�n
-96 Selector de argumento de ! err�neo
-97 No existe b�squeda previa
+95 Desborde el el buffer de sustitución
+96 Selector de argumento de ! erróneo
+97 No existe búsqueda previa
 98 %s: No se encuentra el comando
 99 Demasiados `)'
 100 Demasiados `('
-101 Colocaci�n de `(' incorrecta
-102 Falta el nombre de la redirecci�n
-103 Redirecci�n de salida ambigua
-104 No se puede usar << entre par�ntesis
-105 Redirecci�n de entrada ambigua
-106 Colocaci�n de par�ntesis err�nea
+101 Colocación de `(' incorrecta
+102 Falta el nombre de la redirección
+103 Redirección de salida ambigua
+104 No se puede usar << entre paréntesis
+105 Redirección de entrada ambigua
+106 Colocación de paréntesis errónea
 107 Lazo en los `alias'
 108 La variable $watch no ha sido definida
 109 No hay comandos programados
 110 Uso: sched -<item#>.\nUso: sched [+]hh:mm <comando>
 111 No hay tantos comandos programados
-112 No hay ning�n comando a ejecutar
-113 Tiempo de ejecuci�n del comando incorrecto
+112 No hay ningún comando a ejecutar
+113 Tiempo de ejecución del comando incorrecto
 114 Tiempo relativo inconsistente con am/pm
 115 Se ha agotado el espacio para cadenas termcap
 116 Uso: settc %s [yes|no]
-117 Caracter�stica `%s' desconocida
-118 Par�metro termcap `%%%c' desconocido
+117 Característica `%s' desconocida
+118 Parámetro termcap `%%%c' desconocido
 119 Demasiados argumentos para `%s' (%d)
 120 `%s' requiere %d argumentos
-121 Uso: echotc [-v|-s] [<caracter�stica> [<args>]]
-122 %s: %s. Arquitectura err�nea
+121 Uso: echotc [-v|-s] [<característica> [<args>]]
+122 %s: %s. Arquitectura errónea
 123 !# Lazo en el historial
 124 Consulta de archivo incorrecta
 125 Desborde en el selector
-126 Opci�n desconocida: `-%s'\nUso: %s [ -bcdefilmnqstvVxX -Dnombre[=valor] ] [ argumento ... ]
-127 Opci�n desconocida: `-%s'\nUso: %s [ -bcdefFilmnqstvVxX ] [ argumento ... ]
-128 Opci�n desconocida: `-%s'\nUso: %s [ -bcdefilmnqstvVxX ] [ argumento ... ]
-129 \nModo de terminaci�n autom�tica inv�lido: "%s"
-130 \nInv�lido %s: '%c'
-131 \nFalta el separador '%c' despu�s %s "%s"
+126 Opción desconocida: `-%s'\nUso: %s [ -bcdefilmnqstvVxX -Dnombre[=valor] ] [ argumento ... ]
+127 Opción desconocida: `-%s'\nUso: %s [ -bcdefFilmnqstvVxX ] [ argumento ... ]
+128 Opción desconocida: `-%s'\nUso: %s [ -bcdefilmnqstvVxX ] [ argumento ... ]
+129 \nModo de terminación automática inválido: "%s"
+130 \nInválido %s: '%c'
+131 \nFalta el separador '%c' después %s "%s"
 132 \n%s incompleto: "%s"
 133 `-m' no necesita operandos
-134 Uso: unlimit [-fh] [l�mites]
-135 $%S es de s�lo-lectura
+134 Uso: unlimit [-fh] [límites]
+135 $%S es de sólo-lectura
 136 No existe ese trabajo
 137 Unknown colorls variable `%c%c'
diff --git a/contrib/tcsh/nls/spanish/set10 b/contrib/tcsh/nls/spanish/set10
index 8d5b057..600342e 100644
--- a/contrib/tcsh/nls/spanish/set10
+++ b/contrib/tcsh/nls/spanish/set10
@@ -1,8 +1,8 @@
-$ $tcsh: set10,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set10,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: comando '%s' incorrecto.\n
 2 setpath: insuficientes argumentos para el comando '%s'.\n
 3 setpath: falta el valor en la ruta '%s'\n
 4 setpath: no se encuentra %s en %s\n
-5 setpath: %d posici�n inv�lida en %s\n
+5 setpath: %d posición inválida en %s\n
diff --git a/contrib/tcsh/nls/spanish/set13 b/contrib/tcsh/nls/spanish/set13
index 12b32b0..e31f6d3 100644
--- a/contrib/tcsh/nls/spanish/set13
+++ b/contrib/tcsh/nls/spanish/set13
@@ -1,9 +1,9 @@
-$ $tcsh: set13,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set13,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
 2 %d grupos de hash de %d bits cada uno\n
-3 m�scara de depurado = 0x%08x\n
+3 máscara de depurado = 0x%08x\n
 4 %d aciertos, %d fallos, %d%%\n
 5 %S: comando integrado en la shell.\n
 6 %S: Comando inexistente.\n
diff --git a/contrib/tcsh/nls/spanish/set14 b/contrib/tcsh/nls/spanish/set14
index 5bb621e..9571a7c 100644
--- a/contrib/tcsh/nls/spanish/set14
+++ b/contrib/tcsh/nls/spanish/set14
@@ -1,6 +1,6 @@
-$ $tcsh: set14,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set14,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ sh.file.c
 $set 14 
-1 \n��Qu� asco!! ��Hay demasiados %s!!\n
+1 \n¡¡Qué asco!! ¡¡Hay demasiados %s!!\n
 2 nombres en el archivo de claves
 3 archivos
diff --git a/contrib/tcsh/nls/spanish/set15 b/contrib/tcsh/nls/spanish/set15
index 825af2e..06b581d 100644
--- a/contrib/tcsh/nls/spanish/set15
+++ b/contrib/tcsh/nls/spanish/set15
@@ -1,7 +1,7 @@
-$ $tcsh: set15,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set15,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ sh.func.c
 $set 15 
-1 %s: %s: No se puede %s el l�mite %s\n
+1 %s: %s: No se puede %s el límite %s\n
 2 quitar
 3 poner
 4 \040(hard-limit)
diff --git a/contrib/tcsh/nls/spanish/set16 b/contrib/tcsh/nls/spanish/set16
index 0482ffa..5edb466 100644
--- a/contrib/tcsh/nls/spanish/set16
+++ b/contrib/tcsh/nls/spanish/set16
@@ -1,4 +1,4 @@
-$ $tcsh: set16,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set16,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Se ha reinicializado el grupo de procesos de las terminales de %d a %d\n
@@ -7,7 +7,7 @@ $set 16
 4 seek to eval %x %x\n
 5 seek to alias %x %x\n
 6 seek to file %x\n
-7 Tipo de seek err�neo %d\n
+7 Tipo de seek erróneo %d\n
 8 tell eval %x %x\n
 9 tell alias %x %x\n
 10 tell file %x\n
diff --git a/contrib/tcsh/nls/spanish/set17 b/contrib/tcsh/nls/spanish/set17
index 02df187..a342ab8 100644
--- a/contrib/tcsh/nls/spanish/set17
+++ b/contrib/tcsh/nls/spanish/set17
@@ -1,11 +1,11 @@
-$ $tcsh: set17,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set17,v 1.4 2011/02/04 18:19:43 christos Exp $
 $ sh.proc.c
 $set 17 
-1 BUG: �en espera de un trabajo en segundo plano!\n
-2 Finaliz� %d\n
+1 BUG: ¡en espera de un trabajo en segundo plano!\n
+2 Finalizó %d\n
 3 BUG: Se ha aplicado "flush" al proceso por segunda vez
 4 Ejecutando 
-5 Se�al 
+5 Señal 
 6 Finalizado %-25d
 7 Fin
 8 BUG: status=%-9o
diff --git a/contrib/tcsh/nls/spanish/set18 b/contrib/tcsh/nls/spanish/set18
index b2d7736..caf7ae7 100644
--- a/contrib/tcsh/nls/spanish/set18
+++ b/contrib/tcsh/nls/spanish/set18
@@ -1,4 +1,4 @@
-$ $tcsh: set18,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set18,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ sh.set.c
 $set 18 
-1 Aviso: PATH de tama�o rid�culo ha sido truncado\n
+1 Aviso: PATH de tamaño ridículo ha sido truncado\n
diff --git a/contrib/tcsh/nls/spanish/set19 b/contrib/tcsh/nls/spanish/set19
index fdce85d..0f83042 100644
--- a/contrib/tcsh/nls/spanish/set19
+++ b/contrib/tcsh/nls/spanish/set19
@@ -1,15 +1,23 @@
-$ $tcsh: set19,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set19,v 1.5 2011/02/25 23:58:08 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Se ha agotado la memoria\n
 2 Se ha llamado a free(%lx) antes de asignar nada.
-3 free(%lx) por encima del l�mite superior de la memoria.
-4 free(%lx) por debajo del l�mite inferior de la memoria.
-5 free(%lx) bloque err�neo.
-6 free(%lx) chequeo de rango err�neo.
-7 free(%lx) �ndice de bloque err�neo.
-8 %s asignaci�n actual de memoria:\nfree:\t
-9 \nusada:\t
+3 free(%lx) por encima del límite superior de la memoria.
+4 free(%lx) por debajo del límite inferior de la memoria.
+5 free(%lx) bloque erróneo.
+6 free(%lx) chequeo de rango erróneo.
+7 free(%lx) índice de bloque erróneo.
+8 %s asignación actual de memoria:\nfree:\t
+9 usada
 10 \n\tTotal en uso: %d, total libre: %d\n
-11 \tSe ha asignado memoria de  0x%lx a 0x%lx.  L�mite superior real en 0x%lx\n
+11 \tSe ha asignado memoria de  0x%lx a 0x%lx.  Límite superior real en 0x%lx\n
 12 Se ha asignado memoria de 0x%lx a 0x%lx (%ld).\n
+13 %s current memory allocation:\n
+14 Total space allocated from system: %d\n
+15 Number of non-inuse chunks: %d\n
+16 Number of mmapped regions: %d\n
+17 Total space in mmapped regions: %d\n
+18 Total allocated space: %d\n
+19 Total non-inuse space: %d\n
+20 Top-most, releasable space: %d\n
diff --git a/contrib/tcsh/nls/spanish/set2 b/contrib/tcsh/nls/spanish/set2
index b73c693..dc43d38 100644
--- a/contrib/tcsh/nls/spanish/set2
+++ b/contrib/tcsh/nls/spanish/set2
@@ -1,92 +1,92 @@
-$ $tcsh: set2,v 1.2 2006/03/02 18:46:48 christos Exp $
-$ Nombres de se�ales
+$ $tcsh: set2,v 1.3 2011/02/04 18:19:43 christos Exp $
+$ Nombres de señales
 $set 2 
-1 Se�al nula
+1 Señal nula
 2 Colgar
 3 Interrumpir
 4 Salir
-5 Instrucci�n ilegal
+5 Instrucción ilegal
 6 trap Trace/BPT
 7 Abortar
 8 trap IOT
-9 Ca�da del sistema inminente
+9 Caída del sistema inminente
 10 Salida con error
 11 trap EMT
-12 Excepci�n de punto flotante
+12 Excepción de punto flotante
 13 Terminado
-14 Se�al de usuario 1
-15 Se�al de usuario 2
-16 Error de segmentaci�n
+14 Señal de usuario 1
+15 Señal de usuario 2
+16 Error de segmentación
 17 Error de bus
 18 Error de rango de programa
 19 Error de rango de operando
-20 Llamada del sistema err�nea
-21 Tuber�a rota
+20 Llamada del sistema errónea
+21 Tubería rota
 22 Despertador
 23 Terminado
 24 Cambio de estado en el hijo
 25 Muerte del hijo
-26 Fallo espec�fico de Apollo
+26 Fallo específico de Apollo
 27 El hijo ha parado o terminado
 28 Hijo ha terminado
-29 Fallo de alimentaci�n
+29 Fallo de alimentación
 30 Recurso perdido
 31 Break (Ctrl-Break)
-32 Posible se�al de entrada/salida
-33 E/S as�ncrona (select)
-34 Condici�n urgente en el canal de E/S
+32 Posible señal de entrada/salida
+33 E/S asíncrona (select)
+34 Condición urgente en el canal de E/S
 35 Despertar mutiltarea
-36 Finalizaci�n multitarea
-37 Final de E/S as�ncrona Fortran
-38 Recuperaci�n
+36 Finalización multitarea
+37 Final de E/S asíncrona Fortran
+38 Recuperación
 39 Error incorregible de memoria
 40 Excedido el tiempo de CPU
 41 Bajada del sistema inminente
 42 Grupo micro-tarea-no se ha activado la bandera de despertar
-43 Error de hilo de ejecuci�n - (use cord -T para informaci�n detallada)
+43 Error de hilo de ejecución - (use cord -T para información detallada)
 44 Error de paridad de registro CRAY Y-MP
-45 Petici�n de informaci�n
-46 Suspendido (se�al)
-47 Parado (se�al)
+45 Petición de información
+46 Suspendido (señal)
+47 Parado (señal)
 48 Suspendido
 49 Parado
-50 Contin�a
+50 Continúa
 51 Suspendido (entrada tty)
 52 Parado (entrada tty)
 53 Suspendido (salida tty)
 54 Parado (salida tty)
 55 Modificado el estado de la ventana
-56 Modificado el tama�o de la ventana
-57 Modificado el estado del tel�fono
+56 Modificado el tamaño de la ventana
+57 Modificado el estado del teléfono
 58 Excedido el tiempo de CPU
-59 Excedido el l�mite del tama�o de archivo
-60 Se�al de temporizador virtual
+59 Excedido el límite del tamaño de archivo
+60 Señal de temporizador virtual
 61 Perfilando la alarma de temporizador
-62 Se�al DIL
+62 Señal DIL
 63 Ha tenido lugar un evento interrogable
-64 Los lwps del proceso est�n bloqueados
-65 Se�al LWP especial
-66 Se�al CPR especial
-67 Se�al CPR especial
-68 Primera se�al de tiempo real
-69 Segunda se�al de tiempo real
-70 Tercera se�al de tiempo real
-71 Cuarta se�al de tiempo real
-72 Cuarta se�al por la cola de tiempo real
-73 Antepen�ltima se�al de tiempo real
-74 Pen�ltima se�al de tiempo real
-75 �ltima se�al de tiempo real
-76 E/S as�ncrona LAN
+64 Los lwps del proceso están bloqueados
+65 Señal LWP especial
+66 Señal CPR especial
+67 Señal CPR especial
+68 Primera señal de tiempo real
+69 Segunda señal de tiempo real
+70 Tercera señal de tiempo real
+71 Cuarta señal de tiempo real
+72 Cuarta señal por la cola de tiempo real
+73 Antepenúltima señal de tiempo real
+74 Penúltima señal de tiempo real
+75 Última señal de tiempo real
+76 E/S asíncrona LAN
 77 Lectura/escritura PTY disponible
-78 Intervenci�n E/S requerida
+78 Intervención E/S requerida
 79 Otorgado modo monitor HFT
-80 Se deber�a abandonar el modo monitor HFT
+80 Se debería abandonar el modo monitor HFT
 81 Se ha completado el control de sonido HFT
 82 Hay datos en el buffer circular HFT
 83 Migrar proceso
-84 Tecla de atenci�n asegurada
-85 Reprogramaci�n
-86 Se�alar SS$_DEBUG
+84 Tecla de atención asegurada
+85 Reprogramación
+86 Señalar SS$_DEBUG
 87 Prioridad cambiada
 88 Bloqueo real detectado
-89 Nuevo car�cter de entrada
+89 Nuevo carácter de entrada
diff --git a/contrib/tcsh/nls/spanish/set20 b/contrib/tcsh/nls/spanish/set20
index 9458fef..5297513 100644
--- a/contrib/tcsh/nls/spanish/set20
+++ b/contrib/tcsh/nls/spanish/set20
@@ -1,41 +1,41 @@
-$ $tcsh: set20,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set20,v 1.4 2011/02/04 18:19:43 christos Exp $
 $ tc.bind.c
 $set 20 
-1 Nombre de tecla no v�lido `%S'\n
+1 Nombre de tecla no válido `%S'\n
 2 Nombre de tecla incorrecto: %S\n
 3 Nombre de comando incorrecto: %S\n
 4 Especificador de tecla incorrecto %S\n
 5 Especificada la cadena nula\n
-6 Definiciones de teclas est�ndar\n
+6 Definiciones de teclas estándar\n
 7 Definiciones de teclas alternativas\n
-8 Definiciones Multi-car�cter\n
+8 Definiciones Multi-carácter\n
 9 Definiciones de las teclas de flechas\n
 10 %-15s->  indefinida\n
-11 ���BUG!!! %s no tiene definici�n asociada.\n
+11 ¡¡¡BUG!!! %s no tiene definición asociada.\n
 12 Uso: bindkey [opciones] [--] [TECLA [COMANDO]]\n
 13     -a   lista o define TECLA en un mapa de teclas alternativo\n
-14     -b   acepta definiciones de teclas simb�licas\n
+14     -b   acepta definiciones de teclas simbólicas\n
 15     -s   asume que COMANDO es una cadena ha de imprimir literalmente\n
 16     -c   interpreta COMANDO como comando interno o externo\n
 17     -v   usa las definiciones del editor vi\n
 18     -e   usa las definiciones del editor vi\n
 19     -d   usa las definiciones del editor por defecto\n
 20     -l   lista los comandos del editor y sus descripciones\n
-21     -r   elimina la definici�n asociada a TECLA\n
-22     -k   interpreta TECLA como nombre simb�lico de tecla de flecha\n
+21     -r   elimina la definición asociada a TECLA\n
+22     -k   interpreta TECLA como nombre simbólico de tecla de flecha\n
 23     --   fuerza "break" en el procesamiento de opciones\n
-24     -u   (o cualquier opci�n no v�lida) este mensaje\n
+24     -u   (o cualquier opción no válida) este mensaje\n
 25 Sin TECLA o COMANDO, imprime todas las asociaciones de teclas\n
-26 Sin COMANDO, imprime la asociaci�n de TECLA.\n
-27 especificaci�n de tecla inv�lida -- cadena nula\n
-28 especificaci�n de tecla inv�lida -- cadena vac�a\n
-29 Especificaci�n de tecla de funci�n inv�lida. No se permite una tecla nula\n
-30 especificaci�n de tecla inv�lida -- n�mero hexadecimal incorrecto\n
-31 especificaci�n de tecla inv�lida -- n�mero octal incorrecto\n
-32 especificaci�n de tecla inv�lida -- n�mero decimal incorrecto\n
-33 Especificaci�n de tecla de funci�n incorrecta.\n
+26 Sin COMANDO, imprime la asociación de TECLA.\n
+27 especificación de tecla inválida -- cadena nula\n
+28 especificación de tecla inválida -- cadena vacía\n
+29 Especificación de tecla de función inválida. No se permite una tecla nula\n
+30 especificación de tecla inválida -- número hexadecimal incorrecto\n
+31 especificación de tecla inválida -- número octal incorrecto\n
+32 especificación de tecla inválida -- número decimal incorrecto\n
+33 Especificación de tecla de función incorrecta.\n
 34 No se permite una tecla nula\n
-35 especificaci�n de tecla inv�lida -- nombre desconocido "%S"\n
+35 especificación de tecla inválida -- nombre desconocido "%S"\n
 36 uso: bind [TECLA | COMANDO TECLA | "emacs" | "vi" | "-a"]\n
-37 funci�n no v�lida
-38  %s\t\tno est� definida\n
+37 función no válida
+38  %s\t\tno está definida\n
diff --git a/contrib/tcsh/nls/spanish/set22 b/contrib/tcsh/nls/spanish/set22
index fb311ae..7014632 100644
--- a/contrib/tcsh/nls/spanish/set22
+++ b/contrib/tcsh/nls/spanish/set22
@@ -1,17 +1,17 @@
-$ $tcsh: set22,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set22,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t es un alias de 
 2 \nClave incorrecta para %s\n
-3 Alias err�neo de 'precmd' borrado.\n
-4 Alias err�neo de 'cwdcmd' borrado.\n
-5 Alias err�neo de 'beepcmd' borrado.\n
-6 Alias err�neo de 'periodic' borrado.\n
-7 analizando la l�nea de comandos\n
-8 �Realmente quiere borrar todos los archivos? [n/s]
-9 �Anulado el borrado de los archivos!\n
-10 ahora, la l�nea de comandos es:\n
-11 analizando la l�nea de comandos\n
+3 Alias erróneo de 'precmd' borrado.\n
+4 Alias erróneo de 'cwdcmd' borrado.\n
+5 Alias erróneo de 'beepcmd' borrado.\n
+6 Alias erróneo de 'periodic' borrado.\n
+7 analizando la línea de comandos\n
+8 ¿Realmente quiere borrar todos los archivos? [n/s]
+9 ¡Anulado el borrado de los archivos!\n
+10 ahora, la línea de comandos es:\n
+11 analizando la línea de comandos\n
 12 en una de las listas\n
-13 ahora, la l�nea de comandos es:\n
+13 ahora, la línea de comandos es:\n
 14 sSyY
diff --git a/contrib/tcsh/nls/spanish/set23 b/contrib/tcsh/nls/spanish/set23
index 86a81e4..3a1febb 100644
--- a/contrib/tcsh/nls/spanish/set23
+++ b/contrib/tcsh/nls/spanish/set23
@@ -1,24 +1,24 @@
-$ $tcsh: set23,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set23,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tc.os.c
 $set 23 
-1 Nombre de cpu/m�quina incorrecto
-2 Ruta hasta m�quina demasiado grande
+1 Nombre de cpu/máquina incorrecto
+2 Ruta hasta máquina demasiado grande
 3 desconocida
-4 m�quina: %s\n
-5 %d: No he encontrado esa m�quina\n
+4 máquina: %s\n
+5 %d: No he encontrado esa máquina\n
 6 setlocal: %s: %s\n
-7 No he encontrado esa m�quina
-8 Est� atrapado en un universo que nunca creo
-9 Getwarp fall�
-10 Warp inv�lido
-11 Setwarp fall�
+7 No he encontrado esa máquina
+8 Está atrapado en un universo que nunca creo
+9 Getwarp falló
+10 Warp inválido
+11 Setwarp falló
 12 Universo ilegal
 13 Error Desconocido: %d
 14 nombre_sis:  %s\n
 15 nombre_nodo: %s\n
 16 release:  %s\n
-17 versi�n:  %s\n
-18 m�quina:  %s\n
+17 versión:  %s\n
+18 máquina:  %s\n
 19 getwd: No puedo abrir ".." (%s)
 20 getwd: No puedo cambiar a ".." (%s)
 21 getwd: Error de lectura en ".." (%s)
@@ -28,7 +28,7 @@ $set 23
 25 getwd: No puedo ejecutar stat de "%s" (%s)
 26 getwd: No puedo abrir el directorio "%s" (%s)
 27 getwd: No puedo encontrar "." en ".." (%s)
-28 Tipo de sistema inv�lido
+28 Tipo de sistema inválido
 29 No se ha fijado el tipo de sistema
 30 Demasiados argumentos
-31 Argumento inv�lido
+31 Argumento inválido
diff --git a/contrib/tcsh/nls/spanish/set25 b/contrib/tcsh/nls/spanish/set25
index c81ef4a..6a0dcb4 100644
--- a/contrib/tcsh/nls/spanish/set25
+++ b/contrib/tcsh/nls/spanish/set25
@@ -1,6 +1,6 @@
-$ $tcsh: set25,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set25,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tc.sig.c
 $set 25 
 1 nuestro wait %d\n
-2 error: bsd_signal(%d) se�al fuera de rango\n
+2 error: bsd_signal(%d) señal fuera de rango\n
 3 error: bsd_signal(%d) - sigaction ha fallado, errno %d\n
diff --git a/contrib/tcsh/nls/spanish/set26 b/contrib/tcsh/nls/spanish/set26
index 74c990e..71f3855 100644
--- a/contrib/tcsh/nls/spanish/set26
+++ b/contrib/tcsh/nls/spanish/set26
@@ -1,11 +1,11 @@
-$ $tcsh: set26,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set26,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tc.who.c
 $set 26 
 1 No se puede completar stat %s.  Por favor, ejecute "unset watch".\n
 2 No se puede abrir %s.  Por favor, ejecute "unset watch".\n
-3 �BUG! El �ltimo elemento no es whotail!\n
-4 hacia atr�s: 
-5 �BUG! El primer elemento no es whohead!\n
+3 ¡BUG! El último elemento no es whotail!\n
+4 hacia atrás: 
+5 ¡BUG! El primer elemento no es whohead!\n
 6 nuevo: %s/%s\n
 7 %n tiene %a %l de %m.
 8 %n tiene %a %l.
diff --git a/contrib/tcsh/nls/spanish/set27 b/contrib/tcsh/nls/spanish/set27
index 6f75760..7e1280c 100644
--- a/contrib/tcsh/nls/spanish/set27
+++ b/contrib/tcsh/nls/spanish/set27
@@ -1,8 +1,8 @@
-$ $tcsh: set27,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set27,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tw.comp.c
 $set 27 
 1 comando
 2 separador
-3 patr�n
+3 patrón
 4 rango 
-5 modo de terminaci�n autom�tica
+5 modo de terminación automática
diff --git a/contrib/tcsh/nls/spanish/set3 b/contrib/tcsh/nls/spanish/set3
index 2465dec..23e7244 100644
--- a/contrib/tcsh/nls/spanish/set3
+++ b/contrib/tcsh/nls/spanish/set3
@@ -1,118 +1,118 @@
-$ $tcsh: set3,v 1.3 2006/03/02 18:46:48 christos Exp $
-$ Descripci�n de las funciones de edici�n
+$ $tcsh: set3,v 1.4 2011/02/04 18:19:43 christos Exp $
+$ Descripción de las funciones de edición
 $set 3 
-1 Retroceder un car�cter
-2 Borrar el car�cter detr�s del cursor
+1 Retroceder un carácter
+2 Borrar el carácter detrás del cursor
 3 Cortar desde el comienzo de la palabra hasta el cursor - se guarda en el buffer
-4 Cortar desde el comienzo de la l�nea hasta el cursor - se guarda en el buffer
+4 Cortar desde el comienzo de la línea hasta el cursor - se guarda en el buffer
 5 Ir hasta el comienzo de la palabra
-6 Ir hasta el comienzo de la l�nea
-7 Convertir en may�sculas los caracteres desde el cursor hasta el final de la palabra
-8 Vi: cambiar a may�sculas o min�sculas el car�cter bajo el cursor y avanza una posici�n
-9 Vi: cambia hasta el final de la l�nea
-10 Borra la pantalla y coloca la l�nea actual al comienzo
+6 Ir hasta el comienzo de la línea
+7 Convertir en mayúsculas los caracteres desde el cursor hasta el final de la palabra
+8 Vi: cambiar a mayúsculas o minúsculas el carácter bajo el cursor y avanza una posición
+9 Vi: cambia hasta el final de la línea
+10 Borra la pantalla y coloca la línea actual al comienzo
 11 Completa la palabra
 12 Avanza mediante `Tab' por los ficheros
 13 Retrocede mediante `Tab' por los ficheros
 14 Completa la palabra ignorando los modos programables
 15 Copia la palabra hasta el cursor
-16 Copia el �rea entre la marca y el cursor al buffer
+16 Copia el área entre la marca y el cursor al buffer
 17 Expande a aquella palabra para la que esto es un prefijo
-18 Borra el car�cter bajo el cursor
-19 Borra el car�cter bajo el cursor o se�ala el fin de archivo en un archivo vac�o
-20 Borra el car�cter bajo el cursor o lista posibles finales si est� al final de una l�nea
-21 Borra el car�cter bajo el cursor, lista posibles finales o marca final de archivo
+18 Borra el carácter bajo el cursor
+19 Borra el carácter bajo el cursor o señala el fin de archivo en un archivo vacío
+20 Borra el carácter bajo el cursor o lista posibles finales si está al final de una línea
+21 Borra el carácter bajo el cursor, lista posibles finales o marca final de archivo
 22 Corta del cursor al final de la palabra - se guarda en el buffer
-23 Se suma al argumento si ha arrancado o introduce el d�gito
-24 D�gito al comienzo del argumento
-25 Ir al final de la l�nea de historia
-26 Convierte en min�sculas los caracteres desde el cursor al final de la palabra
+23 Se suma al argumento si ha arrancado o introduce el dígito
+24 Dígito al comienzo del argumento
+25 Ir al final de la línea de historia
+26 Convierte en minúsculas los caracteres desde el cursor al final de la palabra
 27 Indica el fin de archivo
-28 Mover el cursor hasta el final de l�nea
+28 Mover el cursor hasta el final de línea
 29 Intercambia el cursor y la marca
 30 Expande los comodines de nombre de archivo
 31 Expande los escapes del historial
-32 Expande los escapes del historial en una l�nea
+32 Expande los escapes del historial en una línea
 33 Expande variables
-34 Avanza un car�cter
+34 Avanza un carácter
 35 Avanza hasta el final de la palabra
 36 Intercambia los dos caracteres delante del cursor
-37 Busca hacia atr�s en el historial una l�nea que comience igual que la actual
-38 Busca hacia delante una l�nea que comience igual que la actual
-39 Inserta el �ltimo �tem del comando previo
-40 B�squeda incremental hacia deleante
-41 B�squeda incremental hacia atr�s
-42 Borra la l�nea
-43 Corta hasta el final de la l�nea y guarda la informaci�n en el buffer
-44 Corta el �rea de la marca al cursor y guarda la informaci�n en el buffer
-45 Corta la l�nea completa y la guarda en el buffer
+37 Busca hacia atrás en el historial una línea que comience igual que la actual
+38 Busca hacia delante una línea que comience igual que la actual
+39 Inserta el último ítem del comando previo
+40 Búsqueda incremental hacia deleante
+41 Búsqueda incremental hacia atrás
+42 Borra la línea
+43 Corta hasta el final de la línea y guarda la información en el buffer
+44 Corta el área de la marca al cursor y guarda la información en el buffer
+45 Corta la línea completa y la guarda en el buffer
 46 Lista opciones para completar
 47 Lista opciones para completar ignorando los modos programables
-48 Lista los nombres de archivos que concuerdan con el comod�n
-49 Lista opciones para completar o indica el final de l�nea si es una l�nea vac�a
+48 Lista los nombres de archivos que concuerdan con el comodín
+49 Lista opciones para completar o indica el final de línea si es una línea vacía
 50 Imprime la media de carga y es estado de este proceso
 51 Expande los escapes del historial e inserta un espacio
 52 Ejecuta el comando
 53 Expande rutas, eliminando cualquier `.' y `..' que encuentre al comienzo
 54 Expande comandos a la ruta o el alias resultante
-55 Cambia de modo de inserci�n a sobre escritura y vice versa
-56 A�ade el octavo bit al siguiente car�cter introducido
-57 A�ade el siguiente car�cter sin modificar a la l�nea
+55 Cambia de modo de inserción a sobre escritura y vice versa
+56 Añade el octavo bit al siguiente carácter introducido
+57 Añade el siguiente carácter sin modificar a la línea
 58 Reimprime todo
 59 Reinicia un editor parado
 60 Busca ayuda sobre el comando actual
-61 Se a�ade este car�cter a la l�nea
-62 Este car�cter es el primero de una secuencia de caracteres
+61 Se añade este carácter a la línea
+62 Este carácter es el primero de una secuencia de caracteres
 63 Establece una marca bajo el cursor
-64 Corrige la ortograf�a de esta palabra
-65 Corrige la ortograf�a de la l�nea completa
-66 Env�a el car�cter a la terminal en modo `cooked'
-67 Cambia entre los modos literal y l�xico en esta l�nea de historial
-68 Intercambia el car�cter a la izquierda con el que est� bajo el cursor
+64 Corrige la ortografía de esta palabra
+65 Corrige la ortografía de la línea completa
+66 Envía el carácter a la terminal en modo `cooked'
+67 Cambia entre los modos literal y léxico en esta línea de historial
+68 Intercambia el carácter a la izquierda con el que está bajo el cursor
 69 Intercambia los dos caracteres que preceden al cursor
-70 Car�cter tty para suspensi�n retrasada
-71 Car�cter tty para `flush' de salida
-72 Car�cter tty para interrupci�n
-73 Car�cter tty para salida
-74 Car�cter tty para suspensi�n
-75 Car�cter tty para permitir salida
-76 Car�cter tty para impedir salida
-77 Indica car�cter no asignado
+70 Carácter tty para suspensión retrasada
+71 Carácter tty para `flush' de salida
+72 Carácter tty para interrupción
+73 Carácter tty para salida
+74 Carácter tty para suspensión
+75 Carácter tty para permitir salida
+76 Carácter tty para impedir salida
+77 Indica carácter no asignado
 78 Argumento Emacs universal (argumento por 4)
-79 Ir a la l�nea anterior
-80 Convierte en may�sculas los caracteres desde el cursor al final de la palabra
+79 Ir a la línea anterior
+80 Convierte en mayúsculas los caracteres desde el cursor al final de la palabra
 81 Vi: ir al comienzo de la siguiente palabra
-82 Vi: entrar en modo de inserci�n despu�s el cursor
-83 Vi: entrar en modo de inserci�n al final de la l�nea
-84 Vi: cambia a may�sculas o min�sculas el car�cter bajo el cursor y avanza una posici�n
+82 Vi: entrar en modo de inserción después el cursor
+83 Vi: entrar en modo de inserción al final de la línea
+84 Vi: cambia a mayúsculas o minúsculas el carácter bajo el cursor y avanza una posición
 85 Vi: cambiar el comando de prefijo
-86 Vi: cambiar hasta el final de la l�nea
-87 Entrar en modo vi (usa asignaci�n de teclas alternativa)
+86 Vi: cambiar hasta el final de la línea
+87 Entrar en modo vi (usa asignación de teclas alternativa)
 88 Vi: modo de comando completa la palabra
-89 Vi: ir al car�cter previo (retroceso)
+89 Vi: ir al carácter previo (retroceso)
 90 Vi: borrar el comando de prefijo
 91 Vi: ir hasta el final de la palabra delimitado por espacios
 92 Vi: ir hasta el final de la palabra
-93 Vi: retroceder al car�cter especificado
-94 Vi: avanzar al car�cter especificado
-95 Vi: retrocede hasta el car�cter especificado
-96 Vi: avanzar hasta el car�cter especificado
-97 Entrar en modo de inserci�n `vi'
-98 Entrar en modo de inserci�n `vi' al comienzo de la l�nea
-99 Vi: repetir la b�squeda de car�cter en la misma direcci�n
-100 Vi: repetir la b�squeda de car�cter en la direcci�n contraria
-101 Vi: repetir la b�squeda en la misma direcci�n
-102 Vi: repetir la b�squeda en la direcci�n contraria
-103 Vi: reemplazar el car�cter bajo el cursor por el que se introduzca
+93 Vi: retroceder al carácter especificado
+94 Vi: avanzar al carácter especificado
+95 Vi: retrocede hasta el carácter especificado
+96 Vi: avanzar hasta el carácter especificado
+97 Entrar en modo de inserción `vi'
+98 Entrar en modo de inserción `vi' al comienzo de la línea
+99 Vi: repetir la búsqueda de carácter en la misma dirección
+100 Vi: repetir la búsqueda de carácter en la dirección contraria
+101 Vi: repetir la búsqueda en la misma dirección
+102 Vi: repetir la búsqueda en la dirección contraria
+103 Vi: reemplazar el carácter bajo el cursor por el que se introduzca
 104 Vi: modo de reemplazo
-105 Vi: buscar en el historial hacia atr�s
+105 Vi: buscar en el historial hacia atrás
 106 Vi: buscar en el historial hacia adelante
-107 Vi: reemplazar el car�cter bajo el cursor cambiando a modo inserci�n
-108 Vi: reemplazar la l�nea completa
+107 Vi: reemplazar el carácter bajo el cursor cambiando a modo inserción
+108 Vi: reemplazar la línea completa
 109 Vi: ir a la palabra anterior
 110 Vi: ir a la palabra siguiente
 111 Vi: deshacer el cambio anterior
-112 Vi: ir al comienzo de la l�nea
+112 Vi: ir al comienzo de la línea
 113 Ejecutar `which' para el comando actual
 114 Pegar el buffer donde el cursor
 115 Replace just-yanked text with yank from earlier kill
diff --git a/contrib/tcsh/nls/spanish/set30 b/contrib/tcsh/nls/spanish/set30
index ea9e5be..be2af2a 100644
--- a/contrib/tcsh/nls/spanish/set30
+++ b/contrib/tcsh/nls/spanish/set30
@@ -1,15 +1,15 @@
-$ $tcsh: set30,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set30,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tw.parse.c
 $set 30 
 1 comienzo_de_comando %d\n
 2 completar %d 
 3 completar %d %S\n
 4 %s: Error interno de concordancia.\n
-5 �tems
+5 ítems
 6 filas
-7 Existen %d %s, �listarlas de todos modos? [n/s] 
+7 Existen %d %s, ¿listarlas de todos modos? [n/s] 
 8 buscando = %d\n
-9 \nerror interno de tcsh: �No s� lo que busco!\n
+9 \nerror interno de tcsh: ¡No sé lo que busco!\n
 10 no es un directorio
 11 no he encontrado nada
 12 ilegible
diff --git a/contrib/tcsh/nls/spanish/set4 b/contrib/tcsh/nls/spanish/set4
index 1ca3b69..c79067a 100644
--- a/contrib/tcsh/nls/spanish/set4
+++ b/contrib/tcsh/nls/spanish/set4
@@ -1,45 +1,45 @@
-$ $tcsh: set4,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set4,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ cadenas de Termcap
 $set 4
-1 a�ade una l�nea vac�a
+1 añade una línea vacía
 2 timbre audible
 3 borra hasta abajo
-4 borra hasta el final de la l�nea
-5 cursor hasta posici�n horizontal
+4 borra hasta el final de la línea
+5 cursor hasta posición horizontal
 6 borra la pantalla
-7 borra un car�cter
-8 borra una l�nea
+7 borra un carácter
+8 borra una línea
 9 entra en modo de borrado
 10 termina modo de borrado
-11 termina modo de inserci�n
-12 cursor de l�nea de estado
-13 cursor en posici�n inicial
-14 insertar car�cter
-15 entra en modo de inserci�n
-16 inserta car�cter de relleno
-17 env�a cursor hacia abajo
-18 env�a cursor hacia la izquierda
-19 env�a cursor hacia la derecha
-20 env�a cursor hacia arriba
+11 termina modo de inserción
+12 cursor de línea de estado
+13 cursor en posición inicial
+14 insertar carácter
+15 entra en modo de inserción
+16 inserta carácter de relleno
+17 envía cursor hacia abajo
+18 envía cursor hacia la izquierda
+19 envía cursor hacia la derecha
+20 envía cursor hacia arriba
 21 comienza negrita
 22 fin de atributos
 23 espacio no destructivo
-24 fin de �nfasis
-25 comienzo de �nfasis
-26 cursor a la l�nea de estado
-27 mueve el cursor hacia arriba una l�nea
+24 fin de énfasis
+25 comienzo de énfasis
+26 cursor a la línea de estado
+27 mueve el cursor hacia arriba una línea
 28 comienza subrayado
 29 fin de subrayado
 30 timbre visible
-31 borra m�ltiples caracteres
-32 mueve el cursor varias l�neas hacia abajo
-33 inserta m�ltiples caracteres
-34 mueve el cursor varias l�neas hacia la izquierda
-35 mueve el cursor varias l�neas hacia la derecha
-36 mueve el cursor varias l�neas hacia arriba
-37 Tiene m�rgenes autom�ticos
-38 Puede usar tabuladores f�sicos
-39 N�mero de l�neas
-40 N�mero de columnas
+31 borra múltiples caracteres
+32 mueve el cursor varias líneas hacia abajo
+33 inserta múltiples caracteres
+34 mueve el cursor varias líneas hacia la izquierda
+35 mueve el cursor varias líneas hacia la derecha
+36 mueve el cursor varias líneas hacia arriba
+37 Tiene márgenes automáticos
+38 Puede usar tabuladores físicos
+39 Número de líneas
+40 Número de columnas
 41 Tiene teclas alternativa
 42 Ignorando retorno de carro en el margen derecho
diff --git a/contrib/tcsh/nls/spanish/set5 b/contrib/tcsh/nls/spanish/set5
index 4ec38af..6451769 100644
--- a/contrib/tcsh/nls/spanish/set5
+++ b/contrib/tcsh/nls/spanish/set5
@@ -1,4 +1,4 @@
-$ $tcsh: set5,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set5,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ ed.chared.c
 $set 5
-1 No est� disponible la carga media\n
+1 No está disponible la carga media\n
diff --git a/contrib/tcsh/nls/spanish/set6 b/contrib/tcsh/nls/spanish/set6
index 06ded32..d7b1dbd 100644
--- a/contrib/tcsh/nls/spanish/set6
+++ b/contrib/tcsh/nls/spanish/set6
@@ -1,8 +1,8 @@
-$ $tcsh: set6,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set6,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ERROR: comando ilegal asignado a la tecla 0%o\r\n
-2 s�\n
+2 sí\n
 3 editar\n
 4 abortar\n
 5 no\n
diff --git a/contrib/tcsh/nls/spanish/set7 b/contrib/tcsh/nls/spanish/set7
index a50dbcd..ebabe6b 100644
--- a/contrib/tcsh/nls/spanish/set7
+++ b/contrib/tcsh/nls/spanish/set7
@@ -1,30 +1,30 @@
-$ $tcsh: set7,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set7,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh cree que su terminal tiene las\n
-2 \tsiguientes caracter�sticas:\n\n
-3 \tTiene %d columnas y %d l�neas\n
+2 \tsiguientes características:\n\n
+3 \tTiene %d columnas y %d líneas\n
 4 \t%s tecla `Alt'\n
 5 Tiene
 6 No tiene
 7 \t%spuede usar tabuladores\n
 8 No
-9 \t%s m�rgenes autom�ticos\n
+9 \t%s márgenes automáticos\n
 10 Tiene
 11 No tiene
-12 \t%s m�rgenes m�gicos\n
-13 (vac�o)
-14 s�
+12 \t%s márgenes mágicos\n
+13 (vacío)
+14 sí
 15 no
 16 ERROR: no se puede suprimir\r\n
-17 DeleteChars: num es rid�culo: %d\r\n
+17 DeleteChars: num es ridículo: %d\r\n
 18 ERROR: no se puede insertar\r\n
-19 StartInsert: num es rid�culo: %d\r\n
+19 StartInsert: num es ridículo: %d\r\n
 20 %s: No se puede abrir /etc/termcap.\n
 21 %s: No hay ninguna entrada correspondiente a la terminal tipo "%s"\n
 22 %s: usando los valores de una terminal tonta.\n
 23 %s: Aviso: Su terminal no puede moverse hacia arriba.\n
-24 La edici�n de l�neas largas puede resultar extra�a.\n
-25 no se puede borrar hasta el final de l�nea.\n
-26 no se puede borrar el siguiente car�cter.\n
-27 no se puede insertar un car�cter.\n
+24 La edición de líneas largas puede resultar extraña.\n
+25 no se puede borrar hasta el final de línea.\n
+26 no se puede borrar el siguiente carácter.\n
+27 no se puede insertar un carácter.\n
diff --git a/contrib/tcsh/nls/spanish/set8 b/contrib/tcsh/nls/spanish/set8
index abda415..754a816 100644
--- a/contrib/tcsh/nls/spanish/set8
+++ b/contrib/tcsh/nls/spanish/set8
@@ -1,5 +1,5 @@
-$ $tcsh: set8,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set8,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ ed.term.c
 $set 8
 1 Interruptor desconocido
-2 Argumento inv�lido
+2 Argumento inválido
diff --git a/contrib/tcsh/nls/spanish/set9 b/contrib/tcsh/nls/spanish/set9
index c94db08..478385a 100644
--- a/contrib/tcsh/nls/spanish/set9
+++ b/contrib/tcsh/nls/spanish/set9
@@ -1,12 +1,12 @@
-$ $tcsh: set9,v 1.2 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set9,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: No se permite una tecla extendida nula.\n
-2 AddXkey: No se permite comando introducci�n de secuencia (sequence-lead-in)\n
+2 AddXkey: No se permite comando introducción de secuencia (sequence-lead-in)\n
 3 DeleteXkey: No se permite una tecla extendida nula.\n
 4 Tecla de extendida indefinida "%S"\n
-5 Algunas teclas extendidas son demasiado grandes para el buffer de impresi�n interno
-6 Enumerate: ��BUG!! Se ha pasado un puntero nulo!\n
+5 Algunas teclas extendidas son demasiado grandes para el buffer de impresión interno
+6 Enumerate: ¡¡BUG!! Se ha pasado un puntero nulo!\n
 7 no hay entrada
-8 Falta algo a continuaci�n: %c\n
-9 Una constante octal no cabe en un car�cter.\n
+8 Falta algo a continuación: %c\n
+9 Una constante octal no cabe en un carácter.\n
diff --git a/contrib/tcsh/nls/ukrainian/charset b/contrib/tcsh/nls/ukrainian/charset
index fd65f43..81f1b66 100644
--- a/contrib/tcsh/nls/ukrainian/charset
+++ b/contrib/tcsh/nls/ukrainian/charset
@@ -1,3 +1,3 @@
-$ codeset=KOI8-U
+$ codeset=UTF-8
 $set 255
-1 KOI8-U
+1 UTF-8
diff --git a/contrib/tcsh/nls/ukrainian/set1 b/contrib/tcsh/nls/ukrainian/set1
index 2a4aa95..f98e741 100644
--- a/contrib/tcsh/nls/ukrainian/set1
+++ b/contrib/tcsh/nls/ukrainian/set1
@@ -1,140 +1,140 @@
-$ $tcsh: set1,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set1,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ Error messages
 $set 1 
-1 ����������� �������
-2 %s �� ������Ѥ����
-3 ������� �����
-4 �������� ����� $<
-5 ����� ����� ��� $0
-6 �������� ����Ʀ����� []
-7 ���������� $ ��� ���� ����� ]
-8 ������� ����Ʀ����� : � $ (%c)
-9 ���������� ������
-10 ����� ������ ����������
-11 �� ����� ¦���� �̦�
-12 ��������� ��'� �����
-13 ����Ҧ��� ������� glob
-14 ��צ���� �������
-15 ������ �������Ҧ�
-16 �������� �������Ҧ�
-17 ���������� ���������� ����� ������Φ�
-18 �����Φ� �������� if
-19 ��צ��� then
-20 ����� �� � ������
-21 %s �� ��������
-22 ���������� �����
-23 ������ ̦ͦ�� �� ���դ
-24 �������� ��������
+1 Синтаксична помилка
+2 %s не дозволяється
+3 Задовге слово
+4 Задовгий рядок $<
+5 Немає файлу для $0
+6 Неповний модифікатор []
+7 Розширення $ має бути перед ]
+8 Поганий модифікатор : в $ (%c)
+9 Помилковий індекс
+10 Число погано сформоване
+11 Не можна більше слів
+12 Пропущено ім'я файлу
+13 Внутрішня помилка glob
+14 Невідома команда
+15 Замало параметрів
+16 Забагато параметрів
+17 Небезпечно створювати такий псевдонім
+18 Порожній оператор if
+19 Невірне then
+20 Слова не в дужках
+21 %s не знайдено
+22 Некоректна маска
+23 Такого ліміту не існує
+24 Задовгий параметр
 25 Improper or unknown scale factor
-26 ����������� �ͦ���
-27 ���� ������Ǧ� �� ����� ��� � �������
-28 ��צ���� ����� �������
-29 ��צ����� ������; kill -l �����դ �Ӧ �����צ
-30 ��'� �ͦ��ϧ ��� ���������� � ̦����
-31 ������� ��'� �ͦ��ϧ 
-32 ��'� �ͦ��ϧ ��� ���������� � ����צ���-��������� �������
-33 �� �������� �� ͦ����� ����¦� ��������� ��������
-34 ������� ������
-35 ����� ���������� ��������
-36 �� ���� ������� �� ���������� ��������
-37 ���������� ������� �������
+26 Невизначена змінна
+27 Стек каталогів не такий вже і великий
+28 Невірний номер сигналу
+29 Невідомий сигнал; kill -l показує всі можливі
+30 Ім'я змінної має починатися з літери
+31 Задовге ім'я змінної 
+32 Ім'я змінної має починатися з алфавітно-цифрового символу
+33 Ця оболонка не містить засобів керування задачами
+34 Синтакс виразу
+35 Немає домашнього каталогу
+36 Не можу перейти до домашнього каталогу
+37 Некоректна порожня команда
 38 Assignment missing expression
-39 ��צ����� ��������
-40 ������������
-41 %s: ���� ���դ
-42 �������� -c ��˦��դ���� backslash'��
-43 ���������
+39 Невідомий оператор
+40 Неоднозначно
+41 %s: Файл існує
+42 Аргумент -c закінчується backslash'ем
+43 Перервано
 44 Subscript out of range
-45 ������������ �����
-46 ����� ���ϧ ����ަ
-47 ��������� � ���ͦ����
-48 �� � while/foreach
-49 �� ����� ¦���� �����Ӧ�
-50 ����� �Ц�������
-51 ��������� %c
-52 ������Φ� צ���צ���� �� %c
-53 ���� ���'�Ԧ
-54 �� ���� �������� �����
+45 Переповнення рядку
+46 Немає такої задачі
+47 Неможливо з терміналу
+48 Не у while/foreach
+49 Не можна більше процесів
+50 Немає співпадань
+51 Пропущено %c
+52 Відсутній відповідник до %c
+53 Мало пам'яті
+54 Не можу створити канал
 55 %s: %s
 56 %s
-57 ������������: jobs [ -l ]
-58 ���������� ��� ���� ����� ����ަ �� �������
-59 ����� ������ϧ ����ަ
-60 ����� ���������ϧ ����ަ
-61 ����� ������ �� צ���צ��� �������
+57 Використання: jobs [ -l ]
+58 Аргументом має бути номер задачі чи процесу
+59 Немає поточної задачі
+60 Немає попередньої задачі
+61 Жодна задача не відповідає шаблону
 62 Fork nesting > %d; maybe `...` loop
-63 ���������� �� ͦ������� ����¦� ��������� ��������
+63 Підоболонка не міститить засобів керування задачами
 64 Sync fault: Process %d not found
-65 %s�� � 'Ц�צ��Φ' ����ަ
-66 %s�� � '���������Φ' ����ަ
-67 ����� ����� ������Ǧ�
-68 ���� ������Ǧ� ������
-69 ������� �������
-70 ������������: %s [-%s]%s
-71 ������Φ� ������� �������� -h
-72 �� �� �������� ��������
-73 ������ �� 0
-74 ������ �� 0
+65 %sЩе є 'підвішені' задачі
+66 %sЩе є 'призупинені' задачі
+67 Немає інших каталогів
+68 Стек каталогів пустий
+69 Поганий каталог
+70 Використання: %s [-%s]%s
+71 Відсутній операнд прапорця -h
+72 Це не первинна оболонка
+73 Ділення на 0
+74 Ділення на 0
 75 Bad scaling; did you mean "%s"?
-76 �� ���� Ц�צ���� �������� �������� (���� ��)
-77 ��צ����� ����������: %s
-78 �ͦ��� $home �� ���������
-79 ������������: history [-%s] [# ˦��˦��� ��Ħ�]
-80 �� ����� ��������������� $, ! �� < ����� � $# �� $?
-81 ������ ������ ����� � ���Φ �ͦ��ϧ
-82 �� ����� ��������������� * ����� � $# �� $?
-83 �� ����� ��������������� $?<�����> �� $#<�����>
-84 ����������� ��'� �ͦ��ϧ
-85 ������ ������ ����� � �����Ӧ �ͦ��ϧ
-86 ������������ ������ ����������
-87 ������� �ͦ��ϧ
-88 ����������� ����� '!'
-89 �� �� ���� Ц���������
-90 ������ Ц���������
+76 Не можу підвісити первинну оболонку (поки що)
+77 Невідомий користувач: %s
+78 Змінна $home не визначена
+79 Використання: history [-%s] [# кількість подій]
+80 Не можна використовувати $, ! та < разом з $# чи $?
+81 Символ нового рядку в імені змінної
+82 Не можна використовувати * разом з $# чи $?
+83 Не можна використовувати $?<цифра> чи $#<цифра>
+84 Неправильне ім'я змінної
+85 Символ нового рядка в індексі змінної
+86 Переповнення буферу розширення
+87 Синтакс змінної
+88 Неправильна форма '!'
+89 Ще не було підстановок
+90 Погана підстановка
 91 No previous left hand side
 92 Right hand side too long
-93 ������� ����Ʀ����� !: %c
-94 ������� ����Ʀ������
-95 ������������ ������ Ц���������
+93 Поганий модифікатор !: %c
+94 Невдача модифікатора
+95 Переповнення буферу підстановки
 96 Bad ! arg selector
-97 ������ �� �� ����
-98 %s: ��Ħ� �� ��������
-99 ������ ����� )
-100 ������ ����� (
-101 ������ ���ͦ���� ����� ()
-102 ������Τ ��'� ��� ���������������
-103 ������������ ��������������� ���������
-104 �� ����� ��������������� << � ������Φ ()
-105 ������������ ��������������� ��������
-106 ������ ���ͦ���� ����� ()
-107 ���������� ������Φͦ�
-108 �ͦ��� $watch �� �����������
-109 ����� ������������ �������
-110 ������������: sched -<# ��������>.\n������������: sched [+]���:�� <�������>
-111 �������� ����դ�� ���������!
-112 � �� ���������?
-113 ������������ ��� ��� ������������� ��������
-114 ��������� ��� ����ͦ���� � am/pm
+97 Пошуку ще не було
+98 %s: Подію не знайдено
+99 Багато дужок )
+100 Багато дужок (
+101 Погано розміщено дужку ()
+102 Відсутнє ім'я для перенаправлення
+103 Неоднозначне перенаправлення виведення
+104 Не можна використовувати << в середині ()
+105 Неоднозначне перенаправлення введення
+106 Погано розміщено дужки ()
+107 Зациклення псевдонімів
+108 Змінну $watch не встановлено
+109 Немає запланованих завдань
+110 Використання: sched -<# елемента>.\nВикористання: sched [+]год:хв <команда>
+111 Забагато плануєте запускати!
+112 А що запускати?
+113 Неправильний час для запланованого завдання
+114 Відносний час несумісний з am/pm
 115 Out of termcap string space
-116 ������������: settc %s [yes|no]
+116 Використання: settc %s [yes|no]
 117 Unknown capability `%s'
-118 ��צ����� �������� termcap `%%%c'
-119 �������� �������Ԧ� ��� `%s' (%d)
-120 `%s' ������� %d ��������(��)
-121 ������������: echotc [-v|-s] [<capability> [<args>]]
-122 %s: %s. ����������� ��Ȧ�������
-123 !# ���������� ����Ҧ�
+118 Невідомий параметр termcap `%%%c'
+119 Забагато аргументів для `%s' (%d)
+120 `%s' вимагає %d аргумент(ів)
+121 Використання: echotc [-v|-s] [<capability> [<args>]]
+122 %s: %s. Неправильна архітектура
+123 !# Зациклення історії
 124 Malformed file inquiry
-125 ������������ ���������
-126 ��צ����� ��������: `-%s'\n������������: %s [ -bcdefilmnqstvVxX -D��'�[=��������] ] [ �������� ... ]
-127 ��צ����� ��������: `-%s'\n������������: %s [ -bcdefFilmnqstvVxX ] [ �������� ... ]
-128 ��צ����� ��������: `-%s'\n������������: %s [ -bcdefilmnqstvVxX ] [ �������� ... ]
-129 \n��צ��� ���������: "%s"
-130 \n��צ��� %s: '%c'
-131 \n��������� ���Ħ����� '%c' Ц��� %s "%s"
-132 \n������� %s: "%s"
-133 ������Φ� ������� �������� -m
-134 ������������: unlimit [-fh] [̦ͦ��]
-135 $%S ���� ��� �������
-136 ����� ���ϧ ����ަ
-137 ��צ���� �������� �ͦ��ϧ colorls: `%c%c'
+125 Переповнення селектора
+126 Невідомий параметр: `-%s'\nВикористання: %s [ -bcdefilmnqstvVxX -Dім'я[=значення] ] [ аргумент ... ]
+127 Невідомий параметр: `-%s'\nВикористання: %s [ -bcdefFilmnqstvVxX ] [ аргумент ... ]
+128 Невідомий параметр: `-%s'\nВикористання: %s [ -bcdefilmnqstvVxX ] [ аргумент ... ]
+129 \nНевірне завершеня: "%s"
+130 \nНевірне %s: '%c'
+131 \nПропущено роздільник '%c' після %s "%s"
+132 \nНеповне %s: "%s"
+133 Відсутній операнд прапорця -m
+134 Використання: unlimit [-fh] [ліміти]
+135 $%S лише для читання
+136 Немає такої задачі
+137 Невідоме значення змінної colorls: `%c%c'
diff --git a/contrib/tcsh/nls/ukrainian/set10 b/contrib/tcsh/nls/ukrainian/set10
index a406c51..2f74b41 100644
--- a/contrib/tcsh/nls/ukrainian/set10
+++ b/contrib/tcsh/nls/ukrainian/set10
@@ -1,8 +1,8 @@
-$ $tcsh: set10,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set10,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ ma.setp.c
 $set 10 
-1 setpath: ��צ��� ������� '%s'.\n
-2 setpath: ����������� �������Ԧ� ��� ������� '%s'.\n
-3 setpath: �������� צ����Τ � ����� '%s'\n
-4 setpath: %s �� �������� � %s\n
-5 setpath: %d ��Ħ���� ����æ� � %s\n
+1 setpath: невірна команда '%s'.\n
+2 setpath: недостатньо аргументів для команди '%s'.\n
+3 setpath: значення відсутнє в шляху '%s'\n
+4 setpath: %s не знайдено в %s\n
+5 setpath: %d недійсна позиція в %s\n
diff --git a/contrib/tcsh/nls/ukrainian/set11 b/contrib/tcsh/nls/ukrainian/set11
index 4fa15f6..0117e30 100644
--- a/contrib/tcsh/nls/ukrainian/set11
+++ b/contrib/tcsh/nls/ukrainian/set11
@@ -1,10 +1,10 @@
-$ $tcsh: set11,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set11,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.c
 $set 11 
-1 �����: ����� ������� �� tty (%s).\n
-2 ��� �� ���� ��������� �������� � æ� ������æ.\n
-3 ���˦��� ���Ԧ�: %d.\n
-4 ���˦��� ���Ԧ�: %d (� %s).\n
-5 � ��� � %s�����.\n
-6 ���� 
-7 � ��� � %s����� � %s.\n
+1 Увага: немає доступу до tty (%s).\n
+2 Все ще нема керування задачами в цій оболонці.\n
+3 Кількість листів: %d.\n
+4 Кількість листів: %d (в %s).\n
+5 У Вас є %sпошта.\n
+6 нова 
+7 У Вас є %sпошта в %s.\n
diff --git a/contrib/tcsh/nls/ukrainian/set12 b/contrib/tcsh/nls/ukrainian/set12
index d55bcfa..9c6c080 100644
--- a/contrib/tcsh/nls/ukrainian/set12
+++ b/contrib/tcsh/nls/ukrainian/set12
@@ -1,4 +1,4 @@
-$ $tcsh: set12,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set12,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.dir.c
 $set 12 
-1 %s: ������� ������ � "%s"\n
+1 %s: Спробую почати з "%s"\n
diff --git a/contrib/tcsh/nls/ukrainian/set13 b/contrib/tcsh/nls/ukrainian/set13
index a7f08b3..4cf0aae 100644
--- a/contrib/tcsh/nls/ukrainian/set13
+++ b/contrib/tcsh/nls/ukrainian/set13
@@ -1,13 +1,13 @@
-$ $tcsh: set13,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set13,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.exec.c
 $set 13 
-1 ���=%-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: ��������� �������.\n
-6 %S: ������� �� ��������.\n
-7 where: ������ / � �������� �� ��� �ͦ���\n
-8 %S ������������� � 
-9 %S ����Ҧ��� ������� ��������\n
-10 ������� ����: 
+4 %d попадань, %d промахів, %d%%\n
+5 %S: вбудована команда.\n
+6 %S: Команду не знайдено.\n
+7 where: символ / в командах не має змісту\n
+8 %S переназначено у 
+9 %S внутрішня команда оболонки\n
+10 промахи хешу: 
diff --git a/contrib/tcsh/nls/ukrainian/set14 b/contrib/tcsh/nls/ukrainian/set14
index faa6ac6..1e93921 100644
--- a/contrib/tcsh/nls/ukrainian/set14
+++ b/contrib/tcsh/nls/ukrainian/set14
@@ -1,6 +1,6 @@
-$ $tcsh: set14,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set14,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.file.c
 $set 14 
-1 \n��!! �������� %s!!\n
-2 ���� � ���̦ ����̦�
-3 ���̦�
+1 \nОй!! Забагато %s!!\n
+2 імен у файлі паролів
+3 файлів
diff --git a/contrib/tcsh/nls/ukrainian/set15 b/contrib/tcsh/nls/ukrainian/set15
index 498362f..d3ffcb0 100644
--- a/contrib/tcsh/nls/ukrainian/set15
+++ b/contrib/tcsh/nls/ukrainian/set15
@@ -1,7 +1,7 @@
-$ $tcsh: set15,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set15,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.func.c
 $set 15 
-1 %s: %s: �� ���� %s%s ̦ͦ�\n
-2 �����
-3 ���������
-4 \040��������
+1 %s: %s: Не можу %s%s ліміт\n
+2 зняти
+3 виставити
+4 \040жорсткий
diff --git a/contrib/tcsh/nls/ukrainian/set16 b/contrib/tcsh/nls/ukrainian/set16
index f5cb670..ca693ea 100644
--- a/contrib/tcsh/nls/ukrainian/set16
+++ b/contrib/tcsh/nls/ukrainian/set16
@@ -1,9 +1,9 @@
-$ $tcsh: set16,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set16,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Reset tty pgrp from %d to %d\n
-2 \n������������ "logout" ��� �����.\n
-3 \n������������ "exit" ��� ����� � %s.\n
+2 \nВикористайте "logout" щоб вийти.\n
+3 \nВикористайте "exit" щоб вийти з %s.\n
 4 seek to eval %x %x\n
 5 seek to alias %x %x\n
 6 seek to file %x\n
diff --git a/contrib/tcsh/nls/ukrainian/set17 b/contrib/tcsh/nls/ukrainian/set17
index f790544..3ef0316 100644
--- a/contrib/tcsh/nls/ukrainian/set17
+++ b/contrib/tcsh/nls/ukrainian/set17
@@ -1,17 +1,17 @@
-$ $tcsh: set17,v 1.4 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set17,v 1.5 2011/02/04 18:19:44 christos Exp $
 $ sh.proc.c
 $set 17 
-1 �������: �ަ������� �����ϧ ����ަ!\n
-2 ���������� %d\n
-3 �������: process flushed twice
-4 �������� 
-5 ������ 
-6 ���������� %-25d
-7 ���������
-8 �������: ������=%-9o
-9 \040(�������� core)
+1 ПОМИЛКА: очікування фонової задачі!\n
+2 Завершення %d\n
+3 ПОМИЛКА: process flushed twice
+4 Запущено 
+5 Сигнал 
+6 Завершення %-25d
+7 Завершено
+8 ПОМИЛКА: статус=%-9o
+9 \040(записано core)
 10 \040(wd:
-11 wd �����: 
-12 %S: ��� Ц�צ����\n
-13 %S: ��� �����������\n
+11 wd тепер: 
+12 %S: вже підвішено\n
+13 %S: вже призупинено\n
 14 %S: Badly formed number\n
diff --git a/contrib/tcsh/nls/ukrainian/set18 b/contrib/tcsh/nls/ukrainian/set18
index c3d82bf..7053f50 100644
--- a/contrib/tcsh/nls/ukrainian/set18
+++ b/contrib/tcsh/nls/ukrainian/set18
@@ -1,4 +1,4 @@
-$ $tcsh: set18,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set18,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.set.c
 $set 18 
-1 �����: �������� PATH ��Ҧ����\n
+1 Увага: задовгий PATH обрізано\n
diff --git a/contrib/tcsh/nls/ukrainian/set19 b/contrib/tcsh/nls/ukrainian/set19
index ae57dfa..8149e89 100644
--- a/contrib/tcsh/nls/ukrainian/set19
+++ b/contrib/tcsh/nls/ukrainian/set19
@@ -1,15 +1,23 @@
-$ $tcsh: set19,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set19,v 1.6 2011/02/25 23:58:08 christos Exp $
 $ tc.alloc.c
 $set 19 
-1 nbytes=%d: ���� ���'�Ԧ\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.
 5 free(%lx) bad block.
 6 free(%lx) bad range check.
 7 free(%lx) bad block index.
-8 ��Φ�Τ �����Ħ����� ���'�Ԧ %s:\nצ����:\t
-9 \n������:\t
-10 \n\t������ ������: %d, ������ צ����: %d\n
-11 \t������ ���'��� � 0x%lx �� 0x%lx.  Real top at 0x%lx\n
-12 ������ ���'��� � 0x%lx �� 0x%lx (%ld).\n
+8 Нинішнє розподілення пам'яті %s:\nвільно:\t
+9 занято
+10 \n\tВсього занято: %d, всього вільно: %d\n
+11 \tЗанято пам'ять з 0x%lx до 0x%lx.  Real top at 0x%lx\n
+12 Занято пам'ять з 0x%lx до 0x%lx (%ld).\n
+13 %s current memory allocation:\n
+14 Total space allocated from system: %d\n
+15 Number of non-inuse chunks: %d\n
+16 Number of mmapped regions: %d\n
+17 Total space in mmapped regions: %d\n
+18 Total allocated space: %d\n
+19 Total non-inuse space: %d\n
+20 Top-most, releasable space: %d\n
diff --git a/contrib/tcsh/nls/ukrainian/set2 b/contrib/tcsh/nls/ukrainian/set2
index b25777f..1768733 100644
--- a/contrib/tcsh/nls/ukrainian/set2
+++ b/contrib/tcsh/nls/ukrainian/set2
@@ -1,36 +1,36 @@
-$ $tcsh: set2,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set2,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ Signal names
 $set 2 
-1 �������� ������
+1 Нульовий сигнал
 2 Hangup
-3 �����������
-4 ��Ȧ�
-5 ���������� �������æ�n
+3 Переривання
+4 Вихід
+5 Некоректна інструкціяn
 6 Trace/BPT trap
-7 ���Ҧ��� ����������
+7 Аварійне завершення
 8 IOT trap
 9 System Crash Imminent
-10 ������� ����������
+10 Помилка завершення
 11 EMT trap
-12 ������� �����æ� � ��������� �����
-13 �����
-14 ������ ����������� 1
-15 ������ ����������� 2
-16 ������� ������æ�
+12 Помилка операції з плаваючою комою
+13 Вбито
+14 Сигнал користувача 1
+15 Сигнал користувача 2
+16 Помилка адресації
 17 Bus error
 18 Program range error
 19 Operand range error
-20 ������� ��������� ������
-21 ����� ������
+20 Поганий системний виклик
+21 Обрив каналу
 22 Alarm clock
 23 Terminated
-24 �ͦ�� ������� �������
-25 ������ �������
+24 Зміна статусу нащадка
+25 Смерть нащадка
 26 Apollo-specific fault
 27 Child stopped or exited
 28 Child exited
-29 �¦� ��������
-30 ������ �������
+29 Збій живлення
+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
+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 ��צ���� (������)
-47 ����������� (������)
-48 ��צ����
-49 �����������
-50 ����������
-51 ��צ���� (tty input)
-52 ����������� (tty input)
-53 ��צ���� (tty output)
-54 ����������� (tty output)
+46 Підвішено (сигнал)
+47 Призупинено (сигнал)
+48 Підвішено
+49 Призупинено
+50 Продовжено
+51 Підвішено (tty input)
+52 Призупинено (tty input)
+53 Підвішено (tty output)
+54 Призупинено (tty output)
 55 Window status changed
 56 Window size changed
 57 Phone status changed
diff --git a/contrib/tcsh/nls/ukrainian/set20 b/contrib/tcsh/nls/ukrainian/set20
index 64be44e..ffcb288 100644
--- a/contrib/tcsh/nls/ukrainian/set20
+++ b/contrib/tcsh/nls/ukrainian/set20
@@ -1,4 +1,4 @@
-$ $tcsh: set20,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set20,v 1.4 2011/02/04 18:19:44 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->  �� ���������\n
+10 %-15s->  не визначено\n
 11 BUG!!! %s isn't bound to anything.\n
-12 ������������: bindkey [���������] [--] [���� [�������]]\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 ������������: bind [KEY | COMMAND KEY | "emacs" | "vi" | "-a"]\n
-37 ��צ��� ����æ�
-38  %s\t\t�� ���������\n
+36 Використання: bind [KEY | COMMAND KEY | "emacs" | "vi" | "-a"]\n
+37 Невірна функція
+38  %s\t\tне визначено\n
diff --git a/contrib/tcsh/nls/ukrainian/set22 b/contrib/tcsh/nls/ukrainian/set22
index 534298e..57ae392 100644
--- a/contrib/tcsh/nls/ukrainian/set22
+++ b/contrib/tcsh/nls/ukrainian/set22
@@ -1,17 +1,17 @@
-$ $tcsh: set22,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set22,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ tc.func.c
 $set 22 
-1 %S: \t ������������� ��
-2 \n��צ���� ������ ����������� %s\n
+1 %S: \t перевизначено на
+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 ������������ ���¦� ���������� �����\n
-8 �� �����Ħ ������ �������� �Ӧ �����? [n/y] 
-9 ����������� ��������� �Ӧ� ���̦�!\n
-10 ��������� ����� �����:\n
-11 ������������ ���¦� ���������� �����\n
-12 � ������ �� ����˦�\n
-13 ��������� ����� �����:\n
+7 синтаксичний розбір командного рядка\n
+8 Ви справді хочете видалити всі файли? [n/y] 
+9 пропускаємо видалення всіх файлів!\n
+10 командний рядок тепер:\n
+11 синтаксичний розбір командного рядка\n
+12 в одному із списків\n
+13 командний рядок тепер:\n
 14 yY
diff --git a/contrib/tcsh/nls/ukrainian/set23 b/contrib/tcsh/nls/ukrainian/set23
index f62702b..1ddbc6f 100644
--- a/contrib/tcsh/nls/ukrainian/set23
+++ b/contrib/tcsh/nls/ukrainian/set23
@@ -1,4 +1,4 @@
-$ $tcsh: set23,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set23,v 1.4 2011/02/04 18:19:44 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 ���Ӧ�:   %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 ��צ���� ��� �������
-29 ��� ������� �� ���������
-30 �������� �������Ԧ�
-31 ��צ���� ��������
+28 Невірний тип системи
+29 Тип системи не визначено
+30 Забагато аргументів
+31 Невірний аргумент
diff --git a/contrib/tcsh/nls/ukrainian/set25 b/contrib/tcsh/nls/ukrainian/set25
index 0769521..f9a4702 100644
--- a/contrib/tcsh/nls/ukrainian/set25
+++ b/contrib/tcsh/nls/ukrainian/set25
@@ -1,6 +1,6 @@
-$ $tcsh: set25,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set25,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
-2 �������: bsd_signal(%d) ������ �� ������ ���������\n
-3 �������: bsd_signal(%d) - ������� sigaction, ��� ������� %d\n
+2 помилка: bsd_signal(%d) сигнал за межами інтервалу\n
+3 помилка: bsd_signal(%d) - невдача sigaction, код помилки %d\n
diff --git a/contrib/tcsh/nls/ukrainian/set26 b/contrib/tcsh/nls/ukrainian/set26
index 4c28ab2..c546ce6 100644
--- a/contrib/tcsh/nls/ukrainian/set26
+++ b/contrib/tcsh/nls/ukrainian/set26
@@ -1,15 +1,15 @@
-$ $tcsh: set26,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set26,v 1.4 2011/02/04 18:19:44 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 �������! last element is not whotail!\n
+3 ПОМИЛКА! last element is not whotail!\n
 4 backward: 
-5 �������! first element is not whohead!\n
+5 ПОМИЛКА! first element is not whohead!\n
 6 new: %s/%s\n
-7 ���������� %n %a %l (%m).
-8 ���������� %n %a %l.
-9 Ц�'������� ��
-10 צ�'������� צ�
-11 ��ͦ��� %s ��
-12 ��������
+7 Користувач %n %a %l (%m).
+8 Користувач %n %a %l.
+9 під'єднався до
+10 від'єднався від
+11 замінив %s на
+12 локально
diff --git a/contrib/tcsh/nls/ukrainian/set27 b/contrib/tcsh/nls/ukrainian/set27
index 2670e90..996fa37 100644
--- a/contrib/tcsh/nls/ukrainian/set27
+++ b/contrib/tcsh/nls/ukrainian/set27
@@ -1,8 +1,8 @@
-$ $tcsh: set27,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set27,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ tw.comp.c
 $set 27 
-1 �������
-2 ���Ħ�����
-3 ������
-4 ���ͦ���
-5 ����������
+1 команда
+2 роздільник
+3 шаблон
+4 проміжок
+5 завершення
diff --git a/contrib/tcsh/nls/ukrainian/set29 b/contrib/tcsh/nls/ukrainian/set29
index 02c4746..1161216 100644
--- a/contrib/tcsh/nls/ukrainian/set29
+++ b/contrib/tcsh/nls/ukrainian/set29
@@ -1,4 +1,4 @@
-$ $tcsh: set29,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set29,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ tw.help.c
 $set 29 
-1 ������Φ� ���� ��צ��� ��� %S\n
+1 Відсутній файл довідки для %S\n
diff --git a/contrib/tcsh/nls/ukrainian/set30 b/contrib/tcsh/nls/ukrainian/set30
index 8b835de..bb85395 100644
--- a/contrib/tcsh/nls/ukrainian/set30
+++ b/contrib/tcsh/nls/ukrainian/set30
@@ -1,4 +1,4 @@
-$ $tcsh: set30,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set30,v 1.4 2011/02/04 18:19:45 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 ��� %d %s, ���-���� ����������? [n/y] 
+7 Тут %d %s, все-таки показувати? [n/y] 
 8 looking = %d\n
-9 \n����Ҧ��� ������� tcsh: ��� � �� ����, �� ���� � �����!\n
-10 �� �������
-11 �� ��������
-12 �� ���������
+9 \nвнутрішня помилка tcsh: Вже й не знаю, що саме я шукаю!\n
+10 не каталог
+11 не знайдено
+12 не читається
 13 yY
diff --git a/contrib/tcsh/nls/ukrainian/set31 b/contrib/tcsh/nls/ukrainian/set31
index f0b8752..5163621 100644
--- a/contrib/tcsh/nls/ukrainian/set31
+++ b/contrib/tcsh/nls/ukrainian/set31
@@ -1,7 +1,7 @@
-$ $tcsh: set31,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set31,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ vms.termcap.c
 $set 31 
-1 �� ���� צ������ TERMCAP: [%s]\n
-2 �� ���� צ������ %s.\n
-3 �������� %s � %s.\n
-4 �� �������� �Ц������� �� %s � %s\n
+1 Не можу відкрити TERMCAP: [%s]\n
+2 Не можу відкрити %s.\n
+3 Знайдено %s в %s.\n
+4 Не знайдено співпадань по %s у %s\n
diff --git a/contrib/tcsh/nls/ukrainian/set5 b/contrib/tcsh/nls/ukrainian/set5
index 8540d1d..9d98f50 100644
--- a/contrib/tcsh/nls/ukrainian/set5
+++ b/contrib/tcsh/nls/ukrainian/set5
@@ -1,4 +1,4 @@
-$ $tcsh: set5,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set5,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ ed.chared.c
 $set 5
-1 ���������� ��������: �����Τ ������������\n
+1 Недоступне значення: середнє завантаження\n
diff --git a/contrib/tcsh/nls/ukrainian/set6 b/contrib/tcsh/nls/ukrainian/set6
index a86cef7..03b6005 100644
--- a/contrib/tcsh/nls/ukrainian/set6
+++ b/contrib/tcsh/nls/ukrainian/set6
@@ -1,4 +1,4 @@
-$ $tcsh: set6,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set6,v 1.4 2011/02/04 18:19:45 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 ����� ����ϧ �������\n
-7 ������������ �������\n
-8 *** �������� ������� ��������� ***\r\n\n
+6 Немає схожої команди\n
+7 Неоднозначна команда\n
+8 *** Фатальна ПОМИЛКА редактора ***\r\n\n
diff --git a/contrib/tcsh/nls/ukrainian/set7 b/contrib/tcsh/nls/ukrainian/set7
index 8a1bcbf..c469b65 100644
--- a/contrib/tcsh/nls/ukrainian/set7
+++ b/contrib/tcsh/nls/ukrainian/set7
@@ -1,4 +1,4 @@
-$ $tcsh: set7,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set7,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh thinks your terminal has the\n
@@ -14,15 +14,15 @@ $set 7
 11 does not have
 12 \tIt %s magic margins\n
 13 (empty)
-14 ���
-15 Φ
-16 �������: cannot delete\r\n
+14 так
+15 ні
+16 ПОМИЛКА: cannot delete\r\n
 17 DeleteChars: num is riduculous: %d\r\n
-18 �������: 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
-22 %s: ������������ ��������� ������ ���ͦ����.\n
+22 %s: використання настройок тупого терміналу.\n
 23 %s: WARNING: Your terminal cannot move up.\n
 24 Editing may be odd for long lines.\n
 25 no clear EOL capability.\n
diff --git a/contrib/tcsh/nls/ukrainian/set8 b/contrib/tcsh/nls/ukrainian/set8
index 693f9b0..6f8dc43 100644
--- a/contrib/tcsh/nls/ukrainian/set8
+++ b/contrib/tcsh/nls/ukrainian/set8
@@ -1,5 +1,5 @@
-$ $tcsh: set8,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set8,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ ed.term.c
 $set 8
-1 ��צ����� ���������
-2 ��צ���� ��������
+1 Невідомий перемикач
+2 Невірний аргумент
diff --git a/contrib/tcsh/nls/ukrainian/set9 b/contrib/tcsh/nls/ukrainian/set9
index 97971f5..9d11f2c 100644
--- a/contrib/tcsh/nls/ukrainian/set9
+++ b/contrib/tcsh/nls/ukrainian/set9
@@ -1,4 +1,4 @@
-$ $tcsh: set9,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ $tcsh: set9,v 1.4 2011/02/04 18:19:45 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: �������!! 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
diff --git a/contrib/tcsh/patchlevel.h b/contrib/tcsh/patchlevel.h
index c0801cb..53009aa 100644
--- a/contrib/tcsh/patchlevel.h
+++ b/contrib/tcsh/patchlevel.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/patchlevel.h,v 3.167 2009/07/10 17:09:32 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/patchlevel.h,v 3.180 2012/02/13 16:33:50 christos Exp $ */
 /*
  * patchlevel.h: Our life story.
  */
@@ -7,8 +7,8 @@
 
 #define ORIGIN "Astron"
 #define REV 6
-#define VERS 17
-#define PATCHLEVEL 0
-#define DATE "2009-07-10"
+#define VERS 18
+#define PATCHLEVEL 1
+#define DATE "2012-02-14"
 
 #endif /* _h_patchlevel */
diff --git a/contrib/tcsh/pathnames.h b/contrib/tcsh/pathnames.h
index 80d86eb..3d1c8d7 100644
--- a/contrib/tcsh/pathnames.h
+++ b/contrib/tcsh/pathnames.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/pathnames.h,v 3.18 2002/03/08 17:36:46 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/pathnames.h,v 3.22 2011/02/05 20:34:55 christos Exp $ */
 /*
  * pathnames.h: Location of things to find
  */
@@ -33,7 +33,7 @@
 #ifndef _h_pathnames
 #define _h_pathnames
 
-#ifdef BSD4_4
+#ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
 
@@ -92,6 +92,10 @@
 # define _PATH_TCSHELL		"/local/bin/tcsh"	/* use ram disk */
 #endif /* _MINIX && !_PATH_TCSHELL */
 
+#if defined(__linux__) && !defined(_PATH_TCSHELL)
+# define _PATH_TCSHELL		"/bin/tcsh"
+#endif /* __linux__ && !_PATH_TCSHELL */
+
 #if defined(__EMX__) && !defined(_PATH_DEVNULL)
 # define _PATH_DEVNULL		"nul"
 #endif /* __EMX__ && !_PATH_DEVNULL */
@@ -141,7 +145,7 @@
 #endif /* !_PATH_CSHELL */
 
 #ifndef _PATH_TCSHELL
-#  define _PATH_TCSHELL		"/usr/local/bin/tcsh"
+# define _PATH_TCSHELL		"/usr/local/bin/tcsh"
 #endif /* !_PATH_TCSHELL */
 
 #ifndef _PATH_BIN_LOGIN
diff --git a/contrib/tcsh/sh.c b/contrib/tcsh/sh.c
index f90eeab..dcd9116 100644
--- a/contrib/tcsh/sh.c
+++ b/contrib/tcsh/sh.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.c,v 3.145 2009/06/25 21:15:37 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.c,v 3.174 2011/11/29 18:38:54 christos Exp $ */
 /*
  * sh.c: Main shell routines
  */
@@ -39,7 +39,7 @@ char    copyright[] =
  All rights reserved.\n";
 #endif /* not lint */
 
-RCSID("$tcsh: sh.c,v 3.145 2009/06/25 21:15:37 christos Exp $")
+RCSID("$tcsh: sh.c,v 3.174 2011/11/29 18:38:54 christos Exp $")
 
 #include "tc.h"
 #include "ed.h"
@@ -78,7 +78,7 @@ extern int NLSMapsAreInited;
  * ported to Apple Unix (TM) (OREO)  26 -- 29 Jun 1987
  */
 
-jmp_buf_t reslab INIT_ZERO_STRUCT;
+jmp_buf_t reslab;
 
 static const char tcshstr[] = "tcsh";
 
@@ -160,6 +160,77 @@ static	void		  st_restore	(void *);
 
 	int		  main		(int, char **);
 
+#ifndef LOCALEDIR
+#define LOCALEDIR "/usr/share/locale"
+#endif
+
+#ifdef NLS_CATALOGS
+static void
+add_localedir_to_nlspath(const char *path)
+{
+    static const char msgs_LOC[] = "/%L/LC_MESSAGES/%N.cat";
+    static const char msgs_lang[] = "/%l/LC_MESSAGES/%N.cat";
+    char *old;
+    char *new, *new_p;
+    size_t len;
+    int add_LOC = 1;
+    int add_lang = 1;
+    char trypath[MAXPATHLEN];
+    struct stat st;
+
+    if (path == NULL)
+        return;
+
+    (void) xsnprintf(trypath, sizeof(trypath), "%s/en/LC_MESSAGES/tcsh.cat",
+	path);
+    if (stat(trypath, &st) == -1)
+	return;
+
+    if ((old = getenv("NLSPATH")) != NULL)
+        len = strlen(old) + 1;	/* don't forget the colon. */
+    else
+	len = 0;
+
+    len += 2 * strlen(path) +
+	   sizeof(msgs_LOC) + sizeof(msgs_lang); /* includes the extra colon */
+
+    new = new_p = xcalloc(len, 1);
+
+    if (old != NULL) {
+	size_t pathlen = strlen(path);
+	char *old_p;
+
+	(void) xsnprintf(new_p, len, "%s", old);
+	new_p += strlen(new_p);
+	len -= new_p - new;
+
+	/* Check if the paths we try to add are already present in NLSPATH.
+	   If so, note it by setting the appropriate flag to 0. */
+	for (old_p = old; old_p; old_p = strchr(old_p, ':'),
+				 old_p = old_p ? old_p + 1 : NULL) {
+	    if (strncmp(old_p, path, pathlen) != 0)
+	    	continue;
+	    if (strncmp(old_p + pathlen, msgs_LOC, sizeof(msgs_LOC) - 1) == 0)
+		add_LOC = 0;
+	    else if (strncmp(old_p + pathlen, msgs_lang,
+			      sizeof(msgs_lang) - 1) == 0)
+		add_lang = 0;
+	}
+    }
+
+    /* Add the message catalog paths not already present to NLSPATH. */
+    if (add_LOC || add_lang)
+	(void) xsnprintf(new_p, len, "%s%s%s%s%s%s",
+			 old ? ":" : "",
+			 add_LOC ? path : "", add_LOC ? msgs_LOC : "",
+			 add_LOC && add_lang ? ":" : "",
+			 add_lang ? path : "", add_lang ? msgs_lang : "");
+
+    tsetenv(STRNLSPATH, str2short(new));
+    free(new);
+}
+#endif
+
 int
 main(int argc, char **argv)
 {
@@ -179,6 +250,7 @@ main(int argc, char **argv)
     int osetintr;
     struct sigaction oparintr;
 
+    (void)memset(&reslab, 0, sizeof(reslab));
 #ifdef WINNT_NATIVE
     nt_init();
 #endif /* WINNT_NATIVE */
@@ -192,6 +264,13 @@ main(int argc, char **argv)
 # endif /* LC_CTYPE */
 #endif /* NLS */
 
+    STR_environ = blk2short(environ);
+    environ = short2blk(STR_environ);	/* So that we can free it */
+
+#ifdef NLS_CATALOGS
+    add_localedir_to_nlspath(LOCALEDIR);
+#endif
+
     nlsinit();
 
 #ifdef MALLOC_TRACE
@@ -247,7 +326,7 @@ main(int argc, char **argv)
 	t = t ? t + 1 : argv[0];
 	if (*t == '-') t++;
 	progname = strsave((t && *t) ? t : tcshstr);    /* never want a null */
-	tcsh = strcmp(progname, tcshstr) == 0;
+	tcsh = strncmp(progname, tcshstr, sizeof(tcshstr) - 1) == 0;
     }
 
     /*
@@ -263,16 +342,16 @@ main(int argc, char **argv)
     STR_SHELLPATH = SAVE(_PATH_CSHELL);
 # endif
 #endif
-    STR_environ = blk2short(environ);
-    environ = short2blk(STR_environ);	/* So that we can free it */
     STR_WORD_CHARS = SAVE(WORD_CHARS);
 
     HIST = '!';
     HISTSUB = '^';
-    PRCH = '>';
-    PRCHROOT = '#';
+    PRCH = tcsh ? '>' : '%';	/* to replace %# in $prompt for normal users */
+    PRCHROOT = '#';		/* likewise for root */
     word_chars = STR_WORD_CHARS;
     bslash_quote = 0;		/* PWP: do tcsh-style backslash quoting? */
+    anyerror = 1;		/* for compatibility */
+    setcopy(STRanyerror, STRNULL, VAR_READWRITE);
 
     /* Default history size to 100 */
     setcopy(STRhistory, str2short("100"), VAR_READWRITE);
@@ -319,7 +398,6 @@ main(int argc, char **argv)
 	setNS(STRloginsh);
     }
 
-    AsciiOnly = 1;
     NoNLSRebind = getenv("NOREBIND") != NULL;
 #ifdef NLS
 # ifdef SETLOCALEBUG
@@ -336,13 +414,19 @@ main(int argc, char **argv)
     fix_strcoll_bug();
 # endif /* STRCOLLBUG */
 
-    {
+    /*
+     * On solaris ISO8859-1 contains no printable characters in the upper half
+     * so we need to test only for MB_CUR_MAX == 1, otherwise for multi-byte
+     * locales we are always AsciiOnly == 0.
+     */
+    if (MB_CUR_MAX == 1) {
 	int     k;
 
-	for (k = 0200; k <= 0377 && !Isprint(CTL_ESC(k)); k++)
+	for (k = 0200; k <= 0377 && !isprint(CTL_ESC(k)); k++)
 	    continue;
-	AsciiOnly = MB_CUR_MAX == 1 && k > 0377;
-    }
+	AsciiOnly = k > 0377;
+    } else
+	AsciiOnly = 0;
 #else
     AsciiOnly = getenv("LANG") == NULL && getenv("LC_CTYPE") == NULL;
 #endif				/* NLS */
@@ -453,7 +537,8 @@ main(int argc, char **argv)
     if (loginsh || (uid == 0)) {
 	if (*cp) {
 	    /* only for login shells or root and we must have a tty */
-	    if ((cp2 = Strrchr(cp, (Char) '/')) != NULL) {
+	    if (((cp2 = Strrchr(cp, (Char) '/')) != NULL) &&
+		(Strncmp(cp, STRptssl, 3) != 0)) {
 		cp2 = cp2 + 1;
 	    }
 	    else
@@ -506,7 +591,18 @@ main(int argc, char **argv)
     if ((tcp = getenv("HOME")) != NULL)
 	cp = quote(SAVE(tcp));
     else
+#ifdef __ANDROID__
+	/* On Android, $HOME usually isn't set, so we can't load user RC files.
+	   Check for the environment variable EXTERNAL_STORAGE, which contains
+	   the mount point of the external storage (SD card, mostly).  If
+	   EXTERNAL_STORAGE isn't set fall back to "/sdcard". */
+    if ((tcp = getenv("EXTERNAL_STORAGE")) != NULL)
+	cp = quote(SAVE(tcp));
+    else
+	cp = quote(SAVE("/sdcard"));
+#else
 	cp = NULL;
+#endif
 
     if (cp == NULL)
 	fast = 1;		/* No home -> can't read scripts */
@@ -531,6 +627,12 @@ main(int argc, char **argv)
 	setv(STRoid, Itoa(oid, 0, 0), VAR_READWRITE);
 #endif /* apollo */
 
+	setv(STReuid, Itoa(euid, 0, 0), VAR_READWRITE);
+	if ((pw = xgetpwuid(euid)) == NULL)
+	    setcopy(STReuser, STRunknown, VAR_READWRITE);
+	else
+	    setcopy(STReuser, str2short(pw->pw_name), VAR_READWRITE);
+
 	setv(STRuid, Itoa(uid, 0, 0), VAR_READWRITE);
 
 	setv(STRgid, Itoa(gid, 0, 0), VAR_READWRITE);
@@ -542,7 +644,7 @@ main(int argc, char **argv)
 	else if (cln != NULL)
 	    setv(STRuser, quote(SAVE(cln)), VAR_READWRITE);
 	else if ((pw = xgetpwuid(uid)) == NULL)
-	    setcopy(STRuser, str2short("unknown"), VAR_READWRITE);
+	    setcopy(STRuser, STRunknown, VAR_READWRITE);
 	else
 	    setcopy(STRuser, str2short(pw->pw_name), VAR_READWRITE);
 	if (cln == NULL)
@@ -554,7 +656,7 @@ main(int argc, char **argv)
 	if (cgr != NULL)
 	    setv(STRgroup, quote(SAVE(cgr)), VAR_READWRITE);
 	else if ((gr = xgetgrgid(gid)) == NULL)
-	    setcopy(STRgroup, str2short("unknown"), VAR_READWRITE);
+	    setcopy(STRgroup, STRunknown, VAR_READWRITE);
 	else
 	    setcopy(STRgroup, str2short(gr->gr_name), VAR_READWRITE);
 	if (cgr == NULL)
@@ -573,7 +675,7 @@ main(int argc, char **argv)
 	    tsetenv(STRHOST, str2short(cbuff));
 	}
 	else
-	    tsetenv(STRHOST, str2short("unknown"));
+	    tsetenv(STRHOST, STRunknown);
     }
 
 
@@ -697,7 +799,7 @@ main(int argc, char **argv)
 	parseLS_COLORS(str2short(tcp));
 #endif /* COLOR_LS_F */
 
-    doldol = putn((int) getpid());	/* For $$ */
+    doldol = putn((tcsh_number_t)getpid());	/* For $$ */
 #ifdef WINNT_NATIVE
     {
 	char *tmp;
@@ -705,8 +807,8 @@ main(int argc, char **argv)
 	if ((tmp = getenv("TMP")) != NULL) {
 	    tmp = xasprintf("%s/%s", tmp, "sh");
 	    tmp2 = SAVE(tmp);
-	xfree(tmp);
-    }
+	    xfree(tmp);
+	}
 	else {
 	    tmp2 = SAVE(""); 
 	}
@@ -714,7 +816,16 @@ main(int argc, char **argv)
 	xfree(tmp2);
     }
 #else /* !WINNT_NATIVE */
+#ifdef HAVE_MKSTEMP
+    {
+	char *tmpdir = getenv ("TMPDIR");
+	if (!tmpdir)
+	    tmpdir = "/tmp";
+	shtemp = Strspl(SAVE(tmpdir), SAVE("/sh" TMP_TEMPLATE)); /* For << */
+    }
+#else /* !HAVE_MKSTEMP */
     shtemp = Strspl(STRtmpsh, doldol);	/* For << */
+#endif /* HAVE_MKSTEMP */
 #endif /* WINNT_NATIVE */
 
     /*
@@ -738,10 +849,11 @@ main(int argc, char **argv)
     /* PATCH IDEA FROM Issei.Suzuki VERY THANKS */
 #if defined(DSPMBYTE)
 #if defined(NLS) && defined(LC_CTYPE)
-    if (((tcp = setlocale(LC_CTYPE, NULL)) != NULL || (tcp = getenv("LANG")) != NULL) && !adrof(CHECK_MBYTEVAR)) {
+    if (((tcp = setlocale(LC_CTYPE, NULL)) != NULL || (tcp = getenv("LANG")) != NULL) && !adrof(CHECK_MBYTEVAR))
 #else
-    if ((tcp = getenv("LANG")) != NULL && !adrof(CHECK_MBYTEVAR)) {
+    if ((tcp = getenv("LANG")) != NULL && !adrof(CHECK_MBYTEVAR))
 #endif
+    {
 	autoset_dspmbyte(str2short(tcp));
     }
 #if defined(WINNT_NATIVE)
@@ -749,7 +861,14 @@ main(int argc, char **argv)
       nt_autoset_dspmbyte();
 #endif /* WINNT_NATIVE */
 #endif
-
+#if defined(AUTOSET_KANJI) 
+# if defined(NLS) && defined(LC_CTYPE)
+    if (setlocale(LC_CTYPE, NULL) != NULL || getenv("LANG") != NULL)
+# else
+    if (getenv("LANG") != NULL)
+# endif
+	autoset_kanji();
+#endif /* AUTOSET_KANJI */
     fix_version();		/* publish the shell version */
 
     if (argc > 1 && strcmp(argv[1], "--version") == 0) {
@@ -912,6 +1031,8 @@ main(int argc, char **argv)
 
 	    case ' ':
 	    case '\t':
+	    case '\r':
+	    case '\n':
 		/* 
 		 * for O/S's that don't do the argument parsing right in 
 		 * "#!/foo -f " scripts
@@ -1019,10 +1140,7 @@ main(int argc, char **argv)
      * Set up the prompt.
      */
     if (prompt) {
-	if (tcsh)
-	    setcopy(STRprompt, STRdeftcshprompt, VAR_READWRITE);
-	else
-	    setcopy(STRprompt, STRdefcshprompt, VAR_READWRITE);
+	setcopy(STRprompt, STRdefprompt, VAR_READWRITE);
 	/* that's a meta-questionmark */
 	setcopy(STRprompt2, STRmquestion, VAR_READWRITE);
 	setcopy(STRprompt3, STRKCORRECT, VAR_READWRITE);
@@ -1679,7 +1797,7 @@ void
 exitstat(void)
 {
 #ifdef PROF
-    monitor(0);
+    _mcleanup();
 #endif
     /*
      * Note that if STATUS is corrupted (i.e. getn bombs) then error will exit
@@ -1839,7 +1957,7 @@ void
 process(int catch)
 {
     jmp_buf_t osetexit;
-    /* PWP: This might get nuked my longjmp so don't make it a register var */
+    /* PWP: This might get nuked by longjmp so don't make it a register var */
     size_t omark;
     volatile int didexitset = 0;
 
@@ -1927,9 +2045,11 @@ process(int catch)
 	/*
 	 * Echo not only on VERBOSE, but also with history expansion. If there
 	 * is a lexical error then we forego history echo.
+	 * Do not echo if we're only entering history (source -h).
 	 */
 	if ((hadhist && !seterr && intty && !tellwhat && !Expand && !whyles) ||
-	    adrof(STRverbose)) {
+	    (!enterhist && adrof(STRverbose)))
+	{
 	    int odidfds = didfds;
 	    haderr = 1;
 	    didfds = 0;
@@ -1994,9 +2114,14 @@ process(int catch)
 	 * Parse the words of the input into a parse tree.
 	 */
 	t = syntax(paraml.next, &paraml, 0);
-	cleanup_push(t, syntax_cleanup);
-	if (seterr)
+	/*
+	 * We cannot cleanup push here, because cd /blah; echo foo
+	 * would rewind t on the chdir error, and free the rest of the command
+	 */
+	if (seterr) {
+	    freesyn(t);
 	    stderror(ERR_OLD);
+	}
 
 	postcmd();
 	/*
@@ -2004,6 +2129,7 @@ process(int catch)
 	 * <mlschroe@immd4.informatik.uni-erlangen.de> was execute(t, tpgrp);
 	 */
 	execute(t, (tpgrp > 0 ? tpgrp : -1), NULL, NULL, TRUE);
+	freesyn(t);
 
 	/*
 	 * Made it!
@@ -2015,11 +2141,15 @@ process(int catch)
 #endif /* SIG_WINDOW */
 	setcopy(STR_, InputBuf, VAR_READWRITE | VAR_NOGLOB);
     cmd_done:
-	cleanup_until(&paraml);
+	if (cleanup_reset())
+	    cleanup_until(&paraml);
+	else
+	    haderr = 1;
     }
     cleanup_pop_mark(omark);
     resexit(osetexit);
     exitset--;
+    handle_pending_signals();
 }
 
 /*ARGSUSED*/
@@ -2137,12 +2267,15 @@ mailchk(void)
 		continue;
 
 	    /* skip . and .. */
-	    if (!readdir(mailbox) || !readdir(mailbox))
+	    if (!readdir(mailbox) || !readdir(mailbox)) {
+		(void)closedir(mailbox);
 		continue;
+	    }
 
 	    while (readdir(mailbox))
 		mailcount++;
 
+	    (void)closedir(mailbox);
 	    if (mailcount == 0)
 		continue;
 
@@ -2156,7 +2289,7 @@ mailchk(void)
 	else {
 	    char *type;
 	    
-	    if (stb.st_size == 0 || stb.st_atime > stb.st_mtime ||
+	    if (stb.st_size == 0 || stb.st_atime >= stb.st_mtime ||
 		(stb.st_atime <= chktim && stb.st_mtime <= chktim) ||
 		(loginsh && !new))
 		continue;
@@ -2224,8 +2357,14 @@ initdesc(void)
 #ifndef CLOSE_ON_EXEC
     didcch = 0;			/* Havent closed for child */
 #endif /* CLOSE_ON_EXEC */
-    isdiagatty = isatty(SHDIAG);
-    isoutatty = isatty(SHOUT);
+    if (SHDIAG >= 0)
+	isdiagatty = isatty(SHDIAG);
+    else
+    	isdiagatty = 0;
+    if (SHDIAG >= 0)
+	isoutatty = isatty(SHOUT);
+    else
+    	isoutatty = 0;
 #ifdef NLS_BUGS
 #ifdef NLS_CATALOGS
     nlsinit();
@@ -2260,12 +2399,13 @@ xexit(int i)
 
     {
 	struct process *pp, *np;
-
+	pid_t mypid = getpid();
 	/* Kill all processes marked for hup'ing */
 	for (pp = proclist.p_next; pp; pp = pp->p_next) {
 	    np = pp;
-	    do 
-		if ((np->p_flags & PHUP) && np->p_jobid != shpgrp) {
+	    do
+		if ((np->p_flags & PHUP) && np->p_jobid != shpgrp &&
+		    np->p_parentid == mypid) {
 		    if (killpg(np->p_jobid, SIGHUP) != -1) {
 			/* In case the job was suspended... */
 #ifdef SIGCONT
@@ -2352,6 +2492,7 @@ record(void)
 	recdirs(NULL, adrof(STRsavedirs) != NULL);
 	rechist(NULL, adrof(STRsavehist) != NULL);
     }
+    displayHistStats("Exiting");	/* no-op unless DEBUG_HIST */
 }
 
 /*
diff --git a/contrib/tcsh/sh.char.c b/contrib/tcsh/sh.char.c
index 498cc2f..abc1150 100644
--- a/contrib/tcsh/sh.char.c
+++ b/contrib/tcsh/sh.char.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.char.c,v 3.20 2007/03/07 16:31:37 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.char.c,v 3.21 2010/02/09 20:32:34 christos Exp $ */
 /*
  * sh.char.c: Character classification tables
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.char.c,v 3.20 2007/03/07 16:31:37 christos Exp $")
+RCSID("$tcsh: sh.char.c,v 3.21 2010/02/09 20:32:34 christos Exp $")
 
 #include "sh.char.h"
 
@@ -233,8 +233,8 @@ unsigned short _cmap[256] = {
 
 /*	252 udiaeresis	253 yacute	254 thorn	255 ydiaeresis	*/
 	_LET|_DOW,	_LET|_DOW,	_LET|_DOW,	_LET|_DOW,
-};
 #endif /* SHORT_STRINGS */
+};
 
 #if defined(KANJI) && defined(SHORT_STRINGS) && defined(DSPMBYTE)
 /* original table */
diff --git a/contrib/tcsh/sh.char.h b/contrib/tcsh/sh.char.h
index eb20e69..e284860 100644
--- a/contrib/tcsh/sh.char.h
+++ b/contrib/tcsh/sh.char.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.char.h,v 3.35 2008/09/25 14:41:34 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.char.h,v 3.36 2010/05/08 00:36:02 christos Exp $ */
 /*
  * sh.char.h: Table for spotting special characters quickly
  * 	      Makes for very obscure but efficient coding.
@@ -150,17 +150,15 @@ extern tcshuc _cmap_lower[], _cmap_upper[];
 
 #ifdef WIDE_STRINGS
 # define cmap(c, bits)	\
-	(((c) < 0) ? 0 : \
-	((c) & QUOTE) || (c) >= 0x0080 ? 0 : (_cmap[(tcshuc)ASC(c)] & (bits)))
+    (((c) & QUOTE) || (unsigned int)(c) >= 0x0080 ? 0 : \
+	(_cmap[(tcshuc)ASC(c)] & (bits)))
 #elif defined(SHORT_STRINGS) && defined(KANJI)
 #  define cmap(c, bits)	\
-	(((c) < 0) ? 0 : \
-	(((c) & QUOTE) || ((ASC(c) & 0x80) && adrof(STRnokanji))) ? \
+    ((((c) & QUOTE) || ((tcshuc)(ASC(c) & 0x80) && adrof(STRnokanji))) ? \
 	0 : (_cmap[(tcshuc)ASC(c)] & (bits)))
 #else /* SHORT_STRINGS && KANJI */
 # define cmap(c, bits)	\
-	(((c) < 0) ? 0 : \
-	((c) & QUOTE) ? 0 : (_cmap[(tcshuc)ASC(c)] & (bits)))
+    (((c) & QUOTE) ? 0 : (_cmap[(tcshuc)ASC(c)] & (bits)))
 #endif /* SHORT_STRINGS && KANJI */
 
 #define isglob(c)	cmap((c), _GLOB)
diff --git a/contrib/tcsh/sh.decls.h b/contrib/tcsh/sh.decls.h
index 70f76a4..db90288 100644
--- a/contrib/tcsh/sh.decls.h
+++ b/contrib/tcsh/sh.decls.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.decls.h,v 3.55 2009/02/25 22:54:54 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.decls.h,v 3.62 2011/02/25 23:58:34 christos Exp $ */
 /*
  * sh.decls.h	 External declarations from sh*.c
  */
@@ -48,9 +48,9 @@ extern	void		  phup		(void);
 extern	void		  process	(int);
 extern	void		  untty		(void);
 #ifdef PROF
-extern	void		  done		(int);
+extern	void		  done		(int) __attribute__((__noreturn__));
 #else
-extern	void		  xexit		(int);
+extern	void		  xexit		(int) __attribute__((__noreturn__));
 #endif
 extern	int		  grabpgrp	(int, pid_t);
 
@@ -82,7 +82,7 @@ extern	void		  heredoc	(Char *);
 /*
  * sh.err.c
  */
-extern	void		  reset		(void);
+extern	void		  reset		(void) __attribute__((__noreturn__));
 extern	void		  cleanup_push_internal(void *, void (*fn) (void *)
 #ifdef CLEANUP_DEBUG
 						, const char *, size_t
@@ -91,8 +91,9 @@ extern	void		  cleanup_push_internal(void *, void (*fn) (void *)
 #define cleanup_push(v, f) cleanup_push_internal(v, f)
 #endif
 );
+extern	int		  cleanup_reset(void);
 extern	void		  cleanup_ignore(void *);
-extern	void		  cleanup_until	(void *);
+extern	void		  cleanup_until(void *);
 extern	void		  cleanup_until_mark(void);
 extern	size_t		  cleanup_push_mark(void);
 extern	void		  cleanup_pop_mark(size_t);
@@ -103,7 +104,9 @@ extern	void		  sigprocmask_cleanup(void *);
 extern	void		  xfree_indirect(void *);
 extern	void		  errinit	(void);
 extern	void		  seterror	(unsigned int, ...);
-extern	void		  stderror	(unsigned int, ...);
+extern	void		  fixerror	(void);
+extern	void		  stderror	(unsigned int, ...)
+    __attribute__((__noreturn__));
 
 /*
  * sh.exec.c
@@ -122,9 +125,9 @@ extern	int		  find_cmd	(Char *, int);
 /*
  * sh.exp.c
  */
-extern  Char     *filetest       (Char *, Char ***, int);
-extern	int	 	  expr		(Char ***);
-extern	int		  exp0		(Char ***, int);
+extern  Char		 *filetest      (Char *, Char ***, int);
+extern	tcsh_number_t 	  expr		(Char ***);
+extern	tcsh_number_t	  exp0		(Char ***, int);
 
 /*
  * sh.file.c
@@ -212,11 +215,12 @@ extern  int	  	  t_pmatch	(const Char *, const Char *,
  * sh.hist.c
  */
 extern	void	 	  dohist	(Char **, struct command *);
-extern  struct Hist 	 *enthist	(int, struct wordent *, int, int);
+extern  struct Hist 	 *enthist	(int, struct wordent *, int, int, int);
 extern	void	 	  savehist	(struct wordent *, int);
 extern	char		 *fmthist	(int, ptr_t);
 extern	void		  rechist	(Char *, int);
 extern	void		  loadhist	(Char *, int);
+extern	void		  displayHistStats(const char *);
 
 /*
  * sh.init.c
@@ -270,9 +274,11 @@ extern	void		  setzero	(void *, size_t);
 extern	Char		 *strip		(Char *);
 extern	Char		 *quote		(Char *);
 extern	const Char	 *quote_meta	(struct Strbuf *, const Char *);
+#ifndef SHORT_STRINGS
 extern	char		 *strnsave	(const char *, size_t);
+#endif
 extern	char		 *strsave	(const char *);
-extern	void		  udvar		(Char *);
+extern	void		  udvar		(Char *) __attribute__((__noreturn__));
 #ifndef POSIX
 extern  char   	  	 *strstr	(const char *, const char *);
 #endif /* !POSIX */
@@ -368,8 +374,8 @@ extern	void		  mypipe	(int *);
 extern	struct varent 	 *adrof1	(const Char *, struct varent *);
 extern	void		  doset		(Char **, struct command *);
 extern	void		  dolet		(Char **, struct command *);
-extern	Char		 *putn		(int);
-extern	int		  getn		(Char *);
+extern	Char		 *putn		(tcsh_number_t);
+extern	tcsh_number_t	  getn		(const Char *);
 extern	Char		 *value1	(Char *, struct varent *);
 extern	void		  setcopy	(const Char *, const Char *, int);
 extern	void		  setv		(const Char *, Char *, int);
@@ -380,7 +386,7 @@ extern	void		  setq		(const Char *, Char **,
 extern	void		  unset		(Char **, struct command *);
 extern	void		  unset1	(Char *[], struct varent *);
 extern	void		  unsetv	(Char *);
-extern	void		  setNS		(Char *);
+extern	void		  setNS		(const Char *);
 extern	void		  shift		(Char **, struct command *);
 extern	void		  plist		(struct varent *, int);
 extern	Char		 *unparse	(struct command *);
@@ -388,6 +394,9 @@ extern	Char		 *unparse	(struct command *);
 extern	void 		  update_dspmbyte_vars	(void);
 extern	void		  autoset_dspmbyte	(const Char *);
 #endif
+#if defined(AUTOSET_KANJI)
+extern	void		  autoset_kanji	(void);
+#endif
 
 /*
  * sh.time.c
diff --git a/contrib/tcsh/sh.dir.c b/contrib/tcsh/sh.dir.c
index 9f72951..ab89855 100644
--- a/contrib/tcsh/sh.dir.c
+++ b/contrib/tcsh/sh.dir.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.dir.c,v 3.80 2007/05/08 21:05:34 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.dir.c,v 3.82 2011/10/16 16:25:05 christos Exp $ */
 /*
  * sh.dir.c: Directory manipulation functions
  */
@@ -33,7 +33,7 @@
 #include "sh.h"
 #include "ed.h"
 
-RCSID("$tcsh: sh.dir.c,v 3.80 2007/05/08 21:05:34 christos Exp $")
+RCSID("$tcsh: sh.dir.c,v 3.82 2011/10/16 16:25:05 christos Exp $")
 
 /*
  * C Shell - directory management
@@ -204,10 +204,12 @@ skipargs(Char ***v, const char *dstr, const char *str)
     for (n++; loop && *n != NULL && (*n)[0] == '-'; n++) 
 	if (*(s = &((*n)[1])) == '\0')	/* test for bare "-" argument */
 	    dflag |= DIR_OLD;
-	else {
+	else if ((*n)[1] == '-' && (*n)[2] == '\0') {   /* test for -- */
+	    n++;
+	    break;
+	} else {
 	    char *p;
-	    while (*s != '\0')	/* examine flags */
-	    {
+	    while (*s != '\0')	/* examine flags */ {
 		if ((p = strchr(dstr, *s++)) != NULL)
 		    dflag |= (1 << (p - dstr));
 	        else
@@ -643,9 +645,13 @@ dfollow(Char *cp, int old)
 	Char  **cdp;
 
 	for (cdp = c->vec; *cdp; cdp++) {
+	    size_t len = Strlen(*cdp);
 	    buf.len = 0;
-	    Strbuf_append(&buf, *cdp);
-	    Strbuf_append1(&buf, '/');
+	    if (len > 0) {
+		Strbuf_append(&buf, *cdp);
+		if ((*cdp)[len - 1] != '/')
+		    Strbuf_append1(&buf, '/');
+	    }
 	    Strbuf_append(&buf, cp);
 	    Strbuf_terminate(&buf);
 	    /*
diff --git a/contrib/tcsh/sh.dol.c b/contrib/tcsh/sh.dol.c
index bafb971..45b10e0 100644
--- a/contrib/tcsh/sh.dol.c
+++ b/contrib/tcsh/sh.dol.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.dol.c,v 3.77 2009/06/19 16:25:00 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.dol.c,v 3.83 2011/01/25 20:10:46 christos Exp $ */
 /*
  * sh.dol.c: Variable substitutions
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.dol.c,v 3.77 2009/06/19 16:25:00 christos Exp $")
+RCSID("$tcsh: sh.dol.c,v 3.83 2011/01/25 20:10:46 christos Exp $")
 
 /*
  * C shell
@@ -47,7 +47,7 @@ RCSID("$tcsh: sh.dol.c,v 3.77 2009/06/19 16:25:00 christos Exp $")
  * some QUOTEing may have occurred already, so we dont "trim()" here.
  */
 
-static Char Dpeekc;		/* Peek for DgetC */
+static eChar Dpeekc;		/* Peek for DgetC */
 static eChar Dpeekrd;		/* Peek for Dreadc */
 static Char *Dcp, *const *Dvp;	/* Input vector for Dreadc */
 
@@ -317,7 +317,7 @@ Dword(struct blk_buf *bb)
 static eChar
 DgetC(int flag)
 {
-    Char c;
+    eChar c;
 
 top:
     if ((c = Dpeekc) != 0) {
@@ -402,7 +402,7 @@ Dgetdol(void)
 	    stderror(ERR_SYNTAX);
 	if (backpid != 0) {
 	    xfree(dolbang);
-	    setDolp(dolbang = putn(backpid));
+	    setDolp(dolbang = putn((tcsh_number_t)backpid));
 	}
 	cleanup_until(name);
 	goto eatbrac;
@@ -528,7 +528,7 @@ Dgetdol(void)
 		    stderror(ERR_DOLZERO);
 		if (length) {
 		    length = Strlen(ffile);
-		    addla(putn(length));
+		    addla(putn((tcsh_number_t)length));
 		}
 		else {
 		    fixDolMod();
@@ -588,7 +588,7 @@ Dgetdol(void)
 	    cleanup_until(name);
 	    fixDolMod();
 	    if (length) {
-		    addla(putn(Strlen(np)));
+		    addla(putn((tcsh_number_t)Strlen(np)));
 	    } else {
 		    xfree(env_val);
 		    env_val = Strsave(np);
@@ -625,7 +625,7 @@ Dgetdol(void)
 
 	    for (i = 0; Isdigit(*np); i = i * 10 + *np++ - '0')
 		continue;
-	    if (i < 0 || i > upb && !any("-*", *np)) {
+	    if (i < 0 || (i > upb && !any("-*", *np))) {
 		cleanup_until(name);
 		dolerror(vp->v_name);
 		return;
@@ -687,7 +687,7 @@ Dgetdol(void)
 		stderror(ERR_MISSING, '}');
 	    unDredc(c);
 	}
-	addla(putn(upb - lwb + 1));
+	addla(putn((tcsh_number_t)(upb - lwb + 1)));
     }
     else if (length) {
 	int i;
@@ -698,7 +698,7 @@ Dgetdol(void)
 	/* We don't want that, since we can always compute it by adding $#xxx */
 	length += i - 1;	/* Add the number of spaces in */
 #endif
-	addla(putn(length));
+	addla(putn((tcsh_number_t)length));
     }
     else {
 eatmod:
@@ -830,7 +830,7 @@ setDolp(Char *cp)
 		    cp = np;
 		    cp[--len] = '\0';
 		    didmod = 1;
-		    if (diff >= len)
+		    if (diff >= (ssize_t)len)
 			break;
 		} else {
 		    /* should this do a seterror? */
@@ -887,7 +887,7 @@ unDredc(eChar c)
 static eChar
 Dredc(void)
 {
-    Char c;
+    eChar c;
 
     if ((c = Dpeekrd) != 0) {
 	Dpeekrd = 0;
@@ -936,45 +936,52 @@ heredoc(Char *term)
     Char *lbp, *obp, *mbp;
     Char  **vp;
     int    quoted;
+#ifdef HAVE_MKSTEMP
+    char   *tmp = short2str(shtemp);
+    char   *dot = strrchr(tmp, '.');
+
+    if (!dot)
+	stderror(ERR_NAME | ERR_NOMATCH);
+    strcpy(dot, TMP_TEMPLATE);
+
+    xclose(0);
+    if (mkstemp(tmp) == -1)
+	stderror(ERR_SYSTEM, tmp, strerror(errno));
+#else /* !HAVE_MKSTEMP */
     char   *tmp;
-#ifndef WINNT_NATIVE
+# ifndef WINNT_NATIVE
     struct timeval tv;
 
 again:
-#endif /* WINNT_NATIVE */
+# endif /* WINNT_NATIVE */
     tmp = short2str(shtemp);
-#ifndef O_CREAT
-# define O_CREAT 0
+# if O_CREAT == 0
     if (xcreat(tmp, 0600) < 0)
 	stderror(ERR_SYSTEM, tmp, strerror(errno));
-#endif
+# endif
     xclose(0);
-#ifndef O_TEMPORARY
-# define O_TEMPORARY 0
-#endif
-#ifndef O_EXCL
-# define O_EXCL 0
-#endif
     if (xopen(tmp, O_RDWR|O_CREAT|O_EXCL|O_TEMPORARY|O_LARGEFILE, 0600) ==
 	-1) {
 	int oerrno = errno;
-#ifndef WINNT_NATIVE
+# ifndef WINNT_NATIVE
 	if (errno == EEXIST) {
 	    if (unlink(tmp) == -1) {
 		(void) gettimeofday(&tv, NULL);
 		xfree(shtemp);
-		mbp = putn((((int)tv.tv_sec) ^ 
-		    ((int)tv.tv_usec) ^ ((int)getpid())) & 0x00ffffff);
+		mbp = putn((((tcsh_number_t)tv.tv_sec) ^ 
+		    ((tcsh_number_t)tv.tv_usec) ^
+		    ((tcsh_number_t)getpid())) & 0x00ffffff);
 		shtemp = Strspl(STRtmpsh, mbp);
 		xfree(mbp);
 	    }
 	    goto again;
 	}
-#endif /* WINNT_NATIVE */
+# endif /* WINNT_NATIVE */
 	(void) unlink(tmp);
 	errno = oerrno;
  	stderror(ERR_SYSTEM, tmp, strerror(errno));
     }
+#endif /* HAVE_MKSTEMP */
     (void) unlink(tmp);		/* 0 0 inode! */
     Dv[0] = term;
     Dv[1] = NULL;
@@ -1007,6 +1014,10 @@ again:
 	}
 	Strbuf_terminate(&lbuf);
 
+	/* Catch EOF in the middle of a line. */
+	if (c == CHAR_ERR && lbuf.len != 0)
+	    c = '\n';
+
 	/*
 	 * Check for EOF or compare to terminator -- before expansion
 	 */
diff --git a/contrib/tcsh/sh.err.c b/contrib/tcsh/sh.err.c
index 279c7b8..e157d6a 100644
--- a/contrib/tcsh/sh.err.c
+++ b/contrib/tcsh/sh.err.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.err.c,v 3.50 2007/09/28 20:25:15 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.err.c,v 3.55 2011/02/25 23:58:34 christos Exp $ */
 /*
  * sh.err.c: Error printing routines. 
  */
@@ -34,7 +34,7 @@
 #include "sh.h"
 #include <assert.h>
 
-RCSID("$tcsh: sh.err.c,v 3.50 2007/09/28 20:25:15 christos Exp $")
+RCSID("$tcsh: sh.err.c,v 3.55 2011/02/25 23:58:34 christos Exp $")
 
 /*
  * C Shell
@@ -51,6 +51,7 @@ char   *seterr = NULL;	/* Holds last error if there was one */
 #define ERR_NAME	0x10000000
 #define ERR_SILENT	0x20000000
 #define ERR_OLD		0x40000000
+#define ERR_INTERRUPT	0x80000000
 
 #define ERR_SYNTAX	0
 #define ERR_NOTALLOWED	1
@@ -187,7 +188,8 @@ char   *seterr = NULL;	/* Holds last error if there was one */
 #define ERR_BADJOB	132
 #define ERR_INVALID	133
 #define ERR_BADCOLORVAR	134
-#define NO_ERRORS	135
+#define ERR_EOF		135
+#define NO_ERRORS	136
 
 static const char *elst[NO_ERRORS] INIT_ZERO_STRUCT;
 
@@ -364,6 +366,7 @@ errinit(void)
     elst[ERR_READONLY] = CSAVS(1, 135, "$%S is read-only");
     elst[ERR_BADJOB] = CSAVS(1, 136, "No such job (badjob)");
     elst[ERR_BADCOLORVAR] = CSAVS(1, 137, "Unknown colorls variable `%c%c'");
+    elst[ERR_EOF] = CSAVS(1, 138, "Unexpected end of file");
 }
 
 /* Cleanup data. */
@@ -448,6 +451,12 @@ cleanup_until(void *last_var)
     abort();
 }
 
+int
+cleanup_reset(void)
+{
+    return cleanup_sp > cleanup_mark;
+}
+
 void
 cleanup_until_mark(void)
 {
@@ -527,6 +536,7 @@ reset(void)
 {
     cleanup_until_mark();
     _reset();
+    abort();
 }
 
 /*
@@ -549,13 +559,35 @@ seterror(unsigned int id, ...)
     }
 }
 
+void
+fixerror(void)
+{
+    didfds = 0;			/* Forget about 0,1,2 */
+    /*
+     * Go away if -e or we are a child shell
+     */
+    if (!exitset || exiterr || child)
+	xexit(1);
+
+    /*
+     * Reset the state of the input. This buffered seek to end of file will
+     * also clear the while/foreach stack.
+     */
+    btoeof();
+
+    setcopy(STRstatus, STR1, VAR_READWRITE);/*FIXRESET*/
+#ifdef BSDJOBS
+    if (tpgrp > 0)
+	(void) tcsetpgrp(FSHTTY, tpgrp);
+#endif
+}
+
 /*
  * Print the error with the given id.
  *
  * Special ids:
  *	ERR_SILENT: Print nothing.
- *	ERR_OLD: Print the previously set error if one was there.
- *	         otherwise return.
+ *	ERR_OLD: Print the previously set error
  *	ERR_NAME: If this bit is set, print the name of the function
  *		  in bname
  *
@@ -573,7 +605,6 @@ stderror(unsigned int id, ...)
 {
     va_list va;
     int flags;
-    int vareturn;
 
     va_start(va, id);
 
@@ -588,61 +619,38 @@ stderror(unsigned int id, ...)
     /* Pyramid's OS/x has a subtle bug in <varargs.h> which prevents calling
      * va_end more than once in the same function. -- sterling@netcom.com
      */
-    if (!((flags & ERR_OLD) && seterr == NULL)) {
-	vareturn = 0;	/* Don't return immediately after va_end */
-	if (id >= sizeof(elst) / sizeof(elst[0]))
-	    id = ERR_INVALID;
-
-
-	if (!(flags & ERR_SILENT)) {
-	    /*
-	     * Must flush before we print as we wish output before the error
-	     * to go * on (some form of) standard output, while output after
-	     * goes on (some * form of) diagnostic output. If didfds then
-	     * output will go to 1/2 * else to FSHOUT/FSHDIAG. See flush in
-	     * sh.print.c.
-	     */
-	    flush();/*FIXRESET*/
-	    haderr = 1;			/* Now to diagnostic output */
-	    if (flags & ERR_NAME)
-		xprintf("%s: ", bname);/*FIXRESET*/
-	    if ((flags & ERR_OLD)) {
-		/* Old error. */
-		xprintf("%s.\n", seterr);/*FIXRESET*/
-	    } else {
-		xvprintf(elst[id], va);/*FIXRESET*/
-		xprintf(".\n");/*FIXRESET*/
-	    }
+    assert(!((flags & ERR_OLD) && seterr == NULL));
+
+    if (id >= sizeof(elst) / sizeof(elst[0]))
+	id = ERR_INVALID;
+
+    if (!(flags & ERR_SILENT)) {
+	/*
+	 * Must flush before we print as we wish output before the error
+	 * to go on (some form of) standard output, while output after
+	 * goes on (some form of) diagnostic output. If didfds then output
+	 * will go to 1/2 else to FSHOUT/FSHDIAG. See flush in sh.print.c.
+	 */
+	flush();/*FIXRESET*/
+	haderr = 1;		/* Now to diagnostic output */
+	if (flags & ERR_NAME)
+	    xprintf("%s: ", bname);/*FIXRESET*/
+	if ((flags & ERR_OLD)) {
+	    /* Old error. */
+	    xprintf("%s.\n", seterr);/*FIXRESET*/
+	} else {
+	    xvprintf(elst[id], va);/*FIXRESET*/
+	    xprintf(".\n");/*FIXRESET*/
 	}
-    } else {
-	vareturn = 1;	/* Return immediately after va_end */
     }
     va_end(va);
-    if (vareturn)
-	return;
 
     if (seterr) {
 	xfree(seterr);
 	seterr = NULL;
     }
 
-    didfds = 0;			/* Forget about 0,1,2 */
-    /*
-     * Go away if -e or we are a child shell
-     */
-    if (!exitset || exiterr || child)
-	xexit(1);
+    fixerror();
 
-    /*
-     * Reset the state of the input. This buffered seek to end of file will
-     * also clear the while/foreach stack.
-     */
-    btoeof();
-
-    setcopy(STRstatus, STR1, VAR_READWRITE);/*FIXRESET*/
-#ifdef BSDJOBS
-    if (tpgrp > 0)
-	(void) tcsetpgrp(FSHTTY, tpgrp);
-#endif
-    reset();			/* Unwind */
+    reset();		/* Unwind */
 }
diff --git a/contrib/tcsh/sh.exec.c b/contrib/tcsh/sh.exec.c
index ee7a551..2b41a53 100644
--- a/contrib/tcsh/sh.exec.c
+++ b/contrib/tcsh/sh.exec.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.exec.c,v 3.75 2009/06/25 21:15:37 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.exec.c,v 3.79 2011/02/25 23:58:34 christos Exp $ */
 /*
  * sh.exec.c: Search, find, and execute a command!
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.exec.c,v 3.75 2009/06/25 21:15:37 christos Exp $")
+RCSID("$tcsh: sh.exec.c,v 3.79 2011/02/25 23:58:34 christos Exp $")
 
 #include "tc.h"
 #include "tw.h"
@@ -77,7 +77,7 @@ static Char *expath;		/* Path for exerr */
 /*
  * xhash is an array of hash buckets which are used to hash execs.  If
  * it is allocated (havhash true), then to tell if ``name'' is
- * (possibly) presend in the i'th component of the variable path, look
+ * (possibly) present in the i'th component of the variable path, look
  * at the [hashname(name)] bucket of size [hashwidth] bytes, in the [i
  * mod size*8]'th bit.  The cache size is defaults to a length of 1024
  * buckets, each 1 byte wide.  This implementation guarantees that
@@ -141,7 +141,7 @@ static int hits, misses;
 /* Dummy search path for just absolute search when no path */
 static Char *justabs[] = {STRNULL, 0};
 
-static	void	pexerr		(void);
+static	void	pexerr		(void) __attribute__((__noreturn__));
 static	void	texec		(Char *, Char **);
 int	hashname	(Char *);
 static	int 	iscommand	(Char *);
@@ -149,9 +149,9 @@ static	int 	iscommand	(Char *);
 void
 doexec(struct command *t, int do_glob)
 {
-    Char *dp, **pv, **av, *sav;
+    Char *dp, **pv, **opv, **av, *sav;
     struct varent *v;
-    int slash, gflag;
+    int slash, gflag, rehashed;
     int hashval, i;
     Char   *blk[2];
 
@@ -253,9 +253,9 @@ doexec(struct command *t, int do_glob)
      * command search.
      */
     if (v == NULL || v->vec == NULL || v->vec[0] == NULL || slash)
-	pv = justabs;
+	opv = justabs;
     else
-	pv = v->vec;
+	opv = v->vec;
     sav = Strspl(STRslash, *av);/* / command name for postpending */
 #ifndef VFORK
     cleanup_push(sav, xfree);
@@ -264,6 +264,9 @@ doexec(struct command *t, int do_glob)
 #endif /* VFORK */
     hashval = havhash ? hashname(*av) : 0;
 
+    rehashed = 0;
+retry:
+    pv = opv;
     i = 0;
 #ifdef VFORK
     hits++;
@@ -313,6 +316,11 @@ cont:
 #ifdef VFORK
     hits--;
 #endif /* VFORK */
+    if (adrof(STRautorehash) && !rehashed && havhash && opv != justabs) {
+	dohash(NULL, NULL);
+	rehashed = 1;
+	goto retry;
+    }
 #ifndef VFORK
     cleanup_until(sav);
 #else /* VFORK */
@@ -719,11 +727,15 @@ dohash(Char **vv, struct command *c)
 #if defined(_UWIN) || defined(__CYGWIN__)
 	    /* Turn foo.{exe,com,bat} into foo since UWIN's readdir returns
 	     * the file with the .exe, .com, .bat extension
+	     *
+	     * Same for Cygwin, but only for .exe and .com extension.
 	     */
 	    {
 		ssize_t	ext = strlen(dp->d_name) - 4;
 		if ((ext > 0) && (strcasecmp(&dp->d_name[ext], ".exe") == 0 ||
+#ifndef __CYGWIN__
 				  strcasecmp(&dp->d_name[ext], ".bat") == 0 ||
+#endif
 				  strcasecmp(&dp->d_name[ext], ".com") == 0)) {
 #ifdef __CYGWIN__
 		    /* Also store the variation with extension. */
@@ -801,19 +813,23 @@ hashname(Char *cp)
 static int
 iscommand(Char *name)
 {
-    Char **pv;
+    Char **opv, **pv;
     Char *sav;
     struct varent *v;
     int slash = any(short2str(name), '/');
-    int hashval, i;
+    int hashval, rehashed, i;
 
     v = adrof(STRpath);
     if (v == NULL || v->vec == NULL || v->vec[0] == NULL || slash)
-	pv = justabs;
+	opv = justabs;
     else
-	pv = v->vec;
+	opv = v->vec;
     sav = Strspl(STRslash, name);	/* / command name for postpending */
     hashval = havhash ? hashname(name) : 0;
+
+    rehashed = 0;
+retry:
+    pv = opv;
     i = 0;
     do {
 	if (!slash && ABSOLUTEP(pv[0]) && havhash) {
@@ -842,6 +858,11 @@ cont:
 	pv++;
 	i++;
     } while (*pv);
+    if (adrof(STRautorehash) && !rehashed && havhash && opv != justabs) {
+	dohash(NULL, NULL);
+	rehashed = 1;
+	goto retry;
+    }
     xfree(sav);
     return 0;
 }
@@ -1063,7 +1084,7 @@ find_cmd(Char *cmd, int prt)
     const struct biltins *bptr;
     Char **pv;
     Char *sv;
-    int hashval, i, ex, rval = 0;
+    int hashval, rehashed, i, ex, rval = 0;
 
     if (prt && any(short2str(cmd), '/')) {
 	xprintf("%s", CGETS(13, 7, "where: / in command makes no sense\n"));
@@ -1115,6 +1136,8 @@ find_cmd(Char *cmd, int prt)
     sv = Strspl(STRslash, cmd);
     cleanup_push(sv, xfree);
 
+    rehashed = 0;
+retry:
     for (pv = var->vec, i = 0; pv && *pv; pv++, i++) {
 	if (havhash && !eq(*pv, STRdot)) {
 #ifdef FASTHASH
@@ -1143,6 +1166,11 @@ find_cmd(Char *cmd, int prt)
 		return rval;
 	}
     }
+    if (adrof(STRautorehash) && !rehashed && havhash) {
+	dohash(NULL, NULL);
+	rehashed = 1;
+	goto retry;
+    }
     cleanup_until(sv);
     return rval;
 }
diff --git a/contrib/tcsh/sh.exp.c b/contrib/tcsh/sh.exp.c
index e995e86..abb1764 100644
--- a/contrib/tcsh/sh.exp.c
+++ b/contrib/tcsh/sh.exp.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.exp.c,v 3.53 2007/10/01 19:09:28 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.exp.c,v 3.58 2011/12/25 15:21:50 christos Exp $ */
 /*
  * sh.exp.c: Expression evaluations
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.exp.c,v 3.53 2007/10/01 19:09:28 christos Exp $")
+RCSID("$tcsh: sh.exp.c,v 3.58 2011/12/25 15:21:50 christos Exp $")
 
 #include "tw.h"
 
@@ -57,24 +57,24 @@ RCSID("$tcsh: sh.exp.c,v 3.53 2007/10/01 19:09:28 christos Exp $")
 #define EQMATCH 7
 #define NOTEQMATCH 8
 
-static	int	 sh_access	(const Char *, int);
-static	int	 exp1		(Char ***, int);
-static	int	 exp2x		(Char ***, int);
-static	int	 exp2a		(Char ***, int);
-static	int	 exp2b		(Char ***, int);
-static	int	 exp2c		(Char ***, int);
-static	Char 	*exp3		(Char ***, int);
-static	Char 	*exp3a		(Char ***, int);
-static	Char 	*exp4		(Char ***, int);
-static	Char 	*exp5		(Char ***, int);
-static	Char 	*exp6		(Char ***, int);
-static	void	 evalav		(Char **);
-static	int	 isa		(Char *, int);
-static	int	 egetn		(Char *);
+static	int	   sh_access	(const Char *, int);
+static	tcsh_number_t  exp1		(Char ***, int);
+static	tcsh_number_t  exp2x	(Char ***, int);
+static	tcsh_number_t  exp2a	(Char ***, int);
+static	tcsh_number_t  exp2b	(Char ***, int);
+static	tcsh_number_t  exp2c	(Char ***, int);
+static	Char 	  *exp3		(Char ***, int);
+static	Char 	  *exp3a	(Char ***, int);
+static	Char 	  *exp4		(Char ***, int);
+static	Char 	  *exp5		(Char ***, int);
+static	Char 	  *exp6		(Char ***, int);
+static	void	   evalav	(Char **);
+static	int	   isa		(Char *, int);
+static	tcsh_number_t  egetn	(const Char *);
 
 #ifdef EDEBUG
-static	void	 etracc		(const char *, const Char *, Char ***);
-static	void	 etraci		(const char *, int, Char ***);
+static	void	   etracc	(const char *, const Char *, Char ***);
+static	void	   etraci	(const char *, tcsh_number_t, Char ***);
 #else /* !EDEBUG */
 #define etracc(A, B, C) ((void)0)
 #define etraci(A, B, C) ((void)0)
@@ -183,16 +183,16 @@ sh_access(const Char *fname, int mode)
 #endif /* !POSIX */
 }
 
-int
+tcsh_number_t
 expr(Char ***vp)
 {
     return (exp0(vp, 0));
 }
 
-int
+tcsh_number_t
 exp0(Char ***vp, int ignore)
 {
-    int p1 = exp1(vp, ignore);
+    tcsh_number_t p1 = exp1(vp, ignore);
 
     etraci("exp0 p1", p1, vp);
     while (**vp && eq(**vp, STRor2)) {
@@ -212,14 +212,14 @@ exp0(Char ***vp, int ignore)
     return (p1);
 }
 
-static int
+static tcsh_number_t
 exp1(Char ***vp, int ignore)
 {
-    int p1 = exp2x(vp, ignore);
+    tcsh_number_t p1 = exp2x(vp, ignore);
 
     etraci("exp1 p1", p1, vp);
     while (**vp && eq(**vp, STRand2)) {
-	int p2;
+	tcsh_number_t p2;
 
 	(*vp)++;
 	p2 = compat_expr ?
@@ -236,14 +236,14 @@ exp1(Char ***vp, int ignore)
     return (p1);
 }
 
-static int
+static tcsh_number_t
 exp2x(Char ***vp, int ignore)
 {
-    int p1 = exp2a(vp, ignore);
+    tcsh_number_t p1 = exp2a(vp, ignore);
 
     etraci("exp2x p1", p1, vp);
     while (**vp && eq(**vp, STRor)) {
-	int p2;
+	tcsh_number_t p2;
 
 	(*vp)++;
 	p2 = compat_expr ?
@@ -259,14 +259,14 @@ exp2x(Char ***vp, int ignore)
     return (p1);
 }
 
-static int
+static tcsh_number_t
 exp2a(Char ***vp, int ignore)
 {
-    int p1 = exp2b(vp, ignore);
+    tcsh_number_t p1 = exp2b(vp, ignore);
 
     etraci("exp2a p1", p1, vp);
     while (**vp && eq(**vp, STRcaret)) {
-	int p2;
+	tcsh_number_t p2;
 
 	(*vp)++;
 	p2 = compat_expr ?
@@ -282,14 +282,14 @@ exp2a(Char ***vp, int ignore)
     return (p1);
 }
 
-static int
+static tcsh_number_t
 exp2b(Char ***vp, int ignore)
 {
-    int p1 = exp2c(vp, ignore);
+    tcsh_number_t p1 = exp2c(vp, ignore);
 
     etraci("exp2b p1", p1, vp);
     while (**vp && eq(**vp, STRand)) {
-	int p2;
+	tcsh_number_t p2;
 
 	(*vp)++;
 	p2 = compat_expr ?
@@ -305,12 +305,12 @@ exp2b(Char ***vp, int ignore)
     return (p1);
 }
 
-static int
+static tcsh_number_t
 exp2c(Char ***vp, int ignore)
 {
     Char *p1 = exp3(vp, ignore);
     Char *p2;
-    int i;
+    tcsh_number_t i;
 
     cleanup_push(p1, xfree);
     etracc("exp2c p1", p1, vp);
@@ -352,7 +352,7 @@ static Char *
 exp3(Char ***vp, int ignore)
 {
     Char *p1, *p2;
-    int i;
+    tcsh_number_t i;
 
     p1 = exp3a(vp, ignore);
     etracc("exp3 p1", p1, vp);
@@ -399,7 +399,7 @@ exp3a(Char ***vp, int ignore)
 {
     Char *p1, *p2;
     const Char *op;
-    int i;
+    tcsh_number_t i;
 
     p1 = exp4(vp, ignore);
     etracc("exp3a p1", p1, vp);
@@ -427,7 +427,7 @@ static Char *
 exp4(Char ***vp, int ignore)
 {
     Char *p1, *p2;
-    int i = 0;
+    tcsh_number_t i = 0;
 
     p1 = exp5(vp, ignore);
     etracc("exp4 p1", p1, vp);
@@ -464,7 +464,7 @@ static Char *
 exp5(Char ***vp, int ignore)
 {
     Char *p1, *p2;
-    int i = 0;
+    tcsh_number_t i = 0;
 
     p1 = exp6(vp, ignore);
     etracc("exp5 p1", p1, vp);
@@ -519,7 +519,8 @@ exp5(Char ***vp, int ignore)
 static Char *
 exp6(Char ***vp, int ignore)
 {
-    int     ccode, i = 0;
+    tcsh_number_t ccode;
+    tcsh_number_t i = 0;
     Char *cp;
 
     if (**vp == 0)
@@ -626,12 +627,12 @@ filetest(Char *cp, Char ***vp, int ignore)
     char *filnam;
 #endif /* S_IFLNK */
 
-    int i = 0;
+    tcsh_number_t i = 0;
     unsigned pmask = 0xffff;
     int altout = 0;
     Char *ft = cp, *dp, *ep, *strdev, *strino, *strF, *str, valtest = '\0',
     *errval = STR0;
-    char *string, string0[8];
+    char *string, string0[22 + MB_LEN_MAX + 1];	// space for 64 bit octal
     time_t footime;
     struct passwd *pw;
     struct group *gr;
@@ -851,11 +852,11 @@ filetest(Char *cp, Char ***vp, int ignore)
 		 */
 
 	    case 'D':
-		i = (int) st->st_dev;
+		i = (tcsh_number_t) st->st_dev;
 		break;
 
 	    case 'I':
-		i = (int) st->st_ino;
+		i = (tcsh_number_t) st->st_ino;
 		break;
 		
 	    case 'F':
@@ -889,7 +890,7 @@ filetest(Char *cp, Char ***vp, int ignore)
 		
 
 	    case 'N':
-		i = (int) st->st_nlink;
+		i = (tcsh_number_t) st->st_nlink;
 		break;
 
 	    case 'P':
@@ -907,7 +908,7 @@ filetest(Char *cp, Char ***vp, int ignore)
 		    cleanup_until(ep);
 		    return(Strsave(str2short(pw->pw_name)));
 		}
-		i = (int) st->st_uid;
+		i = (tcsh_number_t) st->st_uid;
 		break;
 
 	    case 'G':
@@ -915,11 +916,11 @@ filetest(Char *cp, Char ***vp, int ignore)
 		    cleanup_until(ep);
 		    return(Strsave(str2short(gr->gr_name)));
 		}
-		i = (int) st->st_gid;
+		i = (tcsh_number_t) st->st_gid;
 		break;
 
 	    case 'Z':
-		i = (int) st->st_size;
+		i = (tcsh_number_t) st->st_size;
 		break;
 
 	    case 'A': case 'M': case 'C':
@@ -932,7 +933,7 @@ filetest(Char *cp, Char ***vp, int ignore)
 		    cleanup_until(ep);
 		    return(Strsave(strF));
 		}
-		i = (int) footime;
+		i = (tcsh_number_t) footime;
 		break;
 
 	    }
@@ -1024,8 +1025,8 @@ isa(Char *cp, int what)
     return (0);
 }
 
-static int
-egetn(Char *cp)
+static tcsh_number_t
+egetn(const Char *cp)
 {
     if (*cp && *cp != '-' && !Isdigit(*cp))
 	stderror(ERR_NAME | ERR_EXPRESSION);
@@ -1036,9 +1037,13 @@ egetn(Char *cp)
 
 #ifdef EDEBUG
 static void
-etraci(const char *str, int i, Char ***vp)
+etraci(const char *str, tcsh_number_t i, Char ***vp)
 {
-    xprintf("%s=%d\t", str, i);
+#ifdef HAVE_LONG_LONG
+    xprintf("%s=%lld\t", str, i);
+#else
+    xprintf("%s=%ld\t", str, i);
+#endif
     blkpr(*vp);
     xputchar('\n');
 }
diff --git a/contrib/tcsh/sh.file.c b/contrib/tcsh/sh.file.c
index 37e9475..dff07ab 100644
--- a/contrib/tcsh/sh.file.c
+++ b/contrib/tcsh/sh.file.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.file.c,v 3.36 2007/07/05 14:13:06 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.file.c,v 3.37 2010/02/09 20:21:49 christos Exp $ */
 /*
  * sh.file.c: File completion for csh. This file is not used in tcsh.
  */
@@ -33,7 +33,7 @@
 #include "sh.h"
 #include "ed.h"
 
-RCSID("$tcsh: sh.file.c,v 3.36 2007/07/05 14:13:06 christos Exp $")
+RCSID("$tcsh: sh.file.c,v 3.37 2010/02/09 20:21:49 christos Exp $")
 
 #if defined(FILEC) && defined(TIOCSTI)
 
@@ -594,7 +594,7 @@ again:				/* search for matches */
 static int
 compare(const void *p, const void *q)
 {
-#ifdef WIDE_STRINGS
+#if defined (WIDE_STRINGS) && !defined (UTF16_STRING)
     errno = 0;
 
     return (wcscoll(*(Char *const *) p, *(Char *const *) q));
diff --git a/contrib/tcsh/sh.func.c b/contrib/tcsh/sh.func.c
index 2e37af0..d3b890f 100644
--- a/contrib/tcsh/sh.func.c
+++ b/contrib/tcsh/sh.func.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.func.c,v 3.153 2009/06/25 21:15:37 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.func.c,v 3.162 2011/02/26 00:07:06 christos Exp $ */
 /*
  * sh.func.c: csh builtin functions
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.func.c,v 3.153 2009/06/25 21:15:37 christos Exp $")
+RCSID("$tcsh: sh.func.c,v 3.162 2011/02/26 00:07:06 christos Exp $")
 
 #include "ed.h"
 #include "tw.h"
@@ -41,8 +41,7 @@ RCSID("$tcsh: sh.func.c,v 3.153 2009/06/25 21:15:37 christos Exp $")
 #include "nt.const.h"
 #endif /* WINNT_NATIVE */
 
-#if defined (NLS_CATALOGS) && defined(HAVE_ICONV) && defined(HAVE_NL_LANGINFO)
-#include <langinfo.h>
+#if defined (NLS_CATALOGS) && defined(HAVE_ICONV)
 static iconv_t catgets_iconv; /* Or (iconv_t)-1 */
 #endif
 
@@ -520,12 +519,13 @@ doforeach(Char **v, struct command *c)
 
     USE(c);
     v++;
-    sp = cp = strip(*v);
-    if (!letter(*sp))
+    cp = sp = strip(*v);
+    if (!letter(*cp))
 	stderror(ERR_NAME | ERR_VARBEGIN);
-    while (*cp && alnum(*cp))
+    do {
 	cp++;
-    if (*cp)
+    } while (alnum(*cp));
+    if (*cp != '\0')
 	stderror(ERR_NAME | ERR_VARALNUM);
     cp = *v++;
     if (v[0][0] != '(' || v[blklen(v) - 1][0] != ')')
@@ -587,6 +587,7 @@ dowhile(Char **v, struct command *c)
 	nwp->w_start = lineloc;
 	nwp->w_end.type = TCSH_F_SEEK;
 	nwp->w_end.f_seek = 0;
+	nwp->w_end.a_seek = 0;
 	nwp->w_next = whyles;
 	whyles = nwp;
 	zlast = TC_WHILE;
@@ -763,6 +764,7 @@ search(int type, int level, Char *goal)
 	struct Ain a;
 	a.type = TCSH_F_SEEK;
 	a.f_seek = 0;
+	a.a_seek = 0;
 	bseek(&a);
     }
     cleanup_push(&word, Strbuf_cleanup);
@@ -963,9 +965,6 @@ histgetword(struct wordent *histent)
 	}
     }
     
-    unreadc(c);
-    return histent;
-
 past:
     switch (Stype) {
 
@@ -1376,13 +1375,16 @@ dosetenv(Char **v, struct command *c)
     }
 
     vp = *v++;
-
     lp = vp;
- 
-    for (; *lp != '\0' ; lp++) {
-	if (*lp == '=')
-	    stderror(ERR_NAME | ERR_SYNTAX);
-    }
+
+    if (!letter(*lp))
+	stderror(ERR_NAME | ERR_VARBEGIN);
+    do {
+	lp++;
+    } while (alnum(*lp));
+    if (*lp != '\0')
+	stderror(ERR_NAME | ERR_VARALNUM);
+
     if ((lp = *v++) == 0)
 	lp = STRNULL;
 
@@ -1426,6 +1428,9 @@ dosetenv(Char **v, struct command *c)
 # ifdef LC_CTYPE
 	(void) setlocale(LC_CTYPE, ""); /* for iscntrl */
 # endif /* LC_CTYPE */
+# if defined(AUTOSET_KANJI)
+        autoset_kanji();
+# endif /* AUTOSET_KANJI */
 # ifdef NLS_CATALOGS
 #  ifdef LC_MESSAGES
 	(void) setlocale(LC_MESSAGES, "");
@@ -1859,8 +1864,17 @@ doumask(Char **v, struct command *c)
 #  endif
 # endif /* SYSVREL > 3 && BSDLIMIT */
 
-# if (defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && defined(RLIMIT_AS) && !defined(RLIMIT_VMEM)
-#  define RLIMIT_VMEM	RLIMIT_AS
+# if (defined(__linux__) || defined(__GNU__) || defined(__GLIBC__))
+#  if defined(RLIMIT_AS) && !defined(RLIMIT_VMEM)
+#   define RLIMIT_VMEM	RLIMIT_AS
+#  endif
+/*
+ * Oh well, <asm-generic/resource.h> has it, but <bits/resource.h> does not
+ * Linux headers: When the left hand does not know what the right hand does.
+ */
+#  if defined(RLIMIT_RTPRIO) && !defined(RLIMIT_RTTIME)
+#   define RLIMIT_RTTIME (RLIMIT_RTPRIO + 1)
+#  endif
 # endif
 
 struct limits limits[] = 
@@ -1937,12 +1951,38 @@ struct limits limits[] =
     { RLIMIT_SWAP,	"swapsize",	1024,	"kbytes"	}, 
 # endif /* RLIMIT_SWAP */ 
 
+# ifdef RLIMIT_LOCKS 
+    { RLIMIT_LOCKS,	"maxlocks",	1,	""		}, 
+# endif /* RLIMIT_LOCKS */ 
+
+# ifdef RLIMIT_SIGPENDING 
+    { RLIMIT_SIGPENDING,"maxsignal",	1,	""		}, 
+# endif /* RLIMIT_SIGPENDING */ 
+
+# ifdef RLIMIT_MSGQUEUE 
+    { RLIMIT_MSGQUEUE,	"maxmessage",	1,	""		}, 
+# endif /* RLIMIT_MSGQUEUE */ 
+
+# ifdef RLIMIT_NICE 
+    { RLIMIT_NICE,	"maxnice",	1,	""		}, 
+# endif /* RLIMIT_NICE */ 
+
+# ifdef RLIMIT_RTPRIO 
+    { RLIMIT_RTPRIO,	"maxrtprio",	1,	""		}, 
+# endif /* RLIMIT_RTPRIO */ 
+
+# ifdef RLIMIT_RTTIME 
+    { RLIMIT_RTTIME,	"maxrttime",	1,	"usec"		}, 
+# endif /* RLIMIT_RTTIME */ 
+
     { -1, 		NULL, 		0, 	NULL		}
 };
 
 static struct limits *findlim	(Char *);
 static RLIM_TYPE getval		(struct limits *, Char **);
+static int strtail		(Char *, const char *);
 static void limtail		(Char *, const char *);
+static void limtail2		(Char *, const char *, const char *);
 static void plim		(struct limits *, int);
 static int setlim		(struct limits *, int, RLIM_TYPE);
 
@@ -2050,29 +2090,43 @@ getval(struct limits *lp, Char **v)
 	limtail(cp, "hours");
 	f *= 3600.0;
 	break;
+# endif /* RLIMIT_CPU */
     case 'm':
+# ifdef RLIMIT_CPU
 	if (lp->limconst == RLIMIT_CPU) {
 	    limtail(cp, "minutes");
 	    f *= 60.0;
 	    break;
 	}
-	*cp = 'm';
-	limtail(cp, "megabytes");
+# endif /* RLIMIT_CPU */
+	limtail2(cp, "megabytes", "mbytes");
 	f *= 1024.0 * 1024.0;
 	break;
+# ifdef RLIMIT_CPU
     case 's':
 	if (lp->limconst != RLIMIT_CPU)
 	    goto badscal;
 	limtail(cp, "seconds");
 	break;
 # endif /* RLIMIT_CPU */
+    case 'G':
+	*cp = 'g';
+	/*FALLTHROUGH*/
+    case 'g':
+# ifdef RLIMIT_CPU
+	if (lp->limconst == RLIMIT_CPU)
+	    goto badscal;
+# endif /* RLIMIT_CPU */
+	limtail2(cp, "gigabytes", "gbytes");
+	f *= 1024.0 * 1024.0 * 1024.0;
+	break;
     case 'M':
 # ifdef RLIMIT_CPU
 	if (lp->limconst == RLIMIT_CPU)
 	    goto badscal;
 # endif /* RLIMIT_CPU */
 	*cp = 'm';
-	limtail(cp, "megabytes");
+	limtail2(cp, "megabytes", "mbytes");
 	f *= 1024.0 * 1024.0;
 	break;
     case 'k':
@@ -2080,7 +2134,7 @@ getval(struct limits *lp, Char **v)
 	if (lp->limconst == RLIMIT_CPU)
 	    goto badscal;
 # endif /* RLIMIT_CPU */
-	limtail(cp, "kbytes");
+	limtail2(cp, "kilobytes", "kbytes");
 	f *= 1024.0;
 	break;
     case 'b':
@@ -2104,25 +2158,34 @@ badscal:
     return f == 0.0 ? (RLIM_TYPE) 0 : restrict_limit((f + 0.5));
 # else
     f += 0.5;
-    if (f > (float) RLIM_INFINITY)
+    if (f > (float) ((RLIM_TYPE) RLIM_INFINITY))
 	return ((RLIM_TYPE) RLIM_INFINITY);
     else
 	return ((RLIM_TYPE) f);
 # endif /* convex */
 }
 
-static void
-limtail(Char *cp, const char *str)
+static int
+strtail(Char *cp, const char *str)
 {
-    const char *sp;
-
-    sp = str;
     while (*cp && *cp == (Char)*str)
 	cp++, str++;
-    if (*cp)
-	stderror(ERR_BADSCALE, sp);
+    return (*cp != '\0');
 }
 
+static void
+limtail(Char *cp, const char *str)
+{
+    if (strtail(cp, str))
+	stderror(ERR_BADSCALE, str);
+}
+
+static void
+limtail2(Char *cp, const char *str1, const char *str2)
+{
+    if (strtail(cp, str1) && strtail(cp, str2))
+	stderror(ERR_BADSCALE, str1);
+}
 
 /*ARGSUSED*/
 static void
@@ -2564,13 +2627,24 @@ nlsinit(void)
 
     if (adrof(STRcatalog) != NULL)
 	catalog = xasprintf("tcsh.%s", short2str(varval(STRcatalog)));
+#ifdef NL_CAT_LOCALE /* POSIX-compliant. */
+    /*
+     * Check if LC_MESSAGES is set in the environment and use it, if so.
+     * If not, fall back to the setting of LANG.
+     */
+    catd = catopen(catalog, tgetenv(STRLC_MESSAGES) ? NL_CAT_LOCALE : 0);
+#else /* pre-POSIX */
+# ifndef MCLoadBySet
+#  define MCLoadBySet 0
+#  endif
     catd = catopen(catalog, MCLoadBySet);
+#endif
     if (catalog != default_catalog)
 	xfree(catalog);
 #if defined(HAVE_ICONV) && defined(HAVE_NL_LANGINFO)
     /* xcatgets (), not CGETS, the charset name should be in ASCII anyway. */
     catgets_iconv = iconv_open (nl_langinfo (CODESET),
-				xcatgets(catd, 255, 1, "ASCII"));
+				xcatgets(catd, 255, 1, "UTF-8"));
 #endif /* HAVE_ICONV && HAVE_NL_LANGINFO */
 #endif /* NLS_CATALOGS */
 #ifdef WINNT_NATIVE
diff --git a/contrib/tcsh/sh.glob.c b/contrib/tcsh/sh.glob.c
index 6ee5ecc..16be77e 100644
--- a/contrib/tcsh/sh.glob.c
+++ b/contrib/tcsh/sh.glob.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.glob.c,v 3.76 2008/06/19 15:20:56 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.glob.c,v 3.82 2011/02/27 00:15:17 christos Exp $ */
 /*
  * sh.glob.c: Regular expression expansion
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.glob.c,v 3.76 2008/06/19 15:20:56 christos Exp $")
+RCSID("$tcsh: sh.glob.c,v 3.82 2011/02/27 00:15:17 christos Exp $")
 
 #include "tc.h"
 #include "tw.h"
@@ -431,6 +431,12 @@ libglob(Char **vl)
     char   *ptr;
     int     nonomatch = adrof(STRnonomatch) != 0, magic = 0, match = 0;
 
+    if (adrof(STRglobdot))
+       gflgs |= GLOB_DOT;
+
+    if (adrof(STRglobstar))
+       gflgs |= GLOB_STAR;
+
     if (!vl || !vl[0])
 	return(vl);
 
@@ -510,11 +516,11 @@ globone(Char *str, int action)
 	stderror(ERR_NAME | ERR_NOMATCH);
     }
  result:
-    if (vl[0] == NULL) {
+    if (vl && vl[0] == NULL) {
 	xfree(vl);
 	return (Strsave(STRNULL));
     }
-    if (vl[1]) 
+    if (vl && vl[1]) 
 	return (handleone(str, vl, action));
     else {
 	str = strip(*vl);
@@ -687,7 +693,7 @@ dobackp(Char *cp, int literal)
 static void
 backeval(struct blk_buf *bb, struct Strbuf *word, Char *cp, int literal)
 {
-    int icnt;
+    ssize_t icnt;
     Char c, *ip;
     struct command faket;
     int    hadnl;
@@ -775,7 +781,13 @@ backeval(struct blk_buf *bb, struct Strbuf *word, Char *cp, int literal)
 		stderror(ERR_OLD);
 	    alias(&paraml);
 	    t = syntax(paraml.next, &paraml, 0);
+	    if (t == NULL)
+		return;
 	    cleanup_push(t, syntax_cleanup);
+	    /* The F_BACKQ flag must set so the job output is correct if
+	     * printexitvalue is set.  If it's not set, the job output
+	     * will have "Exit N" appended where N is the exit status. */
+	    t->t_dflg = F_BACKQ|F_NOFORK;
 	    if (seterr)
 		stderror(ERR_OLD);
 #ifdef SIGTSTP
@@ -796,7 +808,7 @@ backeval(struct blk_buf *bb, struct Strbuf *word, Char *cp, int literal)
     c = 0;
     ip = NULL;
     do {
-	int     cnt = 0;
+	ssize_t     cnt = 0;
 	char   *tmp;
 
 	tmp = tibuf;
diff --git a/contrib/tcsh/sh.h b/contrib/tcsh/sh.h
index f955734..691add3 100644
--- a/contrib/tcsh/sh.h
+++ b/contrib/tcsh/sh.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.h,v 3.150 2009/06/25 21:27:37 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.h,v 3.165 2011/04/14 18:25:25 christos Exp $ */
 /*
  * sh.h: Catch it all globals and includes file!
  */
@@ -75,6 +75,10 @@ typedef unsigned long intptr_t;
 # define INIT_ZERO_STRUCT
 # define force_read xread
 #endif /*!WINNT_NATIVE */
+
+#if defined(KANJI) && defined(WIDE_STRINGS) && defined(HAVE_NL_LANGINFO) && defined(CODESET)
+#define AUTOSET_KANJI
+#endif
 /*
  * Sanity
  */
@@ -86,15 +90,21 @@ typedef unsigned long intptr_t;
 # define BSDJOBS
 #endif 
 
+#define TMP_TEMPLATE ".XXXXXX"
+
 #ifdef SHORT_STRINGS
 # ifdef WIDE_STRINGS
 #include <wchar.h>
+#  ifdef UTF16_STRINGS
+typedef wint_t Char;
+#  else
 typedef wchar_t Char;
+#endif
 typedef unsigned long uChar;
 typedef wint_t eChar; /* Can contain any Char value or CHAR_ERR */
 #define CHAR_ERR WEOF /* Pretty please, use bit 31... */
 #define normal_mbtowc(PWC, S, N) rt_mbtowc(PWC, S, N)
-#define reset_mbtowc() IGNORE(mbtowc(NULL, NULL, 0))
+#define reset_mbtowc() TCSH_IGNORE(mbtowc(NULL, NULL, 0))
 # else
 typedef short Char;
 typedef unsigned short uChar;
@@ -114,10 +124,13 @@ typedef int eChar;
 # define SAVE(a) (strsave(a))
 #endif
 
+#if !defined(__inline) && !defined(__GNUC__) && !defined(_MSC_VER)
+#define __inline
+#endif
 /* Elide unused argument warnings */
 #define USE(a)	(void) (a)
-#define IGNORE(a)	ignore((intptr_t)a)
-static inline void ignore(intptr_t a)
+#define TCSH_IGNORE(a)	tcsh_ignore((intptr_t)a)
+static __inline void tcsh_ignore(intptr_t a)
 {
     USE(a);
 }
@@ -219,6 +232,11 @@ static inline void ignore(intptr_t a)
 # define lstat lstat64
 #endif /* __HP_CXD_SPP && !__hpux */
 
+#ifdef HAVE_LONG_LONG
+typedef long long tcsh_number_t;
+#else
+typedef long tcsh_number_t;
+#endif
 /*
  * This macro compares the st_dev field of struct stat. On aix on ibmESA
  * st_dev is a structure, so comparison does not work. 
@@ -238,7 +256,6 @@ static inline void ignore(intptr_t a)
 # include <locale.h>
 #endif /* NLS */
 
-
 #if !defined(_MINIX) && !defined(_VMS_POSIX) && !defined(WINNT_NATIVE) && !defined(__MVS__)
 # include <sys/param.h>
 #endif /* !_MINIX && !_VMS_POSIX && !WINNT_NATIVE && !__MVS__ */
@@ -272,7 +289,7 @@ static inline void ignore(intptr_t a)
 #  else
 #   include <termio.h>
 #  endif /* _UWIN */
-#  if SYSVREL > 3
+#  if SYSVREL > 3 || defined(__linux__)
 #   undef TIOCGLTC	/* we don't need those, since POSIX has them */
 #   undef TIOCSLTC
 #   undef CSWTCH
@@ -293,7 +310,7 @@ static inline void ignore(intptr_t a)
  * redefines malloc(), so we define the following
  * to avoid it.
  */
-# if defined(SYSMALLOC) || defined(linux) || defined(__GNU__) || defined(__GLIBC__) || defined(sgi) || defined(_OSD_POSIX)
+# if defined(SYSMALLOC) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(sgi) || defined(_OSD_POSIX)
 #  define NO_FIX_MALLOC
 #  include <stdlib.h>
 # else /* glibc */
@@ -311,7 +328,7 @@ static inline void ignore(intptr_t a)
 #endif /* POSIX && !WINNT_NATIVE */
 #include <limits.h>
 
-#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(linux) || defined(__GNU__) || defined(__GLIBC__)
+#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
 # if !defined(pyr) && !defined(stellar)
 #  include <time.h>
 #  ifdef _MINIX
@@ -326,6 +343,12 @@ static inline void ignore(intptr_t a)
 #if !((defined(SUNOS4) || defined(_MINIX) /* || defined(DECOSF1) */) && defined(TERMIO))
 # if !defined(_VMS_POSIX) && !defined(WINNT_NATIVE)
 #  include <sys/ioctl.h>
+#  if SYSVREL > 3 || defined(__linux__)
+#   undef TIOCGLTC	/* we don't need those, since POSIX has them */
+#   undef TIOCSLTC
+#   undef CSWTCH
+#   define CSWTCH _POSIX_VDISABLE	/* So job control works */
+#  endif /* SYSVREL > 3 */
 # endif
 #endif 
 
@@ -345,9 +368,6 @@ static inline void ignore(intptr_t a)
 #if !defined(O_RDONLY) || !defined(O_NDELAY)
 # include <fcntl.h>
 #endif 
-#ifndef O_LARGEFILE
-# define O_LARGEFILE 0
-#endif
 
 #include <errno.h>
 
@@ -553,10 +573,12 @@ EXTERN int    neednote IZERO;	/* Need to pnotify() */
 EXTERN int    noexec IZERO;	/* Don't execute, just syntax check */
 EXTERN int    pjobs IZERO;	/* want to print jobs if interrupted */
 EXTERN int    setintr IZERO;	/* Set interrupts on/off -> Wait intr... */
+EXTERN int    handle_intr IZERO;/* Are we currently handling an interrupt? */
 EXTERN int    havhash IZERO;	/* path hashing is available */
 EXTERN int    editing IZERO;	/* doing filename expansion and line editing */
 EXTERN int    noediting IZERO;	/* initial $term defaulted to noedit */
 EXTERN int    bslash_quote IZERO;/* PWP: tcsh-style quoting?  (in sh.c) */
+EXTERN int    anyerror IZERO;	/* propagate errors from pipelines/backq */
 EXTERN int    compat_expr IZERO;/* csh-style expressions? */
 EXTERN int    isoutatty IZERO;	/* is SHOUT a tty */
 EXTERN int    isdiagatty IZERO;/* is SHDIAG a tty */
@@ -646,7 +668,7 @@ EXTERN int   SHDIAG IZERO;	/* Diagnostic output... shell errs go here */
 EXTERN int   OLDSTD IZERO;	/* Old standard input (def for cmds) */
 
 
-#if SYSVREL == 4 && defined(_UTS)
+#if (SYSVREL == 4 && defined(_UTS)) || defined(__linux__)
 /* 
  * From: fadden@uts.amdahl.com (Andy McFadden)
  * we need sigsetjmp for UTS4, but not UTS2.1
@@ -664,7 +686,7 @@ EXTERN int   OLDSTD IZERO;	/* Old standard input (def for cmds) */
 
 #ifdef SIGSETJMP
    typedef struct { sigjmp_buf j; } jmp_buf_t;
-# define setexit()  sigsetjmp(reslab.j)
+# define setexit()  sigsetjmp(reslab.j, 1)
 # define _reset()    siglongjmp(reslab.j, 1)
 #else
    typedef struct { jmp_buf j; } jmp_buf_t;
@@ -1035,11 +1057,12 @@ extern struct limits {
  */
 EXTERN struct Hist {
     struct wordent Hlex;
-    int     Hnum;
+    int     Hnum;		 /* eventno when inserted into history list  */
     int     Href;
     time_t  Htime;
     Char   *histline;
-    struct Hist *Hnext;
+    struct Hist *Hnext, *Hprev;         /* doubly linked list */
+    unsigned Hhash;                     /* hash value of command line */
 }       Histlist IZERO_STRUCT;
 
 EXTERN struct wordent paraml;	/* Current lexical word list */
@@ -1091,7 +1114,7 @@ EXTERN Char    PRCHROOT;	/* Prompt symbol for root */
 #define short2blk(a) 		saveblk(a)
 #define short2str(a) 		caching_strip(a)
 #else
-#ifdef WIDE_STRINGS
+#if defined(WIDE_STRINGS) && !defined(UTF16_STRINGS)
 #define Strchr(a, b)		wcschr(a, b)
 #define Strrchr(a, b)		wcsrchr(a, b)
 #define Strcat(a, b)  		wcscat(a, b)
@@ -1187,33 +1210,18 @@ extern char   **environ;
 
 #ifndef WINNT_NATIVE
 # ifdef NLS_CATALOGS
-#  if defined(linux) || defined(__GNU__) || defined(__GLIBC__)
-#   include <locale.h>
-#   ifdef notdef
-#    include <localeinfo.h>	/* Has this changed ? */
-#   endif
+#  ifdef HAVE_FEATURES_H
 #   include <features.h>
 #  endif
-#  ifdef SUNOS4
-   /* Who stole my nl_types.h? :-( 
-    * All this stuff is in the man pages, but nowhere else?
-    * This does not link right now...
-    */
-   typedef void *nl_catd; 
-   extern const char * catgets (nl_catd, int, int, const char *);
-   nl_catd catopen (const char *, int);
-   int catclose (nl_catd);
-#  else
-#   ifdef __uxps__
-#    define gettxt gettxt_ds
-#   endif
-#   include <nl_types.h>
-#   ifdef __uxps__
-#    undef gettxt
-#   endif
+#  ifdef HAVE_NL_LANGINFO
+#   include <langinfo.h>
+#  endif
+#  ifdef __uxps__
+#   define gettxt gettxt_ds
 #  endif
-#  ifndef MCLoadBySet
-#   define MCLoadBySet 0
+#  include <nl_types.h>
+#  ifdef __uxps__
+#   undef gettxt
 #  endif
 EXTERN nl_catd catd;
 #  if defined(HAVE_ICONV) && defined(HAVE_NL_LANGINFO)
diff --git a/contrib/tcsh/sh.hist.c b/contrib/tcsh/sh.hist.c
index 72b376a..6a12737 100644
--- a/contrib/tcsh/sh.hist.c
+++ b/contrib/tcsh/sh.hist.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.hist.c,v 3.40 2007/03/01 17:14:51 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.hist.c,v 3.53 2011/01/24 18:10:26 christos Exp $ */
 /*
  * sh.hist.c: Shell history expansions and substitutions
  */
@@ -32,8 +32,9 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.hist.c,v 3.40 2007/03/01 17:14:51 christos Exp $")
+RCSID("$tcsh: sh.hist.c,v 3.53 2011/01/24 18:10:26 christos Exp $")
 
+#include <assert.h>
 #include "tc.h"
 
 extern int histvalid;
@@ -42,8 +43,6 @@ Char HistLit = 0;
 
 static	int	heq	(const struct wordent *, const struct wordent *);
 static	void	hfree	(struct Hist *);
-static	void	dohist1	(struct Hist *, int *, int);
-static	void	phist	(struct Hist *, int);
 
 #define HIST_ONLY	0x01
 #define HIST_SAVE	0x02
@@ -57,10 +56,95 @@ static	void	phist	(struct Hist *, int);
  * C shell
  */
 
-void
-savehist(struct wordent *sp, int mflg)
+/* Static functions don't show up in gprof summaries.  So eliminate "static"
+ * modifier from some frequently called functions. */
+#ifdef PROF
+#define PG_STATIC
+#else
+#define PG_STATIC static
+#endif
+
+/* #define DEBUG_HIST 1 */
+
+static const int fastMergeErase = 1;
+static unsigned histCount = 0;		/* number elements on history list */
+static struct Hist *histTail = NULL;     /* last element on history list */
+static struct Hist *histMerg = NULL;	 /* last element merged by Htime */
+
+static void insertHistHashTable(struct Hist *, unsigned);
+
+
+/* Insert new element (hp) in history list after specified predecessor (pp). */
+static void
+hinsert(struct Hist *hp, struct Hist *pp)
+{
+    struct Hist *fp = pp->Hnext;        /* following element, if any */
+    hp->Hnext = fp, hp->Hprev = pp;
+    pp->Hnext = hp;
+    if (fp)
+        fp->Hprev = hp;
+    else
+        histTail = hp;                  /* meaning hp->Hnext == NULL */
+    histCount++;
+}
+
+/* Remove the entry from the history list. */
+static void
+hremove(struct Hist *hp)
+{
+    struct Hist *pp = hp->Hprev;
+    assert(pp);                         /* elements always have a previous */
+    pp->Hnext = hp->Hnext;
+    if (hp->Hnext)
+        hp->Hnext->Hprev = pp;
+    else
+        histTail = pp;                  /* we must have been last */
+    if (hp == histMerg)			/* deleting this hint from list */
+	histMerg = NULL;
+    assert(histCount > 0);
+    histCount--;
+}
+
+/* Prune length of history list to specified size by history variable. */
+PG_STATIC void
+discardExcess(int histlen)
 {
     struct Hist *hp, *np;
+    if (histTail == NULL) {
+        assert(histCount == 0);
+        return;                         /* no entries on history list */
+    }
+    /* Prune dummy entries from the front, then old entries from the back. If
+     * the list is still too long scan the whole list as before.  But only do a
+     * full scan if the list is more than 6% (1/16th) too long. */
+    while (histCount > (unsigned)histlen && (np = Histlist.Hnext)) {
+        if (eventno - np->Href >= histlen || histlen == 0)
+            hremove(np), hfree(np);
+        else
+            break;
+    }
+    while (histCount > (unsigned)histlen && (np = histTail) != &Histlist) {
+        if (eventno - np->Href >= histlen || histlen == 0)
+            hremove(np), hfree(np);
+        else
+            break;
+    }
+    if (histCount - (histlen >> 4) <= (unsigned)histlen)
+	return;				/* don't bother doing the full scan */
+    for (hp = &Histlist; histCount > (unsigned)histlen &&
+	(np = hp->Hnext) != NULL;)
+        if (eventno - np->Href >= histlen || histlen == 0)
+            hremove(np), hfree(np);
+        else
+            hp = np;
+}
+
+/* Add the command "sp" to the history list. */
+void
+savehist(
+  struct wordent *sp,
+  int mflg)				/* true if -m (merge) specified */
+{
     int histlen = 0;
     Char   *cp;
 
@@ -76,14 +160,445 @@ savehist(struct wordent *sp, int mflg)
 	histlen = histlen * 10 + *cp++ - '0';
     }
     if (sp)
-	(void) enthist(++eventno, sp, 1, mflg);
-    for (hp = &Histlist; (np = hp->Hnext) != NULL;)
-	if (eventno - np->Href >= histlen || histlen == 0)
-	    hp->Hnext = np->Hnext, hfree(np);
-	else
-	    hp = np;
+        (void) enthist(++eventno, sp, 1, mflg, histlen);
+    discardExcess(histlen);
+}
+
+#define USE_JENKINS_HASH 1
+/* #define USE_ONE_AT_A_TIME 1 */
+#undef PRIME_LENGTH			/* no need for good HTL */
+
+#ifdef USE_JENKINS_HASH
+#define hashFcnName "lookup3"
+/* From:
+   lookup3.c, by Bob Jenkins, May 2006, Public Domain.
+   "...  You can use this free for any purpose.  It's in
+    the public domain.  It has no warranty."
+   http://burtleburtle.net/bob/hash/index.html
+ */
+
+#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
+#define mix(a,b,c) \
+{ \
+  a -= c;  a ^= rot(c, 4);  c += b; \
+  b -= a;  b ^= rot(a, 6);  a += c; \
+  c -= b;  c ^= rot(b, 8);  b += a; \
+  a -= c;  a ^= rot(c,16);  c += b; \
+  b -= a;  b ^= rot(a,19);  a += c; \
+  c -= b;  c ^= rot(b, 4);  b += a; \
+}
+#define final(a,b,c) \
+{ \
+  c ^= b; c -= rot(b,14); \
+  a ^= c; a -= rot(c,11); \
+  b ^= a; b -= rot(a,25); \
+  c ^= b; c -= rot(b,16); \
+  a ^= c; a -= rot(c, 4); \
+  b ^= a; b -= rot(a,14); \
+  c ^= b; c -= rot(b,24); \
 }
 
+struct hashValue		  /* State used to hash a wordend word list. */
+{
+    uint32_t a, b, c;
+};
+
+/* Set up the internal state */
+static void
+initializeHash(struct hashValue *h)
+{
+    h->a = h->b = h->c = 0xdeadbeef;
+}
+
+/* This does a partial hash of the Chars in a single word.  For efficiency we
+ * include 3 versions of the code to pack Chars into 32-bit words for the
+ * mixing function. */
+static void
+addWordToHash(struct hashValue *h, const Char *word)
+{
+    uint32_t a = h->a, b = h->b, c = h->c;
+#ifdef SHORT_STRINGS
+#ifdef WIDE_STRINGS
+    assert(sizeof(Char) >= 4);
+    while (1) {
+	unsigned k;
+	if ((k = (uChar)*word++) == 0) break; a += k;
+	if ((k = (uChar)*word++) == 0) break; b += k;
+	if ((k = (uChar)*word++) == 0) break; c += k;
+	mix(a, b, c);
+    }
+#else
+    assert(sizeof(Char) == 2);
+    while (1) {
+	unsigned k;
+	if ((k = (uChar)*word++) == 0) break; a += k;
+	if ((k = (uChar)*word++) == 0) break; a += k << 16;
+	if ((k = (uChar)*word++) == 0) break; b += k;
+	if ((k = (uChar)*word++) == 0) break; b += k << 16;
+	if ((k = (uChar)*word++) == 0) break; c += k;
+	if ((k = (uChar)*word++) == 0) break; c += k << 16;
+	mix(a, b, c);
+    }
+#endif
+#else
+    assert(sizeof(Char) == 1);
+    while (1) {
+	unsigned k;
+	if ((k = *word++) == 0) break; a += k;
+	if ((k = *word++) == 0) break; a += k << 8;
+	if ((k = *word++) == 0) break; a += k << 16;
+	if ((k = *word++) == 0) break; a += k << 24;
+	if ((k = *word++) == 0) break; b += k;
+	if ((k = *word++) == 0) break; b += k << 8;
+	if ((k = *word++) == 0) break; b += k << 16;
+	if ((k = *word++) == 0) break; b += k << 24;
+	if ((k = *word++) == 0) break; c += k;
+	if ((k = *word++) == 0) break; c += k << 8;
+	if ((k = *word++) == 0) break; c += k << 16;
+	if ((k = *word++) == 0) break; c += k << 24;
+	mix(a, b, c);
+    }
+#endif
+    h->a = a, h->b = b, h->c = c;
+}
+
+static void
+addCharToHash(struct hashValue *h, Char ch)
+{
+    /* The compiler (gcc -O2) seems to do a good job optimizing this without
+     * explicitly extracting into local variables. */
+    h->a += (uChar)ch;
+    mix(h->a, h->b, h->c);
+}
+
+static uint32_t
+finalizeHash(struct hashValue *h)
+{
+    uint32_t a = h->a, b = h->b, c = h->c;
+    final(a, b, c);
+    return c;
+}
+
+#elif USE_ONE_AT_A_TIME
+#define hashFcnName "one-at-a-time"
+/* This one is also from Bob Jenkins, but is slower but simpler than lookup3.
+   "...  The code given here are all public domain."
+   http://burtleburtle.net/bob/hash/doobs.html */
+
+#if 0
+ub4
+one_at_a_time(char *key, ub4 len)
+{
+  ub4   hash, i;
+  for (hash=0, i=0; i<len; ++i)
+  {
+    hash += key[i];
+    hash += (hash << 10);
+    hash ^= (hash >> 6);
+  }
+  hash += (hash << 3);
+  hash ^= (hash >> 11);
+  hash += (hash << 15);
+  return (hash & mask);
+}
+#endif
+
+struct hashValue { uint32_t h; };
+static void
+initializeHash(struct hashValue *h)
+{
+    h->h = 0;
+}
+
+static void
+addWordToHash(struct hashValue *h, const Char *word)
+{
+    unsigned k;
+    uint32_t hash = h->h;
+    while (k = (uChar)*word++)
+	hash += k, hash += hash << 10, hash ^= hash >> 6;
+    h->h = hash;
+}
+
+static void
+addCharToHash(struct hashValue *h, Char c)
+{
+    Char b[2] = { c, 0 };
+    addWordToHash(h, b);
+}
+
+static uint32_t
+finalizeHash(struct hashValue *h)
+{
+    unsigned hash = h->h;
+    hash += (hash << 3);
+    hash ^= (hash >> 11);
+    hash += (hash << 15);
+    return hash;
+}
+
+#else
+#define hashFcnName "add-mul"
+/* Simple multipy and add hash. */
+#define PRIME_LENGTH 1			/* need "good" HTL */
+struct hashValue { uint32_t h; };
+static void
+initializeHash(struct hashValue *h)
+{
+    h->h = 0xe13e2345;
+}
+
+static void
+addWordToHash(struct hashValue *h, const Char *word)
+{
+    unsigned k;
+    uint32_t hash = h->h;
+    while (k = (uChar)*word++)
+	hash = hash * 0x9e4167b9 + k;
+    h->h = hash;
+}
+
+static void
+addCharToHash(struct hashValue *h, Char c)
+{
+    h->h = h->h * 0x9e4167b9 + (uChar)c;
+}
+
+static uint32_t
+finalizeHash(struct hashValue *h)
+{
+    return h->h;
+}
+#endif
+
+static unsigned
+hashhist(struct wordent *h0)
+{
+    struct hashValue s;
+    struct wordent *firstWord = h0->next;
+    struct wordent *h = firstWord;
+    unsigned hash = 0;
+
+    initializeHash(&s);
+    for (; h != h0; h = h->next) {
+        if (h->word[0] == '\n')
+            break;                      /* don't hash newline */
+        if (h != firstWord)
+            addCharToHash(&s, ' ');	/* space between words */
+	addWordToHash(&s, h->word);
+    }
+    hash = finalizeHash(&s);
+    /* Zero means no hash value, so never return zero as a hash value. */
+    return hash ? hash : 0x7fffffff;	/* prime! */
+}
+
+#if 0
+unsigned
+hashStr(Char *str)
+{
+    struct hashValue s;
+    initializeHash(&s);
+    addWordToHash(&s, str);
+    return finalizeHash(&s);
+}
+#endif
+
+#ifdef PRIME_LENGTH			/* need good HTL */
+#define hash2tableIndex(hash, len) ((hash) % len)
+#else
+#define hash2tableIndex(hash, len) ((hash) & (len-1))
+#endif
+
+/* This code can be enabled to test the above hash functions for speed and
+ * collision avoidance.  The testing is enabled by "occasional" calls to
+ * displayHistStats(), see which. */
+#ifdef DEBUG_HIST
+
+#ifdef BSDTIMES
+static double
+doTiming(int start) {
+    static struct timeval beginTime;
+    if (start) {
+	gettimeofday(&beginTime, NULL);
+	return 0.0;
+    } else {
+	struct timeval now;
+	gettimeofday(&now, NULL);
+	return (now.tv_sec-beginTime.tv_sec) +
+	    (now.tv_usec-beginTime.tv_usec)/1e6;
+    }
+}
+#else
+static double
+doTiming(int start) {
+    USE(start);
+    return 0.0;
+}
+#endif
+
+static void
+generateHashes(int nChars, unsigned nWords, unsigned samples, unsigned *hashes,
+    unsigned length)
+{
+    if (nChars < 1)
+	return;
+    nWords = (nWords < 1) ? 1 : (nWords > 4) ? 4 : nWords;
+    Char *number = xmalloc((nChars+nWords)*sizeof(Char));
+    struct wordent word[4];
+    struct wordent base = { NULL, &word[0], &word[0] };
+    word[0].word = number, word[0].next = &base, word[0].prev = &base;
+    unsigned w = 0;			/* word number */
+    /* Generate multiple words of length 2, 3, 5, then all the rest. */
+    unsigned wBoundaries[4] = { 2-1, 2+3-1, 2+3+5-1, 0 };
+    /* Ensure the last word has at least 4 Chars in it. */
+    while (nWords >= 2 && nChars < (wBoundaries[nWords-2]+1) + 4)
+	nWords--;
+    wBoundaries[nWords-1] = 0xffffffff;	/* don't end word past this point */
+    unsigned i;
+    for (i = 0; i<nChars; i++) {
+	/* In deference to the gawd awful add-mul hash, we won't use the worse
+	 * case here (setting all Chars to 1), but assume mostly (or at least
+	 * initially) ASCII data. */
+	number[i+w] = '!';		/* 0x21 = 33 */
+
+	if (i == wBoundaries[w]) {	/* end a word here and move to next */
+	    w++;			/* next word */
+	    number[i+w] = 0;		/* terminate */
+	    word[w].word = &number[i+w+1];
+	    word[w].next = &base, word[w].prev = &word[w-1];
+	    word[w-1].next = &word[w], base.prev = &word[w];
+	}
+    }
+    /* w is the index of the last word actually created. */
+    number[nChars + w] = 0;		/* terminate last word */
+    unsigned timeLimit = !samples;
+    if (samples == 0)
+	samples = 1000000000;
+    doTiming(1);
+    double sec;
+    for (i = 0; i < samples; i++) {
+	/* increment 4 digit base 255 number; last characters vary fastest */
+	unsigned j = nChars-1 + w;
+	while (1) {
+	    if (++number[j] != 0)
+		break;
+	    /* else reset this digit and proceed to next one */
+	    number[j] = 1;
+	    if (&number[j] <= word[w].word)
+		break;			/* stop at beginning of last word */
+	    j--;
+	}
+	if (word[w].word[0] == '\n')
+	    word[w].word[0]++;		/* suppress newline character */
+	unsigned hash = hashhist(&base);
+	hashes[hash2tableIndex(hash, length)]++;
+	if (timeLimit && (i & 0x3ffff) == 0x3ffff) {
+	    sec = doTiming(0);
+	    if (sec > 10)
+		break;
+	}
+    }
+    if (i >= samples)
+	sec = doTiming(0);
+    else
+	samples = i;			/* number we actually did */
+    if (sec > 0.01) {
+	xprintf("Hash %d (%d Char %u words) with %s: %d nsec/hash, %d mcps\n",
+		samples, nChars, w+1, hashFcnName, (int)((sec/samples)*1e9),
+		(int)((double)samples*nChars/sec/1e6));
+    }
+}
+#endif /* DEBUG_HIST */
+
+#ifdef DEBUG_HIST
+static void
+testHash(void)
+{
+    static const Char STRtestHashTimings[] =
+	{ 't','e','s','t','H','a','s','h','T','i','m','i','n','g','s', 0 };
+    struct varent *vp = adrof(STRtestHashTimings);
+    if (vp && vp->vec) {
+	unsigned hashes[4];		/* dummy place to put hashes */
+	Char **vals = vp->vec;
+	while (*vals) {
+	    int length = getn(*vals);
+	    unsigned words =
+		(length < 5) ? 1 : (length < 25) ? 2 : (length < 75) ? 3 : 4;
+	    if (length > 0)
+		generateHashes(length, words, 0, hashes, 4);
+	    vals++;
+	}
+    }
+    unsigned length = 1024;
+#ifdef PRIME_LENGTH			/* need good HTL */
+    length = 1021;
+#endif
+    unsigned *hashes = xmalloc(length*sizeof(unsigned));
+    memset(hashes, 0, length*sizeof(unsigned));
+    /* Compute collision statistics for half full hashes modulo "length". */
+    generateHashes(4, 1, length/2, hashes, length);
+    /* Evaluate collisions by comparing occupancy rates (mean value 0.5).
+     * One bin for each number of hits. */
+    unsigned bins[155];
+    memset(bins, 0, sizeof(bins));
+    unsigned highest = 0;
+    unsigned i;
+    for (i = 0; i<length; i++) {
+	unsigned hits = hashes[i];
+	if (hits >= sizeof(bins)/sizeof(bins[0])) /* clip */
+	    hits = highest = sizeof(bins)/sizeof(bins[0]) - 1;
+	if (hits > highest)
+	    highest = hits;
+	bins[hits]++;
+    }
+    xprintf("Occupancy of %d buckets by %d hashes %d Chars %d word with %s\n",
+	    length, length/2, 4, 1, hashFcnName);
+    for (i = 0; i <= highest; i++) {
+	xprintf(" %d buckets (%d%%) with %d hits\n",
+		bins[i], bins[i]*100/length, i);
+    }
+    /* Count run lengths to evaluate linear rehashing effectiveness.  Estimate
+     * a little corrupted by edge effects. */
+    memset(bins, 0, sizeof(bins));
+    highest = 0;
+    for (i = 0; hashes[i] == 0; i++);	/* find first occupied bucket */
+    unsigned run = 0;
+    unsigned rehashed = 0;
+    for (; i<length; i++) {
+	unsigned hits = hashes[i];
+	if (hits == 0 && rehashed > 0)
+	    hits = 1 && rehashed--;
+	else if (hits > 1)
+	    rehashed += hits-1;
+	if (hits)
+	    run++;
+	else {
+	    /* a real free slot, count it */
+	    if (run >= sizeof(bins)/sizeof(bins[0])) /* clip */
+		run = highest = sizeof(bins)/sizeof(bins[0]) - 1;
+	    if (run > highest)
+		highest = run;
+	    bins[run]++;
+	    run = 0;
+	}
+    }
+    /* Ignore the partial run at end as we ignored the beginning. */
+    double merit = 0.0, entries = 0;
+    for (i = 0; i <= highest; i++) {
+	entries += bins[i]*i;		/* total hashed objects */
+	merit += bins[i]*i*i;
+    }
+    xprintf("Rehash collision figure of merit %u (ideal=100), run lengths:\n",
+	    (int)(100.0*merit/entries));
+    for (i = 0; i <= highest; i++) {
+	if (bins[i] != 0)
+	    xprintf(" %d runs of length %d buckets\n", bins[i], i);
+    }
+    xfree(hashes);
+}
+#endif /* DEBUG_HIST */
+
+/* Compares two word lists for equality. */
 static int
 heq(const struct wordent *a0, const struct wordent *b0)
 {
@@ -98,40 +613,362 @@ heq(const struct wordent *a0, const struct wordent *b0)
 	    return (b == b0) ? 1 : 0;
 	if (b == b0)
 	    return 0;
-    } 
+    }
+}
+
+/* Renumber entries following p, which we will be deleting. */
+PG_STATIC void
+renumberHist(struct Hist *p)
+{
+    int n = p->Href;
+    while ((p = p->Hnext))
+        p->Href = n--;
+}
+
+/* The hash table is implemented as an array of pointers to Hist entries.  Each
+ * entry is located in the table using hash2tableIndex() and checking the
+ * following entries in case of a collision (linear rehash).  Free entries in
+ * the table are zero (0, NULL, emptyHTE).  Deleted entries that cannot yet be
+ * freed are set to one (deletedHTE).  The Hist.Hhash member is non-zero iff
+ * the entry is in the hash table.  When the hash table get too full, it is
+ * reallocated to be approximately twice the history length (see
+ * getHashTableSize). */
+static struct Hist **histHashTable = NULL;
+static unsigned histHashTableLength = 0; /* number of Hist pointers in table */
+
+static struct Hist * const emptyHTE = NULL;
+static struct Hist * const deletedHTE = (struct Hist *)1;
+
+static struct {
+    unsigned insertCount;
+    unsigned removeCount;
+    unsigned rehashes;
+    int deleted;
+} hashStats;
+
+#ifdef DEBUG_HIST
+void
+checkHistHashTable(int print)
+{
+    unsigned occupied = 0;
+    unsigned deleted = 0;
+    unsigned i;
+    for (i = 0; i<histHashTableLength; i++)
+	if (histHashTable[i] == emptyHTE)
+	    continue;
+	else if (histHashTable[i] == deletedHTE)
+	    deleted++;
+	else
+	    occupied++;
+    if (print)
+	xprintf("  found len %u occupied %u deleted %u\n",
+		histHashTableLength, occupied, deleted);
+    assert(deleted == hashStats.deleted);
+}
+
+static int doneTest = 0;
+
+/* Main entry point for displaying history statistics and hash function
+ * behavior. */
+void
+displayHistStats(const char *reason)
+{
+    /* Just hash statistics for now. */
+    xprintf("%s history hash table len %u count %u (deleted %d)\n", reason,
+	    histHashTableLength, histCount, hashStats.deleted);
+    xprintf("  inserts %u rehashes %u%% each\n",
+	    hashStats.insertCount,
+	    (hashStats.insertCount
+	     ? 100*hashStats.rehashes/hashStats.insertCount : 0));
+    xprintf("  removes %u net %u\n",
+	    hashStats.removeCount,
+	    hashStats.insertCount - hashStats.removeCount);
+    assert(hashStats.insertCount >= hashStats.removeCount);
+    checkHistHashTable(1);
+    memset(&hashStats, 0, sizeof(hashStats));
+    if (!doneTest) {
+	testHash();
+	doneTest = 1;
+    }
+}
+#else
+void
+displayHistStats(const char *reason)
+{
+    USE(reason);
+}
+#endif
+
+static void
+discardHistHashTable(void)
+{
+    if (histHashTable == NULL)
+        return;
+    displayHistStats("Discarding");
+    xfree(histHashTable);
+    histHashTable = NULL;
+}
+
+/* Computes a new hash table size, when the current one is too small. */
+static unsigned
+getHashTableSize(int histlen)
+{
+    unsigned target = histlen * 2;
+    unsigned e = 5;
+    unsigned size;
+    while ((size = 1<<e) < target)
+	e++;
+#ifdef PRIME_LENGTH			/* need good HTL */
+    /* Not all prime, but most are and none have factors smaller than 11. */
+    return size+15;
+#else
+    assert((size & (size-1)) == 0);	/* must be a power of two */
+    return size;
+#endif
+}
+
+/* Create the hash table or resize, if necessary. */
+static void
+createHistHashTable(int histlen)
+{
+    if (histlen == 0) {
+	discardHistHashTable();
+        return;
+    }
+    if (histlen < 0) {
+        histlen = getn(varval(STRhistory));
+	if (histlen == 0)
+	    return;			/* no need for hash table */
+	assert(histlen > 0);
+    }
+    if (histHashTable != NULL) {
+	if (histCount < histHashTableLength * 3 / 4)
+	    return;			/* good enough for now */
+	discardHistHashTable();		/* too small */
+    }
+    histHashTableLength = getHashTableSize(
+	histlen > (int)histCount ? histlen : (int)histCount);
+    histHashTable = xmalloc(histHashTableLength * sizeof(struct Hist *));
+    memset(histHashTable, 0, histHashTableLength * sizeof(struct Hist *));
+    assert(histHashTable[0] == emptyHTE);
+
+    /* Now insert all the entries on the history list into the hash table. */
+    {
+        struct Hist *hp;
+        for (hp = &Histlist; (hp = hp->Hnext) != NULL;) {
+            unsigned lpHash = hashhist(&hp->Hlex);
+            assert(!hp->Hhash || hp->Hhash == lpHash);
+            hp->Hhash = 0;              /* force insert to new hash table */
+            insertHistHashTable(hp, lpHash);
+        }
+    }
+}
+
+/* Insert np into the hash table.  We assume that np is already on the
+ * Histlist.  The specified hashval matches the new Hist entry but has not yet
+ * been assigned to Hhash (or the element is already on the hash table). */
+static void
+insertHistHashTable(struct Hist *np, unsigned hashval)
+{
+    unsigned rehashes = 0;
+    unsigned hi = 0;
+    if (!histHashTable)
+	return;
+    if (np->Hhash != 0) {
+        /* already in hash table */
+        assert(hashval == np->Hhash);
+        return;
+    }
+    assert(np != deletedHTE);
+    /* Find a free (empty or deleted) slot, using linear rehash. */
+    assert(histHashTable);
+    for (rehashes = 0;
+         ((hi = hash2tableIndex(hashval + rehashes, histHashTableLength)),
+          histHashTable[hi] != emptyHTE && histHashTable[hi] != deletedHTE);
+         rehashes++) {
+        assert(np != histHashTable[hi]);
+        if (rehashes >= histHashTableLength / 10) {
+            /* Hash table is full, so grow it.  We assume the create function
+             * will roughly double the size we give it.  Create initializes the
+             * new table with everything on the Histlist, so we are done when
+             * it returns.  */
+#ifdef DEBUG_HIST
+	    xprintf("Growing history hash table from %d ...",
+		histHashTableLength);
+	    flush();
+#endif
+            discardHistHashTable();
+            createHistHashTable(histHashTableLength);
+#ifdef DEBUG_HIST
+	    xprintf("to %d.\n", histHashTableLength);
+#endif
+            return;
+        }
+    }
+    /* Might be sensible to grow hash table if rehashes is "too big" here. */
+    if (histHashTable[hi] == deletedHTE)
+	hashStats.deleted--;
+    histHashTable[hi] = np;
+    np->Hhash = hashval;
+    hashStats.insertCount++;
+    hashStats.rehashes += rehashes;
+}
+
+/* Remove the 'np' entry from the hash table. */
+static void
+removeHistHashTable(struct Hist *np)
+{
+    unsigned hi = np->Hhash;
+    if (!histHashTable || !hi)
+        return;                         /* no hash table or not on it */
+    /* find desired entry */
+    while ((hi = hash2tableIndex(hi, histHashTableLength)),
+           histHashTable[hi] != emptyHTE) {
+        if (np == histHashTable[hi]) {
+	    unsigned i;
+	    unsigned deletes = 0;
+	    histHashTable[hi] = deletedHTE; /* dummy, but non-zero entry */
+	    /* now peek ahead to see if the dummies are really necessary. */
+	    i = 1;
+	    while (histHashTable[hash2tableIndex(hi+i, histHashTableLength)] ==
+		   deletedHTE)
+		i++;
+	    if (histHashTable[hash2tableIndex(hi+i, histHashTableLength)] ==
+		emptyHTE) {
+		/* dummies are no longer necessary placeholders. */
+		deletes = i;
+		while (i-- > 0) {
+		    histHashTable[hash2tableIndex(hi+i, histHashTableLength)] =
+			emptyHTE;
+		}
+	    }
+	    hashStats.deleted += 1 - deletes; /* delta deleted entries */
+	    hashStats.removeCount++;
+            return;
+        }
+        hi++;                           /* linear rehash */
+    }
+    assert(!"Hist entry not found in hash table");
 }
 
+/* Search the history hash table for a command matching lp, using hashval as
+ * its hash value. */
+static struct Hist *
+findHistHashTable(struct wordent *lp, unsigned hashval)
+{
+    unsigned deleted = 0;		/* number of deleted entries skipped */
+    unsigned hi = hashval;
+    struct Hist *hp;
+    if (!histHashTable)
+	return NULL;
+    while ((hi = hash2tableIndex(hi, histHashTableLength)),
+           (hp = histHashTable[hi]) != emptyHTE) {
+        if (hp == deletedHTE)
+	    deleted++;
+	else if (hp->Hhash == hashval && heq(lp, &(hp->Hlex)))
+            return hp;
+	if (deleted > (histHashTableLength>>4)) {
+	    /* lots of deletes, so we need a sparser table. */
+            discardHistHashTable();
+            createHistHashTable(histHashTableLength);
+	    return findHistHashTable(lp, hashval);
+	}
+        hi++;                           /* linear rehash */
+    }
+    return NULL;
+}
+
+/* When merge semantics are in use, find the approximate predecessor for the
+ * new entry, so that the Htime entries are decreasing.  Return the entry just
+ * before the first entry with equal times, so the caller can check for
+ * duplicates.  When pTime is not NULL, use it as a starting point for search,
+ * otherwise search from beginning (largest time value) of history list. */
+PG_STATIC struct Hist *
+mergeInsertionPoint(
+    struct Hist *np,                      /* new entry to be inserted */
+    struct Hist *pTime)                   /* hint about where to insert */
+{
+    struct Hist *pp, *p;
+    if (histTail && histTail->Htime >= np->Htime)
+	pTime = histTail;		/* new entry goes at the end */
+    if (histMerg && histMerg != &Histlist && histMerg != Histlist.Hnext) {
+	/* Check above and below previous insertion point, in case we're adding
+	 * sequential times in the middle of the list (e.g. history -M). */
+	if (histMerg->Htime >= np->Htime)
+	    pTime = histMerg;
+	else if (histMerg->Hprev->Htime >= np->Htime)
+	    pTime = histMerg->Hprev;
+    }
+    if (pTime) {
+        /* With hint, search up the list until Htime is greater.  We skip past
+         * the equal ones, too, so our caller can elide duplicates. */
+        pp = pTime;
+        while (pp != &Histlist && pp->Htime <= np->Htime)
+            pp = pp->Hprev;
+    } else
+        pp = &Histlist;
+    /* Search down the list while current entry's time is too large. */
+    while ((p = pp->Hnext) && (p->Htime > np->Htime))
+            pp = p;                     /* advance insertion point */
+    /* Remember recent position as hint for next time */
+    histMerg = pp;
+    return pp;
+}
+
+/* Bubble Hnum & Href in new entry down to pp through earlier part of list. */
+PG_STATIC void bubbleHnumHrefDown(struct Hist *np, struct Hist *pp)
+{
+    struct Hist *p;
+    for (p = Histlist.Hnext; p != pp->Hnext; p = p->Hnext) {
+        /* swap Hnum & Href values of p and np. */
+        int n = p->Hnum, r = p->Href;
+        p->Hnum = np->Hnum; p->Href = np->Href;
+        np->Hnum = n; np->Href = r;
+    }
+}
 
+/* Enter new command into the history list according to current settings. */
 struct Hist *
-enthist(int event, struct wordent *lp, int docopy, int mflg)
+enthist(
+  int event,				/* newly incremented global eventno */
+  struct wordent *lp,
+  int docopy,
+  int mflg,				/* true if merge requested */
+  int histlen)				/* -1 if unknown */
 {
-    struct Hist *p = NULL, *pp = &Histlist;
-    int n, r;
+    struct Hist *p = NULL, *pp = &Histlist, *pTime = NULL;
     struct Hist *np;
     const Char *dp;
-    
+    unsigned lpHash = 0;                /* non-zero if hashing entries */
+
     if ((dp = varval(STRhistdup)) != STRNULL) {
 	if (eq(dp, STRerase)) {
 	    /* masaoki@akebono.tky.hp.com (Kobayashi Masaoki) */
-	    struct Hist *px;
-	    for (p = pp; (px = p, p = p->Hnext) != NULL;)
-		if (heq(lp, &(p->Hlex))){
-		    px->Hnext = p->Hnext;
-		    if (Htime != 0 && p->Htime > Htime)
-			Htime = p->Htime;
-		    n = p->Href;
-		    hfree(p);
-		    for (p = px->Hnext; p != NULL; p = p->Hnext)
-			p->Href = n--;
-		    break;
-		}
+            createHistHashTable(histlen);
+            lpHash = hashhist(lp);
+            assert(lpHash != 0);
+            p = findHistHashTable(lp, lpHash);
+            if (p) {
+		if (Htime != 0 && p->Htime > Htime)
+		    Htime = p->Htime;
+                /* If we are merging, and the old entry is at the place we want
+                 * to insert the new entry, then remember the place. */
+                if (mflg && Htime != 0 && p->Hprev->Htime >= Htime)
+                    pTime = p->Hprev;
+		if (!fastMergeErase)
+		    renumberHist(p);	/* Reset Href of subsequent entries */
+                hremove(p);
+		hfree(p);
+                p = NULL;               /* so new entry is allocated below */
+	    }
 	}
 	else if (eq(dp, STRall)) {
-	    for (p = pp; (p = p->Hnext) != NULL;)
-		if (heq(lp, &(p->Hlex))) {
-		    eventno--;
-		    break;
-		}
+            createHistHashTable(histlen);
+            lpHash = hashhist(lp);
+            assert(lpHash != 0);
+            p = findHistHashTable(lp, lpHash);
+	    if (p)   /* p!=NULL, only update this entry's Htime below */
+		eventno--;		/* not adding a new event */
 	}
 	else if (eq(dp, STRprev)) {
 	    if (pp->Hnext && heq(lp, &(pp->Hnext->Hlex))) {
@@ -149,14 +986,15 @@ enthist(int event, struct wordent *lp, int docopy, int mflg)
 	Htime = 0;
     }
     else
-	(void) time(&(np->Htime));
+        (void) time(&(np->Htime));
 
     if (p == np)
-	return np;
+        return np;                      /* reused existing entry */
 
+    /* Initialize the new entry. */
     np->Hnum = np->Href = event;
     if (docopy) {
-	copylex(&np->Hlex, lp);
+        copylex(&np->Hlex, lp);
 	if (histvalid)
 	    np->histline = Strsave(histline.s);
 	else
@@ -166,46 +1004,127 @@ enthist(int event, struct wordent *lp, int docopy, int mflg)
 	np->Hlex.next = lp->next;
 	lp->next->prev = &np->Hlex;
 	np->Hlex.prev = lp->prev;
-	lp->prev->next = &np->Hlex;
-	np->histline = NULL;
-    }
-    if (mflg)
-      {
-        while ((p = pp->Hnext) && (p->Htime > np->Htime))
-	  pp = p;
-	while (p && p->Htime == np->Htime)
-	  {
-	    if (heq(&p->Hlex, &np->Hlex))
-	      {
-	        eventno--;
-		hfree(np);
-	        return (p);
-	      }
-	    pp = p;
-	    p = p->Hnext;
-	  }
-	for (p = Histlist.Hnext; p != pp->Hnext; p = p->Hnext)
-	  {
-	    n = p->Hnum; r = p->Href;
-	    p->Hnum = np->Hnum; p->Href = np->Href;
-	    np->Hnum = n; np->Href = r;
-	  }
-      }
-    np->Hnext = pp->Hnext;
-    pp->Hnext = np;
+        lp->prev->next = &np->Hlex;
+        np->histline = NULL;
+    }
+    np->Hhash = 0;
+
+    /* The head of history list is the default insertion point.
+       If merging, advance insertion point, in pp, according to Htime. */
+    /* XXX -- In histdup=all, Htime values can be non-monotonic. */
+    if (mflg) {                         /* merge according to np->Htime */
+        pp = mergeInsertionPoint(np, pTime);
+        for (p = pp->Hnext; p && p->Htime == np->Htime; pp = p, p = p->Hnext) {
+            if (heq(&p->Hlex, &np->Hlex)) {
+                eventno--;              /* duplicate, so don't add new event */
+                hfree(np);
+                return (p);
+              }
+          }
+        /* pp is now the last entry with time >= to np. */
+	if (!fastMergeErase) {		/* renumber at end of loadhist */
+	    /* Before inserting np after pp, bubble its Hnum & Href values down
+	     * through the earlier part of list. */
+	    bubbleHnumHrefDown(np, pp);
+	}
+    }
+    else
+        pp = &Histlist;                 /* insert at beginning of history */
+    hinsert(np, pp);
+    if (lpHash && histlen != 0)		/* erase & all modes use hash table */
+        insertHistHashTable(np, lpHash);
+    else
+        discardHistHashTable();
     return (np);
 }
 
 static void
 hfree(struct Hist *hp)
 {
-
+    assert(hp != histMerg);
+    if (hp->Hhash)
+        removeHistHashTable(hp);
     freelex(&hp->Hlex);
     if (hp->histline)
-	xfree(hp->histline);
+        xfree(hp->histline);
     xfree(hp);
 }
 
+PG_STATIC void
+phist(struct Hist *hp, int hflg)
+{
+    if (hflg & HIST_ONLY) {
+	int old_output_raw;
+
+       /*
+        * Control characters have to be written as is (output_raw).
+        * This way one can preserve special characters (like tab) in
+        * the history file.
+        * From: mveksler@vnet.ibm.com (Veksler Michael)
+        */
+	old_output_raw = output_raw;
+        output_raw = 1;
+	cleanup_push(&old_output_raw, output_raw_restore);
+	if (hflg & HIST_TIME)
+	    /* 
+	     * Make file entry with history time in format:
+	     * "+NNNNNNNNNN" (10 digits, left padded with ascii '0') 
+	     */
+
+	    xprintf("#+%010lu\n", (unsigned long)hp->Htime);
+
+	if (HistLit && hp->histline)
+	    xprintf("%S\n", hp->histline);
+	else
+	    prlex(&hp->Hlex);
+        cleanup_until(&old_output_raw);
+    }
+    else {
+	Char   *cp = str2short("%h\t%T\t%R\n");
+	Char *p;
+	struct varent *vp = adrof(STRhistory);
+
+	if (vp && vp->vec != NULL && vp->vec[0] && vp->vec[1])
+	    cp = vp->vec[1];
+
+	p = tprintf(FMT_HISTORY, cp, NULL, hp->Htime, hp);
+	cleanup_push(p, xfree);
+	for (cp = p; *cp;)
+	    xputwchar(*cp++);
+	cleanup_until(p);
+    }
+}
+
+PG_STATIC void
+dophist(int n, int hflg)
+{
+    struct Hist *hp;
+    if (setintr) {
+	int old_pintr_disabled;
+
+	pintr_push_enable(&old_pintr_disabled);
+	cleanup_until(&old_pintr_disabled);
+    }
+    if ((hflg & HIST_REV) == 0) {
+	/* Since the history list is stored most recent first, non-reversing
+	 * print needs to print (backwards) up the list. */
+	if ((unsigned)n >= histCount)
+	    hp = histTail;
+	else {
+	    for (hp = Histlist.Hnext;
+		 --n > 0 && hp->Hnext != NULL;
+		 hp = hp->Hnext)
+		;
+	}
+	if (hp == NULL)
+	    return;			/* nothing to print */
+	for (; hp != &Histlist; hp = hp->Hprev)
+	    phist(hp, hflg);
+    } else {
+	for (hp = Histlist.Hnext; n-- > 0 && hp != NULL; hp = hp->Hnext)
+	    phist(hp, hflg);
+    }
+}
 
 /*ARGSUSED*/
 void
@@ -247,11 +1166,10 @@ dohist(Char **vp, struct command *c)
 		break;
 	    }
     }
-
     if (hflg & HIST_CLEAR) {
-	struct Hist *np, *hp;
-	for (hp = &Histlist; (np = hp->Hnext) != NULL;)
-	    hp->Hnext = np->Hnext, hfree(np);
+        struct Hist *np, *hp;
+        for (hp = &Histlist; (np = hp->Hnext) != NULL;)
+            hremove(np), hfree(np);
     }
 
     if (hflg & (HIST_LOAD | HIST_MERGE))
@@ -264,76 +1182,7 @@ dohist(Char **vp, struct command *c)
 	else {
 	    n = getn(varval(STRhistory));
 	}
-	dohist1(Histlist.Hnext, &n, hflg);
-    }
-}
-
-static void
-dohist1(struct Hist *hp, int *np, int hflg)
-{
-    int    print = (*np) > 0;
-
-    for (; hp != 0; hp = hp->Hnext) {
-	if (setintr) {
-	    int old_pintr_disabled;
-
-	    pintr_push_enable(&old_pintr_disabled);
-	    cleanup_until(&old_pintr_disabled);
-	}
-	(*np)--;
-	if ((hflg & HIST_REV) == 0) {
-	    dohist1(hp->Hnext, np, hflg);
-	    if (print)
-		phist(hp, hflg);
-	    return;
-	}
-	if (*np >= 0)
-	    phist(hp, hflg);
-    }
-}
-
-static void
-phist(struct Hist *hp, int hflg)
-{
-    if (hflg & HIST_ONLY) {
-	int old_output_raw;
-
-       /*
-        * Control characters have to be written as is (output_raw).
-        * This way one can preserve special characters (like tab) in
-        * the history file.
-        * From: mveksler@vnet.ibm.com (Veksler Michael)
-        */
-	old_output_raw = output_raw;
-        output_raw = 1;
-	cleanup_push(&old_output_raw, output_raw_restore);
-	if (hflg & HIST_TIME)
-	    /* 
-	     * Make file entry with history time in format:
-	     * "+NNNNNNNNNN" (10 digits, left padded with ascii '0') 
-	     */
-
-	    xprintf("#+%010lu\n", (unsigned long)hp->Htime);
-
-	if (HistLit && hp->histline)
-	    xprintf("%S\n", hp->histline);
-	else
-	    prlex(&hp->Hlex);
-        cleanup_until(&old_output_raw);
-    }
-    else {
-	Char   *cp = str2short("%h\t%T\t%R\n");
-	Char *p;
-	struct varent *vp = adrof(STRhistory);
-
-	if (vp && vp->vec != NULL && vp->vec[0] && vp->vec[1])
-	    cp = vp->vec[1];
-
-	p = tprintf(FMT_HISTORY, cp, NULL, hp->Htime, hp);
-	cleanup_push(p, xfree);
-	for (cp = p; *cp;)
-	    xputwchar(*cp++);
-	cleanup_until(p);
+	dophist(n, hflg);
     }
 }
 
@@ -371,6 +1220,7 @@ fmthist(int fmt, ptr_t ptr)
     }
 }
 
+/* Save history before exiting the shell. */
 void
 rechist(Char *fname, int ref)
 {
@@ -424,10 +1274,11 @@ rechist(Char *fname, int ref)
     if ((shist = adrof(STRsavehist)) != NULL && shist->vec != NULL)
 	if (shist->vec[1] && eq(shist->vec[1], STRmerge))
 	    loadhist(fname, 1);
+
     fp = xcreat(short2str(fname), 0600);
+    cleanup_until(fname);
     if (fp == -1) {
 	didfds = oldidfds;
-	cleanup_until(fname);
 	return;
     }
     ftmp = SHOUT;
@@ -437,10 +1288,10 @@ rechist(Char *fname, int ref)
     xclose(fp);
     SHOUT = ftmp;
     didfds = oldidfds;
-    cleanup_until(fname);
 }
 
 
+/* This is the entry point for loading history data from a file. */
 void
 loadhist(Char *fname, int mflg)
 {
@@ -455,4 +1306,14 @@ loadhist(Char *fname, int mflg)
 	loadhist_cmd[2] = STRtildothist;
 
     dosource(loadhist_cmd, NULL);
+
+    /* During history merging (enthist sees mflg set), we disable management of
+     * Hnum and Href (because fastMergeErase is true).  So now reset all the
+     * values based on the final ordering of the history list. */
+    if (mflg) {
+	int n = eventno;
+        struct Hist *hp = &Histlist;
+        while ((hp = hp->Hnext))
+	    hp->Hnum = hp->Href = n--;
+    }
 }
diff --git a/contrib/tcsh/sh.lex.c b/contrib/tcsh/sh.lex.c
index 536097e..80643f7 100644
--- a/contrib/tcsh/sh.lex.c
+++ b/contrib/tcsh/sh.lex.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.lex.c,v 3.81 2009/06/25 21:15:37 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.lex.c,v 3.87 2011/01/24 17:48:15 christos Exp $ */
 /*
  * sh.lex.c: Lexical analysis into tokens
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.lex.c,v 3.81 2009/06/25 21:15:37 christos Exp $")
+RCSID("$tcsh: sh.lex.c,v 3.87 2011/01/24 17:48:15 christos Exp $")
 
 #include "ed.h"
 
@@ -460,7 +460,13 @@ getC1(int flag)
 		setexclp(exclnxt->word);
 	    continue;
 	}
-	c = readc(0);
+	c = readc(1);
+
+	/* Catch EOF in the middle of a line.  (An EOF at the beginning of
+	 * a line would have been processed by the readc(0) in lex().) */
+	if (c == CHAR_ERR)
+	    c = '\n';
+
 	if (c == '$' && (flag & DODOL)) {
 	    getdol();
 	    continue;
@@ -672,11 +678,11 @@ getexcl(Char sc)
     eChar c;
 
     if (sc == 0) {
-	sc = getC(0);
-	if (sc != '{') {
-	    ungetC(sc);
-	    sc = 0;
-	}
+	c = getC(0);
+	if (c == '{')
+	    sc = (Char) c;
+	else
+	    ungetC(c);
     }
     quesarg = -1;
 
@@ -693,7 +699,7 @@ getexcl(Char sc)
 	for (ip = hp->next->next; ip != hp->prev; ip = ip->next)
 	    dol++;
     left = 0, right = dol;
-    if (sc == HISTSUB) {
+    if (sc == HISTSUB && HISTSUB != '\0') {
 	ungetC('s'), unreadc(HISTSUB), c = ':';
 	goto subst;
     }
@@ -726,7 +732,7 @@ subst:
     exclc = right - left + 1;
     while (--left >= 0)
 	hp = hp->next;
-    if (sc == HISTSUB || c == ':') {
+    if ((sc == HISTSUB && HISTSUB != '\0') || c == ':') {
 	do {
 	    hp = getsub(hp);
 	    c = getC(0);
@@ -928,7 +934,7 @@ dosub(Char sc, struct wordent *en, int global)
      * ANSI mode HP/UX compiler chokes on
      * return &enthist(HIST_PURGE, &lexi, 0)->Hlex;
      */
-    hst = enthist(HIST_PURGE, &lexi, 0, 0);
+    hst = enthist(HIST_PURGE, &lexi, 0, 0, -1);
     return &(hst->Hlex);
 }
 
@@ -1147,7 +1153,7 @@ gethent(Char sc)
     int     event;
     int    back = 0;
 
-    c = sc == HISTSUB ? (eChar)HIST : getC(0);
+    c = (sc == HISTSUB && HISTSUB != '\0') ? (eChar)HIST : getC(0);
     if (c == (eChar)HIST) {
 	if (alhistp)
 	    return (alhistp);
@@ -1258,7 +1264,7 @@ gethent(Char sc)
 	    lastev = hp->Hnum;
 	    return (&hp->Hlex);
 	}
-    np = putn(event);
+    np = putn((tcsh_number_t)event);
     seterror(ERR_NOEVENT, short2str(np));
     xfree(np);
     return (0);
diff --git a/contrib/tcsh/sh.misc.c b/contrib/tcsh/sh.misc.c
index 7c4094f..08ec30d 100644
--- a/contrib/tcsh/sh.misc.c
+++ b/contrib/tcsh/sh.misc.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.misc.c,v 3.45 2006/10/14 17:57:21 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.misc.c,v 3.46 2010/05/08 00:41:58 christos Exp $ */
 /*
  * sh.misc.c: Miscelaneous functions
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.misc.c,v 3.45 2006/10/14 17:57:21 christos Exp $")
+RCSID("$tcsh: sh.misc.c,v 3.46 2010/05/08 00:41:58 christos Exp $")
 
 static	int	renum	(int, int);
 static  Char  **blkend	(Char **);
@@ -60,6 +60,7 @@ setzero(void *p, size_t size)
     memset(p, 0, size);
 }
 
+#ifndef SHORT_STRINGS
 char *
 strnsave(const char *s, size_t len)
 {
@@ -70,6 +71,7 @@ strnsave(const char *s, size_t len)
     r[len] = '\0';
     return r;
 }
+#endif
 
 char   *
 strsave(const char *s)
diff --git a/contrib/tcsh/sh.parse.c b/contrib/tcsh/sh.parse.c
index 2ef20c4..35ffe83 100644
--- a/contrib/tcsh/sh.parse.c
+++ b/contrib/tcsh/sh.parse.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.parse.c,v 3.18 2006/03/02 18:46:44 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.parse.c,v 3.19 2011/03/30 16:21:37 christos Exp $ */
 /*
  * sh.parse.c: Interpret a list of tokens
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.parse.c,v 3.18 2006/03/02 18:46:44 christos Exp $")
+RCSID("$tcsh: sh.parse.c,v 3.19 2011/03/30 16:21:37 christos Exp $")
 
 /*
  * C shell
@@ -677,6 +677,9 @@ freesyn(struct command *t)
     default:
 	break;
     }
+#ifdef DEBUG
+    memset(t, 0, sizeof(*t));
+#endif
     xfree(t);
 }
 
diff --git a/contrib/tcsh/sh.print.c b/contrib/tcsh/sh.print.c
index 4fc79cf..f32d422 100644
--- a/contrib/tcsh/sh.print.c
+++ b/contrib/tcsh/sh.print.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.print.c,v 3.33 2006/08/23 15:03:14 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.print.c,v 3.36 2011/05/25 20:17:20 christos Exp $ */
 /*
  * sh.print.c: Primitive Output routines.
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.print.c,v 3.33 2006/08/23 15:03:14 christos Exp $")
+RCSID("$tcsh: sh.print.c,v 3.36 2011/05/25 20:17:20 christos Exp $")
 
 #include "ed.h"
 
@@ -222,7 +222,7 @@ drainoline(void)
 void
 flush(void)
 {
-    int unit;
+    int unit, oldexitset = exitset;
     static int interrupted = 0;
 
     /* int lmode; */
@@ -231,10 +231,16 @@ flush(void)
 	return;
     if (GettingInput && !Tty_raw_mode && linp < &linbuf[sizeof linbuf - 10])
 	return;
+    if (handle_intr)
+	exitset = 1;
+
     if (interrupted) {
 	interrupted = 0;
 	linp = linbuf;		/* avoid recursion as stderror calls flush */
-	stderror(ERR_SILENT);
+	if (handle_intr)
+	    fixerror();
+	else
+	    stderror(ERR_SILENT);
     }
     interrupted = 1;
     if (haderr)
@@ -279,6 +285,12 @@ flush(void)
 	 */
 	case ESTALE:
 #endif
+#ifdef ENOENT
+	/*
+	 * Deal with SoFS bogocity: returns ENOENT instead of ESTALE.
+	 */
+	case ENOENT:
+#endif
 	/*
 	 * Over our quota, writing the history file
 	 */
@@ -286,13 +298,18 @@ flush(void)
 	case EDQUOT:
 #endif
 	/* Nothing to do, but die */
-	    xexit(1);
-	    break;
+	    if (handle_intr == 0)
+		xexit(1);
+	    /*FALLTHROUGH*/
 	default:
-	    stderror(ERR_SILENT);
+	    if (handle_intr)
+		fixerror();
+	    else
+		stderror(ERR_SILENT);
 	    break;
 	}
 
+    exitset = oldexitset;
     linp = linbuf;
     interrupted = 0;
 }
diff --git a/contrib/tcsh/sh.proc.c b/contrib/tcsh/sh.proc.c
index d57f324..f2356d1 100644
--- a/contrib/tcsh/sh.proc.c
+++ b/contrib/tcsh/sh.proc.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.proc.c,v 3.109 2009/06/25 21:15:37 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.proc.c,v 3.121 2012/01/25 15:34:41 christos Exp $ */
 /*
  * sh.proc.c: Job manipulations
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.proc.c,v 3.109 2009/06/25 21:15:37 christos Exp $")
+RCSID("$tcsh: sh.proc.c,v 3.121 2012/01/25 15:34:41 christos Exp $")
 
 #include "ed.h"
 #include "tc.h"
@@ -47,8 +47,10 @@ RCSID("$tcsh: sh.proc.c,v 3.109 2009/06/25 21:15:37 christos Exp $")
 # define HZ 16
 #endif /* aiws */
 
-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(linux) || defined(__GNU__) || defined(__GLIBC__)
-# define BSDWAIT
+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
+# if !defined(__ANDROID__)
+#  define BSDWAIT
+# endif
 #endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */
 #ifndef WTERMSIG
 # define WTERMSIG(w)	(((union wait *) &(w))->w_termsig)
@@ -188,7 +190,7 @@ loop:
         (setintr && (intty || insource) ? WNOHANG | WUNTRACED : WNOHANG), &ru);
 #   else
     /* both a wait3 and rusage */
-#    if !defined(BSDWAIT) || defined(NeXT) || defined(MACH) || defined(linux) || defined(__GNU__) || defined(__GLIBC__) || (defined(IRIS4D) && SYSVREL <= 3) || defined(__lucid) || defined(__osf__)
+#    if !defined(BSDWAIT) || defined(NeXT) || defined(MACH) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || (defined(IRIS4D) && SYSVREL <= 3) || defined(__lucid) || defined(__osf__)
     pid = wait3(&w,
        (setintr && (intty || insource) ? WNOHANG | WUNTRACED : WNOHANG), &ru);
 #    else /* BSDWAIT */
@@ -221,7 +223,11 @@ loop:
 #   ifdef hpux
     pid = wait3(&w.w_status, WNOHANG, 0);
 #   else	/* !hpux */
+#     ifndef BSDWAIT
+    pid = wait3(&w, WNOHANG, &ru);
+#     else
     pid = wait3(&w.w_status, WNOHANG, &ru);
+#     endif /* BSDWAIT */
 #   endif /* !hpux */
 #  else /* !BSDTIMES */
 #   ifdef ODT  /* For Sco Unix 3.2.0 or ODT 1.0 */
@@ -260,7 +266,7 @@ loop:
     jobdebug_flush();
 
     if ((pid == 0) || (pid == -1)) {
-	handle_pending_signals();
+	(void)handle_pending_signals();
 	jobdebug_xprintf(("errno == %d\n", errno));
 	if (errno == EINTR)
 	    goto loop;
@@ -367,6 +373,7 @@ found:
 #ifdef notdef
 		jobflags & PAEXITED ||
 #endif /* notdef */
+		fp->p_cwd == NULL ||
 		!eq(dcwd->di_name, fp->p_cwd->di_name))) {
 	    /* PWP: print a newline after ^C */
 		if (jobflags & PINTERRUPTED) {
@@ -501,7 +508,7 @@ pjwait(struct process *pp)
     pause_mask = oset;
     sigdelset(&pause_mask, SIGCHLD);
     for (;;) {
-	handle_pending_signals();
+	(void)handle_pending_signals();
 	jobflags = 0;
 	do
 	    jobflags |= fp->p_flags;
@@ -551,6 +558,11 @@ pjwait(struct process *pp)
     reason = 0;
     fp = pp;
     do {
+	/* In case of pipelines only the result of the last
+	 * command should be taken in account */
+	if (!anyerror && !(fp->p_flags & PBRACE)
+		&& ((fp->p_flags & PPOU) || (fp->p_flags & PBACKQ)))
+	    continue;
 	if (fp->p_reason)
 	    reason = fp->p_flags & (PSIGNALED | PINTERRUPTED) ?
 		fp->p_reason | META : fp->p_reason;
@@ -562,7 +574,7 @@ pjwait(struct process *pp)
     if ((reason != 0) && (adrof(STRprintexitvalue)) && 
 	(pp->p_flags & PBACKQ) == 0)
 	xprintf(CGETS(17, 2, "Exit %d\n"), reason);
-    reason_str = putn(reason);
+    reason_str = putn((tcsh_number_t)reason);
     cleanup_push(reason_str, xfree);
     setv(STRstatus, reason_str, VAR_READWRITE);
     cleanup_ignore(reason_str);
@@ -582,6 +594,7 @@ dowait(Char **v, struct command *c)
 {
     struct process *pp;
     sigset_t pause_mask;
+    int opintr_disabled, gotsig;
 
     USE(c);
     USE(v);
@@ -594,9 +607,14 @@ loop:
     for (pp = proclist.p_next; pp; pp = pp->p_next)
 	if (pp->p_procid &&	/* pp->p_procid == pp->p_jobid && */
 	    pp->p_flags & PRUNNING) {
-	    handle_pending_signals();
+	    (void)handle_pending_signals();
 	    sigsuspend(&pause_mask);
-	    handle_pending_signals();
+	    opintr_disabled = pintr_disabled;
+	    pintr_disabled = 0;
+	    gotsig = handle_pending_signals();
+	    pintr_disabled = opintr_disabled;
+	    if (gotsig)
+		break;
 	    goto loop;
 	}
     pjobs = 0;
@@ -719,6 +737,7 @@ palloc(pid_t pid, struct command *t)
 
     pp = xcalloc(1, sizeof(struct process));
     pp->p_procid = pid;
+    pp->p_parentid = shpgrp;
     pp->p_flags = ((t->t_dflg & F_AMPERSAND) ? 0 : PFOREGND) | PRUNNING;
     if (t->t_dflg & F_TIME)
 	pp->p_flags |= PPTIME;
@@ -726,6 +745,8 @@ palloc(pid_t pid, struct command *t)
 	pp->p_flags |= PBACKQ;
     if (t->t_dflg & F_HUP)
 	pp->p_flags |= PHUP;
+    if (t->t_dcom && t->t_dcom[0] && (*t->t_dcom[0] == '{'))
+	pp->p_flags |= PBRACE;
     if (cmdmax == 0)
 	morecommand(CMD_INIT);
     cmdp = cmdstr;
@@ -910,6 +931,7 @@ pendjob(void)
 
     if (pcurrjob && (pcurrjob->p_flags & (PFOREGND | PSTOPPED)) == 0) {
 	pp = pcurrjob;
+	pcurrjob = NULL;
 	while (pp->p_procid != pp->p_jobid)
 	    pp = pp->p_friends;
 	xprintf("[%d]", pp->p_index);
@@ -1870,7 +1892,7 @@ pfork(struct command *t, int wanttty)
 	    sigdelset(&pause_mask, SIGCHLD);
 	    sigdelset(&pause_mask, SIGSYNCH);
 	    sigsuspend(&pause_mask);
-	    handle_pending_signals();
+	    (void)handle_pending_signals();
 	    if (sigaction(SIGSYNCH, &osa, NULL))
 		stderror(ERR_SYSTEM, "pfork parent: sigaction restore",
 			 strerror(errno));
diff --git a/contrib/tcsh/sh.proc.h b/contrib/tcsh/sh.proc.h
index 48a3771..bb59dd6 100644
--- a/contrib/tcsh/sh.proc.h
+++ b/contrib/tcsh/sh.proc.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.proc.h,v 3.13 2009/06/19 16:35:33 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.proc.h,v 3.15 2011/04/14 18:25:25 christos Exp $ */
 /*
  * sh.proc.h: Process data structures and variables
  */
@@ -51,6 +51,7 @@ struct process {
     unsigned long p_flags;	/* various job status flags */
     unsigned char p_reason;	/* reason for entering this state */
     int     p_index;		/* shorthand job index */
+    pid_t   p_parentid;		/* parent pid */
     pid_t   p_procid;
     pid_t   p_jobid;		/* pid of job leader */
     /* if a job is stopped/background p_jobid gives its pgrp */
@@ -102,6 +103,7 @@ struct process {
 #define	PNEEDNOTE	(1<<15)	/* notify as soon as practical */
 #define PBACKQ		(1<<16)	/* Process is `` evaluation */
 #define PHUP		(1<<17)	/* Process is marked for SIGHUP on exit */
+#define PBRACE		(1<<18)	/* Process is {} evaluation */
 
 /* defines for arguments to pprint */
 #define	NUMBER		01
diff --git a/contrib/tcsh/sh.sem.c b/contrib/tcsh/sh.sem.c
index c9e2581..c880974 100644
--- a/contrib/tcsh/sh.sem.c
+++ b/contrib/tcsh/sh.sem.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.sem.c,v 3.80 2009/06/25 21:27:38 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.sem.c,v 3.86 2011/02/25 23:24:19 christos Exp $ */
 /*
  * sh.sem.c: I/O redirections and job forking. A touchy issue!
  *	     Most stuff with builtins is incorrect
@@ -33,7 +33,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.sem.c,v 3.80 2009/06/25 21:27:38 christos Exp $")
+RCSID("$tcsh: sh.sem.c,v 3.86 2011/02/25 23:24:19 christos Exp $")
 
 #include "tc.h"
 #include "tw.h"
@@ -50,7 +50,7 @@ RCSID("$tcsh: sh.sem.c,v 3.80 2009/06/25 21:27:38 christos Exp $")
 #endif /* CLOSE_ON_EXEC */
 
 #if defined(__sparc__) || defined(sparc)
-# if !defined(MACH) && SYSVREL == 0 && !defined(Lynx) && !defined(BSD4_4) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__)
+# if !defined(MACH) && SYSVREL == 0 && !defined(Lynx) && !defined(BSD4_4) && !defined(__linux__) && !defined(__GNU__) && !defined(__GLIBC__)
 #  include <vfork.h>
 # endif /* !MACH && SYSVREL == 0 && !Lynx && !BSD4_4 && !glibc */
 #endif /* __sparc__ || sparc */
@@ -232,8 +232,7 @@ execute(struct command *t, volatile int wanttty, int *pipein, int *pipeout,
 		    if (strchr("+-", t->t_dcom[1][0])) {
 			if (t->t_dcom[2]) {
 			    setname("nice");
-			    t->t_nice =
-				getn(t->t_dcom[1]);
+			    t->t_nice = (unsigned char)getn(t->t_dcom[1]);
 			    lshift(t->t_dcom, 2);
 			    t->t_dflg |= F_NICE;
 			}
@@ -629,10 +628,19 @@ execute(struct command *t, volatile int wanttty, int *pipein, int *pipeout,
 	 * possible stopping
 	 */
 	if (bifunc) {
-	    func(t, bifunc);
-	    if (forked)
+	    if (forked) {
+		func(t, bifunc);
 		exitstat();
-	    else {
+	    } else {
+		jmp_buf_t oldexit;
+		int ohaderr = haderr;
+
+		getexit(oldexit);
+		if (setexit() == 0)
+		    func(t, bifunc);
+		resexit(oldexit);
+		haderr = ohaderr;
+
 		if (adrof(STRprintexitvalue)) {
 		    int rv = getn(varval(STRstatus));
 		    if (rv != 0)
@@ -648,11 +656,16 @@ execute(struct command *t, volatile int wanttty, int *pipein, int *pipeout,
 	/*
 	 * For () commands must put new 0,1,2 in FSH* and recurse
 	 */
-	(void)close_on_exec(OLDSTD = dcopy(0, FOLDSTD), 1);
-	(void)close_on_exec(SHOUT = dcopy(1, FSHOUT), 1);
-	isoutatty = isatty(SHOUT);
-	(void)close_on_exec(SHDIAG = dcopy(2, FSHDIAG), 1);
-	isdiagatty = isatty(SHDIAG);
+	if ((OLDSTD = dcopy(0, FOLDSTD)) >= 0)
+	    (void)close_on_exec(OLDSTD, 1);
+	if ((SHOUT = dcopy(1, FSHOUT)) >= 0) {
+	    (void)close_on_exec(SHOUT, 1);
+	    isoutatty = isatty(SHOUT);
+	}
+	if ((SHDIAG = dcopy(2, FSHDIAG)) >= 0) {
+	    (void)close_on_exec(SHDIAG, 1);
+	    isdiagatty = isatty(SHDIAG);
+    	}
 	xclose(SHIN);
 	SHIN = -1;
 #ifndef CLOSE_ON_EXEC
@@ -664,31 +677,31 @@ execute(struct command *t, volatile int wanttty, int *pipein, int *pipeout,
 #endif /* !CLOSE_ON_EXEC */
 	didfds = 0;
 	wanttty = -1;
-	t->t_dspr->t_dflg |= t->t_dflg & F_NOINTERRUPT;
+	t->t_dspr->t_dflg |= t->t_dflg & (F_NOINTERRUPT | F_BACKQ);
 	execute(t->t_dspr, wanttty, NULL, NULL, do_glob);
 	exitstat();
 
     case NODE_PIPE:
 #ifdef BACKPIPE
 	t->t_dcdr->t_dflg |= F_PIPEIN | (t->t_dflg &
-			(F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT));
+	    (F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcdr, wanttty, pv, pipeout, do_glob);
-	t->t_dcar->t_dflg |= F_PIPEOUT |
-	    (t->t_dflg & (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT));
+	t->t_dcar->t_dflg |= F_PIPEOUT | (t->t_dflg &
+	    (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcar, wanttty, pipein, pv, do_glob);
 #else /* !BACKPIPE */
-	t->t_dcar->t_dflg |= F_PIPEOUT |
-	    (t->t_dflg & (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT));
+	t->t_dcar->t_dflg |= F_PIPEOUT | (t->t_dflg &
+	    (F_PIPEIN | F_AMPERSAND | F_STDERR | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcar, wanttty, pipein, pv, do_glob);
 	t->t_dcdr->t_dflg |= F_PIPEIN | (t->t_dflg &
-			(F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT));
+	    (F_PIPEOUT | F_AMPERSAND | F_NOFORK | F_NOINTERRUPT | F_BACKQ));
 	execute(t->t_dcdr, wanttty, pv, pipeout, do_glob);
 #endif /* BACKPIPE */
 	break;
 
     case NODE_LIST:
 	if (t->t_dcar) {
-	    t->t_dcar->t_dflg |= t->t_dflg & F_NOINTERRUPT;
+	    t->t_dcar->t_dflg |= t->t_dflg & (F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcar, wanttty, NULL, NULL, do_glob);
 	    /*
 	     * In strange case of A&B make a new job after A
@@ -699,7 +712,7 @@ execute(struct command *t, volatile int wanttty, int *pipein, int *pipeout,
 	}
 	if (t->t_dcdr) {
 	    t->t_dcdr->t_dflg |= t->t_dflg &
-		(F_NOFORK | F_NOINTERRUPT);
+		(F_NOFORK | F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcdr, wanttty, NULL, NULL, do_glob);
 	}
 	break;
@@ -707,7 +720,7 @@ execute(struct command *t, volatile int wanttty, int *pipein, int *pipeout,
     case NODE_OR:
     case NODE_AND:
 	if (t->t_dcar) {
-	    t->t_dcar->t_dflg |= t->t_dflg & F_NOINTERRUPT;
+	    t->t_dcar->t_dflg |= t->t_dflg & (F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcar, wanttty, NULL, NULL, do_glob);
 	    if ((getn(varval(STRstatus)) == 0) !=
 		(t->t_dtyp == NODE_AND)) {
@@ -716,7 +729,7 @@ execute(struct command *t, volatile int wanttty, int *pipein, int *pipeout,
 	}
 	if (t->t_dcdr) {
 	    t->t_dcdr->t_dflg |= t->t_dflg &
-		(F_NOFORK | F_NOINTERRUPT);
+		(F_NOFORK | F_NOINTERRUPT | F_BACKQ);
 	    execute(t->t_dcdr, wanttty, NULL, NULL, do_glob);
 	}
 	break;
@@ -840,7 +853,7 @@ doio(struct command *t, int *pipein, int *pipeout)
 	}
 	else if (flags & F_PIPEIN) {
 	    xclose(0);
-	    IGNORE(dup(pipein[0]));
+	    TCSH_IGNORE(dup(pipein[0]));
 	    xclose(pipein[0]);
 	    xclose(pipein[1]);
 	}
@@ -850,7 +863,7 @@ doio(struct command *t, int *pipein, int *pipeout)
 	}
 	else {
 	    xclose(0);
-	    IGNORE(dup(OLDSTD));
+	    TCSH_IGNORE(dup(OLDSTD));
 #if defined(CLOSE_ON_EXEC) && defined(CLEX_DUPS)
 	    /*
 	     * PWP: Unlike Bezerkeley 4.3, FIONCLEX for Pyramid is preserved
@@ -903,12 +916,12 @@ doio(struct command *t, int *pipein, int *pipeout)
     }
     else if (flags & F_PIPEOUT) {
 	xclose(1);
-	IGNORE(dup(pipeout[1]));
+	TCSH_IGNORE(dup(pipeout[1]));
 	is1atty = 0;
     }
     else {
 	xclose(1);
-	IGNORE(dup(SHOUT));
+	TCSH_IGNORE(dup(SHOUT));
 	is1atty = isoutatty;
 # if defined(CLOSE_ON_EXEC) && defined(CLEX_DUPS)
 	(void) close_on_exec(1, 0);
@@ -917,11 +930,11 @@ doio(struct command *t, int *pipein, int *pipeout)
 
     xclose(2);
     if (flags & F_STDERR) {
-	IGNORE(dup(1));
+	TCSH_IGNORE(dup(1));
 	is2atty = is1atty;
     }
     else {
-	IGNORE(dup(SHDIAG));
+	TCSH_IGNORE(dup(SHDIAG));
 	is2atty = isdiagatty;
 # if defined(CLOSE_ON_EXEC) && defined(CLEX_DUPS)
 	(void) close_on_exec(2, 0);
diff --git a/contrib/tcsh/sh.set.c b/contrib/tcsh/sh.set.c
index 0047b7a..0f98a2b 100644
--- a/contrib/tcsh/sh.set.c
+++ b/contrib/tcsh/sh.set.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.set.c,v 3.72 2007/09/28 21:02:03 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.set.c,v 3.83 2012/01/15 17:15:28 christos Exp $ */
 /*
  * sh.set.c: Setting and Clearing of variables
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.set.c,v 3.72 2007/09/28 21:02:03 christos Exp $")
+RCSID("$tcsh: sh.set.c,v 3.83 2012/01/15 17:15:28 christos Exp $")
 
 #include "ed.h"
 #include "tw.h"
@@ -50,7 +50,7 @@ static	void		 asx		(Char *, int, Char *);
 static	struct varent 	*getvx		(Char *, int);
 static	Char		*xset		(Char *, Char ***);
 static	Char		*operate	(int, Char *, Char *);
-static	void	 	 putn1		(unsigned);
+static	void	 	 putn1		(tcsh_number_t);
 static	struct varent	*madrof		(Char *, struct varent *);
 static	void		 unsetv1	(struct varent *);
 static	void		 exportpath	(Char **);
@@ -76,13 +76,19 @@ update_vars(Char *vp)
 	Char *pn = varval(vp);
 
 	HIST = *pn++;
-	HISTSUB = *pn;
+	if (HIST)
+	    HISTSUB = *pn;
+	else
+	    HISTSUB = HIST;
     }
     else if (eq(vp, STRpromptchars)) {
 	Char *pn = varval(vp);
 
 	PRCH = *pn++;
-	PRCHROOT = *pn;
+	if (PRCH)
+	    PRCHROOT = *pn;
+	else
+	    PRCHROOT = PRCH;
     }
     else if (eq(vp, STRhistlit)) {
 	HistLit = 1;
@@ -100,6 +106,9 @@ update_vars(Char *vp)
     else if (eq(vp, STRloginsh)) {
 	loginsh = 1;
     }
+    else if (eq(vp, STRanyerror)) {
+	anyerror = 1;
+    }
     else if (eq(vp, STRsymlinks)) {
 	Char *pn = varval(vp);
 
@@ -184,7 +193,7 @@ update_vars(Char *vp)
 	tw_cmd_free();
     }
     else if (eq(vp, STRkillring)) {
-	SetKillRing(getn(varval(vp)));
+	SetKillRing((int)getn(varval(vp)));
     }
 #ifndef HAVENOUTMP
     else if (eq(vp, STRwatch)) {
@@ -222,7 +231,7 @@ void
 doset(Char **v, struct command *c)
 {
     Char *p;
-    Char   *vp, op;
+    Char   *vp;
     Char  **vecp;
     int    hadsub;
     int     subscr;
@@ -262,27 +271,26 @@ doset(Char **v, struct command *c)
     do {
 	hadsub = 0;
 	vp = p;
-	if (letter(*p))
-	    for (; alnum(*p); p++)
-		continue;
-	if (vp == p || !letter(*vp))
+	if (!letter(*p))
 	    stderror(ERR_NAME | ERR_VARBEGIN);
+	do {
+	    p++;
+	} while (alnum(*p));
 	if (*p == '[') {
 	    hadsub++;
 	    p = getinx(p, &subscr);
 	}
-	if ((op = *p) != 0) {
-	    *p++ = 0;
-	    if (*p == 0 && *v && **v == '(')
+	if (*p != '\0' && *p != '=')
+	    stderror(ERR_NAME | ERR_VARALNUM);
+	if (*p == '=') {
+	    *p++ = '\0';
+	    if (*p == '\0' && *v != NULL && **v == '(')
 		p = *v++;
 	}
 	else if (*v && eq(*v, STRequal)) {
-	    op = '=', v++;
-	    if (*v)
+	    if (*++v != NULL)
 		p = *v++;
 	}
-	if (op && op != '=')
-	    stderror(ERR_NAME | ERR_SYNTAX);
 	if (eq(p, STRLparen)) {
 	    Char **e = v;
 
@@ -479,7 +487,7 @@ operate(int op, Char *vp, Char *p)
     Char   *vec[5];
     Char **v = vec;
     Char  **vecp = v;
-    int i;
+    tcsh_number_t i;
 
     if (op != '=') {
 	if (*vp)
@@ -500,10 +508,10 @@ operate(int op, Char *vp, Char *p)
 
 static Char *putp;
 
-Char   *
-putn(int n)
+Char *
+putn(tcsh_number_t n)
 {
-    Char nbuf[(CHAR_BIT * sizeof (n) + 2) / 3 + 2]; /* Enough even for octal */
+    Char nbuf[1024]; /* Enough even for octal */
 
     putp = nbuf;
     if (n < 0) {
@@ -516,17 +524,17 @@ putn(int n)
 }
 
 static void
-putn1(unsigned n)
+putn1(tcsh_number_t n)
 {
     if (n > 9)
 	putn1(n / 10);
-    *putp++ = n % 10 + '0';
+    *putp++ = (Char)(n % 10 + '0');
 }
 
-int
-getn(Char *cp)
+tcsh_number_t
+getn(const Char *cp)
 {
-    int n;
+    tcsh_number_t n;
     int     sign;
     int base;
 
@@ -543,7 +551,7 @@ getn(Char *cp)
 	    stderror(ERR_NAME | ERR_BADNUM);
     }
 
-    if (cp[0] == '0' && cp[1])
+    if (cp[0] == '0' && cp[1] && is_set(STRparseoctal))
 	base = 8;
     else
 	base = 10;
@@ -751,13 +759,15 @@ unset(Char **v, struct command *c)
     if (adrof(STRignoreeof) == 0)
 	numeof = 0;
     if (adrof(STRpromptchars) == 0) {
-	PRCH = '>';
+	PRCH = tcsh ? '>' : '%';
 	PRCHROOT = '#';
     }
     if (adrof(STRhistlit) == 0)
 	HistLit = 0;
     if (adrof(STRloginsh) == 0)
 	loginsh = 0;
+    if (adrof(STRanyerror) == 0)
+	anyerror = 0;
     if (adrof(STRwordchars) == 0)
 	word_chars = STR_WORD_CHARS;
     if (adrof(STRedit) == 0)
@@ -861,10 +871,11 @@ unsetv1(struct varent *p)
     balance(pp, f, 1);
 }
 
+/* Set variable name to NULL. */
 void
-setNS(Char *cp)
+setNS(const Char *varName)
 {
-    setcopy(cp, STRNULL, VAR_READWRITE);
+    setcopy(varName, STRNULL, VAR_READWRITE);
 }
 
 /*ARGSUSED*/
@@ -1091,7 +1102,8 @@ x:
     }
 }
 
-#if defined(KANJI) && defined(SHORT_STRINGS) && defined(DSPMBYTE)
+#if defined(KANJI)
+# if defined(SHORT_STRINGS) && defined(DSPMBYTE)
 extern int dspmbyte_ls;
 
 void
@@ -1222,7 +1234,7 @@ autoset_dspmbyte(const Char *pcp)
 	{ STRLANGEUCJPB, STReuc },
 	{ STRLANGEUCKRB, STReuc },
 	{ STRLANGEUCZHB, STReuc },
-#ifdef linux
+#ifdef __linux__
 	{ STRLANGEUCJPC, STReuc },
 #endif
 	{ STRLANGSJIS, STRsjis },
@@ -1266,4 +1278,26 @@ autoset_dspmbyte(const Char *pcp)
 	}
     }
 }
+# elif defined(AUTOSET_KANJI)
+void
+autoset_kanji(void)
+{
+    char *codeset = nl_langinfo(CODESET);
+    
+    if (*codeset == '\0') {
+	if (adrof(STRnokanji) == NULL)
+	    setNS(STRnokanji);
+	return;
+    }
+
+    if (strcasestr(codeset, "SHIFT_JIS") == (char*)0) {
+	if (adrof(STRnokanji) == NULL)
+	    setNS(STRnokanji);
+	return;
+    }
+
+    if (adrof(STRnokanji) != NULL)
+	unsetv(STRnokanji);
+}
+#endif
 #endif
diff --git a/contrib/tcsh/sh.time.c b/contrib/tcsh/sh.time.c
index f8ff370..beed4c9 100644
--- a/contrib/tcsh/sh.time.c
+++ b/contrib/tcsh/sh.time.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.time.c,v 3.33 2006/03/02 18:46:44 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.time.c,v 3.35 2010/12/09 15:39:29 christos Exp $ */
 /*
  * sh.time.c: Shell time keeping and printing.
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.time.c,v 3.33 2006/03/02 18:46:44 christos Exp $")
+RCSID("$tcsh: sh.time.c,v 3.35 2010/12/09 15:39:29 christos Exp $")
 
 #ifdef SUNOS4
 # include <machine/param.h>
@@ -366,11 +366,11 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #endif /* !BSDTIMES */
 #ifdef TDEBUG
     xprintf("es->tms_utime %lu bs->tms_utime %lu\n",
-	    es->tms_utime, bs->tms_utime);
+	    (unsigned long)es->tms_utime, (unsigned long)bs->tms_utime);
     xprintf("es->tms_stime %lu bs->tms_stime %lu\n",
-	    es->tms_stime, bs->tms_stime);
-    xprintf("ms	%lu e %lu b %lu\n", ms,	e, b);
-    xprintf("t %lu\n", t);
+	    (unsigned long)es->tms_stime, (unsigned long)bs->tms_stime);
+    xprintf("ms	%llu e %p b %p\n", (unsigned long long)ms, e, b);
+    xprintf("t %llu\n", (unsigned long long)t);
 #endif /* TDEBUG */
 
     if (vp && vp->vec && vp->vec[0] && vp->vec[1])
@@ -480,8 +480,8 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", t == 0 ?	0L :
-			IADJUST(r1->ru_ixrss - r0->ru_ixrss) / t);
+		xprintf("%lld", (long long)(t == 0 ?	0L :
+			IADJUST(r1->ru_ixrss - r0->ru_ixrss) / t));
 #endif
 		break;
 
@@ -489,9 +489,9 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", t == 0 ?	0L :
+		xprintf("%lld", (long long)(t == 0 ?	0L :
 			IADJUST(r1->ru_idrss + r1->ru_isrss -
-				(r0->ru_idrss +	r0->ru_isrss)) / t);
+				(r0->ru_idrss +	r0->ru_isrss)) / t));
 #endif
 		break;
 
@@ -499,23 +499,23 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", t == 0 ?	0L :
+		xprintf("%lld", (long long)(t == 0 ? 0L :
 			IADJUST((r1->ru_ixrss +	r1->ru_isrss + r1->ru_idrss) -
-			   (r0->ru_ixrss + r0->ru_idrss	+ r0->ru_isrss)) / t);
+			   (r0->ru_ixrss + r0->ru_idrss	+ r0->ru_isrss)) / t));
 #endif
 		break;
 #endif /* convex */
 	    case 'M':		/* max.	Resident Set Size */
 #ifdef SUNOS4
-		xprintf("%ld", pagetok(r1->ru_maxrss));
+		xprintf("%ld", (long)pagetok(r1->ru_maxrss));
 #else
 # ifdef	convex
-		xprintf("%ld", r1->ru_maxrss * 4L);
+		xprintf("%ld", (long)(r1->ru_maxrss * 4L));
 # else /* !convex */
 #  ifdef _OSD_POSIX
 		xprintf("0",0);
 #  else
-		xprintf("%ld", r1->ru_maxrss / 2L);
+		xprintf("%ld", (long)r1->ru_maxrss);
 #  endif
 # endif	/* convex */
 #endif /* SUNOS4 */
@@ -525,7 +525,7 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", r1->ru_majflt - r0->ru_majflt);
+		xprintf("%ld", (long)(r1->ru_majflt - r0->ru_majflt));
 #endif
 		break;
 
@@ -533,7 +533,7 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", r1->ru_minflt - r0->ru_minflt);
+		xprintf("%ld", (long)(r1->ru_minflt - r0->ru_minflt));
 #endif
 		break;
 
@@ -541,7 +541,7 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", r1->ru_inblock -	r0->ru_inblock);
+		xprintf("%ld", (long)(r1->ru_inblock - r0->ru_inblock));
 #endif
 		break;
 
@@ -549,7 +549,7 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", r1->ru_oublock -	r0->ru_oublock);
+		xprintf("%ld", (long)(r1->ru_oublock - r0->ru_oublock));
 #endif
 		break;
 
@@ -567,7 +567,7 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", r1->ru_msgrcv - r0->ru_msgrcv);
+		xprintf("%ld", (long)(r1->ru_msgrcv - r0->ru_msgrcv));
 #endif
 		break;
 
@@ -575,7 +575,7 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", r1->ru_msgsnd - r0->ru_msgsnd);
+		xprintf("%ld", (long)(r1->ru_msgsnd - r0->ru_msgsnd));
 #endif
 		break;
 
@@ -583,7 +583,7 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", r1->ru_nsignals - r0->ru_nsignals);
+		xprintf("%ld", (long)(r1->ru_nsignals - r0->ru_nsignals));
 #endif
 		break;
 
@@ -591,7 +591,7 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", r1->ru_nvcsw - r0->ru_nvcsw);
+		xprintf("%ld", (long)(r1->ru_nvcsw - r0->ru_nvcsw));
 #endif
 		break;
 
@@ -599,42 +599,42 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 #ifdef _OSD_POSIX
 		xprintf("0",0);
 #else
-		xprintf("%ld", r1->ru_nivcsw - r0->ru_nivcsw);
+		xprintf("%ld", (long)(r1->ru_nivcsw - r0->ru_nivcsw));
 #endif
 		break;
 #else /* BSDTIMES */
 # ifdef	_SEQUENT_
 	    case 'W':		/* number of swaps */
 		i = r1->ps_swap	- r0->ps_swap;
-		xprintf("%ld", i);
+		xprintf("%ld", (long)i);
 		break;
 
 	    case 'M':
-		xprintf("%ld", r1->ps_maxrss / 2);
+		xprintf("%ld", (long)r1->ps_maxrss);
 		break;
 
 	    case 'F':
-		xprintf("%ld", r1->ps_pagein - r0->ps_pagein);
+		xprintf("%ld", (long)(r1->ps_pagein - r0->ps_pagein));
 		break;
 
 	    case 'R':
-		xprintf("%ld", r1->ps_reclaim -	r0->ps_reclaim);
+		xprintf("%ld", (long)(r1->ps_reclaim -	r0->ps_reclaim));
 		break;
 
 	    case 'I':
-		xprintf("%ld", r1->ps_bread - r0->ps_bread);
+		xprintf("%ld", (long)(r1->ps_bread - r0->ps_bread));
 		break;
 
 	    case 'O':
-		xprintf("%ld", r1->ps_bwrite - r0->ps_bwrite);
+		xprintf("%ld", (long)(r1->ps_bwrite - r0->ps_bwrite));
 		break;
 
 	    case 'k':
-		xprintf("%ld", r1->ps_signal - r0->ps_signal);
+		xprintf("%ld", (long)(r1->ps_signal - r0->ps_signal));
 		break;
 
 	    case 'w':
-		xprintf("%ld", r1->ps_volcsw - r0->ps_volcsw);
+		xprintf("%ld", (long)(r1->ps_volcsw - r0->ps_volcsw));
 		break;
 
 	    case 'c':
@@ -642,35 +642,35 @@ prusage(struct tms *bs, struct tms *es, clock_t e, clock_t b)
 		break;
 
 	    case 'Z':
-		xprintf("%ld", r1->ps_zerofill - r0->ps_zerofill);
+		xprintf("%ld", (long)(r1->ps_zerofill - r0->ps_zerofill));
 		break;
 
 	    case 'i':
-		xprintf("%ld", r1->ps_pffincr -	r0->ps_pffincr);
+		xprintf("%ld", (long)(r1->ps_pffincr - r0->ps_pffincr));
 		break;
 
 	    case 'd':
-		xprintf("%ld", r1->ps_pffdecr -	r0->ps_pffdecr);
+		xprintf("%ld", (long)(r1->ps_pffdecr - r0->ps_pffdecr));
 		break;
 
 	    case 'Y':
-		xprintf("%ld", r1->ps_syscall -	r0->ps_syscall);
+		xprintf("%ld", (long)(r1->ps_syscall - r0->ps_syscall));
 		break;
 
 	    case 'l':
-		xprintf("%ld", r1->ps_lread - r0->ps_lread);
+		xprintf("%ld", (long)(r1->ps_lread - r0->ps_lread));
 		break;
 
 	    case 'm':
-		xprintf("%ld", r1->ps_lwrite - r0->ps_lwrite);
+		xprintf("%ld", (long)(r1->ps_lwrite - r0->ps_lwrite));
 		break;
 
 	    case 'p':
-		xprintf("%ld", r1->ps_phread - r0->ps_phread);
+		xprintf("%ld", (long)(r1->ps_phread - r0->ps_phread));
 		break;
 
 	    case 'q':
-		xprintf("%ld", r1->ps_phwrite -	r0->ps_phwrite);
+		xprintf("%ld", (long)(r1->ps_phwrite - r0->ps_phwrite));
 		break;
 # endif	/* _SEQUENT_ */
 #endif /* BSDTIMES */
@@ -687,7 +687,7 @@ pdeltat(timeval_t *t1, timeval_t *t0)
     timeval_t td;
 
     tvsub(&td, t1, t0);
-    xprintf("%ld.%03ld", td.tv_sec, td.tv_usec / 1000L);
+    xprintf("%lld.%03ld", (long long)td.tv_sec, (long)td.tv_usec / 1000L);
 }
 
 static void
@@ -734,6 +734,7 @@ pdtimet(clock_t eval, clock_t bval)
     val	= (eval	- bval)	* 100 /	clk_tck;
 #endif /* POSIX	*/
 
-    xprintf("%ld.%02ld", val / 100, val	- (val / 100 * 100));
+    xprintf("%lld.%02ld", (long long)(val / 100),
+	(long long)(val - (val / 100 * 100)));
 }
 #endif /* BSDTIMES || _SEQUENT_	*/
diff --git a/contrib/tcsh/svn b/contrib/tcsh/svn
new file mode 100644
index 0000000..7bdcecc
--- /dev/null
+++ b/contrib/tcsh/svn
@@ -0,0 +1,32 @@
+#! /usr/bin/env python2.5
+
+import sys
+import os
+
+#for name in os.environ.keys():
+#	print "key " + name + " = " + os.environ[name]
+
+def print_output(cmd, prefix):
+	pipeOut = os.popen3(cmd, mode = 'br')[1]
+	for line in pipeOut:
+		term = ""
+		if os.path.isdir(line.strip()):
+			term = "/"
+		print prefix + line.strip() + term
+	pipeOut.close()
+
+if not os.environ.has_key("COMMAND_LINE"):
+	print "Fancy completion is not supported by your version of tcsh."
+	sys.exit(1)
+
+cmdLine = os.environ["COMMAND_LINE"]
+URL = cmdLine.split()[2]
+dir = "/" + URL.split('/', 3)[3]
+prefix = "file:/"
+
+if dir[-1] != "/":
+	dir = dir.rpartition("/")[0] + "/"
+
+print_output("svn ls " + "file://" + dir, prefix + "/" + dir)
+print_output("ls -d /" + dir + "*", prefix)
+
diff --git a/contrib/tcsh/tc.alloc.c b/contrib/tcsh/tc.alloc.c
index 53546fe..f38df2c 100644
--- a/contrib/tcsh/tc.alloc.c
+++ b/contrib/tcsh/tc.alloc.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.alloc.c,v 3.46 2006/03/02 18:46:44 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.alloc.c,v 3.50 2011/12/30 20:55:24 christos Exp $ */
 /*
  * tc.alloc.c (Caltech) 2/21/82
  * Chris Kingsley, kingsley@cit-20.
@@ -39,8 +39,11 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
+#ifdef HAVE_MALLINFO
+#include <malloc.h>
+#endif
 
-RCSID("$tcsh: tc.alloc.c,v 3.46 2006/03/02 18:46:44 christos Exp $")
+RCSID("$tcsh: tc.alloc.c,v 3.50 2011/12/30 20:55:24 christos Exp $")
 
 #define RCHECK
 #define DEBUG
@@ -438,6 +441,28 @@ realloc(ptr_t cp, size_t nbytes)
 #endif /* !lint */
 }
 
+/*
+ * On linux, _nss_nis_setnetgrent() calls this function to determine
+ * the usable size of the pointer passed, but this is not a portable
+ * API, so we cannot use our malloc replacement without providing one.
+ * Thanks a lot glibc!
+ */
+#ifdef __linux__
+#define M_U_S_CONST
+#else
+#define M_U_S_CONST
+#endif
+size_t malloc_usable_size(M_U_S_CONST void *);
+size_t
+malloc_usable_size(M_U_S_CONST void *ptr)
+{
+    const union overhead *op = (const union overhead *)
+	(((const char *) ptr) - MEMALIGN(sizeof(*op)));
+    if (op->ov_magic == MAGIC)
+	    return 1 << (op->ov_index + 2);
+    else
+	    return 0;
+}
 
 
 #ifndef lint
@@ -587,7 +612,7 @@ showall(Char **v, struct command *c)
 	xprintf(" %4zd", j);
 	totfree += j * (1 << (i + 3));
     }
-    xprintf(CGETS(19, 9, "\nused:\t"));
+    xprintf("\n%s:\t", CGETS(19, 9, "used"));
     for (i = 0; i < NBUCKETS; i++) {
 	xprintf(" %4d", nmalloc[i]);
 	totused += nmalloc[i] * (1 << (i + 3));
@@ -598,13 +623,27 @@ showall(Char **v, struct command *c)
 	    "\tAllocated memory from 0x%lx to 0x%lx.  Real top at 0x%lx\n"),
 	    (unsigned long) membot, (unsigned long) memtop,
 	    (unsigned long) sbrk(0));
-#else
+#else /* SYSMALLOC */
+#ifndef HAVE_MALLINFO
 #ifdef HAVE_SBRK
     memtop = sbrk(0);
 #endif /* HAVE_SBRK */
     xprintf(CGETS(19, 12, "Allocated memory from 0x%lx to 0x%lx (%ld).\n"),
 	    (unsigned long) membot, (unsigned long) memtop, 
 	    (unsigned long) (memtop - membot));
+#else /* HAVE_MALLINFO */
+    struct mallinfo mi;
+
+    mi = mallinfo();
+    xprintf(CGETS(19, 13, "%s current memory allocation:\n"), progname);
+    xprintf(CGETS(19, 14, "Total space allocated from system: %d\n"), mi.arena);
+    xprintf(CGETS(19, 15, "Number of non-inuse chunks: %d\n"), mi.ordblks);
+    xprintf(CGETS(19, 16, "Number of mmapped regions: %d\n"), mi.hblks);
+    xprintf(CGETS(19, 17, "Total space in mmapped regions: %d\n"), mi.hblkhd);
+    xprintf(CGETS(19, 18, "Total allocated space: %d\n"), mi.uordblks);
+    xprintf(CGETS(19, 19, "Total non-inuse space: %d\n"), mi.fordblks);
+    xprintf(CGETS(19, 20, "Top-most, releasable space: %d\n"), mi.keepcost);
+#endif /* HAVE_MALLINFO */
 #endif /* SYSMALLOC */
     USE(c);
     USE(v);
diff --git a/contrib/tcsh/tc.const.c b/contrib/tcsh/tc.const.c
index ce2d18b..641e234 100644
--- a/contrib/tcsh/tc.const.c
+++ b/contrib/tcsh/tc.const.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.const.c,v 3.91 2009/06/19 16:35:33 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.const.c,v 3.98 2011/04/14 18:25:26 christos Exp $ */
 /*
  * sh.const.c: String constants for tcsh.
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.const.c,v 3.91 2009/06/19 16:35:33 christos Exp $")
+RCSID("$tcsh: tc.const.c,v 3.98 2011/04/14 18:25:26 christos Exp $")
 
 Char STRlogout[]	= { 'l', 'o', 'g', 'o', 'u', 't', '\0' };
 Char STRautologout[]	= { 'a', 'u', 't', 'o', 'l', 'o', 'g', 'o', 'u', 't', 
@@ -43,6 +43,7 @@ Char STRrootdefautologout[] = { '1', '5', '\0' };
 #endif
 Char STRautomatic[]	= { 'a', 'u', 't', 'o', 'm', 'a', 't', 'i', 'c',
 			    '\0' };
+Char STRanyerror[]	= { 'a', 'n', 'y', 'e', 'r', 'r', 'o', 'r', '\0' };
 Char STRhangup[]	= { 'h', 'a', 'n', 'g', 'u', 'p', '\0' };
 Char STRaout[]		= { 'a', '.', 'o', 'u', 't', '\0' };
 Char STRtty[]		= { 't', 't', 'y', '\0' };
@@ -60,6 +61,7 @@ Char STR_[]		= { '_', '\0' };
 Char STRNULL[]		= { '\0' };
 Char STRtcsh[]		= { 't', 'c', 's', 'h', '\0' };
 Char STRhome[]		= { 'h', 'o', 'm', 'e', '\0' };
+Char STReuser[]         = { 'e', 'u', 's', 'e', 'r', '\0'};
 Char STRuser[]		= { 'u', 's', 'e', 'r', '\0' };
 Char STRgroup[]		= { 'g', 'r', 'o', 'u', 'p', '\0' };
 #ifdef AFS
@@ -67,6 +69,7 @@ Char STRafsuser[]	   = { 'a', 'f', 's', 'u', 's', 'e', 'r', '\0' };
 #endif /* AFS */
 Char STRterm[]		= { 't', 'e', 'r', 'm', '\0' };
 Char STRversion[]	= { 'v', 'e', 'r', 's', 'i', 'o', 'n', '\0' };
+Char STReuid[]		= { 'e', 'u', 'i', 'd', '\0' };
 Char STRuid[]		= { 'u', 'i', 'd', '\0' };
 Char STRgid[]		= { 'g', 'i', 'd', '\0' };
 Char STRunknown[]	= { 'u', 'n', 'k', 'n', 'o', 'w', 'n', '\0' };
@@ -161,7 +164,7 @@ Char STRLANGBIG5[]	= { 'z', 'h', '_', 'T', 'W', '.', 'B', 'i', 'g', '5',
 			    '\0' };
 Char STRLANGEUCZH[]	= { '\0' };
 Char STRLANGEUCZHB[]	= { '\0' };
-#  elif defined(linux) || defined(__GNU__) || defined(__GLIBC__)
+#  elif defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
 Char STRLANGEUCJP[]	= { 'j', 'a', '_', 'J', 'P', '.', 'E', 'U', 'C', '-',
 			    'J', 'P', '\0' };
 Char STRLANGEUCKR[]	= { 'k', 'o', '_', 'K', 'R', '.', 'E', 'U', 'C', '\0' };
@@ -249,8 +252,7 @@ Char STRsavehist[]	= { 's', 'a', 'v', 'e', 'h', 'i', 's', 't', '\0' };
 Char STRnormal[]	= { 'n', 'o', 'r', 'm', 'a', 'l', '\0' };
 Char STRsldtlogout[]	= { '/', '.', 'l', 'o', 'g', 'o', 'u', 't', '\0' };
 Char STRjobs[]		= { 'j', 'o', 'b', 's', '\0' };
-Char STRdeftcshprompt[]	= { '%', '#', ' ', '\0' };
-Char STRdefcshprompt[]	= { '%', '\0' };
+Char STRdefprompt[]	= { '%', '#', ' ', '\0' };
 Char STRmquestion[]	= { '%', 'R', '?' | QUOTE, ' ', '\0' };
 Char STRKCORRECT[]	= { 'C', 'O', 'R', 'R', 'E', 'C', 'T', '>', '%', 'R', 
 			    ' ', '(', 'y', '|', 'n', '|', 'e', '|', 'a', ')', 
@@ -305,6 +307,8 @@ Char STRmn[]		= { '-', 'n', '\0' };
 Char STRminus[]		= { '-', '\0' };
 Char STRnoglob[]	= { 'n', 'o', 'g', 'l', 'o', 'b', '\0' };
 Char STRnonomatch[]	= { 'n', 'o', 'n', 'o', 'm', 'a', 't', 'c', 'h', '\0' };
+Char STRglobstar[]	= { 'g', 'l', 'o', 'b', 's', 't', 'a', 'r', '\0' };
+Char STRglobdot[]	= { 'g', 'l', 'o', 'b', 'd', 'o', 't', '\0' };
 Char STRfakecom1[]	= { '`', ' ', '.', '.', '.', ' ', '`', '\0' };
 Char STRampm[]		= { 'a', 'm', 'p', 'm', '\0' };
 Char STRtime[]		= { 't', 'i', 'm', 'e', '\0' };
@@ -378,9 +382,11 @@ Char STRQNULL[]		= { '\0' | QUOTE, '\0' };
 Char STRcorrect[]	= { 'c', 'o', 'r', 'r', 'e', 'c', 't', '\0' };
 Char STRcmd[]		= { 'c', 'm', 'd', '\0' };
 Char STRall[]		= { 'a', 'l', 'l', '\0' };
+Char STRalways[]	= { 'a', 'l', 'w', 'a', 'y', 's', '\0' };
 Char STRerase[]		= { 'e', 'r', 'a', 's', 'e', '\0' };
 Char STRprev[]		= { 'p', 'r', 'e', 'v', '\0' };
 Char STRcomplete[]	= { 'c', 'o', 'm', 'p', 'l', 'e', 't', 'e', '\0' };
+Char STREnhance[]	= { 'E', 'n', 'h', 'a', 'n', 'c', 'e', '\0' };
 Char STRenhance[]	= { 'e', 'n', 'h', 'a', 'n', 'c', 'e', '\0' };
 Char STRigncase[]	= { 'i', 'g', 'n', 'c', 'a', 's', 'e', '\0' };
 Char STRautoexpand[]	= { 'a', 'u', 't', 'o', 'e', 'x', 'p', 'a', 'n', 'd',
@@ -388,6 +394,7 @@ Char STRautoexpand[]	= { 'a', 'u', 't', 'o', 'e', 'x', 'p', 'a', 'n', 'd',
 Char STRautocorrect[]	= { 'a', 'u', 't', 'o', 'c', 'o', 'r', 'r', 'e', 'c',
 			    't', '\0' };
 Char STRautolist[]	= { 'a', 'u', 't', 'o', 'l', 'i', 's', 't', '\0' };
+Char STRautorehash[]	= { 'a', 'u', 't', 'o', 'r', 'e', 'h', 'a', 's', 'h', '\0' };
 Char STRbeepcmd[]	= { 'b', 'e', 'e', 'p', 'c', 'm', 'd', '\0' };
 Char STRmatchbeep[]	= { 'm', 'a', 't', 'c', 'h', 'b', 'e', 'e', 'p', '\0' };
 Char STRnomatch[]	= { 'n', 'o', 'm', 'a', 't', 'c', 'h', '\0' };
@@ -505,3 +512,7 @@ Char STRrepeat[]	= { 'r', 'e', 'p', 'e', 'a', 't', '\0' };
 Char STReof[]		= { '^', 'D', '\b', '\b', '\0' };
 Char STRonlyhistory[]	= { 'o', 'n', 'l', 'y', 'h', 'i', 's', 't', 'o', 'r',
 			    'y', '\0' };
+Char STRparseoctal[]	= { 'p', 'a', 'r', 's', 'e', 'o', 'c', 't', 'a', 'l',
+			    '\0' };
+Char STRli[]		= { 'l', 'i', '#', '\0' };
+Char STRco[]		= { 'c', 'o', '#', '\0' };
diff --git a/contrib/tcsh/tc.decls.h b/contrib/tcsh/tc.decls.h
index d6a9f9e..de8ec55 100644
--- a/contrib/tcsh/tc.decls.h
+++ b/contrib/tcsh/tc.decls.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.decls.h,v 3.64 2008/05/14 20:10:30 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.decls.h,v 3.65 2010/02/09 20:26:13 christos Exp $ */
 /*
  * tc.decls.h: Function declarations from all the tcsh modules
  */
@@ -259,9 +259,9 @@ extern	void		  sched_run	(void);
  * tc.str.c:
  */
 #ifdef WIDE_STRINGS
-extern	size_t		  one_mbtowc	(wchar_t *, const char *, size_t);
-extern	size_t		  one_wctomb	(char *, wchar_t);
-extern  int		  rt_mbtowc	(wchar_t *, const char *, size_t);
+extern	size_t		  one_mbtowc	(Char *, const char *, size_t);
+extern	size_t		  one_wctomb	(char *, Char);
+extern  int		  rt_mbtowc	(Char *, const char *, size_t);
 #else
 #define one_mbtowc(PWC, S, N) \
 	((void)(N), *(PWC) = (unsigned char)*(S), (size_t)1)
diff --git a/contrib/tcsh/tc.disc.c b/contrib/tcsh/tc.disc.c
index 30f46c4..cca1290 100644
--- a/contrib/tcsh/tc.disc.c
+++ b/contrib/tcsh/tc.disc.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.disc.c,v 3.17 2006/03/02 18:46:45 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.disc.c,v 3.18 2011/01/09 16:25:29 christos Exp $ */
 /*
  * tc.disc.c: Functions to set/clear line disciplines
  *
@@ -33,7 +33,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.disc.c,v 3.17 2006/03/02 18:46:45 christos Exp $")
+RCSID("$tcsh: tc.disc.c,v 3.18 2011/01/09 16:25:29 christos Exp $")
 
 #ifdef OREO
 #include <compat.h>
@@ -43,7 +43,7 @@ RCSID("$tcsh: tc.disc.c,v 3.17 2006/03/02 18:46:45 christos Exp $")
 
 static int add_discipline = 0;	/* Did we add a line discipline	 */
 
-#if defined(IRIS4D) || defined(OREO) || defined(sonyrisc)
+#if defined(IRIS4D) || defined(OREO) || defined(sonyrisc) || defined(__ANDROID__)
 # define HAVE_DISC
 # ifndef POSIX
 static struct termio otermiob;
diff --git a/contrib/tcsh/tc.func.c b/contrib/tcsh/tc.func.c
index 23262b7..b13fe04 100644
--- a/contrib/tcsh/tc.func.c
+++ b/contrib/tcsh/tc.func.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.func.c,v 3.139 2009/06/25 21:15:38 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.func.c,v 3.148 2011/12/14 16:36:44 christos Exp $ */
 /*
  * tc.func.c: New tcsh builtins.
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.func.c,v 3.139 2009/06/25 21:15:38 christos Exp $")
+RCSID("$tcsh: tc.func.c,v 3.148 2011/12/14 16:36:44 christos Exp $")
 
 #include "ed.h"
 #include "ed.defns.h"		/* for the function names */
@@ -118,7 +118,7 @@ expand_lex(const struct wordent *sp0, int from, int to)
 		 * elsewhere.
 		 */
 		if ((*s & QUOTE)
-		    && (((*s & TRIM) == HIST) ||
+		    && (((*s & TRIM) == HIST && HIST != '\0') ||
 			(((*s & TRIM) == '\'') && (prev_c != '\\')) ||
 			(((*s & TRIM) == '\"') && (prev_c != '\\')) ||
 			(((*s & TRIM) == '\\') && (prev_c != '\\')))) {
@@ -174,7 +174,7 @@ Itoa(int n, size_t min_digits, Char attributes)
     do {
 	*p++ = un % 10 + '0';
 	un /= 10;
-    } while ((pad && --min_digits > 0) || un != 0);
+    } while ((pad && (ssize_t)--min_digits > 0) || un != 0);
 
     res = xmalloc((p - buf + 2) * sizeof(*res));
     s = res;
@@ -671,7 +671,7 @@ auto_lock(void)
     struct authorization *apw;
     extern char *crypt16 (const char *, const char *);
 
-# define XCRYPT(a, b) crypt16(a, b)
+# define XCRYPT(pw, a, b) crypt16(a, b)
 
     if ((pw = xgetpwuid(euid)) != NULL &&	/* effective user passwd  */
         (apw = getauthuid(euid)) != NULL) 	/* enhanced ultrix passwd */
@@ -681,7 +681,7 @@ auto_lock(void)
 
     struct spwd *spw;
 
-# define XCRYPT(a, b) crypt(a, b)
+# define XCRYPT(pw, a, b) crypt(a, b)
 
     if ((pw = xgetpwuid(euid)) != NULL)	{	/* effective user passwd  */
 	errno = 0;
@@ -695,7 +695,12 @@ auto_lock(void)
 
 #else
 
-#define XCRYPT(a, b) crypt(a, b)
+
+#ifdef __CYGWIN__
+# define XCRYPT(pw, a, b) cygwin_xcrypt(pw, a, b)
+#else
+# define XCRYPT(pw, a, b) crypt(a, b)
+#endif
 
 #if !defined(__MVS__)
     if ((pw = xgetpwuid(euid)) != NULL)	/* effective user passwd  */
@@ -727,7 +732,7 @@ auto_lock(void)
 #endif
 	pp = xgetpass("Password:");
 
-	crpp = XCRYPT(pp, srpp);
+	crpp = XCRYPT(pw, pp, srpp);
 	if ((strcmp(crpp, srpp) == 0)
 #ifdef AFS
 	    || (ka_UserAuthenticateGeneral(KA_USERAUTH_VERSION,
@@ -1035,7 +1040,7 @@ aliasrun(int cnt, Char *s1, Char *s2)
     cleanup_until(&w);
     pendjob();
     /* Restore status */
-    setv(STRstatus, putn(status), VAR_READWRITE);
+    setv(STRstatus, putn((tcsh_number_t)status), VAR_READWRITE);
 }
 
 void
@@ -1635,7 +1640,7 @@ fixio(int fd, int e)
 # endif /* !EWOULDBLOCK || EWOULDBLOCK != EAGAIN */
 #endif /* POSIX && EAGAIN */
 
-	e = 0;
+	e = -1;
 #ifdef FDRETRY
 # ifdef F_SETFL
 /*
@@ -1683,19 +1688,17 @@ fixio(int fd, int e)
 	if (fcntl(fd, F_SETFL, e) == -1)
 	    return -1;
 	else 
-	    e = 1;
+	    e = 0;
 # endif /* F_SETFL */
 
 # ifdef FIONBIO
 	e = 0;
 	if (ioctl(fd, FIONBIO, (ioctl_t) &e) == -1)
 	    return -1;
-	else
-	    e = 1;
 # endif	/* FIONBIO */
 
 #endif /* FDRETRY */
-	return e ? 0 : -1;
+	return e;
 
     case EINTR:
 	return 0;
@@ -1928,7 +1931,7 @@ getremotehost(int dest_fd)
 				(ptr = strstr(domain, s)) != NULL) {
 			        char *cbuf;
 
-				cbuf = strspl(name, ptr);
+				cbuf = strspl(name, ptr + strlen(s));
 				if (getaddrinfo(cbuf, NULL, &hints, &res) != 0)
 				    res = NULL;
 				xfree(cbuf);
@@ -1939,6 +1942,7 @@ getremotehost(int dest_fd)
 		    if (res != NULL) {
 			if (res->ai_canonname != NULL) {
 			    strncpy(hbuf, res->ai_canonname, sizeof(hbuf));
+			    hbuf[sizeof(hbuf) - 1] = '\0';
 			    host = hbuf;
 			}
 			freeaddrinfo(res);
@@ -2025,12 +2029,13 @@ remotehost(void)
     }
     wait_options = 0;
  done:
+    cleanup_push(&hostname, strbuf_cleanup);
     xclose(fds[0]);
     while ((wait_res = waitpid(pid, &status, wait_options)) == -1
 	   && errno == EINTR)
 	handle_pending_signals();
-    cleanup_push(&hostname, strbuf_cleanup);
-    if (wait_res == pid && WIFEXITED(status) && WEXITSTATUS(status) == 0) {
+    if (hostname.len > 0 && wait_res == pid && WIFEXITED(status)
+	   && WEXITSTATUS(status) == 0) {
 	strbuf_terminate(&hostname);
 	tsetenv(STRREMOTEHOST, str2short(hostname.s));
     }
diff --git a/contrib/tcsh/tc.nls.c b/contrib/tcsh/tc.nls.c
index 5a75f68..7cc6e42 100644
--- a/contrib/tcsh/tc.nls.c
+++ b/contrib/tcsh/tc.nls.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.nls.c,v 3.21 2006/09/26 16:45:30 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.nls.c,v 3.23 2010/02/12 22:17:20 christos Exp $ */
 /*
  * tc.nls.c: NLS handling
  */
@@ -32,9 +32,33 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.nls.c,v 3.21 2006/09/26 16:45:30 christos Exp $")
+RCSID("$tcsh: tc.nls.c,v 3.23 2010/02/12 22:17:20 christos Exp $")
+
 
 #ifdef WIDE_STRINGS
+# ifdef HAVE_WCWIDTH
+#  ifdef UTF16_STRINGS
+int
+xwcwidth (wint_t wchar)
+{
+  wchar_t ws[2];
+
+  if (wchar <= 0xffff)
+    return wcwidth ((wchar_t) wchar);
+  /* UTF-16 systems can't handle these values directly in calls to wcwidth.
+     However, they can handle them as surrogate pairs in calls to wcswidth.
+     What we do here is to convert UTF-32 values >= 0x10000 into surrogate
+     pairs and compute the width by calling wcswidth. */
+  wchar -= 0x10000;
+  ws[0] = 0xd800 | (wchar >> 10);
+  ws[1] = 0xdc00 | (wchar & 0x3ff);
+  return wcswidth (ws, 2);
+}
+#  else
+#define xwcwidth wcwidth
+#  endif /* !UTF16_STRINGS */
+# endif /* HAVE_WCWIDTH */
+
 int
 NLSWidth(Char c)
 {
@@ -42,7 +66,7 @@ NLSWidth(Char c)
     int l;
     if (c & INVALID_BYTE)
 	return 1;
-    l = wcwidth(c);
+    l = xwcwidth((wchar_t) c);
     return l >= 0 ? l : 0;
 # else
     return iswprint(c) != 0;
@@ -58,7 +82,7 @@ NLSStringWidth(const Char *s)
     while (*s) {
 	c = *s++;
 #ifdef HAVE_WCWIDTH
-	if ((l = wcwidth(c)) < 0)
+	if ((l = xwcwidth((wchar_t) c)) < 0)
 		l = 2;
 #else
 	l = iswprint(c) != 0;
diff --git a/contrib/tcsh/tc.nls.h b/contrib/tcsh/tc.nls.h
index d681a9e..3de76c7 100644
--- a/contrib/tcsh/tc.nls.h
+++ b/contrib/tcsh/tc.nls.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.nls.h,v 3.13 2006/02/14 14:07:36 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.nls.h,v 3.14 2011/02/25 23:57:21 christos Exp $ */
 /*
  * tc.nls.h: NLS support
  *
@@ -34,8 +34,6 @@
 #ifndef _h_tc_nls
 #define _h_tc_nls
 
-#include "sh.h"
-
 #ifdef WIDE_STRINGS
 extern int NLSWidth(Char);
 extern int NLSStringWidth (const Char *);
diff --git a/contrib/tcsh/tc.os.c b/contrib/tcsh/tc.os.c
index 7738321..3377549 100644
--- a/contrib/tcsh/tc.os.c
+++ b/contrib/tcsh/tc.os.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.os.c,v 3.69 2006/08/24 20:56:31 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.os.c,v 3.72 2011/01/25 13:58:19 christos Exp $ */
 /*
  * tc.os.c: OS Dependent builtin functions
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.os.c,v 3.69 2006/08/24 20:56:31 christos Exp $")
+RCSID("$tcsh: tc.os.c,v 3.72 2011/01/25 13:58:19 christos Exp $")
 
 #include "tw.h"
 #include "ed.h"
@@ -1584,3 +1584,42 @@ isapad(void)
     return(res);
 }
 #endif
+
+#ifdef __ANDROID__
+#include <stdio.h>
+/* Android (<= 2.1?) has an incomplete ttyname implementation. */
+char *
+ttyname(int fd)
+{
+    char path[64];
+    ssize_t siz;
+    static char ttyname[32];
+
+    if (!isatty(fd))
+	return NULL;
+
+    (void)snprintf(path, sizeof(path), "/proc/self/fd/%d", fd);
+    siz = readlink(path, ttyname, sizeof(ttyname));
+    if (siz < 0 || siz == sizeof(ttyname))
+	return NULL;
+    ttyname[siz] = '\0';
+    return ttyname;
+}
+#endif /* __ANDROID__ */
+
+#if defined(__CYGWIN__) && !defined(NO_CRYPT)
+#undef CHAR		/* Collides with Win32 API */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <sys/cygwin.h>
+char *
+cygwin_xcrypt(struct passwd *pw, const char *password, const char *expected_pwd)
+{
+    static char invalid_password[] = "\377";
+    HANDLE token = cygwin_logon_user(pw, password);
+    if (token == INVALID_HANDLE_VALUE)
+	return invalid_password;
+    CloseHandle(token);
+    return (char *) expected_pwd;
+}
+#endif /* __CYGWIN__ && !NO_CRYPT */
diff --git a/contrib/tcsh/tc.os.h b/contrib/tcsh/tc.os.h
index 74f0d6f..6a46baf 100644
--- a/contrib/tcsh/tc.os.h
+++ b/contrib/tcsh/tc.os.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.os.h,v 3.102 2007/07/05 14:13:06 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.os.h,v 3.105 2011/02/04 18:00:26 christos Exp $ */
 /*
  * tc.os.h: Shell os dependent defines
  */
@@ -164,7 +164,7 @@ struct ucred {
  * It would break on glibc, where all this is
  * defined in <termios.h>. Wrapper added.
  */
-#if !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(_VMS_POSIX)
+#if !defined(__linux__) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(_VMS_POSIX)
 # if defined(INTEL) || defined(u3b2) || defined (u3b5) || defined(ub15) || defined(u3b20d) || defined(ISC) || defined(SCO) || defined(tower32)
 #  ifdef TIOCGWINSZ
 /*
@@ -361,6 +361,18 @@ struct ucred {
 #ifndef O_RDWR
 # define O_RDWR		2
 #endif /* O_RDWR */
+#ifndef O_TEMPORARY
+# define O_TEMPORARY	0
+#endif /* O_TEMPORARY */
+#ifndef O_EXCL
+# define O_EXCL		0
+#endif /* O_EXCL */
+#ifndef O_LARGEFILE
+# define O_LARGEFILE	0
+#endif /* O_LARGEFILE */
+#ifndef O_CREAT
+# define O_CREAT	0
+#endif /* O_CREAT */
 
 /*
  * Lseek()
@@ -601,4 +613,8 @@ extern int killpg (pid_t, int);
 # endif
 #endif
 
+#if defined(__CYGWIN__) && !defined(NO_CRYPT)
+extern char *cygwin_xcrypt(struct passwd *, const char *, const char *);
+#endif /* __CYGWIN__ && !NO_CRYPT */
+
 #endif /* _h_tc_os */
diff --git a/contrib/tcsh/tc.prompt.c b/contrib/tcsh/tc.prompt.c
index f63fdf0..2ac2355 100644
--- a/contrib/tcsh/tc.prompt.c
+++ b/contrib/tcsh/tc.prompt.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.prompt.c,v 3.67 2006/11/17 16:26:58 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.prompt.c,v 3.70 2011/10/27 22:41:06 christos Exp $ */
 /*
  * tc.prompt.c: Prompt printing stuff
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.prompt.c,v 3.67 2006/11/17 16:26:58 christos Exp $")
+RCSID("$tcsh: tc.prompt.c,v 3.70 2011/10/27 22:41:06 christos Exp $")
 
 #include "ed.h"
 #include "tw.h"
@@ -213,8 +213,9 @@ tprintf(int what, const Char *fmt, const char *str, time_t tim, ptr_t info)
 		}
 		break;
 	    case '#':
-		Strbuf_append1(&buf,
-			       attributes | ((uid == 0) ? PRCHROOT : PRCH));
+		Scp = (uid == 0 || euid == 0) ? PRCHROOT : PRCH;
+		if (Scp != '\0')
+		    Strbuf_append1(&buf, attributes | Scp);
 		break;
 	    case '!':
 	    case 'h':
@@ -458,6 +459,11 @@ tprintf(int what, const Char *fmt, const char *str, time_t tim, ptr_t info)
 			    Strbuf_append1(&buf, attributes | *z++);
 		}
 		break;
+	    case 'N':
+		if ((z = varval(STReuser)) != STRNULL)
+		    while (*z)
+			Strbuf_append1(&buf, attributes | *z++);
+		break;
 	    case 'l':
 #ifndef HAVENOUTMP
 		if (what == FMT_WHO) {
@@ -528,6 +534,8 @@ tprintf(int what, const Char *fmt, const char *str, time_t tim, ptr_t info)
 
 		    for (pp = proclist.p_next; pp; pp = pp->p_next)
 			njobs++;
+		    if (njobs == -1)
+			njobs++;
 		    p = Itoa(njobs, 1, attributes);
 		    Strbuf_append(&buf, p);
 		    xfree(p);
diff --git a/contrib/tcsh/tc.sig.c b/contrib/tcsh/tc.sig.c
index 343754f..92bc798 100644
--- a/contrib/tcsh/tc.sig.c
+++ b/contrib/tcsh/tc.sig.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.sig.c,v 3.36 2006/08/24 20:56:31 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.sig.c,v 3.40 2012/01/25 15:34:41 christos Exp $ */
 /*
  * tc.sig.c: Signal routine emulations
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.sig.c,v 3.36 2006/08/24 20:56:31 christos Exp $")
+RCSID("$tcsh: tc.sig.c,v 3.40 2012/01/25 15:34:41 christos Exp $")
 
 #include "tc.wait.h"
 
@@ -60,26 +60,38 @@ int alrmcatch_disabled; /* = 0; */
 int phup_disabled; /* = 0; */
 int pchild_disabled; /* = 0; */
 int pintr_disabled; /* = 0; */
+int handle_interrupt; /* = 0; */
 
-void
+int
 handle_pending_signals(void)
 {
+    int rv = 0;
     if (!phup_disabled && phup_pending) {
 	phup_pending = 0;
+	handle_interrupt++;
 	phup();
+	handle_interrupt--;
     }
     if (!pintr_disabled && pintr_pending) {
 	pintr_pending = 0;
+	handle_interrupt++;
 	pintr();
+	handle_interrupt--;
+	rv = 1;
     }
     if (!pchild_disabled && pchild_pending) {
 	pchild_pending = 0;
+	handle_interrupt++;
 	pchild();
+	handle_interrupt--;
     }
     if (!alrmcatch_disabled && alrmcatch_pending) {
 	alrmcatch_pending = 0;
+	handle_interrupt++;
 	alrmcatch();
+	handle_interrupt--;
     }
+    return rv;
 }
 
 void
diff --git a/contrib/tcsh/tc.sig.h b/contrib/tcsh/tc.sig.h
index cf9d61a..4e27998 100644
--- a/contrib/tcsh/tc.sig.h
+++ b/contrib/tcsh/tc.sig.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.sig.h,v 3.33 2007/07/05 14:13:06 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.sig.h,v 3.34 2010/11/29 15:28:58 christos Exp $ */
 /*
  * tc.sig.h: Signal handling
  *
@@ -159,7 +159,7 @@ extern int phup_disabled;
 extern int pintr_disabled;
 
 extern void sigset_interrupting(int, void (*) (int));
-extern void handle_pending_signals(void);
+extern int handle_pending_signals(void);
 
 extern void queue_alrmcatch(int);
 extern void queue_pchild(int);
diff --git a/contrib/tcsh/tc.str.c b/contrib/tcsh/tc.str.c
index 568a1ef..ca00721 100644
--- a/contrib/tcsh/tc.str.c
+++ b/contrib/tcsh/tc.str.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.str.c,v 3.30 2009/06/25 21:27:38 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.str.c,v 3.42 2012/01/10 21:34:31 christos Exp $ */
 /*
  * tc.str.c: Short string package
  * 	     This has been a lesson of how to write buggy code!
@@ -33,9 +33,10 @@
  */
 #include "sh.h"
 
+#include <assert.h>
 #include <limits.h>
 
-RCSID("$tcsh: tc.str.c,v 3.30 2009/06/25 21:27:38 christos Exp $")
+RCSID("$tcsh: tc.str.c,v 3.42 2012/01/10 21:34:31 christos Exp $")
 
 #define MALLOC_INCR	128
 #ifdef WIDE_STRINGS
@@ -46,7 +47,7 @@ RCSID("$tcsh: tc.str.c,v 3.30 2009/06/25 21:27:38 christos Exp $")
 
 #ifdef WIDE_STRINGS
 size_t
-one_mbtowc(wchar_t *pwc, const char *s, size_t n)
+one_mbtowc(Char *pwc, const char *s, size_t n)
 {
     int len;
 
@@ -61,7 +62,7 @@ one_mbtowc(wchar_t *pwc, const char *s, size_t n)
 }
 
 size_t
-one_wctomb(char *s, wchar_t wchar)
+one_wctomb(char *s, Char wchar)
 {
     int len;
 
@@ -69,7 +70,23 @@ one_wctomb(char *s, wchar_t wchar)
 	s[0] = wchar & 0xFF;
 	len = 1;
     } else {
-	len = wctomb(s, wchar);
+#ifdef UTF16_STRINGS
+	if (wchar >= 0x10000) {
+	    /* UTF-16 systems can't handle these values directly in calls to
+	       wctomb.  Convert value to UTF-16 surrogate and call wcstombs to
+	       convert the "string" to the correct multibyte representation,
+	       if any. */
+	    wchar_t ws[3];
+	    wchar -= 0x10000;
+	    ws[0] = 0xd800 | (wchar >> 10);
+	    ws[1] = 0xdc00 | (wchar & 0x3ff);
+	    ws[2] = 0;
+	    /* The return value of wcstombs excludes the trailing 0, so len is
+	       the correct number of multibytes for the Unicode char. */
+	    len = wcstombs (s, ws, MB_CUR_MAX + 1);
+	} else
+#endif
+	len = wctomb(s, (wchar_t) wchar);
 	if (len == -1)
 	    s[0] = wchar;
 	if (len <= 0)
@@ -79,14 +96,55 @@ one_wctomb(char *s, wchar_t wchar)
 }
 
 int
-rt_mbtowc(wchar_t *pwc, const char *s, size_t n)
+rt_mbtowc(Char *pwc, const char *s, size_t n)
 {
     int ret;
     char back[MB_LEN_MAX];
+    wchar_t tmp;
+#if defined(UTF16_STRINGS) && defined(HAVE_MBRTOWC)
+# if defined(AUTOSET_KANJI)
+    static mbstate_t mb_zero, mb;
+    /*
+     * Workaround the Shift-JIS endcoding that translates unshifted 7 bit ASCII!
+     */
+    if (!adrof(STRnokanji) && n && pwc && s && (*s == '\\' || *s == '~') &&
+	!memcmp(&mb, &mb_zero, sizeof(mb)))
+    {
+	*pwc = *s;
+	return 1;
+    }
+# else
+    mbstate_t mb;
+# endif
+
+    memset (&mb, 0, sizeof mb);
+    ret = mbrtowc(&tmp, s, n, &mb);
+#else
+    ret = mbtowc(&tmp, s, n);
+#endif
+    if (ret > 0) {
+	*pwc = tmp;
+#if defined(UTF16_STRINGS) && defined(HAVE_MBRTOWC)
+	if (tmp >= 0xd800 && tmp <= 0xdbff) {
+	    /* UTF-16 surrogate pair.  Fetch second half and compute
+	       UTF-32 value.  Dispense with the inverse test in this case. */
+	    size_t n2 = mbrtowc(&tmp, s + ret, n - ret, &mb);
+	    if (n2 == 0 || n2 == (size_t)-1 || n2 == (size_t)-2)
+		ret = -1;
+	    else {
+		*pwc = (((*pwc & 0x3ff) << 10) | (tmp & 0x3ff)) + 0x10000;
+		ret += n2;
+	    }
+	} else
+#endif
+      	if (wctomb(back, *pwc) != ret || memcmp(s, back, ret) != 0)
+	    ret = -1;
 
-    ret = mbtowc(pwc, s, n);
-    if (ret > 0 && (wctomb(back, *pwc) != ret || memcmp(s, back, ret) != 0))
+    } else if (ret == -2)
 	ret = -1;
+    else if (ret == 0)
+	*pwc = '\0';
+
     return ret;
 }
 #endif
@@ -186,7 +244,7 @@ short2str(const Char *src)
     return (sdst);
 }
 
-#ifndef WIDE_STRINGS
+#if !defined (WIDE_STRINGS) || defined (UTF16_STRINGS)
 Char   *
 s_strcpy(Char *dst, const Char *src)
 {
@@ -334,18 +392,20 @@ int
 s_strcasecmp(const Char *str1, const Char *str2)
 {
 #ifdef WIDE_STRINGS
-    wchar_t l1 = 0, l2 = 0;
-    for (; *str1 && ((*str1 == *str2 && (l1 = l2 = 0) == 0) || 
-	(l1 = towlower(*str1)) == (l2 = towlower(*str2))); str1++, str2++)
-	continue;
-    
+    wint_t l1 = 0, l2 = 0;
+    for (; *str1; str1++, str2++)
+	if (*str1 == *str2)
+	    l1 = l2 = 0;
+	else if ((l1 = towlower(*str1)) != (l2 = towlower(*str2)))
+	    break;
 #else
-    unsigned char c1, c2, l1 = 0, l2 = 0;
-    for (; *str1 && ((*str1 == *str2 && (l1 = l2 = 0) == 0) || 
-	((c1 = (unsigned char)*str1) == *str1 &&
-	 (c2 = (unsigned char)*str2) == *str2 &&
-	(l1 = tolower(c1)) == (l2 = tolower(c2)))); str1++, str2++)
-	continue;
+    unsigned char l1 = 0, l2 = 0;
+    for (; *str1; str1++, str2++)
+	if (*str1 == *str2)
+		l1 = l2 = 0;
+	else if ((l1 = tolower((unsigned char)*str1)) !=
+	    (l2 = tolower((unsigned char)*str2)))
+	    break;
 #endif
     /*
      * The following case analysis is necessary so that characters which look
@@ -568,6 +628,7 @@ STRBUF##_store1(struct STRBUF *buf, CHAR c)			\
 	    buf->size *= 2;					\
 	buf->s = xrealloc(buf->s, buf->size * sizeof(*buf->s));	\
     }								\
+    assert(buf->s);						\
     buf->s[buf->len] = c;					\
 }								\
 								\
diff --git a/contrib/tcsh/tc.wait.h b/contrib/tcsh/tc.wait.h
index 4bda506..16f09b3 100644
--- a/contrib/tcsh/tc.wait.h
+++ b/contrib/tcsh/tc.wait.h
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.wait.h,v 3.14 2004/12/25 21:15:08 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.wait.h,v 3.15 2011/02/04 18:00:26 christos Exp $ */
 /*
  * tc.wait.h: <sys/wait.h> for machines that don't have it or have it and
  *	      is incorrect.
@@ -39,7 +39,7 @@
  * We try to use the system's wait.h when we can...
  */
 
-#if SYSVREL > 0 && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__)
+#if SYSVREL > 0 && !defined(__linux__) && !defined(__GNU__) && !defined(__GLIBC__)
 # ifdef hpux
 #  ifndef __hpux
 #   define NEEDwait
diff --git a/contrib/tcsh/tc.who.c b/contrib/tcsh/tc.who.c
index 2aa0686..6759109 100644
--- a/contrib/tcsh/tc.who.c
+++ b/contrib/tcsh/tc.who.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.who.c,v 3.51 2006/03/03 22:08:45 amold Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tc.who.c,v 3.57 2012/01/17 20:53:38 christos Exp $ */
 /*
  * tc.who.c: Watch logins and logouts...
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.who.c,v 3.51 2006/03/03 22:08:45 amold Exp $")
+RCSID("$tcsh: tc.who.c,v 3.57 2012/01/17 20:53:38 christos Exp $")
 
 #include "tc.h"
 
@@ -44,6 +44,11 @@ RCSID("$tcsh: tc.who.c,v 3.51 2006/03/03 22:08:45 amold Exp $")
 
 #ifdef HAVE_UTMPX_H
 # include <utmpx.h>
+# define UTNAMLEN	sizeof(((struct utmpx *) 0)->ut_name)
+# define UTLINLEN	sizeof(((struct utmpx *) 0)->ut_line)
+# ifdef HAVE_STRUCT_UTMPX_UT_HOST
+#  define UTHOSTLEN	sizeof(((struct utmpx *) 0)->ut_host)
+# endif
 /* I just redefine a few words here.  Changing every occurrence below
  * seems like too much of work.  All UTMP functions have equivalent
  * UTMPX counterparts, so they can be added all here when needed.
@@ -55,68 +60,81 @@ RCSID("$tcsh: tc.who.c,v 3.51 2006/03/03 22:08:45 amold Exp $")
 #  define TCSH_PATH_UTMP _PATH_UTMPX
 # elif defined(UTMPX_FILE)
 #  define TCSH_PATH_UTMP UTMPX_FILE
-# endif /* __UTMPX_FILE && !UTMPX_FILE */
-# ifdef TCSH_PATH_UTMP
+# elif __FreeBSD_version >= 900000
+#  /* Why isn't this defined somewhere? */
+#  define TCSH_PATH_UTMP "/var/run/utx.active"
+# elif defined(__hpux)
+#  define TCSH_PATH_UTMP "/etc/utmpx"
+# endif
+# if defined(TCSH_PATH_UTMP) || !defined(HAVE_UTMP_H)
 #  define utmp utmpx
-#  if defined(HAVE_STRUCT_UTMP_UT_TV)
+#  define TCSH_USE_UTMPX
+#  if defined(HAVE_GETUTENT) || defined(HAVE_GETUTXENT)
+#   define getutent getutxent
+#   define setutent setutxent
+#   define endutent endutxent
+#  endif /* HAVE_GETUTENT || HAVE_GETUTXENT */
+#  if defined(HAVE_STRUCT_UTMPX_UT_TV)
 #   define ut_time ut_tv.tv_sec
-#  elif defined(HAVE_STRUCT_UTMP_UT_XTIME)
+#  elif defined(HAVE_STRUCT_UTMPX_UT_XTIME)
 #   define ut_time ut_xtime
 #  endif
-#  ifdef HAVE_STRUCT_UTMP_UT_USER
+#  if defined(HAVE_STRUCT_UTMPX_UT_USER)
 #   define ut_name ut_user
 #  endif
-#  ifdef HAVE_GETUTENT
-#   define getutent getutxent
-#   define setutent setutxent
-#   define endutent endutxent
-#  endif /* HAVE_GETUTENT */
-# else
-#  ifdef HAVE_UTMP_H
-#   include <utmp.h>
-#  endif /* WINNT_NATIVE */
-# endif /* TCSH_PATH_UTMP */
-#else /* !HAVE_UTMPX_H */
-# ifdef HAVE_UTMP_H
-#  include <utmp.h>
-# endif /* WINNT_NATIVE */
+# endif /* TCSH_PATH_UTMP || !HAVE_UTMP_H */
 #endif /* HAVE_UTMPX_H */
 
-#ifndef BROKEN_CC
-# define UTNAMLEN	sizeof(((struct utmp *) 0)->ut_name)
-# define UTLINLEN	sizeof(((struct utmp *) 0)->ut_line)
-# ifdef HAVE_STRUCT_UTMP_UT_HOST
-#  ifdef _SEQUENT_
-#   define UTHOSTLEN	100
-#  else
-#   define UTHOSTLEN	sizeof(((struct utmp *) 0)->ut_host)
-#  endif
-# endif	/* HAVE_STRUCT_UTMP_UT_HOST */
-#else
+#if !defined(TCSH_USE_UTMPX) && defined(HAVE_UTMP_H)
+# include <utmp.h>
+# if defined(HAVE_STRUCT_UTMP_UT_TV)
+#  define ut_time ut_tv.tv_sec
+# elif defined(HAVE_STRUCT_UTMP_UT_XTIME)
+#  define ut_time ut_xtime
+# endif
+# if defined(HAVE_STRUCT_UTMP_UT_USER)
+#  define ut_name ut_user
+# endif
+# ifndef BROKEN_CC
+#  define UTNAMLEN	sizeof(((struct utmp *) 0)->ut_name)
+#  define UTLINLEN	sizeof(((struct utmp *) 0)->ut_line)
+#  ifdef HAVE_STRUCT_UTMP_UT_HOST
+#   ifdef _SEQUENT_
+#    define UTHOSTLEN	100
+#   else
+#    define UTHOSTLEN	sizeof(((struct utmp *) 0)->ut_host)
+#   endif
+#  endif	/* HAVE_STRUCT_UTMP_UT_HOST */
+# else
 /* give poor cc a little help if it needs it */
 struct utmp __ut;
-
-# define UTNAMLEN	sizeof(__ut.ut_name)
-# define UTLINLEN	sizeof(__ut.ut_line)
-# ifdef HAVE_STRUCT_UTMP_UT_HOST
-#  ifdef _SEQUENT_
-#   define UTHOSTLEN	100
+#  define UTNAMLEN	sizeof(__ut.ut_name)
+#  define UTLINLEN	sizeof(__ut.ut_line)
+#  ifdef HAVE_STRUCT_UTMP_UT_HOST
+#   ifdef _SEQUENT_
+#    define UTHOSTLEN	100
+#   else
+#    define UTHOSTLEN	sizeof(__ut.ut_host)
+#   endif
+#  endif /* HAVE_STRUCT_UTMP_UT_HOST */
+# endif /* BROKEN_CC */
+# ifndef TCSH_PATH_UTMP
+#  ifdef UTMP_FILE
+#   define TCSH_PATH_UTMP UTMP_FILE
+#  elif defined(_PATH_UTMP)
+#   define TCSH_PATH_UTMP _PATH_UTMP
 #  else
-#   define UTHOSTLEN	sizeof(__ut.ut_host)
-#  endif
-# endif /* HAVE_STRUCT_UTMP_UT_HOST */
-#endif /* BROKEN_CC */
-
-#ifndef TCSH_PATH_UTMP
-# ifdef	UTMP_FILE
-#  define TCSH_PATH_UTMP UTMP_FILE
-# elif defined(_PATH_UTMP)
-#  define TCSH_PATH_UTMP _PATH_UTMP
-# else
-#  define TCSH_PATH_UTMP "/etc/utmp"
-# endif /* UTMP_FILE */
-#endif /* TCSH_PATH_UTMP */
+#   define TCSH_PATH_UTMP "/etc/utmp"
+#  endif /* UTMP_FILE */
+# endif /* TCSH_PATH_UTMP */
+#endif /* !TCSH_USE_UTMPX && HAVE_UTMP_H */
 
+#ifndef UTNAMLEN
+#define UTNAMLEN 64
+#endif
+#ifndef UTLINLEN
+#define UTLINLEN 64
+#endif
 
 struct who {
     struct who *who_next;
@@ -124,9 +142,9 @@ struct who {
     char    who_name[UTNAMLEN + 1];
     char    who_new[UTNAMLEN + 1];
     char    who_tty[UTLINLEN + 1];
-#ifdef HAVE_STRUCT_UTMP_UT_HOST
+#ifdef UTHOSTLEN
     char    who_host[UTHOSTLEN + 1];
-#endif /* HAVE_STRUCT_UTMP_UT_HOST */
+#endif /* UTHOSTLEN */
     time_t  who_time;
     int     who_status;
 };
@@ -180,7 +198,7 @@ watch_login(int force)
 {
     int     comp = -1, alldone;
     int	    firsttime = stlast == 1;
-#ifdef HAVE_GETUTENT
+#if defined(HAVE_GETUTENT) || defined(HAVE_GETUTXENT)
     struct utmp *uptr;
 #else
     int utmpfd;
@@ -259,7 +277,7 @@ watch_login(int force)
 	return;
     }
     stlast = sta.st_mtime;
-#ifdef HAVE_GETUTENT
+#if defined(HAVE_GETUTENT) || defined(HAVE_GETUTXENT)
     setutent();
 #else
     if ((utmpfd = xopen(TCSH_PATH_UTMP, O_RDONLY|O_LARGEFILE)) < 0) {
@@ -284,7 +302,7 @@ watch_login(int force)
      * Read in the utmp file, sort the entries, and update existing entries or
      * add new entries to the status list.
      */
-#ifdef HAVE_GETUTENT
+#if defined(HAVE_GETUTENT) || defined(HAVE_GETUTXENT)
     while ((uptr = getutent()) != NULL) {
         memcpy(&utmp, uptr, sizeof (utmp));
 #else
@@ -333,7 +351,7 @@ watch_login(int force)
 	    }
 	    else {
 		(void) strncpy(wp->who_new, utmp.ut_name, UTNAMLEN);
-# ifdef HAVE_STRUCT_UTMP_UT_HOST
+# ifdef UTHOSTLEN
 #  ifdef _SEQUENT_
 		host = ut_find_host(wp->who_tty);
 		if (host)
@@ -343,7 +361,7 @@ watch_login(int force)
 #  else
 		(void) strncpy(wp->who_host, utmp.ut_host, UTHOSTLEN);
 #  endif
-# endif /* HAVE_STRUCT_UTMP_UT_HOST */
+# endif /* UTHOSTLEN */
 		wp->who_time = utmp.ut_time;
 		if (wp->who_name[0] == '\0')
 		    wp->who_status = ONLINE;
@@ -354,7 +372,7 @@ watch_login(int force)
 	else {		/* new tty in utmp */
 	    wpnew = xcalloc(1, sizeof *wpnew);
 	    (void) strncpy(wpnew->who_tty, utmp.ut_line, UTLINLEN);
-# ifdef HAVE_STRUCT_UTMP_UT_HOST
+# ifdef UTHOSTLEN
 #  ifdef _SEQUENT_
 	    host = ut_find_host(wpnew->who_tty);
 	    if (host)
@@ -364,7 +382,7 @@ watch_login(int force)
 #  else
 	    (void) strncpy(wpnew->who_host, utmp.ut_host, UTHOSTLEN);
 #  endif
-# endif /* HAVE_STRUCT_UTMP_UT_HOST */
+# endif /* UTHOSTLEN */
 	    wpnew->who_time = utmp.ut_time;
 # ifdef DEAD_PROCESS
 	    if (utmp.ut_type == DEAD_PROCESS)
@@ -387,14 +405,11 @@ watch_login(int force)
 	    wp->who_prev = wpnew;	/* linked in now */
 	}
     }
-#ifdef HAVE_GETUTENT
+#if defined(HAVE_GETUTENT) || defined(HAVE_GETUTXENT)
     endutent();
 #else
     cleanup_until(&utmpfd);
 #endif
-# if defined(HAVE_STRUCT_UTMP_UT_HOST) && defined(_SEQUENT_)
-    endutent();
-# endif
 #endif /* !WINNT_NATIVE */
 
     if (force || vp == NULL) {
@@ -494,11 +509,11 @@ debugwholist(struct who *new, struct who *wp)
 static void
 print_who(struct who *wp)
 {
-#ifdef HAVE_STRUCT_UTMP_UT_HOST
+#ifdef UTHOSTLEN
     Char   *cp = str2short(CGETS(26, 7, "%n has %a %l from %m."));
 #else
     Char   *cp = str2short(CGETS(26, 8, "%n has %a %l."));
-#endif /* HAVE_STRUCT_UTMP_UT_HOST */
+#endif /* UTHOSTLEN */
     struct varent *vp = adrof(STRwho);
     Char *str;
 
@@ -519,11 +534,11 @@ who_info(ptr_t ptr, int c)
 {
     struct who *wp = ptr;
     char *wbuf;
-#ifdef HAVE_STRUCT_UTMP_UT_HOST
+#ifdef UTHOSTLEN
     char *wb;
     int flg;
     char *pb;
-#endif /* HAVE_STRUCT_UTMP_UT_HOST */
+#endif /* UTHOSTLEN */
 
     switch (c) {
     case 'n':		/* user name */
@@ -551,7 +566,7 @@ who_info(ptr_t ptr, int c)
 	}
 	break;
 
-#ifdef HAVE_STRUCT_UTMP_UT_HOST
+#ifdef UTHOSTLEN
     case 'm':
 	if (wp->who_host[0] == '\0')
 	    return strsave(CGETS(26, 12, "local"));
@@ -585,7 +600,7 @@ who_info(ptr_t ptr, int c)
 	    *wb = '\0';
 	    return wbuf;
 	}
-#endif /* HAVE_STRUCT_UTMP_UT_HOST */
+#endif /* UTHOSTLEN */
 
     case 'l':
 	return strsave(wp->who_tty);
@@ -620,7 +635,7 @@ dolog(Char **v, struct command *c)
     }
 }
 
-# ifdef HAVE_STRUCT_UTMP_UT_HOST
+# ifdef UTHOSTLEN
 size_t
 utmphostsize(void)
 {
@@ -644,12 +659,11 @@ utmphost(void)
     resetwatch();
     return host;
 }
-# endif /* HAVE_STRUCT_UTMP_UT_HOST */
+# endif /* UTHOSTLEN */
 
 #ifdef WINNT_NATIVE
-void add_to_who_list(name, mach_nm)
-    char *name;
-    char *mach_nm;
+void
+add_to_who_list(char *name, char *mach_nm)
 {
 
     struct who *wp, *wpnew;
diff --git a/contrib/tcsh/tcsh.man b/contrib/tcsh/tcsh.man
index 5178d10..cb0709e 100644
--- a/contrib/tcsh/tcsh.man
+++ b/contrib/tcsh/tcsh.man
@@ -72,7 +72,7 @@
 .\"   used here if you can. In particular, please don't use nroff commands
 .\"   which aren't already used herein.
 .\" 
-.TH TCSH 1 "10 July 2009" "Astron 6.17.00"
+.TH TCSH 1 "14 February 2012" "Astron 6.18.01"
 .SH NAME
 tcsh \- C shell with file name completion and command line editing
 .SH SYNOPSIS
@@ -444,6 +444,17 @@ would list all three files, because case is ignored and hyphens and
 underscores are equivalent.  Periods, however, are not equivalent to
 hyphens or underscores.
 .PP
+If the \fBcomplete\fR shell variable is set to `Enhance', completion
+ignores case and differences between a hyphen and an underscore word
+separator only when the user types a lowercase character or a hyphen.
+Entering an uppercase character or an underscore will not match the 
+corresponding lowercase character or hyphen word separator.  
+Typing `rm a\-\-file[^D]' in the directory of the previous example would 
+still list all three files, but typing `rm A\-\-file' would match only 
+`A_silly_file' and typing `rm a__file[^D]' would match just `A_silly_file' 
+and `another_silly_file' because the user explicitly used an uppercase 
+or an underscore character.  
+.PP
 Completion and listing are affected by several other shell variables:
 \fBrecexact\fR can be set to complete on the shortest possible unique
 match, even if more typing might result in a longer match:
@@ -609,7 +620,7 @@ See \fBFilename substitution\fR.
 .TP 8
 .B expand-line \fR(not bound)
 Like \fIexpand-history\fR, but
-expands history substitutions in each word in the input buffer,
+expands history substitutions in each word in the input buffer.
 .TP 8
 .B expand-variables \fR(^X-$)
 Expands the variable to the left of the cursor.
@@ -860,7 +871,7 @@ history use the literal form.
 .PP
 The \fIhistory\fR builtin command can print, store in a file, restore
 and clear the history list at any time,
-and the \fBsavehist\fR and \fBhistfile\fR shell variables can be can be set to
+and the \fBsavehist\fR and \fBhistfile\fR shell variables can be set to
 store the history list automatically on logout and restore it on login.
 .PP
 History substitutions introduce words from the history list into the input
@@ -1150,7 +1161,7 @@ The system maintains its own list of ``environment'' variables.
 These can be displayed and changed with \fIprintenv\fR, \fIsetenv\fR and
 \fIunsetenv\fR.
 .PP
-(+) Variables may be made read-only with `set \-r' (q.v.)
+(+) Variables may be made read-only with `set \-r' (q.v.).
 Read-only variables may not be modified or unset;
 attempting to do so will cause an error.
 Once made read-only, a variable cannot be made writable,
@@ -1328,9 +1339,14 @@ pattern.
 .PP
 In matching filenames, the character `.' at the beginning of a filename or
 immediately following a `/', as well as the character `/' must be matched
-explicitly.  The character `*' matches any string of characters, including the
-null string.  The character `?' matches any single character.  The sequence
-`[...]' matches any one of the characters enclosed.  Within `[...]', a pair of
+explicitly (unless either
+.B globdot
+or
+.B globstar
+or both are set(+)).  The character `*' matches any string of characters, 
+including the null string.  The character `?' matches any single character.  
+The sequence `[...]' matches any one of the characters enclosed.  
+Within `[...]', a pair of
 characters separated by `\-' matches any character lexically between the two.
 .PP
 (+) Some glob-patterns can be negated:
@@ -1381,6 +1397,20 @@ only if there were no files in the current directory ending in `.a', `.c', or
 of patterns) which matches nothing is left unchanged rather than causing
 an error.
 .PP
+The \fBglobstar\fR shell variable can be set to allow `**' or `***' as 
+a file glob pattern that matches any string of characters including `/',
+recursively traversing any existing sub-directories.  For example, 
+`ls **.c' will list all the .c files in the current directory tree.
+If used by itself, it will match match zero or more sub-directories
+(e.g. `ls /usr/include/**/time.h' will list any file named `time.h'
+in the /usr/include directory tree; `ls /usr/include/**time.h' will match 
+any file in the /usr/include directory tree ending in `time.h'; and
+`ls /usr/include/**time**.h' will match any .h file with `time' either
+in a subdirectory name or in the filename itself).
+To prevent problems with recursion, the `**' glob-pattern will not 
+descend into a symbolic link containing a directory.  To override this,
+use `***' (+)
+.PP
 The \fBnoglob\fR shell variable can be set to prevent filename substitution,
 and the \fIexpand-glob\fR editor command, normally bound to `^X-*', can be
 used to interactively expand individual filename substitutions.
@@ -1501,7 +1531,7 @@ to specify an interpreter other than the shell itself.
 .PP
 On systems which do not understand the `#!' script interpreter convention
 the shell may be compiled to emulate it; see the \fBversion\fR shell
-variable\fR.  If so, the shell checks the first line of the file to
+variable.  If so, the shell checks the first line of the file to
 see if it is of the form `#!\fIinterpreter\fR \fIarg\fR ...'.  If it is,
 the shell starts \fIinterpreter\fR with the given \fIarg\fRs and feeds the
 file to it on standard input.
@@ -1704,7 +1734,7 @@ Sticky bit is set (+)
 for a terminal device (+)
 .TP 4
 .B R
-Has been migrated (convex only) (+)
+Has been migrated (Convex only) (+)
 .TP 4
 .B L
 Applies subsequent operators in a multiple-operator test to a symbolic link
@@ -1730,7 +1760,7 @@ non-links.  \fBL\fR has a different meaning when it is the last operator
 in a multiple-operator test; see below.
 .PP
 It is possible but not useful, and sometimes misleading, to combine operators
-which expect \fIfile\fR to be a file with operators which do not,
+which expect \fIfile\fR to be a file with operators which do not
 (e.g., \fBX\fR and \fBt\fR).  Following \fBL\fR with a non-file operator
 can lead to particularly strange results.
 .PP
@@ -2261,7 +2291,7 @@ see the \fBversion\fR shell variable.
 .B case \fIlabel\fB:
 A label in a \fIswitch\fR statement as discussed below.
 .TP 8
-.B cd \fR[\fB\-p\fR] [\fB\-l\fR] [\fB\-n\fR|\fB\-v\fR] [\fIname\fR]
+.B cd \fR[\fB\-p\fR] [\fB\-l\fR] [\fB\-n\fR|\fB\-v\fR] [\I--\fR] [\fIname\fR]
 If a directory \fIname\fR is given, changes the shell's working directory
 to \fIname\fR.  If not, changes to \fBhome\fR.
 If \fIname\fR is `\-' it is interpreted as the previous working directory
@@ -2276,6 +2306,8 @@ begins with `/', then this is tried to see if it is a directory.
 With \fB\-p\fR, prints the final directory stack, just like \fIdirs\fR.
 The \fB\-l\fR, \fB\-n\fR and \fB\-v\fR flags have the same effect on \fIcd\fR
 as on \fIdirs\fR, and they imply \fB\-p\fR.  (+)
+Using \fB\-\-\fR forces a break from option processing so the next word
+is taken as the directory \fIname\fR even if it begins with '\-'. (+)
 .PP
 See also the \fBimplicitcd\fR shell variable.
 .RE
@@ -2559,7 +2591,7 @@ Finally, here's a complex example for inspiration:
 .br
 \&'n/\-name/f/' 'n/\-newer/f/' 'n/\-{,n}cpio/f/' \e
 .br
-\'n/\-exec/c/' 'n/\-ok/c/' 'n/\-user/u/' \e
+\&\'n/\-exec/c/' 'n/\-ok/c/' 'n/\-user/u/' \e
 .br
 \&'n/\-group/g/' 'n/\-fstype/(nfs 4.2)/' \e
 .br
@@ -2811,7 +2843,7 @@ With \fIcommand\fR, runs \fIcommand\fR such that it will exit on a hangup
 signal and arranges for the shell to send it a hangup signal when the shell
 exits.
 Note that commands may set their own response to hangups, overriding \fIhup\fR.
-Without an argument (allowed in only a shell script), causes the shell to
+Without an argument, causes the non-interactive shell only to
 exit on a hangup for the remainder of the script.
 See also \fBSignal handling\fR and the \fInohup\fR builtin command.
 .TP 8
@@ -2911,6 +2943,14 @@ the size of the largest core dump that will be created
 the maximum amount of physical memory a process
 may have allocated to it at a given time
 .TP
+\fIvmemoryuse\fR
+the maximum amount of virtual memory a process
+may have allocated to it at a given time (address space)
+.TP
+\fIvmemoryuse\fR
+the maximum amount of virtual memory a process
+may have allocated to it at a given time
+.TP
 \fIheapsize\fR
 the maximum amount of memory a process
 may allocate per \fIbrk()\fR system call
@@ -2929,18 +2969,40 @@ the maximum number of simultaneous processes for this user id
 .TP
 \fIsbsize\fR
 the maximum size of socket buffer usage for this user
-.TP 
-\fIswapsize\fR 
-the maximum amount of swap space reserved or used for this user 
+.TP
+\fIswapsize\fR
+the maximum amount of swap space reserved or used for this user
+.TP
+\fImaxlocks\fR
+the maximum number of locks for this user
+.TP
+\fImaxsignal\fR
+the maximum number of pending signals for this user
+.TP
+\fImaxmessage\fR
+the maximum number of bytes in POSIX mqueues for this user
+.TP
+\fImaxnice\fR
+the maximum nice priority the user is allowed to raise mapped from [19...-20]
+to [0...39] for this user
+.TP
+\fImaxrtprio\fR
+the maximum realtime priority for this user
+\fImaxrttime\fR
+the timeout for RT tasks in microseconds for this user.
 .PP
 \fImaximum-use\fR may be given as a (floating point or
 integer) number followed by a scale factor.  For all limits
 other than \fIcputime\fR the default scale is `k' or `kilobytes'
-(1024 bytes); a scale factor of `m' or `megabytes' may also
-be used.  For \fIcputime\fR the default scaling is `seconds',
+(1024 bytes); a scale factor of `m' or `megabytes' or `g' or `gigabytes'
+may also be used.  For \fIcputime\fR the default scaling is `seconds',
 while `m' for minutes or `h' for hours, or a time of the
 form `mm:ss' giving minutes and seconds may be used.
 .PP
+If \fImaximum-use\fR  is `unlimited',
+then the limitation on the specified \fIresource\fR
+is removed (this is equivalent to the \fIunlimit\fR builtin command).
+.PP
 For both \fIresource\fR names and scale factors, unambiguous
 prefixes of the names suffice.
 .RE
@@ -2952,7 +3014,7 @@ See also \fIwatchlog\fR.
 .TP 8
 .B login
 Terminates a login shell, replacing it with an instance of
-\fI/bin/login.\fR This is one way to log off, included for
+\fI/bin/login\fR. This is one way to log off, included for
 compatibility with \fIsh\fR(1).
 .TP 8
 .B logout
@@ -3021,7 +3083,7 @@ unless \fBlistflags\fR contains an `x', in which case it acts like `ls \-xF'.
 so `alias ls ls\-F' generally does the right thing.
 .PP
 The \fBls\-F\fR builtin can list files using different colors depending on the
-filetype or extension.  See the \fBcolor\fR \fItcsh\fR variable and the
+filetype or extension.  See the \fBcolor\fR shell variable and the
 \fBLS_COLORS\fR environment variable.
 .RE
 .PP
@@ -3037,7 +3099,7 @@ itself can cause unexpected behavior, because the shell
 does not like to lose its tty.  (TCF only)
 .PD
 .TP 8
-.B newgrp \fR[\fB\-\fR] \fIgroup\fR (+)
+.B newgrp \fR[\fB\-\fR] \fI[group]\fR (+)
 Equivalent to `exec newgrp'; see \fInewgrp\fR(1).
 Available only if the shell was so compiled;
 see the \fBversion\fR shell variable.
@@ -3055,7 +3117,7 @@ commands in simple \fIif\fR statements apply.
 .B nohup \fR[\fIcommand\fR]
 With \fIcommand\fR, runs \fIcommand\fR such that it will ignore hangup signals.
 Note that commands may set their own response to hangups, overriding \fInohup\fR.
-Without an argument (allowed in only a shell script), causes the shell to
+Without an argument, causes the non-interactive shell only to
 ignore hangups for the remainder of the script.
 See also \fBSignal handling\fR and the \fIhup\fR builtin command.
 .TP 8
@@ -3118,11 +3180,12 @@ as on \fIdirs\fR.  (+)
 .B rehash
 Causes the internal hash table of the contents of the
 directories in the \fBpath\fR variable to be recomputed.  This is
-needed if new commands are added to directories in \fBpath\fR
-while you are logged in.  This should be necessary only if
-you add commands to one of your own directories, or if a
-systems programmer changes the contents of one of the
-system directories.  Also flushes the cache of home directories
+needed if the \fBautorehash\fR shell variable is not set and new
+commands are added to directories in \fBpath\fR while you are logged
+in.  With \fBautorehash\fR, a new command will be found
+automatically, except in the special case where another command of
+the same name which is located in a different directory already
+exists in the hash table.  Also flushes the cache of home directories
 built by tilde expansion.
 .TP 8
 .B repeat \fIcount command
@@ -3217,14 +3280,13 @@ The second form sets \fIname\fR to the null string.
 The third form sets \fIname\fR to the single \fIword\fR.
 The fourth form sets \fIname\fR to the list of words in
 \fIwordlist\fR.  In all cases the value is command and filename expanded.
-If \-r is specified, the value is set read-only.  If \-f or \-l are
-specified, set only unique words keeping their order.
-\-f prefers the first occurrence of a word, and \-l the last.
-The fifth form sets the \fIindex\fR'th component of name to \fIword\fR;
+If \fB\-r\fR is specified, the value is set read-only.  If \fB\-f\fR or
+\fB\-l\fR are specified, set only unique words keeping their order.
+\fB\-f\fR prefers the first occurrence of a word, and \fB\-l\fR the last.
+The fifth form sets the \fIindex\fR'th component of \fIname\fR to \fIword\fR;
 this component must already exist.
 The sixth form lists only the names of all shell variables that are read-only.
 The seventh form makes \fIname\fR read-only, whether or not it has a value.
-The second form sets \fIname\fR to the null string.
 The eighth form is the same as the third form, but
 make \fIname\fR read-only at the same time.
 .PD
@@ -3360,7 +3422,7 @@ Common values for the mask are
 022, giving read and execute access to the group and others.
 Without \fIvalue\fR, prints the current file creation mask.
 .TP 8
-.B unalias \fIpattern
+.B unalias \fIpattern\fR
 .br
 Removes all aliases whose names match \fIpattern\fR.
 `unalias *' thus removes all aliases.
@@ -3590,8 +3652,8 @@ characters are added by completion.
 The first word is the number of minutes of inactivity before automatic
 logout.  The optional second word is the number of minutes of inactivity
 before automatic locking.
-When the shell automatically logs out,
-it prints `auto-logout', sets the variable logout to `automatic' and exits.
+When the shell automatically logs out, it prints `auto-logout', sets the
+variable \fBlogout\fR to `automatic' and exits.
 When the shell automatically locks, the user is required to enter his password
 to continue working.  Five incorrect attempts result in automatic logout.
 Set to `60' (automatic logout after 60 minutes, and no locking) by default
@@ -3601,6 +3663,14 @@ the tty is a pseudo-tty (pty) or the shell was not so compiled (see the
 \fBversion\fR shell variable).
 See also the \fBafsuser\fR and \fBlogout\fR shell variables.
 .TP 8
+.B autorehash \fR(+)
+If set, the internal hash table of the contents of the directories in the
+\fBpath\fR variable will be recomputed if a command is not found in the hash
+table.  In addition, the list of available commands will be rebuilt for each
+command completion or spelling correction attempt if set to `complete' or
+`correct' respectively; if set to `always', this will be done for both
+cases.
+.TP 8
 .B backslash_quote \fR(+)
 If set, backslashes (`\\') always quote `\\', `'', and `"'.  This may make
 complex quoting tasks easier, but it can cause syntax errors in \fIcsh\fR(1)
@@ -3633,10 +3703,15 @@ If set, the shell will evaluate expressions right to left, like the original
 \fIcsh\fR.
 .TP 8
 .B complete \fR(+)
-If set to `enhance', completion 1) ignores case and 2) considers
-periods, hyphens and underscores (`.', `\-' and `_') to be word
-separators and hyphens and underscores to be equivalent. If set to
-`igncase', the completion becomes case insensitive.
+If set to `igncase', the completion becomes case insensitive.
+If set to `enhance', completion ignores case and considers
+hyphens and underscores to be equivalent; it will also treat
+periods, hyphens and underscores (`.', `\-' and `_') as word
+separators.
+If set to `Enhance', completion matches uppercase and underscore
+characters explicitly and matches lowercase and hyphens in a
+case-insensivite manner; it will treat periods, hypens and underscores
+as word separators.
 .TP 8
 .B continue \fR(+)
 If set to a list of commands, the shell will continue the listed
@@ -3683,7 +3758,7 @@ but the first element (the current working directory) is always correct.
 See also the \fBcwd\fR and \fBowd\fR shell variables.
 .TP 8
 .B dspmbyte \fR(+)
-Has an affect iff 'dspm' is listed as part of the \fBversion\fR shell variable.
+Has an effect iff 'dspm' is listed as part of the \fBversion\fR shell variable.
 If set to `euc', it enables display and editing EUC-kanji(Japanese) code.
 If set to `sjis', it enables display and editing Shift-JIS(Japanese) code.
 If set to `big5', it enables display and editing Big5(Chinese) code.
@@ -3709,12 +3784,12 @@ is set to number 0,1,2 and 3.  Each number has the following meaning:
   3 ... used for both the first byte and second byte of a multi-byte character.
 .\" SHK: I tried my best to get the following to be grammatically correct.
 .\" However, I still don't understand what's going on here.  In the
- \" following example, there are three bytes, but the text seems to refer to
- \" each nybble as a character.  What's going on here?  It this 3-byte code
- \" in the table?  The text above seems to imply that there are 256
- \" characters/bytes in the table.  If I get some more info on this (perhaps
- \" a complete example), I could fix the text to be grammatically correct.
- \" (steve.kelem@xilinx.com 1999/09/13)
+.\" following example, there are three bytes, but the text seems to refer to
+.\" each nybble as a character.  What's going on here?  It this 3-byte code
+.\" in the table?  The text above seems to imply that there are 256
+.\" characters/bytes in the table.  If I get some more info on this (perhaps
+.\" a complete example), I could fix the text to be grammatically correct.
+.\" (steve.kelem@xilinx.com 1999/09/13)
 .PP
   Example:
 .br
@@ -3782,6 +3857,12 @@ If set, the `%c'/`%.' and `%C' prompt sequences (see the \fBprompt\fR
 shell variable) indicate skipped directories with an ellipsis (`...')
 instead of `/<skipped>'.
 .TP 8
+.B euid \fR(+)
+The user's effective user ID.
+.TP 8
+.B euser \fR(+)
+The first matching passwd entry name corresponding to the effective user ID.
+.TP 8
 .B fignore \fR(+)
 Lists file name suffixes to be ignored by completion.
 .TP 8
@@ -3795,6 +3876,22 @@ If set in \fIcsh\fR, filename completion is used.
 .B gid \fR(+)
 The user's real group ID.
 .TP 8
+.B globdot \fR(+)
+If set, wild-card glob patterns will match files and directories beginning
+with `.' except for `.' and `..'
+.TP 8
+.B globstar \fR(+)
+If set, the `**' and `***' file glob patterns will match any string of 
+characters including `/' traversing any existing sub-directories.  (e.g. 
+`ls **.c' will list all the .c files in the current directory tree).
+If used by itself, it will match match zero or more sub-directories
+(e.g. `ls /usr/include/**/time.h' will list any file named `time.h'
+in the /usr/include directory tree; whereas `ls /usr/include/**time.h'
+will match any file in the /usr/include directory tree ending in `time.h').
+To prevent problems with recursion, the `**' glob-pattern will not 
+descend into a symbolic link containing a directory.  To override this,
+use `***'
+.TP 8
 .B group \fR(+)
 The user's group name.
 .TP 8
@@ -3802,7 +3899,7 @@ The user's group name.
 If set, the incremental search match (in \fIi-search-back\fR and
 \fIi-search-fwd\fR) and the region between the mark and the cursor are
 highlighted in reverse video.
-
+.IP "" 8
 Highlighting requires more frequent terminal writes, which introduces extra
 overhead. If you care about terminal performance, you may want to leave this
 unset.
@@ -3926,13 +4023,12 @@ signal (see \fBSignal handling\fR).  See also the \fBautologout\fR
 shell variable.
 .TP 8
 .B mail
-The names of the files or directories to check for incoming mail,
-separated by whitespace, and optionally preceded by a numeric word.
-Before each prompt, if 10 minutes have passed since the last check, the
-shell checks each file and says `You have new mail.' (or, if \fBmail\fR
-contains multiple files, `You have new mail in \fIname\fR.') if the
-filesize is greater than zero in size and has a modification time
-greater than its access time.
+A list of files and directories to check for incoming mail, optionally
+preceded by a numeric word.  Before each prompt, if 10 minutes have
+passed since the last check, the shell checks each file and says `You
+have new mail.' (or, if \fBmail\fR contains multiple files, `You have
+new mail in \fIname\fR.') if the filesize is greater than zero in size
+and has a modification time greater than its access time.
 .PP
 .RS +8
 .PD
@@ -4011,7 +4107,12 @@ See also the \fBcwd\fR and \fBdirstack\fR shell variables.
 .TP 8
 .B padhour
 If set, enable the printing of padding '0' for hours, in 24 and 12 hour
-formats.  E.G.: 07:45:42 vs. 7:45:42
+formats.  E.G.: 07:45:42 vs. 7:45:42.
+.TP 8
+.B parseoctal
+To retain compatibily with older versions numeric variables starting with
+0 are not interpreted as octal. Setting this variable enables proper octal
+parsing.
 .TP 8
 .B path
 A list of directories in which to look for executable commands.
@@ -4105,6 +4206,9 @@ A single `%'.
 %n
 The user name.
 .TP 4
+%N
+The effective user name.
+.TP 4
 %j
 The number of jobs.
 .TP 4
@@ -4249,7 +4353,14 @@ Reset to 1 in login shells.
 See also \fBloginsh\fR.
 .TP 8
 .B status
-The status returned by the last command.  If it terminated
+The status returned by the last command, unless the variable
+.B anyerror
+is set, and any error in a pipeline or a backquote expansion will be
+propagated (this is the default
+.B csh
+behavior, and the current
+.B tcsh
+default). If it terminated
 abnormally, then 0200 is added to the status.  Builtin commands
 which fail return exit status `1', all other builtin commands
 return status `0'.
@@ -4991,7 +5102,7 @@ See the \fBgid\fR, \fBloginsh\fR, \fBoid\fR, \fBshlvl\fR, \fBtcsh\fR,
 variables.
 .PP
 A new syntax for including useful information in the prompt string
-(see \fBprompt\fR).
+(see \fBprompt\fR),
 and special prompts for loops and spelling correction
 (see \fBprompt2\fR and \fBprompt3\fR).
 .PP
@@ -5016,8 +5127,7 @@ done with output control.
 Alias substitution is most often used to clumsily simulate shell procedures;
 shell procedures should be provided rather than aliases.
 .PP
-Commands within loops are not placed in the history
-list.  Control structures should be parsed rather than being recognized as
+Control structures should be parsed rather than being recognized as
 built-in commands.  This would allow control commands to be placed anywhere,
 to be combined with `|', and to be used with `&' and `;' metasyntax.
 .PP
@@ -5091,7 +5201,7 @@ pipe(2), setrlimit(2), sigvec(2), stat(2), umask(2), vfork(2), wait(2),
 malloc(3), setlocale(3), tty(4), a.out(5), termcap(5), environ(7),
 termio(7), Introduction to the C Shell
 .SH VERSION
-This manual documents tcsh 6.17.00 (Astron) 2009-07-10.
+This manual documents tcsh 6.18.01 (Astron) 2012-02-14.
 .SH AUTHORS
 .PD 0
 .TP 2
diff --git a/contrib/tcsh/tcsh.man2html b/contrib/tcsh/tcsh.man2html
index 8a0cefd..2dc2c7d 100644
--- a/contrib/tcsh/tcsh.man2html
+++ b/contrib/tcsh/tcsh.man2html
@@ -1,5 +1,5 @@
 : # -*- perl -*-
-# $tcsh: tcsh.man2html,v 1.14 2006/03/02 18:46:45 christos Exp $
+# $tcsh: tcsh.man2html,v 1.15 2011/02/05 16:15:56 christos Exp $
 
 # tcsh.man2html, Dave Schweisguth <dcs@proton.chem.yale.edu>
 #
@@ -689,10 +689,9 @@ sub font {
 
     $bold = $italic = 0;
     foreach $i (0 .. $#begin) {
-	$* = 1;
 	$part = join('', @para[$begin[$i] .. $end[$i]]);
-	$part =~ s/^\.([BI])\s+(.*)$/\\f$1$2\\fR/g;	    # .B, .I
-	@pieces = split(/(\\f[BIR])/, $part);
+	$part =~ s/^\.([BI])\s+(.*)$/\\f$1$2\\fR/gm;	    # .B, .I
+	@pieces = split(/(\\f[BIR])/m, $part);
 	$part = '';
 	foreach $j (@pieces) {
 	    if ($j eq '\fB') {
@@ -725,7 +724,6 @@ sub font {
 		$part .= $j;	
 	    }
 	}
-	$* = 0;
 
 	# Close bold/italic before break
 
diff --git a/contrib/tcsh/tw.color.c b/contrib/tcsh/tw.color.c
index 2e935fc..31a1d2d 100644
--- a/contrib/tcsh/tw.color.c
+++ b/contrib/tcsh/tw.color.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.color.c,v 1.25 2008/10/17 19:57:33 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tw.color.c,v 1.27 2010/08/19 05:52:19 christos Exp $ */
 /*
  * tw.color.c: builtin color ls-F
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tw.color.c,v 1.25 2008/10/17 19:57:33 christos Exp $")
+RCSID("$tcsh: tw.color.c,v 1.27 2010/08/19 05:52:19 christos Exp $")
 
 #include "tw.h"
 #include "ed.h"
@@ -86,6 +86,9 @@ static Variable variables[] = {
     VAR(NOS, "ow", ""),		/* Other writable dir (o+w) but not sticky */
     VAR(NOS, "st", ""),		/* Sticky dir (+t) but not other writable */
     VAR(NOS, "rs", "0"),	/* Reset to normal color */
+    VAR(NOS, "hl", "44;37"),    /* Reg file extra hard links, obsolete? */
+    VAR(NOS, "mh", "44;37"),    /* Reg file extra hard links */
+    VAR(NOS, "ca", "30;41"),    /* File with capability */
 };
 
 enum FileType {
diff --git a/contrib/tcsh/tw.init.c b/contrib/tcsh/tw.init.c
index 29f5586..68adbb9 100644
--- a/contrib/tcsh/tw.init.c
+++ b/contrib/tcsh/tw.init.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.init.c,v 3.39 2006/03/02 18:46:45 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tw.init.c,v 3.42 2011/04/17 14:49:30 christos Exp $ */
 /*
  * tw.init.c: Handle lists of things to complete
  */
@@ -32,7 +32,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tw.init.c,v 3.39 2006/03/02 18:46:45 christos Exp $")
+RCSID("$tcsh: tw.init.c,v 3.42 2011/04/17 14:49:30 christos Exp $")
 
 #include "tw.h"
 #include "ed.h"
@@ -234,10 +234,14 @@ tw_cmd_cmd(void)
 #if defined(_UWIN) || defined(__CYGWIN__)
 	    /* Turn foo.{exe,com,bat} into foo since UWIN's readdir returns
 	     * the file with the .exe, .com, .bat extension
+	     *
+	     * Same for Cygwin, but only for .exe and .com extension.
 	     */
 	    len = strlen(dp->d_name);
 	    if (len > 4 && (strcmp(&dp->d_name[len - 4], ".exe") == 0 ||
+#ifndef __CYGWIN__
 		strcmp(&dp->d_name[len - 4], ".bat") == 0 ||
+#endif /* !__CYGWIN__ */
 		strcmp(&dp->d_name[len - 4], ".com") == 0))
 		dp->d_name[len - 4] = '\0';
 #endif /* _UWIN || __CYGWIN__ */
@@ -400,7 +404,7 @@ tw_cmd_next(struct Strbuf *res, struct Strbuf *dir, int *flags)
      * We need to process relatives in the path.
      */
     while ((tw_cmd_state.dfd == NULL ||
-	    (ret = tw_dir_next(res, tw_cmd_state.dfd)) == 0) &&
+	    (res->len = 0, ret = tw_dir_next(res, tw_cmd_state.dfd)) == 0) &&
 	   *tw_cmd_state.pathv != NULL) {
 
         CLRDIR(tw_cmd_state.dfd)
@@ -408,6 +412,7 @@ tw_cmd_next(struct Strbuf *res, struct Strbuf *dir, int *flags)
 	while (*tw_cmd_state.pathv && tw_cmd_state.pathv[0][0] == '/')
 	    tw_cmd_state.pathv++;
 	if ((ptr = *tw_cmd_state.pathv) != 0) {
+	    res->len = 0;
 	    Strbuf_append(res, ptr);
 	    ret = 1;
 	    /*
@@ -660,7 +665,7 @@ tw_grpname_start(DIR *dfd, const Char *pat)
 {
     USE(pat);
     SETDIR(dfd)
-#if !defined(_VMS_POSIX) && !defined(_OSD_POSIX) && !defined(WINNT_NATIVE)
+#if !defined(_VMS_POSIX) && !defined(_OSD_POSIX) && !defined(WINNT_NATIVE) && !defined (__ANDROID__)
     (void) setgrent();	/* Open group file */
 #endif /* !_VMS_POSIX && !_OSD_POSIX && !WINNT_NATIVE */
 } /* end tw_grpname_start */
@@ -684,7 +689,7 @@ tw_grpname_next(struct Strbuf *res, struct Strbuf *dir, int *flags)
     USE(flags);
     USE(dir);
     pintr_disabled++;
-#if !defined(_VMS_POSIX) && !defined(_OSD_POSIX) && !defined(WINNT_NATIVE)
+#if !defined(_VMS_POSIX) && !defined(_OSD_POSIX) && !defined(WINNT_NATIVE) && !defined(__ANDROID__)
     errno = 0;
     while ((gr = getgrent()) == NULL && errno == EINTR) {
 	handle_pending_signals();
@@ -715,7 +720,7 @@ tw_grpname_end(void)
 #ifdef YPBUGS
     fix_yp_bugs();
 #endif
-#if !defined(_VMS_POSIX) && !defined(_OSD_POSIX) && !defined(WINNT_NATIVE)
+#if !defined(_VMS_POSIX) && !defined(_OSD_POSIX) && !defined(WINNT_NATIVE) && !defined (__ANDROID__)
    (void) endgrent();
 #endif /* !_VMS_POSIX && !_OSD_POSIX && !WINNT_NATIVE */
 } /* end tw_grpname_end */
diff --git a/contrib/tcsh/tw.parse.c b/contrib/tcsh/tw.parse.c
index d17225f..dc32dba 100644
--- a/contrib/tcsh/tw.parse.c
+++ b/contrib/tcsh/tw.parse.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.parse.c,v 3.124 2007/07/02 15:48:48 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/tw.parse.c,v 3.133 2011/04/14 14:33:05 christos Exp $ */
 /*
  * tw.parse.c: Everyone has taken a shot in this futile effort to
  *	       lexically analyze a csh line... Well we cannot good
@@ -35,7 +35,7 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tw.parse.c,v 3.124 2007/07/02 15:48:48 christos Exp $")
+RCSID("$tcsh: tw.parse.c,v 3.133 2011/04/14 14:33:05 christos Exp $")
 
 #include "tw.h"
 #include "ed.h"
@@ -124,7 +124,8 @@ static  int      tw_collect_items	(COMMAND, int, struct Strbuf *,
 static  int      tw_collect		(COMMAND, int, struct Strbuf *,
 					 struct Strbuf *, Char *, Char *, int,
 					 DIR *);
-static	Char 	 tw_suffix		(int, const Char *, Char *);
+static	Char 	 tw_suffix		(int, struct Strbuf *,const Char *,
+					 Char *);
 static	void 	 tw_fixword		(int, struct Strbuf *, Char *, Char *);
 static	void	 tw_list_items		(int, int, int);
 static 	void	 add_scroll_tab		(Char *);
@@ -205,9 +206,11 @@ tenematch(Char *inputline, int num_read, COMMAND command)
 	/* Don't quote '/' to make the recognize stuff work easily */
 	/* Don't quote '$' in double quotes */
 
-	if (cmap(*cp, _ESC) && cp < str_end - 1 && cp[1] == HIST)
+	if (cmap(*cp, _ESC) && cp < str_end - 1 && cp[1] == HIST &&
+	    HIST != '\0')
 	    Strbuf_append1(&qline, *++cp | QUOTE);
-	else if (qu && (tricky(*cp) || *cp == '~') && !(qu == '\"' && tricky_dq(*cp)))
+	else if (qu && (tricky(*cp) || *cp == '~') &&
+	    !(qu == '\"' && tricky_dq(*cp)))
 	    Strbuf_append1(&qline, *cp | QUOTE);
 	else
 	    Strbuf_append1(&qline, *cp);
@@ -350,6 +353,20 @@ tenematch(Char *inputline, int num_read, COMMAND command)
 	Strbuf_append(&wordbuf, qline.s + wordp);
 	Strbuf_terminate(&wordbuf);
 	cleanup_push(&wordbuf, Strbuf_cleanup);
+
+	/*
+	 * Don't try to spell things that we know they are correct.
+	 * Trying to spell can hang when we have NFS mounted hung
+	 * volumes.
+	 */
+	if ((looking == TW_COMMAND) && Strchr(wordbuf.s, '/') != NULL) {
+	    if (executable(NULL, wordbuf.s, 0)) {
+		cleanup_until(&wordbuf);
+		search_ret = 0;
+		goto end;
+	    }
+	}
+
 	search_ret = spell_me(&wordbuf, looking, pat, suf);
 	qline.len = wordp;
 	Strbuf_append(&qline, wordbuf.s);
@@ -640,8 +657,9 @@ insert_meta(const Char *cp, const Char *cpend, const Char *word,
 	    Strbuf_append1(&buffer, w);
 	    Strbuf_append1(&buffer, qu);
 	} else if (wq &&
-		   ((!qu && (tricky(w) || (w == HISTSUB && buffer.len == 0))) ||
-		    (!cmap(qu, _ESC) && w == HIST))) {
+		   ((!qu && (tricky(w) || (w == HISTSUB && HISTSUB != '\0'
+		       && buffer.len == 0))) ||
+		    (!cmap(qu, _ESC) && w == HIST && HIST != '\0'))) {
 	    in_sync = 0;
 	    Strbuf_append1(&buffer, '\\');
 	    Strbuf_append1(&buffer, w);
@@ -688,37 +706,40 @@ is_prefix(Char *check, Char *template)
  * and matches on shortening of commands
  */
 static int
-is_prefixmatch(Char *check, Char *template, int igncase)
+is_prefixmatch(Char *check, Char *template, int enhanced)
 {
-    Char MCH1, MCH2;
+    Char MCH1, MCH2, LCH1, LCH2;
 
     for (; *check; check++, template++) {
 	if ((*check & TRIM) != (*template & TRIM)) {
-            MCH1 = (*check & TRIM);
-            MCH2 = (*template & TRIM);
-            MCH1 = Isupper(MCH1) ? Tolower(MCH1) : MCH1;
-            MCH2 = Isupper(MCH2) ? Tolower(MCH2) : MCH2;
-            if (MCH1 != MCH2) {
-                if (!igncase && ((*check & TRIM) == '-' || 
+	    MCH1 = (*check & TRIM);
+	    MCH2 = (*template & TRIM);
+            LCH1 = Isupper(MCH1) ? Tolower(MCH1) : 
+		enhanced == 2 && MCH1 == '_' ? '-' : MCH1;
+            LCH2 = Isupper(MCH2) ? Tolower(MCH2) :
+		enhanced == 2 && MCH2 == '_' ? '-' : MCH2;
+	    if (MCH1 != MCH2 && MCH1 != LCH2 &&
+		(LCH1 != MCH2 || enhanced == 2)) {
+		if (enhanced && ((*check & TRIM) == '-' || 
 				 (*check & TRIM) == '.' ||
 				 (*check & TRIM) == '_')) {
-                    MCH1 = MCH2 = (*check & TRIM);
-                    if (MCH1 == '_') {
-                        MCH2 = '-';
-                    } else if (MCH1 == '-') {
-                        MCH2 = '_';
-                    }
-                    for (;*template && (*template & TRIM) != MCH1 &&
-				       (*template & TRIM) != MCH2; template++)
+		    MCH1 = MCH2 = (*check & TRIM);
+		    if (MCH1 == '_' && enhanced != 2) {
+			MCH2 = '-';
+		    } else if (MCH1 == '-') {
+			MCH2 = '_';
+		    }
+		    for (; *template && (*template & TRIM) != MCH1 &&
+					(*template & TRIM) != MCH2; template++)
 			continue;
-                    if (!*template) {
+		    if (!*template) {
 	                return (FALSE);
-                    }
-                } else {
-	            return (FALSE);
-                }
-            }
-        }
+		    }
+		} else {
+		    return (FALSE);
+		}
+	    }
+	}
     }
     return (TRUE);
 } /* end is_prefixmatch */
@@ -853,7 +874,7 @@ static int
 recognize(struct Strbuf *exp_name, const Char *item, size_t name_length,
 	  int numitems, int enhanced, int igncase)
 {
-    Char MCH1, MCH2;
+    Char MCH1, MCH2, LCH1, LCH2;
     Char *x;
     const Char *ent;
     size_t len = 0;
@@ -872,18 +893,21 @@ recognize(struct Strbuf *exp_name, const Char *item, size_t name_length,
 	for (x = exp_name->s, ent = item; *x; x++, ent++) {
 	    MCH1 = *x & TRIM;
 	    MCH2 = *ent & TRIM;
-            MCH1 = Isupper(MCH1) ? Tolower(MCH1) : MCH1;
-            MCH2 = Isupper(MCH2) ? Tolower(MCH2) : MCH2;
-	    if (MCH1 != MCH2)
-		break;
+	    LCH1 = Isupper(MCH1) ? Tolower(MCH1) : MCH1;
+	    LCH2 = Isupper(MCH2) ? Tolower(MCH2) : MCH2;
+	    if (MCH1 != MCH2) {
+		if (LCH1 == MCH2 || (MCH1 == '_' && MCH2 == '-'))
+		    *x = *ent;
+		else if (LCH1 != LCH2)
+		    break;
+	    }
 	    len++;
 	}
-	if (*x || !*ent)	/* Shorter or exact match */
-	    memcpy(exp_name->s, item, len * sizeof(*exp_name->s));
     }
     *x = '\0';		/* Shorten at 1st char diff */
     exp_name->len = x - exp_name->s;
-    if (!(match_unique_match || is_set(STRrecexact) || (enhanced && *ent)) && len == name_length)	/* Ambiguous to prefix? */
+    if (!(match_unique_match || is_set(STRrecexact) || (enhanced && *ent)) &&
+	len == name_length)	/* Ambiguous to prefix? */
 	return (-1);	/* So stop now and save time */
     return (0);
 } /* end recognize */
@@ -915,6 +939,7 @@ tw_collect_items(COMMAND command, int looking, struct Strbuf *exp_dir,
     int gpat       = flags & TW_PAT_OK;	 /* Match against a pattern */
     int ignoring   = flags & TW_IGN_OK;	 /* Use fignore? */
     int d = 4, nd;			 /* Spelling distance */
+    Char **cp;
     Char *ptr;
     struct varent *vp;
     struct Strbuf buf = Strbuf_INIT, item = Strbuf_INIT;
@@ -939,6 +964,17 @@ tw_collect_items(COMMAND command, int looking, struct Strbuf *exp_dir,
 		break;
 	    }
 
+    if (looking == TW_COMMAND
+	&& (vp = adrof(STRautorehash)) != NULL && vp->vec != NULL)
+	for (cp = vp->vec; *cp; cp++)
+	    if (Strcmp(*cp, STRalways) == 0
+		|| (Strcmp(*cp, STRcorrect) == 0 && command == SPELL)
+		|| (Strcmp(*cp, STRcomplete) == 0 && command != SPELL)) {
+		tw_cmd_free();
+		tw_cmd_start(NULL, NULL);
+		break;
+	    }
+
     cleanup_push(&item, Strbuf_cleanup);
     cleanup_push(&buf, Strbuf_cleanup);
     while (!done &&
@@ -966,9 +1002,15 @@ tw_collect_items(COMMAND command, int looking, struct Strbuf *exp_dir,
 	    /*
 	     * Turn foo.{exe,com,bat,cmd} into foo since UWIN's readdir returns
 	     * the file with the .exe, .com, .bat, .cmd extension
+	     *
+	     * Same for Cygwin, but only for .exe and .com extension.
 	     */
 	    {
+#ifdef __CYGWIN__
+		static const char *rext[] = { ".exe", ".com" };
+#else
 		static const char *rext[] = { ".exe", ".bat", ".com", ".cmd" };
+#endif
 		size_t exti = Strlen(item.s);
 
 		if (exti > 4) {
@@ -1047,18 +1089,18 @@ tw_collect_items(COMMAND command, int looking, struct Strbuf *exp_dir,
 	case RECOGNIZE_ALL:
 	case RECOGNIZE_SCROLL:
 
-	    if ((vp = adrof(STRcomplete)) != NULL && vp->vec != NULL) {
-		Char **cp;
+	    if ((vp = adrof(STRcomplete)) != NULL && vp->vec != NULL)
 		for (cp = vp->vec; *cp; cp++) {
-		    if (Strcmp(*cp, STRigncase) == 0)
+		    if (Strcmp(*cp, STREnhance) == 0)
+			enhanced = 2;
+		    else if (Strcmp(*cp, STRigncase) == 0)
 			igncase = 1;
-		    if (Strcmp(*cp, STRenhance) == 0)
+		    else if (Strcmp(*cp, STRenhance) == 0)
 			enhanced = 1;
 		}
-	    }
 
 	    if (enhanced || igncase) {
-	        if (!is_prefixmatch(target, item.s, igncase))
+	        if (!is_prefixmatch(target, item.s, enhanced))
 		    break;
      	    } else {
 	        if (!is_prefix(target, item.s))
@@ -1191,9 +1233,10 @@ tw_collect_items(COMMAND command, int looking, struct Strbuf *exp_dir,
  */
 /*ARGSUSED*/
 static Char
-tw_suffix(int looking, const Char *exp_dir, Char *exp_name)
+tw_suffix(int looking, struct Strbuf *word, const Char *exp_dir, Char *exp_name)
 {
     Char *ptr;
+    Char *dollar;
     struct varent *vp;
 
     (void) strip(exp_name);
@@ -1215,6 +1258,10 @@ tw_suffix(int looking, const Char *exp_dir, Char *exp_name)
 	else if ((ptr = tgetenv(exp_name)) == NULL || *ptr == '\0')
 	    return ' ';
 
+	if ((dollar = Strrchr(word->s, '$')) != 0 && 
+	    dollar[1] == '{' && Strchr(dollar, '}') == NULL)
+	  return '}';
+
 	return isadirectory(exp_dir, ptr) ? '/' : ' ';
 
 
@@ -1262,6 +1309,7 @@ tw_fixword(int looking, struct Strbuf *word, Char *dir, Char *exp_name)
 
     case TW_VARIABLE:
 	if ((ptr = Strrchr(word->s, '$')) != NULL) {
+	    if (ptr[1] == '{') ptr++;
 	    word->len = ptr + 1 - word->s; /* Delete after the dollar */
 	} else
 	    word->len = 0;
@@ -1497,8 +1545,10 @@ t_search(struct Strbuf *word, COMMAND command, int looking, int list_max,
 	gpat = 0;	/* Override pattern mechanism */
     }
     else if ((target = Strrchr(name, '$')) != 0 && 
+	     (target[1] != '{' || Strchr(target, '}') == NULL) &&
 	     (Strchr(name, '/') == NULL)) {
 	target++;
+	if (target[0] == '{') target++;
 	looking = TW_VARIABLE;
 	gpat = 0;	/* Override pattern mechanism */
     }
@@ -1741,7 +1791,7 @@ t_search(struct Strbuf *word, COMMAND command, int looking, int list_max,
 	    switch (suf) {
 	    case 0: 	/* Automatic suffix */
 		Strbuf_append1(word,
-			       tw_suffix(looking, exp_dir.s, exp_name.s));
+			       tw_suffix(looking, word, exp_dir.s, exp_name.s));
 		break;
 
 	    case CHAR_ERR:	/* No suffix */
diff --git a/contrib/tcsh/vms.termcap.c b/contrib/tcsh/vms.termcap.c
index 58ce7e8..ffae26c 100644
--- a/contrib/tcsh/vms.termcap.c
+++ b/contrib/tcsh/vms.termcap.c
@@ -1,4 +1,4 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/vms.termcap.c,v 1.11 2006/03/02 18:46:45 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/vms.termcap.c,v 1.12 2011/01/09 16:25:29 christos Exp $ */
 /*
  *	termcap.c	1.1	20/7/87		agc	Joypace Ltd
  *
@@ -9,8 +9,8 @@
  *	A public domain implementation of the termcap(3) routines.
  */
 #include "sh.h"
-RCSID("$tcsh: vms.termcap.c,v 1.11 2006/03/02 18:46:45 christos Exp $")
-#if defined(_VMS_POSIX) || defined(_OSD_POSIX)
+RCSID("$tcsh: vms.termcap.c,v 1.12 2011/01/09 16:25:29 christos Exp $")
+#if defined(_VMS_POSIX) || defined(_OSD_POSIX) || defined(__ANDROID__)
 /*    efth      1988-Apr-29
 
     - Correct when TERM != name and TERMCAP is defined   [tgetent]
@@ -43,10 +43,30 @@ extern FILE	*fopen();	/* old fopen */
  *	in bp (which must be an array of 1024 chars). Returns 1 if
  *	termcap entry found, 0 if not found, and -1 if file not found.
  */
-
 int
 tgetent(char *bp, char *name)
 {
+#ifdef __ANDROID__
+	/* Use static termcap entry since termcap file usually doesn't exist. */
+	capab = bp;
+	strcpy(bp,
+	"linux|linux console:"
+        ":am:eo:mi:ms:xn:xo:"
+        ":it#8:"
+        ":AL=\\E[%dL:DC=\\E[%dP:DL=\\E[%dM:IC=\\E[%d@:K2=\\E[G:al=\\E[L:"
+        ":bl=^G:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:cr=^M:"
+        ":cs=\\E[%i%d;%dr:ct=\\E[3g:dc=\\E[P:dl=\\E[M:do=^J:ec=\\E[%dX:"
+        ":ei=\\E[4l:ho=\\E[H:ic=\\E[@:im=\\E[4h:k1=\\E[[A:k2=\\E[[B:"
+        ":k3=\\E[[C:k4=\\E[[D:k5=\\E[[E:k6=\\E[17~:k7=\\E[18~:k8=\\E[19~:"
+        ":k9=\\E[20~:kD=\\E[3~:kI=\\E[2~:kN=\\E[6~:kP=\\E[5~:kb=\\177:"
+        ":kd=\\E[B:kh=\\E[1~:kl=\\E[D:kr=\\E[C:ku=\\E[A:le=^H:mb=\\E[5m:"
+        ":md=\\E[1m:me=\\E[0m:mh=\\E[2m:mr=\\E[7m:nd=\\E[C:nw=^M^J:"
+        ":rc=\\E8:sc=\\E7:se=\\E[27m:sf=^J:so=\\E[7m:sr=\\EM:st=\\EH:ta=^I:"
+        ":ue=\\E[24m:up=\\E[A:us=\\E[4m:vb=200\\E[?5h\\E[?5l:"
+        ":ve=\\E[?25h\\E[?0c:vi=\\E[?25l\\E[?1c:vs=\\E[?25h\\E[?0c:"
+	);
+	return(1);
+#else
 	FILE	*fp;
 	char	*termfile;
 	char	*cp,
@@ -118,6 +138,7 @@ sscanf to look at aliases.  These are delimited by '|'. */
 	sleep(1);
 #endif /* DEBUG */
 	return(0);
+#endif /* ANDROID */
 }
 
 /*
author	mp <mp@FreeBSD.org>	2012-02-22 03:36:15 +0000
committer	mp <mp@FreeBSD.org>	2012-02-22 03:36:15 +0000
commit	3ee51a00f36c11a6172d08d787943dfc63f66110 (patch)
tree	522fd2d4d27770566e466a79d636194e5743d94a /contrib
parent	d177303078ee8f6069218009d6c3c2b6d9d9ca97 (diff)
parent	54c5644df8eb87e7a5b1c4c411e349ac329ee04b (diff)
download	FreeBSD-src-3ee51a00f36c11a6172d08d787943dfc63f66110.zip FreeBSD-src-3ee51a00f36c11a6172d08d787943dfc63f66110.tar.gz