aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Peek <mp@FreeBSD.org>2007-03-11 22:33:41 +0000
committerMark Peek <mp@FreeBSD.org>2007-03-11 22:33:41 +0000
commit45e5710bbb3676c9d945e9df78019b2c58930a59 (patch)
tree34aefea92d30b614247ef1f2671f2362f4761785
parent547e75d62598e0442ceaabccc0c3388d89a5554f (diff)
downloadsrc-45e5710bbb3676c9d945e9df78019b2c58930a59.tar.gz
src-45e5710bbb3676c9d945e9df78019b2c58930a59.zip
Import of tcsh-6.15.00
Notes
Notes: svn path=/vendor/tcsh/dist/; revision=167465
-rw-r--r--contrib/tcsh/Fixes99
-rw-r--r--contrib/tcsh/Imakefile2
-rwxr-xr-xcontrib/tcsh/MAKEDIFFS2
-rwxr-xr-xcontrib/tcsh/MAKESHAR2
-rw-r--r--contrib/tcsh/Makefile.in116
-rw-r--r--contrib/tcsh/Makefile.std2
-rw-r--r--contrib/tcsh/Makefile.vms2
-rw-r--r--contrib/tcsh/README32
-rw-r--r--contrib/tcsh/complete.tcsh2
-rw-r--r--contrib/tcsh/config.h.in48
-rw-r--r--contrib/tcsh/config/bsd4.415
-rw-r--r--contrib/tcsh/config_f.h18
-rwxr-xr-xcontrib/tcsh/configure1753
-rw-r--r--contrib/tcsh/configure.in62
-rw-r--r--contrib/tcsh/ed.chared.c1101
-rw-r--r--contrib/tcsh/ed.decls.h395
-rw-r--r--contrib/tcsh/ed.defns.c42
-rw-r--r--contrib/tcsh/ed.h58
-rw-r--r--contrib/tcsh/ed.init.c122
-rw-r--r--contrib/tcsh/ed.inputl.c218
-rw-r--r--contrib/tcsh/ed.refresh.c209
-rw-r--r--contrib/tcsh/ed.screen.c496
-rw-r--r--contrib/tcsh/ed.term.c92
-rw-r--r--contrib/tcsh/ed.term.h2
-rw-r--r--contrib/tcsh/ed.xmap.c311
-rw-r--r--contrib/tcsh/eight-bit.me2
-rw-r--r--contrib/tcsh/gethost.c21
-rw-r--r--contrib/tcsh/glob.c360
-rw-r--r--contrib/tcsh/glob.h20
-rw-r--r--contrib/tcsh/host.defs16
-rw-r--r--contrib/tcsh/imake.config2
-rw-r--r--contrib/tcsh/ma.setp.c108
-rw-r--r--contrib/tcsh/mi.termios.c4
-rw-r--r--contrib/tcsh/mi.varargs.h2
-rw-r--r--contrib/tcsh/nls/C/set12
-rw-r--r--contrib/tcsh/nls/C/set102
-rw-r--r--contrib/tcsh/nls/C/set112
-rw-r--r--contrib/tcsh/nls/C/set122
-rw-r--r--contrib/tcsh/nls/C/set132
-rw-r--r--contrib/tcsh/nls/C/set142
-rw-r--r--contrib/tcsh/nls/C/set152
-rw-r--r--contrib/tcsh/nls/C/set162
-rw-r--r--contrib/tcsh/nls/C/set172
-rw-r--r--contrib/tcsh/nls/C/set182
-rw-r--r--contrib/tcsh/nls/C/set192
-rw-r--r--contrib/tcsh/nls/C/set22
-rw-r--r--contrib/tcsh/nls/C/set202
-rw-r--r--contrib/tcsh/nls/C/set212
-rw-r--r--contrib/tcsh/nls/C/set222
-rw-r--r--contrib/tcsh/nls/C/set232
-rw-r--r--contrib/tcsh/nls/C/set242
-rw-r--r--contrib/tcsh/nls/C/set252
-rw-r--r--contrib/tcsh/nls/C/set262
-rw-r--r--contrib/tcsh/nls/C/set272
-rw-r--r--contrib/tcsh/nls/C/set292
-rw-r--r--contrib/tcsh/nls/C/set34
-rw-r--r--contrib/tcsh/nls/C/set302
-rw-r--r--contrib/tcsh/nls/C/set312
-rw-r--r--contrib/tcsh/nls/C/set42
-rw-r--r--contrib/tcsh/nls/C/set52
-rw-r--r--contrib/tcsh/nls/C/set62
-rw-r--r--contrib/tcsh/nls/C/set72
-rw-r--r--contrib/tcsh/nls/C/set82
-rw-r--r--contrib/tcsh/nls/C/set92
-rw-r--r--contrib/tcsh/nls/Makefile3
-rw-r--r--contrib/tcsh/nls/et/set12
-rw-r--r--contrib/tcsh/nls/et/set102
-rw-r--r--contrib/tcsh/nls/et/set112
-rw-r--r--contrib/tcsh/nls/et/set122
-rw-r--r--contrib/tcsh/nls/et/set132
-rw-r--r--contrib/tcsh/nls/et/set142
-rw-r--r--contrib/tcsh/nls/et/set152
-rw-r--r--contrib/tcsh/nls/et/set162
-rw-r--r--contrib/tcsh/nls/et/set172
-rw-r--r--contrib/tcsh/nls/et/set182
-rw-r--r--contrib/tcsh/nls/et/set192
-rw-r--r--contrib/tcsh/nls/et/set22
-rw-r--r--contrib/tcsh/nls/et/set202
-rw-r--r--contrib/tcsh/nls/et/set212
-rw-r--r--contrib/tcsh/nls/et/set222
-rw-r--r--contrib/tcsh/nls/et/set232
-rw-r--r--contrib/tcsh/nls/et/set242
-rw-r--r--contrib/tcsh/nls/et/set252
-rw-r--r--contrib/tcsh/nls/et/set262
-rw-r--r--contrib/tcsh/nls/et/set272
-rw-r--r--contrib/tcsh/nls/et/set292
-rw-r--r--contrib/tcsh/nls/et/set32
-rw-r--r--contrib/tcsh/nls/et/set302
-rw-r--r--contrib/tcsh/nls/et/set312
-rw-r--r--contrib/tcsh/nls/et/set42
-rw-r--r--contrib/tcsh/nls/et/set52
-rw-r--r--contrib/tcsh/nls/et/set62
-rw-r--r--contrib/tcsh/nls/et/set72
-rw-r--r--contrib/tcsh/nls/et/set82
-rw-r--r--contrib/tcsh/nls/et/set92
-rw-r--r--contrib/tcsh/nls/finnish/set12
-rw-r--r--contrib/tcsh/nls/finnish/set102
-rw-r--r--contrib/tcsh/nls/finnish/set112
-rw-r--r--contrib/tcsh/nls/finnish/set122
-rw-r--r--contrib/tcsh/nls/finnish/set132
-rw-r--r--contrib/tcsh/nls/finnish/set142
-rw-r--r--contrib/tcsh/nls/finnish/set152
-rw-r--r--contrib/tcsh/nls/finnish/set162
-rw-r--r--contrib/tcsh/nls/finnish/set172
-rw-r--r--contrib/tcsh/nls/finnish/set182
-rw-r--r--contrib/tcsh/nls/finnish/set192
-rw-r--r--contrib/tcsh/nls/finnish/set22
-rw-r--r--contrib/tcsh/nls/finnish/set202
-rw-r--r--contrib/tcsh/nls/finnish/set212
-rw-r--r--contrib/tcsh/nls/finnish/set222
-rw-r--r--contrib/tcsh/nls/finnish/set232
-rw-r--r--contrib/tcsh/nls/finnish/set242
-rw-r--r--contrib/tcsh/nls/finnish/set252
-rw-r--r--contrib/tcsh/nls/finnish/set262
-rw-r--r--contrib/tcsh/nls/finnish/set272
-rw-r--r--contrib/tcsh/nls/finnish/set292
-rw-r--r--contrib/tcsh/nls/finnish/set32
-rw-r--r--contrib/tcsh/nls/finnish/set302
-rw-r--r--contrib/tcsh/nls/finnish/set312
-rw-r--r--contrib/tcsh/nls/finnish/set42
-rw-r--r--contrib/tcsh/nls/finnish/set52
-rw-r--r--contrib/tcsh/nls/finnish/set62
-rw-r--r--contrib/tcsh/nls/finnish/set72
-rw-r--r--contrib/tcsh/nls/finnish/set82
-rw-r--r--contrib/tcsh/nls/finnish/set92
-rw-r--r--contrib/tcsh/nls/french/set12
-rw-r--r--contrib/tcsh/nls/french/set102
-rw-r--r--contrib/tcsh/nls/french/set112
-rw-r--r--contrib/tcsh/nls/french/set122
-rw-r--r--contrib/tcsh/nls/french/set132
-rw-r--r--contrib/tcsh/nls/french/set142
-rw-r--r--contrib/tcsh/nls/french/set152
-rw-r--r--contrib/tcsh/nls/french/set162
-rw-r--r--contrib/tcsh/nls/french/set172
-rw-r--r--contrib/tcsh/nls/french/set182
-rw-r--r--contrib/tcsh/nls/french/set192
-rw-r--r--contrib/tcsh/nls/french/set22
-rw-r--r--contrib/tcsh/nls/french/set202
-rw-r--r--contrib/tcsh/nls/french/set212
-rw-r--r--contrib/tcsh/nls/french/set222
-rw-r--r--contrib/tcsh/nls/french/set232
-rw-r--r--contrib/tcsh/nls/french/set242
-rw-r--r--contrib/tcsh/nls/french/set252
-rw-r--r--contrib/tcsh/nls/french/set262
-rw-r--r--contrib/tcsh/nls/french/set272
-rw-r--r--contrib/tcsh/nls/french/set292
-rw-r--r--contrib/tcsh/nls/french/set32
-rw-r--r--contrib/tcsh/nls/french/set302
-rw-r--r--contrib/tcsh/nls/french/set312
-rw-r--r--contrib/tcsh/nls/french/set42
-rw-r--r--contrib/tcsh/nls/french/set52
-rw-r--r--contrib/tcsh/nls/french/set62
-rw-r--r--contrib/tcsh/nls/french/set72
-rw-r--r--contrib/tcsh/nls/french/set82
-rw-r--r--contrib/tcsh/nls/french/set92
-rw-r--r--contrib/tcsh/nls/german/set12
-rw-r--r--contrib/tcsh/nls/german/set102
-rw-r--r--contrib/tcsh/nls/german/set112
-rw-r--r--contrib/tcsh/nls/german/set122
-rw-r--r--contrib/tcsh/nls/german/set132
-rw-r--r--contrib/tcsh/nls/german/set142
-rw-r--r--contrib/tcsh/nls/german/set152
-rw-r--r--contrib/tcsh/nls/german/set162
-rw-r--r--contrib/tcsh/nls/german/set172
-rw-r--r--contrib/tcsh/nls/german/set182
-rw-r--r--contrib/tcsh/nls/german/set192
-rw-r--r--contrib/tcsh/nls/german/set22
-rw-r--r--contrib/tcsh/nls/german/set202
-rw-r--r--contrib/tcsh/nls/german/set212
-rw-r--r--contrib/tcsh/nls/german/set222
-rw-r--r--contrib/tcsh/nls/german/set232
-rw-r--r--contrib/tcsh/nls/german/set242
-rw-r--r--contrib/tcsh/nls/german/set252
-rw-r--r--contrib/tcsh/nls/german/set262
-rw-r--r--contrib/tcsh/nls/german/set272
-rw-r--r--contrib/tcsh/nls/german/set292
-rw-r--r--contrib/tcsh/nls/german/set32
-rw-r--r--contrib/tcsh/nls/german/set302
-rw-r--r--contrib/tcsh/nls/german/set312
-rw-r--r--contrib/tcsh/nls/german/set42
-rw-r--r--contrib/tcsh/nls/german/set52
-rw-r--r--contrib/tcsh/nls/german/set62
-rw-r--r--contrib/tcsh/nls/german/set72
-rw-r--r--contrib/tcsh/nls/german/set82
-rw-r--r--contrib/tcsh/nls/german/set92
-rw-r--r--contrib/tcsh/nls/greek/set12
-rw-r--r--contrib/tcsh/nls/greek/set102
-rw-r--r--contrib/tcsh/nls/greek/set112
-rw-r--r--contrib/tcsh/nls/greek/set122
-rw-r--r--contrib/tcsh/nls/greek/set132
-rw-r--r--contrib/tcsh/nls/greek/set142
-rw-r--r--contrib/tcsh/nls/greek/set152
-rw-r--r--contrib/tcsh/nls/greek/set162
-rw-r--r--contrib/tcsh/nls/greek/set172
-rw-r--r--contrib/tcsh/nls/greek/set182
-rw-r--r--contrib/tcsh/nls/greek/set192
-rw-r--r--contrib/tcsh/nls/greek/set22
-rw-r--r--contrib/tcsh/nls/greek/set202
-rw-r--r--contrib/tcsh/nls/greek/set212
-rw-r--r--contrib/tcsh/nls/greek/set222
-rw-r--r--contrib/tcsh/nls/greek/set232
-rw-r--r--contrib/tcsh/nls/greek/set242
-rw-r--r--contrib/tcsh/nls/greek/set252
-rw-r--r--contrib/tcsh/nls/greek/set262
-rw-r--r--contrib/tcsh/nls/greek/set272
-rw-r--r--contrib/tcsh/nls/greek/set292
-rw-r--r--contrib/tcsh/nls/greek/set32
-rw-r--r--contrib/tcsh/nls/greek/set302
-rw-r--r--contrib/tcsh/nls/greek/set312
-rw-r--r--contrib/tcsh/nls/greek/set42
-rw-r--r--contrib/tcsh/nls/greek/set52
-rw-r--r--contrib/tcsh/nls/greek/set62
-rw-r--r--contrib/tcsh/nls/greek/set72
-rw-r--r--contrib/tcsh/nls/greek/set82
-rw-r--r--contrib/tcsh/nls/greek/set92
-rw-r--r--contrib/tcsh/nls/italian/set12
-rw-r--r--contrib/tcsh/nls/italian/set102
-rw-r--r--contrib/tcsh/nls/italian/set112
-rw-r--r--contrib/tcsh/nls/italian/set122
-rw-r--r--contrib/tcsh/nls/italian/set132
-rw-r--r--contrib/tcsh/nls/italian/set142
-rw-r--r--contrib/tcsh/nls/italian/set152
-rw-r--r--contrib/tcsh/nls/italian/set162
-rw-r--r--contrib/tcsh/nls/italian/set172
-rw-r--r--contrib/tcsh/nls/italian/set182
-rw-r--r--contrib/tcsh/nls/italian/set192
-rw-r--r--contrib/tcsh/nls/italian/set22
-rw-r--r--contrib/tcsh/nls/italian/set202
-rw-r--r--contrib/tcsh/nls/italian/set212
-rw-r--r--contrib/tcsh/nls/italian/set222
-rw-r--r--contrib/tcsh/nls/italian/set232
-rw-r--r--contrib/tcsh/nls/italian/set242
-rw-r--r--contrib/tcsh/nls/italian/set252
-rw-r--r--contrib/tcsh/nls/italian/set262
-rw-r--r--contrib/tcsh/nls/italian/set272
-rw-r--r--contrib/tcsh/nls/italian/set292
-rw-r--r--contrib/tcsh/nls/italian/set32
-rw-r--r--contrib/tcsh/nls/italian/set302
-rw-r--r--contrib/tcsh/nls/italian/set312
-rw-r--r--contrib/tcsh/nls/italian/set42
-rw-r--r--contrib/tcsh/nls/italian/set52
-rw-r--r--contrib/tcsh/nls/italian/set62
-rw-r--r--contrib/tcsh/nls/italian/set72
-rw-r--r--contrib/tcsh/nls/italian/set82
-rw-r--r--contrib/tcsh/nls/italian/set92
-rw-r--r--contrib/tcsh/nls/ja/set12
-rw-r--r--contrib/tcsh/nls/ja/set102
-rw-r--r--contrib/tcsh/nls/ja/set112
-rw-r--r--contrib/tcsh/nls/ja/set122
-rw-r--r--contrib/tcsh/nls/ja/set132
-rw-r--r--contrib/tcsh/nls/ja/set152
-rw-r--r--contrib/tcsh/nls/ja/set162
-rw-r--r--contrib/tcsh/nls/ja/set172
-rw-r--r--contrib/tcsh/nls/ja/set182
-rw-r--r--contrib/tcsh/nls/ja/set22
-rw-r--r--contrib/tcsh/nls/ja/set212
-rw-r--r--contrib/tcsh/nls/ja/set242
-rw-r--r--contrib/tcsh/nls/ja/set292
-rw-r--r--contrib/tcsh/nls/ja/set32
-rw-r--r--contrib/tcsh/nls/ja/set302
-rw-r--r--contrib/tcsh/nls/ja/set420
-rw-r--r--contrib/tcsh/nls/ja/set52
-rw-r--r--contrib/tcsh/nls/ja/set62
-rw-r--r--contrib/tcsh/nls/ja/set72
-rw-r--r--contrib/tcsh/nls/ja/set82
-rw-r--r--contrib/tcsh/nls/pl/set12
-rw-r--r--contrib/tcsh/nls/pl/set102
-rw-r--r--contrib/tcsh/nls/pl/set112
-rw-r--r--contrib/tcsh/nls/pl/set122
-rw-r--r--contrib/tcsh/nls/pl/set132
-rw-r--r--contrib/tcsh/nls/pl/set142
-rw-r--r--contrib/tcsh/nls/pl/set152
-rw-r--r--contrib/tcsh/nls/pl/set162
-rw-r--r--contrib/tcsh/nls/pl/set172
-rw-r--r--contrib/tcsh/nls/pl/set182
-rw-r--r--contrib/tcsh/nls/pl/set192
-rw-r--r--contrib/tcsh/nls/pl/set22
-rw-r--r--contrib/tcsh/nls/pl/set202
-rw-r--r--contrib/tcsh/nls/pl/set212
-rw-r--r--contrib/tcsh/nls/pl/set222
-rw-r--r--contrib/tcsh/nls/pl/set232
-rw-r--r--contrib/tcsh/nls/pl/set242
-rw-r--r--contrib/tcsh/nls/pl/set252
-rw-r--r--contrib/tcsh/nls/pl/set262
-rw-r--r--contrib/tcsh/nls/pl/set272
-rw-r--r--contrib/tcsh/nls/pl/set292
-rw-r--r--contrib/tcsh/nls/pl/set32
-rw-r--r--contrib/tcsh/nls/pl/set302
-rw-r--r--contrib/tcsh/nls/pl/set312
-rw-r--r--contrib/tcsh/nls/pl/set42
-rw-r--r--contrib/tcsh/nls/pl/set52
-rw-r--r--contrib/tcsh/nls/pl/set62
-rw-r--r--contrib/tcsh/nls/pl/set72
-rw-r--r--contrib/tcsh/nls/pl/set82
-rw-r--r--contrib/tcsh/nls/pl/set92
-rw-r--r--contrib/tcsh/nls/russian/set12
-rw-r--r--contrib/tcsh/nls/russian/set102
-rw-r--r--contrib/tcsh/nls/russian/set112
-rw-r--r--contrib/tcsh/nls/russian/set122
-rw-r--r--contrib/tcsh/nls/russian/set132
-rw-r--r--contrib/tcsh/nls/russian/set142
-rw-r--r--contrib/tcsh/nls/russian/set152
-rw-r--r--contrib/tcsh/nls/russian/set162
-rw-r--r--contrib/tcsh/nls/russian/set172
-rw-r--r--contrib/tcsh/nls/russian/set182
-rw-r--r--contrib/tcsh/nls/russian/set192
-rw-r--r--contrib/tcsh/nls/russian/set22
-rw-r--r--contrib/tcsh/nls/russian/set202
-rw-r--r--contrib/tcsh/nls/russian/set212
-rw-r--r--contrib/tcsh/nls/russian/set222
-rw-r--r--contrib/tcsh/nls/russian/set232
-rw-r--r--contrib/tcsh/nls/russian/set242
-rw-r--r--contrib/tcsh/nls/russian/set252
-rw-r--r--contrib/tcsh/nls/russian/set262
-rw-r--r--contrib/tcsh/nls/russian/set272
-rw-r--r--contrib/tcsh/nls/russian/set292
-rw-r--r--contrib/tcsh/nls/russian/set32
-rw-r--r--contrib/tcsh/nls/russian/set302
-rw-r--r--contrib/tcsh/nls/russian/set312
-rw-r--r--contrib/tcsh/nls/russian/set42
-rw-r--r--contrib/tcsh/nls/russian/set52
-rw-r--r--contrib/tcsh/nls/russian/set62
-rw-r--r--contrib/tcsh/nls/russian/set72
-rw-r--r--contrib/tcsh/nls/russian/set82
-rw-r--r--contrib/tcsh/nls/russian/set92
-rw-r--r--contrib/tcsh/nls/spanish/set12
-rw-r--r--contrib/tcsh/nls/spanish/set102
-rw-r--r--contrib/tcsh/nls/spanish/set112
-rw-r--r--contrib/tcsh/nls/spanish/set122
-rw-r--r--contrib/tcsh/nls/spanish/set132
-rw-r--r--contrib/tcsh/nls/spanish/set142
-rw-r--r--contrib/tcsh/nls/spanish/set152
-rw-r--r--contrib/tcsh/nls/spanish/set162
-rw-r--r--contrib/tcsh/nls/spanish/set172
-rw-r--r--contrib/tcsh/nls/spanish/set182
-rw-r--r--contrib/tcsh/nls/spanish/set192
-rw-r--r--contrib/tcsh/nls/spanish/set22
-rw-r--r--contrib/tcsh/nls/spanish/set202
-rw-r--r--contrib/tcsh/nls/spanish/set212
-rw-r--r--contrib/tcsh/nls/spanish/set222
-rw-r--r--contrib/tcsh/nls/spanish/set232
-rw-r--r--contrib/tcsh/nls/spanish/set242
-rw-r--r--contrib/tcsh/nls/spanish/set252
-rw-r--r--contrib/tcsh/nls/spanish/set262
-rw-r--r--contrib/tcsh/nls/spanish/set272
-rw-r--r--contrib/tcsh/nls/spanish/set292
-rw-r--r--contrib/tcsh/nls/spanish/set32
-rw-r--r--contrib/tcsh/nls/spanish/set302
-rw-r--r--contrib/tcsh/nls/spanish/set312
-rw-r--r--contrib/tcsh/nls/spanish/set42
-rw-r--r--contrib/tcsh/nls/spanish/set52
-rw-r--r--contrib/tcsh/nls/spanish/set62
-rw-r--r--contrib/tcsh/nls/spanish/set72
-rw-r--r--contrib/tcsh/nls/spanish/set82
-rw-r--r--contrib/tcsh/nls/spanish/set92
-rw-r--r--contrib/tcsh/nls/ukrainian/set12
-rw-r--r--contrib/tcsh/nls/ukrainian/set102
-rw-r--r--contrib/tcsh/nls/ukrainian/set112
-rw-r--r--contrib/tcsh/nls/ukrainian/set122
-rw-r--r--contrib/tcsh/nls/ukrainian/set132
-rw-r--r--contrib/tcsh/nls/ukrainian/set142
-rw-r--r--contrib/tcsh/nls/ukrainian/set152
-rw-r--r--contrib/tcsh/nls/ukrainian/set162
-rw-r--r--contrib/tcsh/nls/ukrainian/set172
-rw-r--r--contrib/tcsh/nls/ukrainian/set182
-rw-r--r--contrib/tcsh/nls/ukrainian/set192
-rw-r--r--contrib/tcsh/nls/ukrainian/set22
-rw-r--r--contrib/tcsh/nls/ukrainian/set202
-rw-r--r--contrib/tcsh/nls/ukrainian/set212
-rw-r--r--contrib/tcsh/nls/ukrainian/set222
-rw-r--r--contrib/tcsh/nls/ukrainian/set232
-rw-r--r--contrib/tcsh/nls/ukrainian/set242
-rw-r--r--contrib/tcsh/nls/ukrainian/set252
-rw-r--r--contrib/tcsh/nls/ukrainian/set262
-rw-r--r--contrib/tcsh/nls/ukrainian/set272
-rw-r--r--contrib/tcsh/nls/ukrainian/set292
-rw-r--r--contrib/tcsh/nls/ukrainian/set32
-rw-r--r--contrib/tcsh/nls/ukrainian/set302
-rw-r--r--contrib/tcsh/nls/ukrainian/set312
-rw-r--r--contrib/tcsh/nls/ukrainian/set42
-rw-r--r--contrib/tcsh/nls/ukrainian/set52
-rw-r--r--contrib/tcsh/nls/ukrainian/set62
-rw-r--r--contrib/tcsh/nls/ukrainian/set72
-rw-r--r--contrib/tcsh/nls/ukrainian/set82
-rw-r--r--contrib/tcsh/nls/ukrainian/set92
-rw-r--r--contrib/tcsh/patchlevel.h6
-rw-r--r--contrib/tcsh/pathnames.h2
-rw-r--r--contrib/tcsh/sh.c759
-rw-r--r--contrib/tcsh/sh.char.c4
-rw-r--r--contrib/tcsh/sh.char.h61
-rw-r--r--contrib/tcsh/sh.decls.h520
-rw-r--r--contrib/tcsh/sh.dir.c626
-rw-r--r--contrib/tcsh/sh.dir.h2
-rw-r--r--contrib/tcsh/sh.dol.c698
-rw-r--r--contrib/tcsh/sh.err.c233
-rw-r--r--contrib/tcsh/sh.exec.c442
-rw-r--r--contrib/tcsh/sh.exp.c282
-rw-r--r--contrib/tcsh/sh.file.c408
-rw-r--r--contrib/tcsh/sh.func.c944
-rw-r--r--contrib/tcsh/sh.glob.c693
-rw-r--r--contrib/tcsh/sh.h234
-rw-r--r--contrib/tcsh/sh.hist.c185
-rw-r--r--contrib/tcsh/sh.init.c37
-rw-r--r--contrib/tcsh/sh.lex.c707
-rw-r--r--contrib/tcsh/sh.misc.c409
-rw-r--r--contrib/tcsh/sh.parse.c206
-rw-r--r--contrib/tcsh/sh.print.c77
-rw-r--r--contrib/tcsh/sh.proc.c667
-rw-r--r--contrib/tcsh/sh.proc.h7
-rw-r--r--contrib/tcsh/sh.sem.c312
-rw-r--r--contrib/tcsh/sh.set.c342
-rw-r--r--contrib/tcsh/sh.time.c74
-rw-r--r--contrib/tcsh/sh.types.h29
-rw-r--r--contrib/tcsh/snames.h2
-rw-r--r--contrib/tcsh/tc.alloc.c145
-rw-r--r--contrib/tcsh/tc.bind.c757
-rw-r--r--contrib/tcsh/tc.const.c10
-rw-r--r--contrib/tcsh/tc.decls.h327
-rw-r--r--contrib/tcsh/tc.disc.c10
-rw-r--r--contrib/tcsh/tc.func.c1055
-rw-r--r--contrib/tcsh/tc.h33
-rw-r--r--contrib/tcsh/tc.nls.c257
-rw-r--r--contrib/tcsh/tc.nls.h53
-rw-r--r--contrib/tcsh/tc.os.c481
-rw-r--r--contrib/tcsh/tc.os.h79
-rw-r--r--contrib/tcsh/tc.printf.c171
-rw-r--r--contrib/tcsh/tc.prompt.c410
-rw-r--r--contrib/tcsh/tc.sched.c110
-rw-r--r--contrib/tcsh/tc.sig.c407
-rw-r--r--contrib/tcsh/tc.sig.h171
-rw-r--r--contrib/tcsh/tc.str.c315
-rw-r--r--contrib/tcsh/tc.vers.c27
-rw-r--r--contrib/tcsh/tc.wait.h2
-rw-r--r--contrib/tcsh/tc.who.c160
-rw-r--r--contrib/tcsh/tcsh.man69
-rw-r--r--contrib/tcsh/tcsh.man2html2
-rw-r--r--contrib/tcsh/termcap.vms2
-rw-r--r--contrib/tcsh/tw.color.c94
-rw-r--r--contrib/tcsh/tw.comp.c212
-rw-r--r--contrib/tcsh/tw.decls.h130
-rw-r--r--contrib/tcsh/tw.h4
-rw-r--r--contrib/tcsh/tw.help.c115
-rw-r--r--contrib/tcsh/tw.init.c472
-rw-r--r--contrib/tcsh/tw.parse.c1274
-rw-r--r--contrib/tcsh/tw.spell.c82
-rw-r--r--contrib/tcsh/vms.termcap.c35
446 files changed, 10718 insertions, 12180 deletions
diff --git a/contrib/tcsh/Fixes b/contrib/tcsh/Fixes
index 384c3295d259..7da8ac9605e0 100644
--- a/contrib/tcsh/Fixes
+++ b/contrib/tcsh/Fixes
@@ -1,3 +1,102 @@
+ 74. V6.15.00 - 20070303
+ 73. fix extension eating windows code (christos)
+ 72. fix loop in %R history expansion (christos)
+ 71. sched +X source file disables interrupts (Mike Sullivan)
+ 70. One off copying macro buffers (Jean-Luc Leger)
+ 69. Avoid infinite loops in :ga modifiers when the LHS is a substring of the
+ RHS.
+ 68. Automatically disable WIDE_STRINGS with --disable-nls (Miloslav Trmac)
+ 67. V6.14.07 - 20060825
+ 66. rename set to setv to avoid clashes (christos)
+ 65. Eliminate sighold/sigrelse (christos)
+ 64. Compilation cleanups. (Martin Kraemer)
+ 63. Don't rebuild needlessly when generated files are unchanged
+ (Martin Kraemer)
+ 62. Fix confusion between Char and eChar (Martin Kraemer)
+ 61. V6.14.06 - 20060824
+ 60. set PROGRAM_ENVIRONMENT for OSD_POSIX (Martin Kraemer)
+ 59. EBCDIC patch (Martin Kraemer)
+ 58. Remove globbing support in history rearches (Ryan Barrett)
+ 57. Highlighting patch (Ryan Barrett)
+ 56. Mark-Cursor exchange emacs editing fix (Martin Kraemer)
+ 55. V6.14.05 - 20060304
+ 54. don't limit termcap strings to 1K (Alan Ferrency)
+ 53. protect against null path.
+ 52. Be more conservative in wide_read PR#29
+ 51. remove HAVE_STRCOLL; not needed anymore (Miloslav Trmac)
+ 50. remove imake support and make nls configurable by configure
+ (Miloslav Trmac)
+ 49. V6.14.04 - 20060214
+ 48. Fixes build failure with !SHORT_STRINGS (Miloslav Trmac)
+ 47. Fixes constness warnings with !SHORT_STRINGS: short2str is "strip()",
+ which modifies its argument. Rather than verify this is safe in all
+ callers, I have added caching_strip() to mirror the behavior of other
+ modes. (Miloslav Trmac)
+ 46. Fixes some constness warnings with SHORT_STRINGS; this is orthogonal
+ to both build errors with SHORT_STRINGS in 6.14.03, and
+ short_strings.patch. (Miloslav Trmac)
+ 45. config-catalogs.patch: Autodetect catalog support (#14). (Miloslav Trmac)
+ 44. auth.patch: Handle false positives in getauthid() detection,
+ IIRC on FreeBSD. (Miloslav Trmac)
+ 43. crypt.patch: Autodetect whether <crypt.h> is available. (Miloslav Trmac)
+ 42. sigint.patch: Block SIGINT while waiting on children.
+ This is necessary, but I'll still have to look on the older
+ releases to find out why it was not necessary before
+ ("before" = 6.13 on Linux). (Miloslav Trmac)
+ 41. config-package.patch: Readd package version to configure.in,
+ the testsuite uses it.
+ (TODO: a better integration with package.h) (Miloslav Trmac)
+ 40. item_len.patch: Truncate item.len when truncating the string,
+ just to be sure. (Miloslav Trmac)
+ 39. va_list.patch: Add missing va_end(). (Miloslav Trmac)
+ 38. Use va_copy in xvasprintf(); emulate va_copy as suggested in
+ Autoconf manual if it is not available. (Miloslav Trmac)
+ 37. declarations.patch: Replace some #ifdef nests by autodetecting
+ whether the guarded declaration is necessary.
+ I'm only guessing this is the intent of the #ifdefs, though.
+ Declare environ unconditionally, it is a bit hard to detect
+ and the declaration is correct for Linux, anyway. (Miloslav Trmac)
+ 36. warning.patch: Fix a const warning.
+ 35. More color-ls variables (Jean-Luc Leger)
+ 34. V6.14.03 - 20060212
+ 33. Signal related changes (Miloslav Trmac)
+ 32. Misc cast cleanups and code clarification (Miloslav Trmac)
+ 31. Use dynamically allocated buffers everywhere (Miloslav Trmac)
+ 30. Fix reading of invalid byte sequences (Miloslav Trmac)
+ 29. read should only increment count when it succeeds (Miloslav Trmac)
+ 28. testsuiteadditions (Miloslav Trmac)
+ 27. -n fixes (Miloslav Trmac)
+ 26. signness warnings (Miloslav Trmac)
+ 25. Prevent infinite recursion in catclose (Gerhard Niklasch)
+ 24. Add Dragonfly (Joerg Sonnenberger)
+ 23. Check for wcwidth returning a negative number (TOMITA Yoshinori)
+ 22. recognize "li" and "co" in echotc (Martin Kraemer) [PR/7]
+ 21. Don't use T_Cols for wrapping purposes; use TermH consistently
+ (Martin Kraemer) [PR/8]
+ 20. Don't display duplicate utmp records (Miloslav Trmac) [PR/17]
+ 19. Clarify hashing and -f sections of man page (Volker Quetschke) [PR/20]
+ 18. Dave Yearke: configure did not recognize solaris 10 [PR/18]
+ 17. CYGWIN: Don't lowercase commands and allow foo.exe on command line.
+ (Corinna Vinschen) [PR/19]
+ 16. CYGWIN: cd /foo && cd .. ends up erroneously in // for systems that
+ HAVE_SLASHSLASH [PR/21]
+ 15. %j was broken (Peter Kruse)
+ 14. Extend // handling in pathnames from being apollo specific to also
+ cygwin (Corinna Vinschen)
+ 13. Fix uppercase/lowercase transformations (Jean-Luc Leger)
+ 12. Fix symlink expansion (revert from 6.10.00) (Jean-Luc Leger and Christos)
+ 11. Fix literal sequence in prompt (Miloslav Trmac)
+ 10. V6.14.02 - 20050412
+ 9. Prototype fixes (Miloslav Trmac and Jean-Luc Leger)
+ 8. V6.14.01 - 20050411
+ 7. Make =- refer to $owd (H.Merijn Brand)
+ 6. Use prototypes (almost) everywhere (Miloslav Trmac) (issue #5)
+ 5. Fix doc path in Cygwin installation (Corinna Vinschen)
+ 4. Fix column size calculation (Martin Kraemer)
+ 3. Implement newline-and-hold and newline-and-down-history (Per Hedeland)
+ 2. Messages fixes for the ja (Japanese) locale (NAKAMURA Takeshi) (issue #4)
+ 1. Enable charset conversion in nls (Miloslav Trmac) (issue #3)
+
76. V6.14.00 - 20050325
75. Additional messages for the ja (Japanese) locale (NAKAMURA Takeshi)
74. V6.13.10 - 20050321
diff --git a/contrib/tcsh/Imakefile b/contrib/tcsh/Imakefile
index bc77ad9840ab..9dc3323967eb 100644
--- a/contrib/tcsh/Imakefile
+++ b/contrib/tcsh/Imakefile
@@ -1,5 +1,5 @@
XCOMM
-XCOMM $Id: Imakefile,v 1.84 2004/12/25 21:15:05 christos Exp $
+XCOMM $tcsh: Imakefile,v 1.85 2006/03/02 18:46:44 christos Exp $
XCOMM
XCOMM Imakefile for tcsh 6.12
XCOMM Marc Horowitz, MIT SIPB
diff --git a/contrib/tcsh/MAKEDIFFS b/contrib/tcsh/MAKEDIFFS
index 3b87683c5d5f..01395f00d591 100755
--- a/contrib/tcsh/MAKEDIFFS
+++ b/contrib/tcsh/MAKEDIFFS
@@ -2,7 +2,7 @@
#
# MAKEDIFFS.sh: Make context diffs for the csh sources
#
-# $Id: MAKEDIFFS,v 3.0 1991/07/04 21:57:47 christos Exp $
+# $tcsh: MAKEDIFFS,v 3.1 2006/03/02 18:46:44 christos Exp $
XINUDIR=/usr/share/src/mtXinu/bin/csh
BSDDIR=/usr/share/src/mtXinu/BSD/bin/csh
TAHOEDIR=/usr/share/src/mtXinu/TAHOE/bin/csh
diff --git a/contrib/tcsh/MAKESHAR b/contrib/tcsh/MAKESHAR
index 691690f081d1..f2238e8d83b2 100755
--- a/contrib/tcsh/MAKESHAR
+++ b/contrib/tcsh/MAKESHAR
@@ -2,7 +2,7 @@
#
# MAKESHAR.sh: Make a shar file for the sources
#
-# $Id: MAKESHAR,v 3.1 1992/05/09 04:03:53 christos Exp $
+# $tcsh: MAKESHAR,v 3.2 2006/03/02 18:46:44 christos Exp $
AWK=/usr/bin/nawk # Must be nawk or gawk cause of 2D arrays
WC=/usr/ucb/wc
diff --git a/contrib/tcsh/Makefile.in b/contrib/tcsh/Makefile.in
index da0875ff8207..f925c5ab7437 100644
--- a/contrib/tcsh/Makefile.in
+++ b/contrib/tcsh/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 3.27 2005/03/23 13:20:30 kim Exp $
+# $tcsh: Makefile.in,v 3.36 2006/08/24 20:56:31 christos Exp $
# Makefile.in 4.3 6/11/83
#
# C Shell with process control; VM/UNIX VAX Makefile
@@ -8,7 +8,7 @@
# things; Paul Placeway, CIS Dept., Ohio State University
#
SHELL=/bin/sh
-VERSION=6.12
+VERSION=@PACKAGE_VERSION@
BUILD=tcsh$(EXEEXT)
VPATH=@srcdir@
srcdir=@srcdir@
@@ -231,7 +231,8 @@ LIBES= @LIBS@ ## This is set by autoconf.
#
EXTRAFLAGS = @HESDEF@ $(AFSDEF)
-EXTRALIBS = @HESLIB@ $(AFSLIB)
+EXTRALIBS = @HESLIB@ $(AFSLIB) @LIBICONV@
+
# The difficult choice of a c-compiler...
@@ -326,14 +327,19 @@ AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \
WishList config_f.h eight-bit.me glob.3 patchlevel.h \
pathnames.h tcsh.man Ported src.desc Imakefile imake.config \
README.imake complete.tcsh vmsreadme.txt termcap.vms snames.h \
- host.defs gethost.c tcsh.man2html configure.in configure config.h.in
+ 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
VHSRCS=${PVSRCS} ${AVSRCS}
CONFSRCS=config/*
ALLSRCS= ${SHSRCS} ${TWSRCS} ${EDSRCS} ${TCSRCS} ${VHSRCS}
-DISTSRCS= ${PSSRCS} ${TWSRCS} ${EDSRCS} ${TCSRCS} ${AVSRCS}
+DISTSRCS= ${PSSRCS} ${TWSRCS} ${EDSRCS} ${TCSRCS} ${AVSRCS} $(TESTFILES)
OBJS= ${SHOBJS} ${TWOBJS} ${EDOBJS} ${TCOBJS}
@@ -362,18 +368,26 @@ gethost: gethost.c sh.err.h tc.const.h sh.h
${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
tc.defs.c: gethost host.defs
- @rm -f $@
- @echo "/* Do not edit this file, make creates it */" > $@
- ./gethost $(srcdir)/host.defs >> $@
+ @rm -f $@.tmp
+ @echo "/* Do not edit this file, make creates it */" > $@.tmp
+ ./gethost $(srcdir)/host.defs >> $@.tmp
+ @if [ -f $@ ] && cmp -s $@.tmp $@; then echo $@ unchanged.; rm -f $@.tmp; else mv -f $@.tmp $@; echo $@ recreated.; fi
tcsh.ps: tcsh.man
rm -f tcsh.ps
-ptroff -t -man $(srcdir)/tcsh.man > tcsh.ps
-
.c.${SUF}:
${CC} ${CF} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $<
+.SUFFIXES: .s .i
+
+.c.i:
+ ${CC} -E ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $< | cat -s > $@
+
+.c.s:
+ ${CC} -S ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $<
+
# _VMS_POSIX #module addition
#.c.${SUF}:
# @(echo '#module '`echo $< | sed -e 's/\./_/g'`; cat $<) > $*..c
@@ -410,31 +424,53 @@ tcsh.ps: tcsh.man
## co $<
ed.defns.h: ed.defns.c
- @rm -f $@
- @echo '/* Do not edit this file, make creates it. */' > $@
- @echo '#ifndef _h_ed_defns' >> $@
- @echo '#define _h_ed_defns' >> $@
- grep '[FV]_' $(srcdir)/ed.defns.c | grep '^#define' >> $@
- @echo '#endif /* _h_ed_defns */' >> $@
+ @rm -f $@.tmp
+ @echo '/* Do not edit this file, make creates it. */' > $@.tmp
+ @echo '#ifndef _h_ed_defns' >> $@.tmp
+ @echo '#define _h_ed_defns' >> $@.tmp
+ grep '[FV]_' $(srcdir)/ed.defns.c | grep '^#define' >> $@.tmp
+ @echo '#endif /* _h_ed_defns */' >> $@.tmp
+ @if [ -f $@ ] && cmp -s $@.tmp $@; then echo $@ unchanged.; rm -f $@.tmp; else mv -f $@.tmp $@; echo $@ recreated.; fi
sh.err.h: sh.err.c
- @rm -f $@
- @echo '/* Do not edit this file, make creates it. */' > $@
- @echo '#ifndef _h_sh_err' >> $@
- @echo '#define _h_sh_err' >> $@
- grep 'ERR_' $(srcdir)/sh.err.c | grep '^#define' >> $@
- @echo '#endif /* _h_sh_err */' >> $@
+ @rm -f $@.tmp
+ @echo '/* Do not edit this file, make creates it. */' > $@.tmp
+ @echo '#ifndef _h_sh_err' >> $@.tmp
+ @echo '#define _h_sh_err' >> $@.tmp
+ grep 'ERR_' $(srcdir)/sh.err.c | grep '^#define' >> $@.tmp
+ @echo '#endif /* _h_sh_err */' >> $@.tmp
+ @if [ -f $@ ] && cmp -s $@.tmp $@; then echo $@ unchanged.; rm -f $@.tmp; else mv -f $@.tmp $@; echo $@ recreated.; fi
tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
- @rm -f $@
- @echo '/* Do not edit this file, make creates it. */' > $@
- @echo '#ifndef _h_tc_const' >> $@
- @echo '#define _h_tc_const' >> $@
+ @rm -f $@.tmp
+ @echo '/* Do not edit this file, make creates it. */' > $@.tmp
+ @echo '#ifndef _h_tc_const' >> $@.tmp
+ @echo '#define _h_tc_const' >> $@.tmp
${CPP} $(CPPFLAGS) ${DFLAGS} ${EXTRAFLAGS} -D_h_tc_const\
$(srcdir)/tc.const.c | \
sed -n -e 's/^\(Char STR[a-zA-Z0-9_]*\) *\[ *\].*/extern \1[];/p' | \
- sort >> $@
- @echo '#endif /* _h_tc_const */' >> $@
+ sort >> $@.tmp
+ @echo '#endif /* _h_tc_const */' >> $@.tmp
+ @if [ -f $@ ] && cmp -s $@.tmp $@; then echo $@ unchanged.; rm -f $@.tmp; else mv -f $@.tmp $@; echo $@ recreated.; fi
+
+$(srcdir)/tests/package.m4: $(srcdir)/configure.in
+ { \
+ echo '# Signature of the current package.'; \
+ echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \
+ echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \
+ echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \
+ echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \
+ echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+ } >$(srcdir)/tests/package.m4
+
+$(srcdir)/tests/testsuite: tests/package.m4 tests/testsuite.at $(TESTFILES)
+ autom4te --language=autotest -I $(srcdir)/tests \
+ $(srcdir)/tests/testsuite.at -o $@.tmp
+ mv $@.tmp $@
+
+atconfig: config.status
+ $(SHELL) ./config.status ./atconfig
+
csh.prof: ${OBJS} sh.prof.${SUF} mcrt0.${SUF}
rm -f csh.prof
@@ -489,12 +525,12 @@ install.man: tcsh.man
chmod 444 ${DESTMAN}/tcsh.${MANSECT}
install.cygwin: install install.man
- -mkdir -p ${DESTDIR}${prefix}/doc/tcsh
- cp ${srcdir}/FAQ ${srcdir}/Fixes ${DESTDIR}${prefix}/doc/tcsh
- cp ${srcdir}/NewThings ${srcdir}/README ${DESTDIR}${prefix}/doc/tcsh
- cp ${srcdir}/WishList ${srcdir}/Y2K ${DESTDIR}${prefix}/doc/tcsh
+ -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
+ cp ${srcdir}/WishList ${srcdir}/Y2K ${DESTDIR}${prefix}/share/doc/tcsh
perl ${srcdir}/tcsh.man2html ${srcdir}/tcsh.man
- cp -rp tcsh.html ${DESTDIR}${prefix}/doc/tcsh
+ cp -rp tcsh.html ${DESTDIR}${prefix}/share/doc/tcsh
-mkdir -p ${DESTDIR}/etc/profile.d
-mkdir -p ${DESTDIR}/etc/postinstall
cp -p ${srcdir}/cygwin/etc/csh.* ${DESTDIR}/etc
@@ -515,7 +551,8 @@ install.cygwin: install install.man
clean:
${RM} -f a.out strings x.c xs.c tcsh$(EXEEXT) tcsh.a _MAKE_LOG gethost
- ${RM} -f *.${SUF} sh.prof.c ed.defns.h tc.const.h sh.err.h tc.defs.c
+ ${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
veryclean: clean
@@ -527,13 +564,15 @@ veryclean: clean
distclean: veryclean
+cleandir: veryclean
+
tags: /tmp
${CTAGS} sh*.c
tar.Z:
rm -f tcsh-${VERSION}.tar.Z
rm -rf tcsh-${VERSION}
- -mkdir tcsh-${VERSION} tcsh-${VERSION}/config
+ -mkdir tcsh-${VERSION} tcsh-${VERSION}/config tcsh-${VERSION}/tests
cp ${ALLSRCS} tcsh-${VERSION}
cp ${CONFSRCS} tcsh-${VERSION}/config
tar cf - nls/Makefile nls/?*/set?* | (cd tcsh-${VERSION}; tar xpf -)
@@ -543,7 +582,7 @@ tar.Z:
tar.gz:
rm -f tcsh-${VERSION}.tar.gz
rm -rf tcsh-${VERSION}
- -mkdir tcsh-${VERSION} tcsh-${VERSION}/config
+ -mkdir tcsh-${VERSION} tcsh-${VERSION}/config tcsh-${VERSION}/tests
cp ${ALLSRCS} tcsh-${VERSION}
cp ${CONFSRCS} tcsh-${VERSION}/config
tar cf - nls/Makefile nls/?*/set?* | (cd tcsh-${VERSION}; tar xpf -)
@@ -553,7 +592,7 @@ tar.gz:
shar:
rm -f tcsh-*.shar
rm -rf tcsh-${VERSION}
- -mkdir tcsh-${VERSION} tcsh-${VERSION}/config
+ -mkdir tcsh-${VERSION} tcsh-${VERSION}/config tcsh-${VERSION}/tests
cp ${ALLSRCS} tcsh-${VERSION}
cp ${CONFSRCS} tcsh-${VERSION}/config
tar cf - nls/Makefile nls/?*/set?* | (cd tcsh-${VERSION}; tar xpf -)
@@ -568,7 +607,7 @@ catalogs:
tcsh-${VERSION}.tar.Z:
rm -rf tcsh-${VERSION}
rm -f tcsh-${VERSION}.tar tcsh-${VERSION}.tar.Z DIFFS.[123]
- -mkdir tcsh-${VERSION}
+ -mkdir tcsh-${VERSION} tcsh-${VERSION}/tests
./MAKEDIFFS bsd
mv DIFFS.1 DIFFS.2 DIFFS.3 tcsh-${VERSION}
cp ${DISTSRCS} tcsh-${VERSION}
@@ -621,6 +660,9 @@ $(srcdir)/stamp-h.in: $(srcdir)/configure.in
cd $(srcdir) && autoheader
@echo timestamp > $(srcdir)/stamp-h.in
+check: atconfig $(srcdir)/tests/testsuite
+ $(SHELL) $(srcdir)/tests/testsuite
+
#
# Dependencies
#
diff --git a/contrib/tcsh/Makefile.std b/contrib/tcsh/Makefile.std
index 69219e3a31db..1af09d927778 100644
--- a/contrib/tcsh/Makefile.std
+++ b/contrib/tcsh/Makefile.std
@@ -1,4 +1,4 @@
-# $Id: Makefile.std,v 1.96 2004/12/25 21:15:05 christos Exp $
+# $tcsh: Makefile.std,v 1.97 2006/03/02 18:46:44 christos Exp $
# Makefile.std 4.3 6/11/83
#
# C Shell with process control; VM/UNIX VAX Makefile
diff --git a/contrib/tcsh/Makefile.vms b/contrib/tcsh/Makefile.vms
index 75d2c95cdbd6..d3a258b671a1 100644
--- a/contrib/tcsh/Makefile.vms
+++ b/contrib/tcsh/Makefile.vms
@@ -1,4 +1,4 @@
-# $Id: Makefile.vms,v 1.38 2004/12/25 21:15:05 christos Exp $
+# $tcsh: Makefile.vms,v 1.39 2006/03/02 18:46:44 christos Exp $
# Makefile.vms 4.3 6/11/83
#
# C Shell with process control; VM/UNIX VAX Makefile
diff --git a/contrib/tcsh/README b/contrib/tcsh/README
index 3852b666517f..9648c27871ee 100644
--- a/contrib/tcsh/README
+++ b/contrib/tcsh/README
@@ -1,4 +1,4 @@
-This is tcsh version 6.14. Tcsh is a version of the Berkeley
+This is tcsh version 6.15. 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.
@@ -19,12 +19,12 @@ names of the authors from the source code or documentation).
To install tcsh:
-0) Try running "configure". If that works, goto step 6.
- If you are using imake, try xmkmf and goto step 3.
- If imake does not work, copy Makefile.std to Makefile.
+0) Try running "./configure". If that doesn't work, goto step 1.
+ Run "./configure --help" to see possible options. After running
+ configure, goto step 3.
-1) Look at the Makefile and make sure that you are using the right
- compilation flags.
+1) Otherwise copy Makefile.std to Makefile. Look at the Makefile and
+ make sure that you are using the right compilation flags.
2) Copy the appropriate for your machine and OS config file from the
config subdirectory into config.h. Consult the file "Ported" for
@@ -34,7 +34,7 @@ To install tcsh:
the supplied ones. If you get tcsh working on a new machine, I'd
appreciate a copy of the config file plus additional information
about the architecture/OS. If you are creating a new config file,
- look very hard at BSDJOBS, BSDSIGS, and BSDTIMES if you are running
+ look very hard at BSDJOBS and BSDTIMES if you are running
a non-BSD machine. For vanila SysV, these would all be #undef-ed,
but others may vary (such as A/UX or HPUX). On a pyramid, compile
in the UCB universe even if you are running under the ATT universe
@@ -42,33 +42,27 @@ To install tcsh:
3) Look at config_f.h, and enable or disable any features you want.
It is configured the way I like it, but you may disagree.
- If you do not have NLS, then locale.h will not be found. Undefine it
- and things should work ok. On the other hand, if you have NLS you
- might as well use it...
4) Look at host.defs to make sure that you have the right defines to set
the environment variables "HOSTTYPE", "MACHTYPE", "OSTYPE" and
"VENDOR" correctly. If you need to make changes, PLEASE SEND THEM
BACK TO ME.
-5) You may want to adjust the TCSH_BINDIR and TCSH_MANDIR entries in
+5) You may want to adjust the DESTBIN and DESTMAN entries in
the Makefile. These are the directories that tcsh, and the tcsh.1
man entry will be placed in when you do a "make install" and "make
install.man" respectively. If you decide to install tcsh somewhere
other than in /usr/local/bin/tcsh, you should #define _PATH_TCSHELL
"/your/installation/directory/tcsh" in pathnames.h.
-6) If you've changed any of the configuration variables you may need
- to re-run configure.
+6) make
-7) make
-
-8) Read the documentation while you are waiting. The file tcsh.man
+7) Read the documentation while you are waiting. The file tcsh.man
is in standard [nt]roff -man format. If you like, you can run the
tcsh.man2html script (requires Perl) to generate an HTML version of
the manpage which you can read with Mosaic, lynx or other HTML browser.
-9) Test tcsh by typing ./tcsh to see that it has compiled correctly.
+8) Test tcsh by typing ./tcsh to see that it has compiled correctly.
The history command should give a time stamp on every entry.
Typing normal characters should echo each exactly once. Control-A
should put the cursor at the beginning of the input line, but after
@@ -86,12 +80,12 @@ To install tcsh:
passwd appears on the screen, you have lost /dev/tty. Otherwise
everything is fine.
-10) Once satisfied that tcsh is working correctly, complete the installation
+9) Once satisfied that tcsh is working correctly, complete the installation
by typing "make install" to install the binary, and "make install.man" to
install the documentation. Don't forget to look at complete.tcsh for
useful completions...
-11) Enjoy.
+10) Enjoy.
12) PLEASE file any bug reports (and fixes), code for new features at:
diff --git a/contrib/tcsh/complete.tcsh b/contrib/tcsh/complete.tcsh
index 35d7a79415e2..42edcbd62079 100644
--- a/contrib/tcsh/complete.tcsh
+++ b/contrib/tcsh/complete.tcsh
@@ -1,5 +1,5 @@
#
-# $Id: complete.tcsh,v 1.46 2005/03/21 21:26:08 kim Exp $
+# $tcsh: complete.tcsh,v 1.47 2006/03/02 18:46:44 christos Exp $
# example file using the new completion code
#
# Debian GNU/Linux
diff --git a/contrib/tcsh/config.h.in b/contrib/tcsh/config.h.in
index 2b402257494a..f2211a5ffd57 100644
--- a/contrib/tcsh/config.h.in
+++ b/contrib/tcsh/config.h.in
@@ -10,10 +10,28 @@
/* 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
+
+/* Define to 1 if you have the declaration of `crypt', and to 0 if you don't.
+ */
+#undef HAVE_DECL_CRYPT
+
+/* Define to 1 if you have the declaration of `environ', and to 0 if you
+ don't. */
+#undef HAVE_DECL_ENVIRON
+
/* Define to 1 if you have the declaration of `gethostname', and to 0 if you
don't. */
#undef HAVE_DECL_GETHOSTNAME
+/* Define to 1 if you have the declaration of `getpgrp', and to 0 if you
+ don't. */
+#undef HAVE_DECL_GETPGRP
+
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
@@ -21,6 +39,9 @@
/* Define to 1 if you have the `dup2' function. */
#undef HAVE_DUP2
+/* Define to 1 if you have the `getauthid' function. */
+#undef HAVE_GETAUTHID
+
/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
@@ -33,7 +54,7 @@
/* Define to 1 if you have the `getutent' function. */
#undef HAVE_GETUTENT
-/* Define to 1 if you have the iconv () interface */
+/* Define if you have the iconv() function. */
#undef HAVE_ICONV
/* Define to 1 if you have the <inttypes.h> header file. */
@@ -42,6 +63,9 @@
/* Define to 1 if the system has the type `long long'. */
#undef HAVE_LONG_LONG
+/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
+#undef HAVE_MBRTOWC
+
/* Define to 1 if you have the `memmove' function. */
#undef HAVE_MEMMOVE
@@ -78,6 +102,10 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
+/* Define to 1 if you have the `strcoll' function and it is properly defined.
+ */
+#undef HAVE_STRCOLL
+
/* Define to 1 if you have the `strerror' function. */
#undef HAVE_STRERROR
@@ -143,6 +171,12 @@
/* Define to 1 if you have the `wcwidth' function. */
#undef HAVE_WCWIDTH
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
+
+/* Support NLS. */
+#undef NLS
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
@@ -158,12 +192,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
/* Define to 1 if the `setpgrp' function takes no argument. */
#undef SETPGRP_VOID
@@ -176,9 +204,6 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
-
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
@@ -194,6 +219,9 @@
/* Define to `int' if neither <sys/types.h> nor <sys/socket.h> define. */
#undef socklen_t
+/* Define to `int' not defined in <sys/types.h>. */
+#undef ssize_t
+
/* Define to `int' if <sys/types.h> doesn't define. */
#undef uid_t
diff --git a/contrib/tcsh/config/bsd4.4 b/contrib/tcsh/config/bsd4.4
index 5f028dea2ca3..6be4ebb35070 100644
--- a/contrib/tcsh/config/bsd4.4
+++ b/contrib/tcsh/config/bsd4.4
@@ -21,11 +21,6 @@
#define POSIXJOBS
/*
- * POSIXSIGS Use the POSIX signal facilities to emulate BSD signals.
- */
-#undef POSIXSIGS
-
-/*
* VFORK This machine has a vfork().
* It used to be that for job control to work, this define
* was mandatory. This is not the case any more.
@@ -47,16 +42,9 @@
#define BSDJOBS
/*
- * BSDSIGS You have 4.2-style signals, rather than USG style.
- * Note: POSIX systems should not define this unless they
- * have sigvec() and friends (ie: 4.3BSD-RENO, HP-UX).
- */
-#define BSDSIGS
-
-/*
* BSDTIMES You have BSD-style process time stuff (like rusage)
* This may or may not be true. For example, Apple Unix
- * (OREO) has BSDJOBS and BSDSIGS but not BSDTIMES.
+ * (OREO) has BSDJOBS but not BSDTIMES.
*/
#define BSDTIMES
@@ -108,7 +96,6 @@
# define _PATH_TCSHELL "/usr/contrib/bin/tcsh"
# endif
-# undef NLS
# undef NLS_CATALOGS
#elif defined(__APPLE__)
diff --git a/contrib/tcsh/config_f.h b/contrib/tcsh/config_f.h
index 2f3f4035c7c4..aee736336325 100644
--- a/contrib/tcsh/config_f.h
+++ b/contrib/tcsh/config_f.h
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/config_f.h,v 3.32 2005/03/04 13:46:04 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/config_f.h,v 3.40 2006/08/28 14:53:04 mitr Exp $ */
/*
* config_f.h -- configure various defines for tcsh
*
@@ -50,26 +50,20 @@
* WIDE_STRINGS Represent strings using wide characters
* Allows proper function in multibyte encodings like UTF-8
*/
-#if defined (SHORT_STRINGS) && SIZEOF_WCHAR_T >= 4 && !defined (WINNT_NATIVE) && !defined(_OSD_POSIX)
+#if defined (SHORT_STRINGS) && defined (NLS) && SIZEOF_WCHAR_T >= 4 && defined (HAVE_MBRTOWC) && !defined (WINNT_NATIVE) && !defined(_OSD_POSIX)
# define WIDE_STRINGS
#endif
/*
- * NLS: Use Native Language System
- * Routines like setlocale() are needed
- * if you don't have <locale.h>, you don't want
- * to define this.
- */
-#define NLS
-
-/*
* 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.
*/
-#undef NLS_CATALOGS
+#if defined (NLS) && defined (HAVE_CATGETS)
+# define NLS_CATALOGS
+#endif
/*
* LOGINFIRST Source ~/.login before ~/.cshrc
@@ -149,7 +143,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 (__linux__)
# define SYSMALLOC
#else
# undef SYSMALLOC
diff --git a/contrib/tcsh/configure b/contrib/tcsh/configure
index c3e2ca1362dc..00cf593c66a7 100755
--- a/contrib/tcsh/configure
+++ b/contrib/tcsh/configure
@@ -1,6 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.59 for tcsh 6.15.00.
+#
+# Report bugs to <http://bugs.gw.com/>.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -265,11 +267,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='tcsh'
+PACKAGE_TARNAME='tcsh'
+PACKAGE_VERSION='6.15.00'
+PACKAGE_STRING='tcsh 6.15.00'
+PACKAGE_BUGREPORT='http://bugs.gw.com/'
ac_unique_file="tc.vers.c"
# Factoring default headers for most tests.
@@ -309,7 +311,7 @@ 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 datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP DFLAGS HESDEF HESLIB LIBOBJS LTLIBOBJS'
+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 datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBICONV LTLIBICONV DFLAGS HESDEF HESLIB LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -778,7 +780,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 this package to adapt to many kinds of systems.
+\`configure' configures tcsh 6.15.00 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -838,12 +840,23 @@ _ACEOF
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of tcsh 6.15.00:";;
+ esac
cat <<\_ACEOF
+Optional Features:
+ --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
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir
--with-hesiod=PREFIX Use Hesiod lookup for ~ expansion
Some influential environment variables:
@@ -858,6 +871,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to <http://bugs.gw.com/>.
_ACEOF
fi
@@ -953,6 +967,8 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
+tcsh configure 6.15.00
+generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -965,7 +981,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by tcsh $as_me 6.15.00, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1294,8 +1310,19 @@ 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
@@ -1486,6 +1513,11 @@ case "${host}" in
tcsh_config_file=bsd4.4
;;
+ ## DragonFly systems
+ *-*-dragonfly*)
+ tcsh_config_file=bsd4.4
+ ;;
+
## Silicon Graphics machines
*-sgi-iri* )
tcsh_config_file=irix
@@ -1516,16 +1548,16 @@ case "${host}" in
*-sun-sunos4.1.[3456]* )
tcsh_config_file=sunos413
;;
- *-*-solaris2.[01]* ) # Should handle sparc or x86
+ *-*-solaris2.[01] ) # Should handle sparc or x86
tcsh_config_file=sol2
;;
- *-sun-solaris2.2* ) # Sparc only release
+ *-sun-solaris2.2 ) # Sparc only release
tcsh_config_file=sol22
;;
- *-sun-solaris2.3* ) # Sparc only release
+ *-sun-solaris2.3 ) # Sparc only release
tcsh_config_file=sol23
;;
- *-*-solaris2.[45]* ) # Should handle sparc, x86 and powerpc
+ *-*-solaris2.[45] ) # Should handle sparc, x86 and powerpc
tcsh_config_file=sol24
;;
*-*-solaris2.* ) # Should handle sparc, x86 and powerpc
@@ -3477,31 +3509,604 @@ if test "$ac_cv_search_connect" != no; then
fi
-echo "$as_me:$LINENO: checking for library containing iconv" >&5
-echo $ECHO_N "checking for library containing iconv... $ECHO_C" >&6
-if test "${ac_cv_search_iconv+set}" = set; then
+
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-gnu-ld or --without-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+ withval="$with_gnu_ld"
+ test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi;
+# Prepare PATH_SEPARATOR.
+# 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=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+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
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # 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%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ 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
+else
+ echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+fi
+if test "${acl_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_func_search_save_LIBS=$LIBS
-ac_cv_search_iconv=no
-cat >conftest.$ac_ext <<_ACEOF
+ if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # 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" != yes && break ;;
+ esac
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}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
+else
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ acl_cv_prog_gnu_ld=yes ;;
+*)
+ 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
+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
+else
+
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+
+fi
+echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$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"
+ # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+ enableval="$enable_rpath"
+ :
+else
+ enable_rpath=yes
+fi;
+
+
+
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+ withval="$with_libiconv_prefix"
+
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+
+fi;
+ LIBICONV=
+ LTLIBICONV=
+ INCICONV=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='iconv '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ 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"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ 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
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ 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
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$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\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ done
+ fi
+
+
+
+
+
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ 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
+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
/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char iconv ();
+#include <stdlib.h>
+#include <iconv.h>
int
main ()
{
-iconv ();
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
;
return 0;
}
@@ -3528,7 +4133,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_iconv="none required"
+ am_cv_func_iconv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3536,27 +4141,23 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_iconv" = no; then
- for ac_lib in iconv; do
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ 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
/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char iconv ();
+#include <stdlib.h>
+#include <iconv.h>
int
main ()
{
-iconv ();
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
;
return 0;
}
@@ -3583,8 +4184,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_iconv="-l$ac_lib"
-break
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3592,21 +4193,111 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- done
-fi
-LIBS=$ac_func_search_save_LIBS
+ LIBS="$am_save_LIBS"
+ fi
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_search_iconv" >&5
-echo "${ECHO_T}$ac_cv_search_iconv" >&6
-if test "$ac_cv_search_iconv" != no; then
- test "$ac_cv_search_iconv" = "none required" || LIBS="$ac_cv_search_iconv $LIBS"
+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
cat >>confdefs.h <<\_ACEOF
#define HAVE_ICONV 1
_ACEOF
+ 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
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
+
+ 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
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; 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"
+fi
+rm -f 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
+
+cat >>confdefs.h <<_ACEOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
+_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
@@ -3850,158 +4541,10 @@ done
-for ac_header in auth.h inttypes.h shadow.h stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; 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 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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_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 the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_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 eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-for ac_header in utmpx.h utmp.h
+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 eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -4122,9 +4665,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## ---------------------------------- ##
+## Report this to http://bugs.gw.com/ ##
+## ---------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -4272,9 +4815,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## ---------------------------------- ##
+## Report this to http://bugs.gw.com/ ##
+## ---------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -4845,9 +5388,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## ---------------------------------- ##
+## Report this to http://bugs.gw.com/ ##
+## ---------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -5688,75 +6231,6 @@ _ACEOF
fi
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if test "${ac_cv_type_signal+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>
-#include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
-
-int
-main ()
-{
-int i;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_signal=void
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_signal=int
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
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
@@ -5864,6 +6338,79 @@ fi
+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. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <sys/types.h>
+
+
+int
+main ()
+{
+if ((ssize_t *) 0)
+ return 0;
+if (sizeof (ssize_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; 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
+rm -f 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
+
+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
@@ -6078,6 +6625,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#define utmp utmpx
@@ -6128,6 +6676,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#define utmp utmpx
@@ -6199,6 +6748,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#define utmp utmpx
@@ -6249,6 +6799,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#define utmp utmpx
@@ -6320,6 +6871,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#define utmp utmpx
@@ -6370,6 +6922,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#define utmp utmpx
@@ -6441,6 +6994,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#define utmp utmpx
@@ -6491,6 +7045,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#define utmp utmpx
@@ -6774,26 +7329,6 @@ _ACEOF
fi
-echo "$as_me:$LINENO: checking for function prototypes" >&5
-echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
-if test "$ac_cv_prog_cc_stdc" != no; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define PROTOTYPES 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define __PROTOTYPES 1
-_ACEOF
-
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-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
@@ -6858,6 +7393,158 @@ _ACEOF
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_includes_default
+#ifdef HAVE_CRYPT_H
+#include <crypt.h>
+#endif
+
+
+int
+main ()
+{
+#ifndef crypt
+ char *p = (char *) crypt;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_have_decl_crypt=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl_crypt=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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
+_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_includes_default
+#ifdef HAVE_CRYPT_H
+#include <crypt.h>
+#endif
+
+
+int
+main ()
+{
+#ifndef environ
+ char *p = (char *) environ;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_have_decl_environ=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl_environ=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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
+_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
@@ -6869,7 +7556,13 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include "config_p.h"
$ac_includes_default
+#ifdef HAVE_CRYPT_H
+#include <crypt.h>
+#endif
+
+
int
main ()
{
@@ -6928,25 +7621,199 @@ _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. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include "config_p.h"
+$ac_includes_default
+#ifdef HAVE_CRYPT_H
+#include <crypt.h>
+#endif
+int
+main ()
+{
+#ifndef getpgrp
+ char *p = (char *) getpgrp;
+#endif
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_have_decl_getpgrp=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_have_decl_getpgrp=no
+fi
+rm -f 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
+_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 gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+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
+#else
+char (*f) () = setlocale;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != setlocale;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; 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 conftest.err conftest.$ac_objext \
+ 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
+ have_setlocale=yes
+else
+ have_setlocale=no
+fi
-for ac_func in dup2 getcwd gethostname getpwent getutent memmove memset nice nl_langinfo sbrk setpgid setpriority strerror strstr sysconf wcwidth
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+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
@@ -7110,6 +7977,69 @@ _ACEOF
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
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <wchar.h>
+int
+main ()
+{
+mbstate_t state; return ! (sizeof state && mbrtowc);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; 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
+fi
+rm -f 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
+ if test $ac_cv_func_mbrtowc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MBRTOWC 1
+_ACEOF
+
+ 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
@@ -7174,9 +8104,84 @@ _ACEOF
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_strcoll_works=no
+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
+int
+main ()
+{
+exit (strcoll ("abc", "def") >= 0 ||
+ strcoll ("ABC", "DEF") >= 0 ||
+ strcoll ("123", "456") >= 0)
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; 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
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
+if test $ac_cv_func_strcoll_works = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRCOLL 1
+_ACEOF
+
+fi
+
+
+
+
+
+if test "$have_setlocale" != no; then
+ # Check whether --enable-nls or --disable-nls was given.
+if test "${enable_nls+set}" = set; then
+ enableval="$enable_nls"
+else
+ enable_nls=yes
+fi;
+ if test "x$enable_nls" != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define NLS 1
+_ACEOF
+
+ fi
+fi
# Check whether --with-hesiod or --without-hesiod was given.
@@ -7724,7 +8729,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by $as_me, which was
+This file was extended by tcsh $as_me 6.15.00, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7779,12 +8784,15 @@ $config_files
Configuration headers:
$config_headers
+Configuration commands:
+$config_commands
+
Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-config.status
+tcsh config.status 6.15.00
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -7887,6 +8895,7 @@ do
case "$ac_config_target" in
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "./atconfig" ) CONFIG_COMMANDS="$CONFIG_COMMANDS ./atconfig" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -7901,6 +8910,7 @@ done
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -7989,6 +8999,8 @@ s,@EXEEXT@,$EXEEXT,;t t
s,@OBJEXT@,$OBJEXT,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
+s,@LIBICONV@,$LIBICONV,;t t
+s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@DFLAGS@,$DFLAGS,;t t
s,@HESDEF@,$HESDEF,;t t
s,@HESLIB@,$HESLIB,;t t
@@ -8450,6 +9462,143 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
fi
done
_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_dest" : 'X\(//\)[^/]' \| \
+ X"$ac_dest" : 'X\(//\)$' \| \
+ X"$ac_dest" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dir"
+ else
+ as_dir="$ac_dir"
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$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'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
+
+ ac_builddir=.
+
+if test "$ac_dir" != .; then
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_srcdir=.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
+
+
+ { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+echo "$as_me: executing $ac_dest commands" >&6;}
+ case $ac_dest in
+ ./atconfig ) cat >./atconfig <<ATEOF
+# Configurable variable values for building test suites.
+# Generated by $0.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
+at_testdir='.'
+abs_builddir='$ac_abs_builddir'
+at_srcdir='$ac_srcdir'
+abs_srcdir='$ac_abs_srcdir'
+at_top_srcdir='$ac_top_srcdir'
+abs_top_srcdir='$ac_abs_top_srcdir'
+at_top_builddir='$ac_top_builddir'
+abs_top_builddir='$ac_abs_top_builddir'
+
+AUTOTEST_PATH='.'
+
+SHELL=\${CONFIG_SHELL-'$SHELL'}
+ATEOF
+ ;;
+ esac
+done
+_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
diff --git a/contrib/tcsh/configure.in b/contrib/tcsh/configure.in
index bc5e39852519..604ac7119978 100644
--- a/contrib/tcsh/configure.in
+++ b/contrib/tcsh/configure.in
@@ -9,9 +9,10 @@ dnl Written by Kaveh Ghazi (ghazi@caip.rutgers.edu) 5/11/96.
dnl
AC_PREREQ([2.59])dnl Minimum Autoconf version required.
-AC_INIT
+AC_INIT([tcsh], [6.15.00], [http://bugs.gw.com/])
AC_CONFIG_SRCDIR([tc.vers.c])
AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_TESTDIR([.], [.])
AC_CANONICAL_HOST
@@ -120,6 +121,11 @@ case "${host}" in
tcsh_config_file=bsd4.4
;;
+ ## DragonFly systems
+ *-*-dragonfly*)
+ tcsh_config_file=bsd4.4
+ ;;
+
## Silicon Graphics machines
*-sgi-iri* )
tcsh_config_file=irix
@@ -150,16 +156,16 @@ case "${host}" in
*-sun-sunos4.1.[3456]* )
tcsh_config_file=sunos413
;;
- *-*-solaris2.[01]* ) # Should handle sparc or x86
+ *-*-solaris2.[01] ) # Should handle sparc or x86
tcsh_config_file=sol2
;;
- *-sun-solaris2.2* ) # Sparc only release
+ *-sun-solaris2.2 ) # Sparc only release
tcsh_config_file=sol22
;;
- *-sun-solaris2.3* ) # Sparc only release
+ *-sun-solaris2.3 ) # Sparc only release
tcsh_config_file=sol23
;;
- *-*-solaris2.[45]* ) # Should handle sparc, x86 and powerpc
+ *-*-solaris2.[45] ) # Should handle sparc, x86 and powerpc
tcsh_config_file=sol24
;;
*-*-solaris2.* ) # Should handle sparc, x86 and powerpc
@@ -260,12 +266,10 @@ 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([iconv], [iconv], [AC_DEFINE([HAVE_ICONV], [1],
- [Define to 1 if you have the iconv () interface])])
+AM_ICONV
dnl Checks for header files
-AC_CHECK_HEADERS([auth.h inttypes.h shadow.h stdint.h])
-AC_CHECK_HEADERS([utmpx.h utmp.h])
+AC_CHECK_HEADERS([auth.h crypt.h inttypes.h shadow.h stdint.h utmp.h utmpx.h])
AC_CHECK_HEADERS([wchar.h],
[AC_CHECK_SIZEOF([wchar_t], [], [dnl
#include <stdio.h>
@@ -279,10 +283,18 @@ dnl Checks for types
AC_CHECK_TYPES([long long])
AC_TYPE_GETGROUPS
AC_TYPE_MODE_T
-AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
AC_TYPE_UID_T
+AC_DEFUN([AC_TYPE_SSIZE_T], [
+AC_CHECK_TYPE(ssize_t,,
+AC_DEFINE(ssize_t, int, [Define to `int' not defined in <sys/types.h>.]),
+[
+#include <sys/types.h>
+])
+])
+AC_TYPE_SSIZE_T
+
AC_DEFUN([AC_TYPE_SOCKLEN_T], [
AC_CHECK_TYPE(socklen_t,,
AC_DEFINE(socklen_t, int, [Define to `int' if neither <sys/types.h> nor <sys/socket.h> define.]),
@@ -308,7 +320,8 @@ AC_CHECK_MEMBERS([struct dirent.d_ino], , ,
#endif])
AC_CHECK_MEMBERS([struct utmp.ut_host, struct utmp.ut_user, struct utmp.ut_tv,
struct utmp.ut_xtime], , ,
-[#ifdef HAVE_UTMPX_H
+[#include <sys/types.h>
+#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#define utmp utmpx
#elif defined HAVE_UTMP_H
@@ -320,16 +333,24 @@ AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family], , ,
dnl Checks for compiler characteristics
AC_C_CONST
-AC_C_PROTOTYPES
AC_C_VOLATILE
dnl checks for library functions
-AC_CHECK_DECLS([gethostname])
-AC_CHECK_FUNCS([dup2 getcwd gethostname getpwent getutent memmove memset] dnl
- [nice nl_langinfo sbrk setpgid setpriority strerror strstr sysconf] dnl
- [wcwidth])
+AC_CHECK_DECLS([crypt, environ, gethostname, getpgrp], , ,
+[#include "config_p.h"
+AC_INCLUDES_DEFAULT([])
+#ifdef HAVE_CRYPT_H
+#include <crypt.h>
+#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_FUNC_GETPGRP
+AC_FUNC_MBRTOWC
AC_FUNC_SETPGRP
+AC_FUNC_STRCOLL
dnl This is not good enough; we need sockaddr_storage too.
dnl See whether we can use IPv6 related functions
@@ -379,6 +400,15 @@ dnl IPv6_CHECK_FUNC(getnameinfo, DFLAGS="$DFLAGS -DINET6")
AC_SUBST(DFLAGS)
+dnl Checks for system services
+if test "$have_setlocale" != no; then
+ AC_ARG_ENABLE([nls], AS_HELP_STRING([--disable-nls], [Disable NLS support]),
+ [], [enable_nls=yes])
+ if test "x$enable_nls" != xno; then
+ AC_DEFINE([NLS], [1], [Support NLS.])
+ fi
+fi
+
AC_ARG_WITH(hesiod,
[ --with-hesiod=PREFIX Use Hesiod lookup for ~ expansion],
[hesiod="$withval"], [hesiod=no])
diff --git a/contrib/tcsh/ed.chared.c b/contrib/tcsh/ed.chared.c
index 2585d9403304..9f09c68562af 100644
--- a/contrib/tcsh/ed.chared.c
+++ b/contrib/tcsh/ed.chared.c
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.chared.c,v 3.83 2005/03/03 16:21:08 kim Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.chared.c,v 3.93 2006/08/23 15:03:13 christos Exp $ */
/*
* ed.chared.c: Character editing functions.
*/
@@ -72,7 +72,7 @@
#include "sh.h"
-RCSID("$Id: ed.chared.c,v 3.83 2005/03/03 16:21:08 kim Exp $")
+RCSID("$tcsh: ed.chared.c,v 3.93 2006/08/23 15:03:13 christos Exp $")
#include "ed.h"
#include "tw.h"
@@ -103,8 +103,7 @@ static int ActionFlag = TCSHOP_NOP; /* What delayed action to take */
* Word search state
*/
static int searchdir = F_UP_SEARCH_HIST; /* Direction of last search */
-static Char patbuf[INBUFSIZE]; /* Search target */
-static int patlen = 0;
+static struct Strbuf patbuf; /* = Strbuf_INIT; Search target */
/*
* Char search state
*/
@@ -112,41 +111,42 @@ static int srch_dir = CHAR_FWD; /* Direction of last search */
static Char srch_char = 0; /* Search target */
/* all routines that start with c_ are private to this set of routines */
-static void c_alternativ_key_map __P((int));
-void c_insert __P((int));
-void c_delafter __P((int));
-void c_delbefore __P((int));
-static int c_to_class __P((Char));
-static Char *c_prev_word __P((Char *, Char *, int));
-static Char *c_next_word __P((Char *, Char *, int));
-static Char *c_number __P((Char *, int *, int));
-static Char *c_expand __P((Char *));
-static void c_excl __P((Char *));
-static void c_substitute __P((void));
-static void c_delfini __P((void));
-static int c_hmatch __P((Char *));
-static void c_hsetpat __P((void));
+static void c_alternativ_key_map (int);
+void c_insert (int);
+void c_delafter (int);
+void c_delbefore (int);
+static int c_to_class (Char);
+static Char *c_prev_word (Char *, Char *, int);
+static Char *c_next_word (Char *, Char *, int);
+static Char *c_number (Char *, int *, int);
+static Char *c_expand (Char *);
+static void c_excl (Char *);
+static void c_substitute (void);
+static void c_delfini (void);
+static int c_hmatch (Char *);
+static void c_hsetpat (void);
#ifdef COMMENT
-static void c_get_word __P((Char **, Char **));
+static void c_get_word (Char **, Char **);
#endif
-static Char *c_preword __P((Char *, Char *, int, Char *));
-static Char *c_nexword __P((Char *, Char *, int));
-static Char *c_endword __P((Char *, Char *, int, Char *));
-static Char *c_eword __P((Char *, Char *, int));
-static void c_push_kill __P((Char *, Char *));
-static CCRETVAL c_get_histline __P((void));
-static CCRETVAL c_search_line __P((Char *, int));
-static CCRETVAL v_repeat_srch __P((int));
-static CCRETVAL e_inc_search __P((int));
-static CCRETVAL e_insert_str __P((Char *));
-static CCRETVAL v_search __P((int));
-static CCRETVAL v_csearch_fwd __P((Char, int, int));
-static CCRETVAL v_action __P((int));
-static CCRETVAL v_csearch_back __P((Char, int, int));
+static Char *c_preword (Char *, Char *, int, Char *);
+static Char *c_nexword (Char *, Char *, int);
+static Char *c_endword (Char *, Char *, int, Char *);
+static Char *c_eword (Char *, Char *, int);
+static void c_push_kill (Char *, Char *);
+static void c_save_inputbuf (void);
+static CCRETVAL c_search_line (Char *, int);
+static CCRETVAL v_repeat_srch (int);
+static CCRETVAL e_inc_search (int);
+#ifdef notyet
+static CCRETVAL e_insert_str (Char *);
+#endif
+static CCRETVAL v_search (int);
+static CCRETVAL v_csearch_fwd (Char, int, int);
+static CCRETVAL v_action (int);
+static CCRETVAL v_csearch_back (Char, int, int);
static void
-c_alternativ_key_map(state)
- int state;
+c_alternativ_key_map(int state)
{
switch (state) {
case 0:
@@ -163,8 +163,7 @@ c_alternativ_key_map(state)
}
void
-c_insert(num)
- int num;
+c_insert(int num)
{
Char *cp;
@@ -181,8 +180,7 @@ c_insert(num)
}
void
-c_delafter(num)
- int num;
+c_delafter(int num)
{
Char *cp, *kp = NULL;
@@ -190,7 +188,6 @@ c_delafter(num)
num = (int) (LastChar - Cursor); /* bounds check */
if (num > 0) { /* if I can delete anything */
- num = NLSExtend(Cursor, LastChar - Cursor, num);
if (VImode) {
kp = UndoBuf; /* Set Up for VI undo command */
UndoAction = TCSHOP_INSERT;
@@ -205,7 +202,11 @@ c_delafter(num)
for (cp = Cursor; cp + num <= LastChar; cp++)
*cp = cp[num];
LastChar -= num;
- if (Mark && Mark > Cursor)
+ /* Mark was within the range of the deleted word? */
+ if (Mark && Mark > Cursor && Mark <= Cursor+num)
+ Mark = Cursor;
+ /* Mark after the deleted word? */
+ else if (Mark && Mark > Cursor)
Mark -= num;
}
#ifdef notdef
@@ -220,8 +221,7 @@ c_delafter(num)
}
void
-c_delbefore(num) /* delete before dot, with bounds checking */
- int num;
+c_delbefore(int num) /* delete before dot, with bounds checking */
{
Char *cp, *kp = NULL;
@@ -229,7 +229,6 @@ c_delbefore(num) /* delete before dot, with bounds checking */
num = (int) (Cursor - InputBuf); /* bounds check */
if (num > 0) { /* if I can delete anything */
- num = NLSExtend(Cursor, Cursor - InputBuf, -num);
if (VImode) {
kp = UndoBuf; /* Set Up for VI undo command */
UndoAction = TCSHOP_INSERT;
@@ -245,15 +244,17 @@ c_delbefore(num) /* delete before dot, with bounds checking */
*cp = cp[num];
LastChar -= num;
Cursor -= num;
- if (Mark && Mark > Cursor)
+ /* Mark was within the range of the deleted word? */
+ if (Mark && Mark > Cursor && Mark <= Cursor+num)
+ Mark = Cursor;
+ /* Mark after the deleted word? */
+ else if (Mark && Mark > Cursor)
Mark -= num;
}
}
static Char *
-c_preword(p, low, n, delim)
- Char *p, *low, *delim;
- int n;
+c_preword(Char *p, Char *low, int n, Char *delim)
{
while (n--) {
Char *prev = low;
@@ -299,8 +300,7 @@ c_preword(p, low, n, delim)
* 3/ others
*/
static int
-c_to_class(ch)
-Char ch;
+c_to_class(Char ch)
{
if (Isspace(ch))
return C_CLASS_WHITE;
@@ -312,9 +312,7 @@ Char ch;
}
static Char *
-c_prev_word(p, low, n)
- Char *p, *low;
- int n;
+c_prev_word(Char *p, Char *low, int n)
{
p--;
@@ -361,9 +359,7 @@ c_prev_word(p, low, n)
}
static Char *
-c_next_word(p, high, n)
- Char *p, *high;
- int n;
+c_next_word(Char *p, Char *high, int n)
{
if (!VImode) {
while (n--) {
@@ -404,9 +400,7 @@ c_next_word(p, high, n)
}
static Char *
-c_nexword(p, high, n)
- Char *p, *high;
- int n;
+c_nexword(Char *p, Char *high, int n)
{
while (n--) {
while ((p < high) && !Isspace(*p))
@@ -438,10 +432,7 @@ c_nexword(p, high, n)
*/
static Char *
-c_number(p, num, dval)
- Char *p;
- int *num;
- int dval;
+c_number(Char *p, int *num, int dval)
{
int i;
int sign = 1;
@@ -452,7 +443,7 @@ c_number(p, num, dval)
}
if (*p == '$') {
if (*++p != '-') {
- *num = NCARGS; /* Handle $ */
+ *num = INT_MAX; /* Handle $ */
return(--p);
}
sign = -1; /* Handle $- */
@@ -471,8 +462,7 @@ c_number(p, num, dval)
*/
static Char *
-c_expand(p)
- Char *p;
+c_expand(Char *p)
{
Char *q;
struct Hist *h = Histlist.Hnext;
@@ -481,32 +471,33 @@ c_expand(p)
int all_dig;
int been_once = 0;
Char *op = p;
- Char buf[INBUFSIZE];
- Char *bend = buf;
- Char *modbuf, *omodbuf;
+ Char *buf;
+ size_t buf_len;
+ Char *modbuf;
+ buf = NULL;
if (!h)
goto excl_err;
excl_sw:
switch (*(q = p + 1)) {
case '^':
- bend = expand_lex(buf, INBUFSIZE, &h->Hlex, 1, 1);
+ buf = expand_lex(&h->Hlex, 1, 1);
break;
case '$':
if ((l = (h->Hlex).prev) != 0)
- bend = expand_lex(buf, INBUFSIZE, l->prev->prev, 0, 0);
+ buf = expand_lex(l->prev->prev, 0, 0);
break;
case '*':
- bend = expand_lex(buf, INBUFSIZE, &h->Hlex, 1, NCARGS);
+ buf = expand_lex(&h->Hlex, 1, INT_MAX);
break;
default:
if (been_once) { /* unknown argument */
/* assume it's a modifier, e.g. !foo:h, and get whole cmd */
- bend = expand_lex(buf, INBUFSIZE, &h->Hlex, 0, NCARGS);
+ buf = expand_lex(&h->Hlex, 0, INT_MAX);
q -= 2;
break;
}
@@ -599,27 +590,27 @@ excl_sw:
}
else if (q[1] == '*') {
++q;
- to = NCARGS;
+ to = INT_MAX;
}
else {
to = from;
}
if (from < 0 || to < from)
goto excl_err;
- bend = expand_lex(buf, INBUFSIZE, &h->Hlex, from, to);
- }
- else { /* get whole cmd */
- bend = expand_lex(buf, INBUFSIZE, &h->Hlex, 0, NCARGS);
+ buf = expand_lex(&h->Hlex, from, to);
}
+ else /* get whole cmd */
+ buf = expand_lex(&h->Hlex, 0, INT_MAX);
break;
}
+ if (buf == NULL)
+ buf = SAVE("");
/*
* Apply modifiers, if any.
*/
if (q[1] == ':') {
- *bend = '\0';
- modbuf = omodbuf = buf;
+ modbuf = buf;
while (q[1] == ':' && modbuf != NULL) {
switch (q[2]) {
case 'r':
@@ -630,10 +621,9 @@ excl_sw:
case 'x':
case 'u':
case 'l':
- if ((modbuf = domod(omodbuf, (int) q[2])) != NULL) {
- if (omodbuf != buf)
- xfree((ptr_t) omodbuf);
- omodbuf = modbuf;
+ if ((modbuf = domod(buf, (int) q[2])) != NULL) {
+ xfree(buf);
+ buf = modbuf;
}
++q;
break;
@@ -661,33 +651,28 @@ excl_sw:
if (q[1])
++q;
}
- if (omodbuf != buf) {
- (void) Strcpy(buf, omodbuf);
- xfree((ptr_t) omodbuf);
- bend = Strend(buf);
- }
}
+ buf_len = Strlen(buf);
/*
- * Now replace the text from op to q inclusive with the text from buf to
- * bend.
+ * Now replace the text from op to q inclusive with the text from buf.
*/
q++;
/*
* Now replace text non-inclusively like a real CS major!
*/
- if (LastChar + (bend - buf) - (q - op) >= InputLim)
+ if (LastChar + buf_len - (q - op) >= InputLim)
goto excl_err;
- (void) memmove((ptr_t) (q + (bend - buf) - (q - op)), (ptr_t) q,
- (size_t) ((LastChar - q) * sizeof(Char)));
- LastChar += (bend - buf) - (q - op);
- Cursor += (bend - buf) - (q - op);
- (void) memmove((ptr_t) op, (ptr_t) buf,
- (size_t) ((bend - buf) * sizeof(Char)));
+ (void) memmove(op + buf_len, q, (LastChar - q) * sizeof(Char));
+ LastChar += buf_len - (q - op);
+ Cursor += buf_len - (q - op);
+ (void) memcpy(op, buf, buf_len * sizeof(Char));
*LastChar = '\0';
- return(op + (bend - buf));
+ xfree(buf);
+ return op + buf_len;
excl_err:
+ xfree(buf);
SoundBeep();
return(op + 1);
}
@@ -700,8 +685,7 @@ excl_err:
*/
static void
-c_excl(p)
- Char *p;
+c_excl(Char *p)
{
int i;
Char *q;
@@ -743,7 +727,7 @@ c_excl(p)
static void
-c_substitute()
+c_substitute(void)
{
Char *p;
@@ -764,7 +748,7 @@ c_substitute()
}
static void
-c_delfini() /* Finish up delete action */
+c_delfini(void) /* Finish up delete action */
{
int Size;
@@ -796,9 +780,7 @@ c_delfini() /* Finish up delete action */
}
static Char *
-c_endword(p, high, n, delim)
- Char *p, *high, *delim;
- int n;
+c_endword(Char *p, Char *high, int n, Char *delim)
{
Char inquote = 0;
p++;
@@ -829,9 +811,7 @@ c_endword(p, high, n, delim)
static Char *
-c_eword(p, high, n)
- Char *p, *high;
- int n;
+c_eword(Char *p, Char *high, int n)
{
p++;
@@ -853,8 +833,7 @@ c_eword(p, high, n)
/* Set the max length of the kill ring */
void
-SetKillRing(max)
- int max;
+SetKillRing(int max)
{
CStr *new;
int count, i, j;
@@ -863,7 +842,7 @@ SetKillRing(max)
max = 1; /* no ring, but always one buffer */
if (max == KillRingMax)
return;
- new = (CStr *)xcalloc((size_t) max, sizeof(CStr));
+ new = xcalloc(max, sizeof(CStr));
if (KillRing != NULL) {
if (KillRingLen != 0) {
if (max >= KillRingLen) {
@@ -892,8 +871,7 @@ SetKillRing(max)
/* Push string from start upto (but not including) end onto kill ring */
static void
-c_push_kill(start, end)
- Char *start, *end;
+c_push_kill(Char *start, Char *end)
{
CStr save, *pos;
Char *dp, *cp, *kp;
@@ -939,10 +917,7 @@ c_push_kill(start, end)
pos = &KillRing[KillPos];
KillPos = (KillPos + 1) % KillRingMax;
if (pos->len < len) {
- if (pos->buf == NULL)
- pos->buf = (Char *) xmalloc(len * sizeof(Char));
- else
- pos->buf = (Char *) xrealloc((ptr_t) pos->buf, len * sizeof(Char));
+ pos->buf = xrealloc(pos->buf, len * sizeof(Char));
pos->len = len;
}
cp = start;
@@ -952,15 +927,31 @@ c_push_kill(start, end)
*kp = '\0';
}
-static CCRETVAL
-c_get_histline()
+/* Save InputBuf etc in SavedBuf etc for restore after cmd exec */
+static void
+c_save_inputbuf()
+{
+ SavedBuf.len = 0;
+ Strbuf_append(&SavedBuf, InputBuf);
+ Strbuf_terminate(&SavedBuf);
+ LastSaved = LastChar - InputBuf;
+ CursSaved = Cursor - InputBuf;
+ HistSaved = Hist_num;
+ RestoreSaved = 1;
+}
+
+CCRETVAL
+GetHistLine()
{
struct Hist *hp;
int h;
if (Hist_num == 0) { /* if really the current line */
- copyn(InputBuf, HistBuf, INBUFSIZE);
- LastChar = InputBuf + (LastHist - HistBuf);
+ if (HistBuf.s != NULL)
+ copyn(InputBuf, HistBuf.s, INBUFSIZE);/*FIXBUF*/
+ else
+ *InputBuf = '\0';
+ LastChar = InputBuf + HistBuf.len;
#ifdef KSHVI
if (VImode)
@@ -985,14 +976,18 @@ c_get_histline()
}
if (HistLit && hp->histline) {
- copyn(InputBuf, hp->histline, INBUFSIZE);
+ copyn(InputBuf, hp->histline, INBUFSIZE);/*FIXBUF*/
CurrentHistLit = 1;
}
else {
- (void) sprlex(InputBuf, sizeof(InputBuf) / sizeof(Char), &hp->Hlex);
+ Char *p;
+
+ p = sprlex(&hp->Hlex);
+ copyn(InputBuf, p, sizeof(InputBuf) / sizeof(Char));/*FIXBUF*/
+ xfree(p);
CurrentHistLit = 0;
}
- LastChar = InputBuf + Strlen(InputBuf);
+ LastChar = Strend(InputBuf);
if (LastChar > InputBuf) {
if (LastChar[-1] == '\n')
@@ -1016,18 +1011,16 @@ c_get_histline()
}
static CCRETVAL
-c_search_line(pattern, dir)
-Char *pattern;
-int dir;
+c_search_line(Char *pattern, int dir)
{
Char *cp;
- int len;
+ size_t len;
- len = (int) Strlen(pattern);
+ len = Strlen(pattern);
if (dir == F_UP_SEARCH_HIST) {
for (cp = Cursor; cp >= InputBuf; cp--)
- if (Strncmp(cp, pattern, (size_t) len) == 0 ||
+ if (Strncmp(cp, pattern, len) == 0 ||
Gmatch(cp, pattern)) {
Cursor = cp;
return(CC_NORM);
@@ -1035,7 +1028,7 @@ int dir;
return(CC_ERROR);
} else {
for (cp = Cursor; *cp != '\0' && cp < InputLim; cp++)
- if (Strncmp(cp, pattern, (size_t) len) == 0 ||
+ if (Strncmp(cp, pattern, len) == 0 ||
Gmatch(cp, pattern)) {
Cursor = cp;
return(CC_NORM);
@@ -1045,30 +1038,30 @@ int dir;
}
static CCRETVAL
-e_inc_search(dir)
- int dir;
+e_inc_search(int dir)
{
- static Char STRfwd[] = { 'f', 'w', 'd', '\0' },
- STRbck[] = { 'b', 'c', 'k', '\0' };
+ static const Char STRfwd[] = { 'f', 'w', 'd', '\0' },
+ STRbck[] = { 'b', 'c', 'k', '\0' };
static Char pchar = ':'; /* ':' = normal, '?' = failed */
static Char endcmd[2];
- Char ch, *cp,
+ const Char *cp;
+ Char ch,
*oldCursor = Cursor,
oldpchar = pchar;
CCRETVAL ret = CC_NORM;
int oldHist_num = Hist_num,
- oldpatlen = patlen,
+ oldpatlen = patbuf.len,
newdir = dir,
done, redo;
- if (LastChar + sizeof(STRfwd)/sizeof(Char) + 2 + patlen >= InputLim)
+ if (LastChar + sizeof(STRfwd)/sizeof(Char) + 2 + patbuf.len >= InputLim)
return(CC_ERROR);
for (;;) {
- if (patlen == 0) { /* first round */
+ if (patbuf.len == 0) { /* first round */
pchar = ':';
- patbuf[patlen++] = '*';
+ Strbuf_append1(&patbuf, '*');
}
done = redo = 0;
*LastChar++ = '\n';
@@ -1076,9 +1069,16 @@ e_inc_search(dir)
*cp; *LastChar++ = *cp++)
continue;
*LastChar++ = pchar;
- for (cp = &patbuf[1]; cp < &patbuf[patlen]; *LastChar++ = *cp++)
+ for (cp = &patbuf.s[1]; cp < &patbuf.s[patbuf.len];
+ *LastChar++ = *cp++)
continue;
*LastChar = '\0';
+ if (adrof(STRhighlight) && pchar == ':') {
+ /* if the no-glob-search patch is applied, remove the - 1 below */
+ IncMatchLen = patbuf.len - 1;
+ ClearLines();
+ ClearDisp();
+ }
Refresh();
if (GetNextChar(&ch) != 1)
@@ -1089,10 +1089,10 @@ e_inc_search(dir)
case F_INSERT:
case F_DIGIT:
case F_MAGIC_SPACE:
- if (patlen > INBUFSIZE - 3)
+ if (LastChar + 1 >= InputLim) /*FIXBUF*/
SoundBeep();
else {
- patbuf[patlen++] = ch;
+ Strbuf_append1(&patbuf, ch);
*LastChar++ = ch;
*LastChar = '\0';
Refresh();
@@ -1110,14 +1110,14 @@ e_inc_search(dir)
break;
case F_DELPREV:
- if (patlen > 1)
+ if (patbuf.len > 1)
done++;
else
SoundBeep();
break;
default:
- switch (ch) {
+ switch (ASC(ch)) {
case 0007: /* ^G: Abort */
ret = CC_ERROR;
done++;
@@ -1125,16 +1125,16 @@ e_inc_search(dir)
case 0027: /* ^W: Append word */
/* No can do if globbing characters in pattern */
- for (cp = &patbuf[1]; ; cp++)
- if (cp >= &patbuf[patlen]) {
- Cursor += patlen - 1;
+ for (cp = &patbuf.s[1]; ; cp++)
+ if (cp >= &patbuf.s[patbuf.len]) {
+ Cursor += patbuf.len - 1;
cp = c_next_word(Cursor, LastChar, 1);
while (Cursor < cp && *Cursor != '\n') {
- if (patlen > INBUFSIZE - 3) {
+ if (LastChar + 1 >= InputLim) {/*FIXBUF*/
SoundBeep();
break;
}
- patbuf[patlen++] = *Cursor;
+ Strbuf_append1(&patbuf, *Cursor);
*LastChar++ = *Cursor++;
}
Cursor = oldCursor;
@@ -1167,43 +1167,43 @@ e_inc_search(dir)
if (!done) {
/* Can't search if unmatched '[' */
- for (cp = &patbuf[patlen - 1], ch = ']'; cp > patbuf; cp--)
+ for (cp = &patbuf.s[patbuf.len - 1], ch = ']'; cp > patbuf.s; cp--)
if (*cp == '[' || *cp == ']') {
ch = *cp;
break;
}
- if (patlen > 1 && ch != '[') {
+ if (patbuf.len > 1 && ch != '[') {
if (redo && newdir == dir) {
if (pchar == '?') { /* wrap around */
- Hist_num = newdir == F_UP_SEARCH_HIST ? 0 : 0x7fffffff;
- if (c_get_histline() == CC_ERROR)
+ Hist_num = newdir == F_UP_SEARCH_HIST ? 0 : INT_MAX;
+ if (GetHistLine() == CC_ERROR)
/* Hist_num was fixed by first call */
- (void) c_get_histline();
+ (void) GetHistLine();
Cursor = newdir == F_UP_SEARCH_HIST ?
LastChar : InputBuf;
} else
Cursor += newdir == F_UP_SEARCH_HIST ? -1 : 1;
}
- patbuf[patlen++] = '*';
- patbuf[patlen] = '\0';
+ Strbuf_append1(&patbuf, '*');
+ Strbuf_terminate(&patbuf);
if (Cursor < InputBuf || Cursor > LastChar ||
- (ret = c_search_line(&patbuf[1], newdir)) == CC_ERROR) {
+ (ret = c_search_line(&patbuf.s[1], newdir)) == CC_ERROR) {
LastCmd = (KEYCMD) newdir; /* avoid c_hsetpat */
ret = newdir == F_UP_SEARCH_HIST ?
e_up_search_hist(0) : e_down_search_hist(0);
if (ret != CC_ERROR) {
Cursor = newdir == F_UP_SEARCH_HIST ?
LastChar : InputBuf;
- (void) c_search_line(&patbuf[1], newdir);
+ (void) c_search_line(&patbuf.s[1], newdir);
}
}
- patbuf[--patlen] = '\0';
+ patbuf.s[--patbuf.len] = '\0';
if (ret == CC_ERROR) {
SoundBeep();
if (Hist_num != oldHist_num) {
Hist_num = oldHist_num;
- if (c_get_histline() == CC_ERROR)
+ if (GetHistLine() == CC_ERROR)
return(CC_ERROR);
}
Cursor = oldCursor;
@@ -1225,10 +1225,10 @@ e_inc_search(dir)
if (ret == CC_NORM || (ret == CC_ERROR && oldpatlen == 0)) {
/* restore on normal return or error exit */
pchar = oldpchar;
- patlen = oldpatlen;
+ patbuf.len = oldpatlen;
if (Hist_num != oldHist_num) {
Hist_num = oldHist_num;
- if (c_get_histline() == CC_ERROR)
+ if (GetHistLine() == CC_ERROR)
return(CC_ERROR);
}
Cursor = oldCursor;
@@ -1243,20 +1243,19 @@ e_inc_search(dir)
}
static CCRETVAL
-v_search(dir)
- int dir;
+v_search(int dir)
{
+ struct Strbuf tmpbuf = Strbuf_INIT;
Char ch;
- Char tmpbuf[INBUFSIZE];
- Char oldbuf[INBUFSIZE];
+ Char *oldbuf;
Char *oldlc, *oldc;
- int tmplen;
- copyn(oldbuf, InputBuf, INBUFSIZE);
+ cleanup_push(&tmpbuf, Strbuf_cleanup);
+ oldbuf = Strsave(InputBuf);
+ cleanup_push(oldbuf, xfree);
oldlc = LastChar;
oldc = Cursor;
- tmplen = 0;
- tmpbuf[tmplen++] = '*';
+ Strbuf_append1(&tmpbuf, '*');
InputBuf[0] = '\0';
LastChar = InputBuf;
@@ -1268,20 +1267,23 @@ v_search(dir)
*Cursor++ = dir == F_UP_SEARCH_HIST ? '?' : '/';
Refresh();
for (ch = 0;ch == 0;) {
- if (GetNextChar(&ch) != 1)
+ if (GetNextChar(&ch) != 1) {
+ cleanup_until(&tmpbuf);
return(e_send_eof(0));
+ }
switch (ASC(ch)) {
case 0010: /* Delete and backspace */
case 0177:
- if (tmplen > 1) {
+ if (tmpbuf.len > 1) {
*Cursor-- = '\0';
LastChar = Cursor;
- tmpbuf[tmplen--] = '\0';
+ tmpbuf.len--;
}
else {
- copyn(InputBuf, oldbuf, INBUFSIZE);
+ copyn(InputBuf, oldbuf, INBUFSIZE);/*FIXBUF*/
LastChar = oldlc;
Cursor = oldc;
+ cleanup_until(&tmpbuf);
return(CC_REFRESH);
}
Refresh();
@@ -1299,45 +1301,46 @@ v_search(dir)
break;
default:
- if (tmplen >= INBUFSIZE)
- SoundBeep();
- else {
- tmpbuf[tmplen++] = ch;
- *Cursor++ = ch;
- LastChar = Cursor;
- }
+ Strbuf_append1(&tmpbuf, ch);
+ *Cursor++ = ch;
+ LastChar = Cursor;
Refresh();
ch = 0;
break;
}
}
+ cleanup_until(oldbuf);
- if (tmplen == 1) {
+ if (tmpbuf.len == 1) {
/*
* Use the old pattern, but wild-card it.
*/
- if (patlen == 0) {
+ if (patbuf.len == 0) {
InputBuf[0] = '\0';
LastChar = InputBuf;
Cursor = InputBuf;
Refresh();
+ cleanup_until(&tmpbuf);
return(CC_ERROR);
}
- if (patbuf[0] != '*') {
- (void) Strcpy(tmpbuf, patbuf);
- patbuf[0] = '*';
- (void) Strcpy(&patbuf[1], tmpbuf);
- patlen++;
- patbuf[patlen++] = '*';
- patbuf[patlen] = '\0';
+ if (patbuf.s[0] != '*') {
+ oldbuf = Strsave(patbuf.s);
+ patbuf.len = 0;
+ Strbuf_append1(&patbuf, '*');
+ Strbuf_append(&patbuf, oldbuf);
+ xfree(oldbuf);
+ Strbuf_append1(&patbuf, '*');
+ Strbuf_terminate(&patbuf);
}
}
else {
- tmpbuf[tmplen++] = '*';
- tmpbuf[tmplen] = '\0';
- (void) Strcpy(patbuf, tmpbuf);
- patlen = tmplen;
+ Strbuf_append1(&tmpbuf, '*');
+ Strbuf_terminate(&tmpbuf);
+ patbuf.len = 0;
+ Strbuf_append(&patbuf, tmpbuf.s);
+ Strbuf_terminate(&patbuf);
}
+ cleanup_until(&tmpbuf);
LastCmd = (KEYCMD) dir; /* avoid c_hsetpat */
Cursor = LastChar = InputBuf;
if ((dir == F_UP_SEARCH_HIST ? e_up_search_hist(0) :
@@ -1346,7 +1349,7 @@ v_search(dir)
return(CC_ERROR);
}
else {
- if (ch == 0033) {
+ if (ASC(ch) == 0033) {
Refresh();
*LastChar++ = '\n';
*LastChar = '\0';
@@ -1366,8 +1369,7 @@ v_search(dir)
/*ARGSUSED*/
CCRETVAL
-v_cmd_mode(c)
- Char c;
+v_cmd_mode(Char c)
{
USE(c);
InsertPos = 0;
@@ -1395,8 +1397,7 @@ v_cmd_mode(c)
/*ARGSUSED*/
CCRETVAL
-e_unassigned(c)
- Char c;
+e_unassigned(Char c)
{ /* bound to keys that arn't really assigned */
USE(c);
SoundBeep();
@@ -1404,9 +1405,9 @@ e_unassigned(c)
return(CC_NORM);
}
+#ifdef notyet
static CCRETVAL
-e_insert_str(c)
- Char *c;
+e_insert_str(Char *c)
{
int i, n;
@@ -1414,7 +1415,7 @@ e_insert_str(c)
if (LastChar + Argument * n >= InputLim)
return(CC_ERROR); /* end of buffer space */
if (inputmode != MODE_INSERT) {
- c_delafter(Argument * NLSChars(c));
+ c_delafter(Argument * Strlen(c));
}
c_insert(Argument * n);
while (Argument--) {
@@ -1424,10 +1425,10 @@ e_insert_str(c)
Refresh();
return(CC_NORM);
}
+#endif
CCRETVAL
-e_insert(c)
- Char c;
+e_insert(Char c)
{
#ifndef SHORT_STRINGS
c &= ASCII; /* no meta chars ever */
@@ -1439,28 +1440,6 @@ e_insert(c)
if (LastChar + Argument >= InputLim)
return(CC_ERROR); /* end of buffer space */
- if (!NLSFinished(Cursor, 0, c)) {
- Char buf[MB_LEN_MAX + 1];
- int f;
- size_t i = 1;
- buf[0] = c;
- do {
- if (GetNextChar(&c) != 1)
- break;
- f = NLSFinished(buf, i, (eChar)c);
- if (f == -1) {
- UngetNextChar(c);
- break;
- }
- buf[i++] = c;
- } while (!f && i < MB_CUR_MAX);
- if (i > 1) {
- buf[i] = 0;
- return e_insert_str(buf);
- }
- c = buf[0];
- }
-
if (Argument == 1) { /* How was this optimized ???? */
if (inputmode != MODE_INSERT) {
@@ -1498,8 +1477,7 @@ e_insert(c)
}
int
-InsertStr(s) /* insert ASCIZ s at cursor (for complete) */
- Char *s;
+InsertStr(Char *s) /* insert ASCIZ s at cursor (for complete) */
{
int len;
@@ -1515,8 +1493,7 @@ InsertStr(s) /* insert ASCIZ s at cursor (for complete) */
}
void
-DeleteBack(n) /* delete the n characters before . */
- int n;
+DeleteBack(int n) /* delete the n characters before . */
{
if (n <= 0)
return;
@@ -1526,8 +1503,7 @@ DeleteBack(n) /* delete the n characters before . */
}
CCRETVAL
-e_digit(c) /* gray magic here */
- Char c;
+e_digit(Char c) /* gray magic here */
{
if (!Isdigit(c))
return(CC_ERROR); /* no NULs in the input ever!! */
@@ -1560,10 +1536,13 @@ e_digit(c) /* gray magic here */
}
CCRETVAL
-e_argdigit(c) /* for ESC-n */
- Char c;
+e_argdigit(Char c) /* for ESC-n */
{
+#ifdef IS_ASCII
c &= ASCII;
+#else
+ c = CTL_ESC(ASC(c) & ASCII); /* stripping for EBCDIC done the ASCII way */
+#endif
if (!Isdigit(c))
return(CC_ERROR); /* no NULs in the input ever!! */
@@ -1581,8 +1560,7 @@ e_argdigit(c) /* for ESC-n */
}
CCRETVAL
-v_zero(c) /* command mode 0 for vi */
- Char c;
+v_zero(Char c) /* command mode 0 for vi */
{
if (DoingArg) { /* if doing an arg, add this in... */
if (Argument > 1000000)
@@ -1603,10 +1581,17 @@ v_zero(c) /* command mode 0 for vi */
/*ARGSUSED*/
CCRETVAL
-e_newline(c)
- Char c;
+e_newline(Char c)
{ /* always ignore argument */
USE(c);
+ if (adrof(STRhighlight) && MarkIsSet) {
+ MarkIsSet = 0;
+ ClearLines();
+ ClearDisp();
+ Refresh();
+ }
+ MarkIsSet = 0;
+
/* PastBottom(); NOW done in ed.inputl.c */
*LastChar++ = '\n'; /* for the benefit of CSH */
*LastChar = '\0'; /* just in case */
@@ -1617,8 +1602,32 @@ e_newline(c)
/*ARGSUSED*/
CCRETVAL
-e_send_eof(c)
- Char c;
+e_newline_hold(Char c)
+{
+ USE(c);
+ c_save_inputbuf();
+ HistSaved = 0;
+ *LastChar++ = '\n'; /* for the benefit of CSH */
+ *LastChar = '\0'; /* just in case */
+ return(CC_NEWLINE);
+}
+
+/*ARGSUSED*/
+CCRETVAL
+e_newline_down_hist(Char c)
+{
+ USE(c);
+ if (Hist_num > 1) {
+ HistSaved = Hist_num;
+ }
+ *LastChar++ = '\n'; /* for the benefit of CSH */
+ *LastChar = '\0'; /* just in case */
+ return(CC_NEWLINE);
+}
+
+/*ARGSUSED*/
+CCRETVAL
+e_send_eof(Char c)
{ /* for when ^D is ONLY send-eof */
USE(c);
PastBottom();
@@ -1628,8 +1637,7 @@ e_send_eof(c)
/*ARGSUSED*/
CCRETVAL
-e_complete(c)
- Char c;
+e_complete(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -1638,8 +1646,7 @@ e_complete(c)
/*ARGSUSED*/
CCRETVAL
-e_complete_back(c)
- Char c;
+e_complete_back(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -1648,8 +1655,7 @@ e_complete_back(c)
/*ARGSUSED*/
CCRETVAL
-e_complete_fwd(c)
- Char c;
+e_complete_fwd(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -1658,8 +1664,7 @@ e_complete_fwd(c)
/*ARGSUSED*/
CCRETVAL
-e_complete_all(c)
- Char c;
+e_complete_all(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -1668,8 +1673,7 @@ e_complete_all(c)
/*ARGSUSED*/
CCRETVAL
-v_cm_complete(c)
- Char c;
+v_cm_complete(Char c)
{
USE(c);
if (Cursor < LastChar)
@@ -1680,8 +1684,7 @@ v_cm_complete(c)
/*ARGSUSED*/
CCRETVAL
-e_toggle_hist(c)
- Char c;
+e_toggle_hist(Char c)
{
struct Hist *hp;
int h;
@@ -1703,7 +1706,7 @@ e_toggle_hist(c)
if (!CurrentHistLit) {
if (hp->histline) {
- copyn(InputBuf, hp->histline, INBUFSIZE);
+ copyn(InputBuf, hp->histline, INBUFSIZE);/*FIXBUF*/
CurrentHistLit = 1;
}
else {
@@ -1711,11 +1714,15 @@ e_toggle_hist(c)
}
}
else {
- (void) sprlex(InputBuf, sizeof(InputBuf) / sizeof(Char), &hp->Hlex);
+ Char *p;
+
+ p = sprlex(&hp->Hlex);
+ copyn(InputBuf, p, sizeof(InputBuf) / sizeof(Char));/*FIXBUF*/
+ xfree(p);
CurrentHistLit = 0;
}
- LastChar = InputBuf + Strlen(InputBuf);
+ LastChar = Strend(InputBuf);
if (LastChar > InputBuf) {
if (LastChar[-1] == '\n')
LastChar--;
@@ -1737,8 +1744,7 @@ e_toggle_hist(c)
/*ARGSUSED*/
CCRETVAL
-e_up_hist(c)
- Char c;
+e_up_hist(Char c)
{
Char beep = 0;
@@ -1747,15 +1753,16 @@ e_up_hist(c)
*LastChar = '\0'; /* just in case */
if (Hist_num == 0) { /* save the current buffer away */
- copyn(HistBuf, InputBuf, INBUFSIZE);
- LastHist = HistBuf + (LastChar - InputBuf);
+ HistBuf.len = 0;
+ Strbuf_append(&HistBuf, InputBuf);
+ Strbuf_terminate(&HistBuf);
}
Hist_num += Argument;
- if (c_get_histline() == CC_ERROR) {
+ if (GetHistLine() == CC_ERROR) {
beep = 1;
- (void) c_get_histline(); /* Hist_num was fixed by first call */
+ (void) GetHistLine(); /* Hist_num was fixed by first call */
}
Refresh();
@@ -1767,8 +1774,7 @@ e_up_hist(c)
/*ARGSUSED*/
CCRETVAL
-e_down_hist(c)
- Char c;
+e_down_hist(Char c)
{
USE(c);
UndoAction = TCSHOP_NOP;
@@ -1781,7 +1787,7 @@ e_down_hist(c)
return(CC_ERROR); /* make it beep */
}
- return(c_get_histline());
+ return(GetHistLine());
}
@@ -1790,42 +1796,35 @@ e_down_hist(c)
* c_hmatch() return True if the pattern matches the prefix
*/
static int
-c_hmatch(str)
-Char *str;
+c_hmatch(Char *str)
{
- if (Strncmp(patbuf, str, (size_t) patlen) == 0)
+ if (Strncmp(patbuf.s, str, patbuf.len) == 0)
return 1;
- return Gmatch(str, patbuf);
+ return Gmatch(str, patbuf.s);
}
/*
* c_hsetpat(): Set the history seatch pattern
*/
static void
-c_hsetpat()
+c_hsetpat(void)
{
if (LastCmd != F_UP_SEARCH_HIST && LastCmd != F_DOWN_SEARCH_HIST) {
- patlen = (int) (Cursor - InputBuf);
- if (patlen >= INBUFSIZE) patlen = INBUFSIZE -1;
- if (patlen >= 0) {
- (void) Strncpy(patbuf, InputBuf, (size_t) patlen);
- patbuf[patlen] = '\0';
- }
- else
- patlen = (int) Strlen(patbuf);
+ patbuf.len = 0;
+ Strbuf_appendn(&patbuf, InputBuf, Cursor - InputBuf);
+ Strbuf_terminate(&patbuf);
}
#ifdef SDEBUG
xprintf("\nHist_num = %d\n", Hist_num);
- xprintf("patlen = %d\n", patlen);
- xprintf("patbuf = \"%S\"\n", patbuf);
+ xprintf("patlen = %d\n", (int)patbuf.len);
+ xprintf("patbuf = \"%S\"\n", patbuf.s);
xprintf("Cursor %d LastChar %d\n", Cursor - InputBuf, LastChar - InputBuf);
#endif
}
/*ARGSUSED*/
CCRETVAL
-e_up_search_hist(c)
- Char c;
+e_up_search_hist(Char c)
{
struct Hist *hp;
int h;
@@ -1843,10 +1842,10 @@ e_up_search_hist(c)
return(CC_ERROR);
}
- if (Hist_num == 0)
- {
- copyn(HistBuf, InputBuf, INBUFSIZE);
- LastHist = HistBuf + (LastChar - InputBuf);
+ if (Hist_num == 0) {
+ HistBuf.len = 0;
+ Strbuf_append(&HistBuf, InputBuf);
+ Strbuf_terminate(&HistBuf);
}
@@ -1860,18 +1859,25 @@ e_up_search_hist(c)
hp = hp->Hnext;
while (hp != NULL) {
- Char sbuf[INBUFSIZE], *hl;
- if (hp->histline == NULL) {
- hp->histline = Strsave(sprlex(sbuf, sizeof(sbuf) / sizeof(Char),
- &hp->Hlex));
+ Char *hl;
+ int matched;
+
+ if (hp->histline == NULL)
+ hp->histline = sprlex(&hp->Hlex);
+ if (HistLit)
+ hl = hp->histline;
+ else {
+ hl = sprlex(&hp->Hlex);
+ cleanup_push(hl, xfree);
}
- hl = HistLit ? hp->histline : sprlex(sbuf, sizeof(sbuf) / sizeof(Char),
- &hp->Hlex);
#ifdef SDEBUG
xprintf("Comparing with \"%S\"\n", hl);
#endif
- if ((Strncmp(hl, InputBuf, (size_t) (LastChar - InputBuf)) ||
- hl[LastChar-InputBuf]) && c_hmatch(hl)) {
+ matched = (Strncmp(hl, InputBuf, (size_t) (LastChar - InputBuf)) ||
+ hl[LastChar-InputBuf]) && c_hmatch(hl);
+ if (!HistLit)
+ cleanup_until(hl);
+ if (matched) {
found++;
break;
}
@@ -1881,20 +1887,19 @@ e_up_search_hist(c)
if (!found) {
#ifdef SDEBUG
- xprintf("not found\n");
+ xprintf("not found\n");
#endif
return(CC_ERROR);
}
Hist_num = h;
- return(c_get_histline());
+ return(GetHistLine());
}
/*ARGSUSED*/
CCRETVAL
-e_down_search_hist(c)
- Char c;
+e_down_search_hist(Char c)
{
struct Hist *hp;
int h;
@@ -1915,26 +1920,30 @@ e_down_search_hist(c)
c_hsetpat(); /* Set search pattern !! */
for (h = 1; h < Hist_num && hp; h++) {
- Char sbuf[INBUFSIZE], *hl;
- if (hp->histline == NULL) {
- hp->histline = Strsave(sprlex(sbuf, sizeof(sbuf) / sizeof(Char),
- &hp->Hlex));
+ Char *hl;
+ if (hp->histline == NULL)
+ hp->histline = sprlex(&hp->Hlex);
+ if (HistLit)
+ hl = hp->histline;
+ else {
+ hl = sprlex(&hp->Hlex);
+ cleanup_push(hl, xfree);
}
- hl = HistLit ? hp->histline : sprlex(sbuf, sizeof(sbuf) / sizeof(Char),
- &hp->Hlex);
#ifdef SDEBUG
xprintf("Comparing with \"%S\"\n", hl);
#endif
if ((Strncmp(hl, InputBuf, (size_t) (LastChar - InputBuf)) ||
hl[LastChar-InputBuf]) && c_hmatch(hl))
found = h;
+ if (!HistLit)
+ cleanup_until(hl);
hp = hp->Hnext;
}
if (!found) { /* is it the current history number? */
- if (!c_hmatch(HistBuf)) {
+ if (!c_hmatch(HistBuf.s)) {
#ifdef SDEBUG
- xprintf("not found\n");
+ xprintf("not found\n");
#endif
return(CC_ERROR);
}
@@ -1942,13 +1951,12 @@ e_down_search_hist(c)
Hist_num = found;
- return(c_get_histline());
+ return(GetHistLine());
}
/*ARGSUSED*/
CCRETVAL
-e_helpme(c)
- Char c;
+e_helpme(Char c)
{
USE(c);
PastBottom();
@@ -1958,8 +1966,7 @@ e_helpme(c)
/*ARGSUSED*/
CCRETVAL
-e_correct(c)
- Char c;
+e_correct(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -1968,8 +1975,7 @@ e_correct(c)
/*ARGSUSED*/
CCRETVAL
-e_correctl(c)
- Char c;
+e_correctl(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -1978,19 +1984,14 @@ e_correctl(c)
/*ARGSUSED*/
CCRETVAL
-e_run_fg_editor(c)
- Char c;
+e_run_fg_editor(Char c)
{
struct process *pp;
USE(c);
if ((pp = find_stop_ed()) != NULL) {
/* save our editor state so we can restore it */
- tellwhat = 1;
- copyn(WhichBuf, InputBuf, INBUFSIZE);
- LastWhich = WhichBuf + (LastChar - InputBuf);
- CursWhich = WhichBuf + (Cursor - InputBuf);
- HistWhich = Hist_num;
+ c_save_inputbuf();
Hist_num = 0; /* for the history commands */
/* put the tty in a sane mode */
@@ -2002,15 +2003,15 @@ e_run_fg_editor(c)
(void) Rawmode(); /* go on */
Refresh();
- tellwhat = 0;
+ RestoreSaved = 0;
+ HistSaved = 0;
}
return(CC_NORM);
}
/*ARGSUSED*/
CCRETVAL
-e_list_choices(c)
- Char c;
+e_list_choices(Char c)
{
USE(c);
PastBottom();
@@ -2020,8 +2021,7 @@ e_list_choices(c)
/*ARGSUSED*/
CCRETVAL
-e_list_all(c)
- Char c;
+e_list_all(Char c)
{
USE(c);
PastBottom();
@@ -2031,8 +2031,7 @@ e_list_all(c)
/*ARGSUSED*/
CCRETVAL
-e_list_glob(c)
- Char c;
+e_list_glob(Char c)
{
USE(c);
PastBottom();
@@ -2042,8 +2041,7 @@ e_list_glob(c)
/*ARGSUSED*/
CCRETVAL
-e_expand_glob(c)
- Char c;
+e_expand_glob(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -2052,8 +2050,7 @@ e_expand_glob(c)
/*ARGSUSED*/
CCRETVAL
-e_normalize_path(c)
- Char c;
+e_normalize_path(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -2062,8 +2059,7 @@ e_normalize_path(c)
/*ARGSUSED*/
CCRETVAL
-e_normalize_command(c)
- Char c;
+e_normalize_command(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -2072,8 +2068,7 @@ e_normalize_command(c)
/*ARGSUSED*/
CCRETVAL
-e_expand_vars(c)
- Char c;
+e_expand_vars(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -2082,10 +2077,11 @@ e_expand_vars(c)
/*ARGSUSED*/
CCRETVAL
-e_which(c)
- Char c;
+e_which(Char c)
{ /* do a fast command line which(1) */
USE(c);
+ c_save_inputbuf();
+ Hist_num = 0; /* for the history commands */
PastBottom();
*LastChar = '\0'; /* just in case */
return(CC_WHICH);
@@ -2093,14 +2089,12 @@ e_which(c)
/*ARGSUSED*/
CCRETVAL
-e_last_item(c)
- Char c;
+e_last_item(Char c)
{ /* insert the last element of the prev. cmd */
- Char *cp;
struct Hist *hp;
struct wordent *wp, *firstp;
int i;
- Char buf[INBUFSIZE];
+ Char *expanded;
USE(c);
if (Argument <= 0)
@@ -2123,24 +2117,26 @@ e_last_item(c)
wp = wp->prev;
}
- cp = expand_lex(buf, INBUFSIZE, wp->prev, 0, i - 1);
- *cp = '\0';
- if (InsertStr(buf))
+ expanded = expand_lex(wp->prev, 0, i - 1);
+ if (InsertStr(expanded)) {
+ xfree(expanded);
return(CC_ERROR);
+ }
+ xfree(expanded);
return(CC_REFRESH);
}
/*ARGSUSED*/
CCRETVAL
-e_dabbrev_expand(c)
- Char c;
+e_dabbrev_expand(Char c)
{ /* expand to preceding word matching prefix */
Char *cp, *ncp, *bp;
struct Hist *hp;
- int arg = 0, len = 0, i; /* len = 0 to shut up gcc -Wall */
+ int arg = 0, i;
+ size_t len = 0;
int found = 0;
- Char hbuf[INBUFSIZE];
+ Char *hbuf;
static int oldevent, hist, word;
static Char *start, *oldcursor;
@@ -2152,18 +2148,20 @@ e_dabbrev_expand(c)
if (cp == Cursor || Isspace(*cp))
return(CC_ERROR);
+ hbuf = NULL;
hp = Histlist.Hnext;
bp = InputBuf;
if (Argument == 1 && eventno == oldevent && cp == start &&
- Cursor == oldcursor && patlen > 0 && Strncmp(patbuf, cp, patlen) == 0){
+ Cursor == oldcursor && patbuf.len > 0
+ && Strncmp(patbuf.s, cp, patbuf.len) == 0){
/* continue previous search - go to last match (hist/word) */
if (hist != 0) { /* need to move up history */
for (i = 1; i < hist && hp != NULL; i++)
hp = hp->Hnext;
if (hp == NULL) /* "can't happen" */
- return(CC_ERROR);
- cp = expand_lex(hbuf, INBUFSIZE, &hp->Hlex, 0, NCARGS);
- *cp = '\0';
+ goto err_hbuf;
+ hbuf = expand_lex(&hp->Hlex, 0, INT_MAX);
+ cp = Strend(hbuf);
bp = hbuf;
hp = hp->Hnext;
}
@@ -2171,8 +2169,8 @@ e_dabbrev_expand(c)
} else { /* starting new search */
oldevent = eventno;
start = cp;
- patlen = (int) (Cursor - cp);
- (void) Strncpy(patbuf, cp, patlen);
+ patbuf.len = 0;
+ Strbuf_appendn(&patbuf, cp, Cursor - cp);
hist = 0;
word = 0;
}
@@ -2183,43 +2181,48 @@ e_dabbrev_expand(c)
hist++;
word = 0;
if (hp == NULL)
- return(CC_ERROR);
- cp = expand_lex(hbuf, INBUFSIZE, &hp->Hlex, 0, NCARGS);
- *cp = '\0';
+ goto err_hbuf;
+ hbuf = expand_lex(&hp->Hlex, 0, INT_MAX);
+ cp = Strend(hbuf);
bp = hbuf;
hp = hp->Hnext;
continue;
} else {
word++;
- len = (int) (c_endword(ncp-1, cp, 1, STRshwordsep) - ncp + 1);
+ len = c_endword(ncp-1, cp, 1, STRshwordsep) - ncp + 1;
cp = ncp;
}
- if (len > patlen && Strncmp(cp, patbuf, patlen) == 0) {
+ if (len > patbuf.len && Strncmp(cp, patbuf.s, patbuf.len) == 0) {
/* We don't fully check distinct matches as Gnuemacs does: */
if (Argument > 1) { /* just count matches */
if (++arg >= Argument)
found++;
} else { /* match if distinct from previous */
- if (len != Cursor - start || Strncmp(cp, start, len) != 0)
+ if (len != (size_t)(Cursor - start)
+ || Strncmp(cp, start, len) != 0)
found++;
}
}
}
if (LastChar + len - (Cursor - start) >= InputLim)
- return(CC_ERROR); /* no room */
+ goto err_hbuf; /* no room */
DeleteBack(Cursor - start);
c_insert(len);
while (len--)
*Cursor++ = *cp++;
oldcursor = Cursor;
+ xfree(hbuf);
return(CC_REFRESH);
+
+ err_hbuf:
+ xfree(hbuf);
+ return CC_ERROR;
}
/*ARGSUSED*/
CCRETVAL
-e_yank_kill(c)
- Char c;
+e_yank_kill(Char c)
{ /* almost like GnuEmacs */
int len;
Char *kp, *cp;
@@ -2245,13 +2248,17 @@ e_yank_kill(c)
Mark = cp; /* else cursor at beginning, mark at end */
}
+ if (adrof(STRhighlight) && MarkIsSet) {
+ ClearLines();
+ ClearDisp();
+ }
+ MarkIsSet = 0;
return(CC_REFRESH);
}
/*ARGSUSED*/
CCRETVAL
-e_yank_pop(c)
- Char c;
+e_yank_pop(Char c)
{ /* almost like GnuEmacs */
int m_bef_c, del_len, ins_len;
Char *kp, *cp;
@@ -2305,13 +2312,17 @@ e_yank_pop(c)
Mark = cp; /* else cursor at beginning, mark at end */
}
+ if (adrof(STRhighlight) && MarkIsSet) {
+ ClearLines();
+ ClearDisp();
+ }
+ MarkIsSet = 0;
return(CC_REFRESH);
}
/*ARGSUSED*/
CCRETVAL
-v_delprev(c) /* Backspace key in insert mode */
- Char c;
+v_delprev(Char c) /* Backspace key in insert mode */
{
int rc;
@@ -2329,8 +2340,7 @@ v_delprev(c) /* Backspace key in insert mode */
/*ARGSUSED*/
CCRETVAL
-e_delprev(c)
- Char c;
+e_delprev(Char c)
{
USE(c);
if (Cursor > InputBuf) {
@@ -2344,8 +2354,7 @@ e_delprev(c)
/*ARGSUSED*/
CCRETVAL
-e_delwordprev(c)
- Char c;
+e_delwordprev(Char c)
{
Char *cp;
@@ -2392,8 +2401,7 @@ e_delwordprev(c)
/* rename e_delnext() -> e_delnext_eof() */
/*ARGSUSED*/
CCRETVAL
-e_delnext(c)
- Char c;
+e_delnext(Char c)
{
USE(c);
if (Cursor == LastChar) {/* if I'm at the end */
@@ -2416,8 +2424,7 @@ e_delnext(c)
/*ARGSUSED*/
CCRETVAL
-e_delnext_eof(c)
- Char c;
+e_delnext_eof(Char c)
{
USE(c);
if (Cursor == LastChar) {/* if I'm at the end */
@@ -2446,8 +2453,7 @@ e_delnext_eof(c)
/*ARGSUSED*/
CCRETVAL
-e_delnext_list(c)
- Char c;
+e_delnext_list(Char c)
{
USE(c);
if (Cursor == LastChar) { /* if I'm at the end */
@@ -2465,8 +2471,7 @@ e_delnext_list(c)
/*ARGSUSED*/
CCRETVAL
-e_delnext_list_eof(c)
- Char c;
+e_delnext_list_eof(Char c)
{
USE(c);
if (Cursor == LastChar) { /* if I'm at the end */
@@ -2491,8 +2496,7 @@ e_delnext_list_eof(c)
/*ARGSUSED*/
CCRETVAL
-e_list_eof(c)
- Char c;
+e_list_eof(Char c)
{
CCRETVAL rv;
@@ -2512,8 +2516,7 @@ e_list_eof(c)
/*ARGSUSED*/
CCRETVAL
-e_delwordnext(c)
- Char c;
+e_delwordnext(Char c)
{
Char *cp;
@@ -2534,8 +2537,7 @@ e_delwordnext(c)
/*ARGSUSED*/
CCRETVAL
-e_toend(c)
- Char c;
+e_toend(Char c)
{
USE(c);
Cursor = LastChar;
@@ -2550,8 +2552,7 @@ e_toend(c)
/*ARGSUSED*/
CCRETVAL
-e_tobeg(c)
- Char c;
+e_tobeg(Char c)
{
USE(c);
Cursor = InputBuf;
@@ -2571,20 +2572,21 @@ e_tobeg(c)
/*ARGSUSED*/
CCRETVAL
-e_killend(c)
- Char c;
+e_killend(Char c)
{
USE(c);
c_push_kill(Cursor, LastChar); /* copy it */
- Mark = LastChar = Cursor; /* zap! -- delete to end */
+ LastChar = Cursor; /* zap! -- delete to end */
+ if (Mark > Cursor)
+ Mark = Cursor;
+ MarkIsSet = 0;
return(CC_REFRESH);
}
/*ARGSUSED*/
CCRETVAL
-e_killbeg(c)
- Char c;
+e_killbeg(Char c)
{
USE(c);
c_push_kill(InputBuf, Cursor); /* copy it */
@@ -2596,19 +2598,18 @@ e_killbeg(c)
/*ARGSUSED*/
CCRETVAL
-e_killall(c)
- Char c;
+e_killall(Char c)
{
USE(c);
c_push_kill(InputBuf, LastChar); /* copy it */
Cursor = Mark = LastChar = InputBuf; /* zap! -- delete all of it */
+ MarkIsSet = 0;
return(CC_REFRESH);
}
/*ARGSUSED*/
CCRETVAL
-e_killregion(c)
- Char c;
+e_killregion(Char c)
{
USE(c);
if (!Mark)
@@ -2623,13 +2624,17 @@ e_killregion(c)
c_push_kill(Mark, Cursor); /* copy it */
c_delbefore((int)(Cursor - Mark));
}
+ if (adrof(STRhighlight) && MarkIsSet) {
+ ClearLines();
+ ClearDisp();
+ }
+ MarkIsSet = 0;
return(CC_REFRESH);
}
/*ARGSUSED*/
CCRETVAL
-e_copyregion(c)
- Char c;
+e_copyregion(Char c)
{
USE(c);
if (!Mark)
@@ -2646,8 +2651,7 @@ e_copyregion(c)
/*ARGSUSED*/
CCRETVAL
-e_charswitch(cc)
- Char cc;
+e_charswitch(Char cc)
{
Char c;
@@ -2669,8 +2673,7 @@ e_charswitch(cc)
/*ARGSUSED*/
CCRETVAL
-e_gcharswitch(cc)
- Char cc;
+e_gcharswitch(Char cc)
{ /* gosmacs style ^T */
Char c;
@@ -2688,17 +2691,14 @@ e_gcharswitch(cc)
/*ARGSUSED*/
CCRETVAL
-e_charback(c)
- Char c;
+e_charback(Char c)
{
- int num;
USE(c);
if (Cursor > InputBuf) {
- num = NLSExtend(Cursor, Cursor - InputBuf, -Argument);
- if (num > Cursor - InputBuf)
+ if (Argument > Cursor - InputBuf)
Cursor = InputBuf;
else
- Cursor -= num;
+ Cursor -= Argument;
if (VImode)
if (ActionFlag & TCSHOP_DELETE) {
@@ -2716,8 +2716,7 @@ e_charback(c)
/*ARGSUSED*/
CCRETVAL
-v_wordback(c)
- Char c;
+v_wordback(Char c)
{
USE(c);
if (Cursor == InputBuf)
@@ -2737,8 +2736,7 @@ v_wordback(c)
/*ARGSUSED*/
CCRETVAL
-e_wordback(c)
- Char c;
+e_wordback(Char c)
{
USE(c);
if (Cursor == InputBuf)
@@ -2759,14 +2757,11 @@ e_wordback(c)
/*ARGSUSED*/
CCRETVAL
-e_charfwd(c)
- Char c;
+e_charfwd(Char c)
{
- int num;
USE(c);
if (Cursor < LastChar) {
- num = NLSExtend(Cursor, LastChar - Cursor, Argument);
- Cursor += num;
+ Cursor += Argument;
if (Cursor > LastChar)
Cursor = LastChar;
@@ -2786,8 +2781,7 @@ e_charfwd(c)
/*ARGSUSED*/
CCRETVAL
-e_wordfwd(c)
- Char c;
+e_wordfwd(Char c)
{
USE(c);
if (Cursor == LastChar)
@@ -2808,8 +2802,7 @@ e_wordfwd(c)
/*ARGSUSED*/
CCRETVAL
-v_wordfwd(c)
- Char c;
+v_wordfwd(Char c)
{
USE(c);
if (Cursor == LastChar)
@@ -2830,8 +2823,7 @@ v_wordfwd(c)
/*ARGSUSED*/
CCRETVAL
-v_wordbegnext(c)
- Char c;
+v_wordbegnext(Char c)
{
USE(c);
if (Cursor == LastChar)
@@ -2854,13 +2846,12 @@ v_wordbegnext(c)
/*ARGSUSED*/
static CCRETVAL
-v_repeat_srch(c)
- int c;
+v_repeat_srch(int c)
{
CCRETVAL rv = CC_ERROR;
#ifdef SDEBUG
- xprintf("dir %d patlen %d patbuf %S\n",
- c, patlen, patbuf);
+ xprintf("dir %d patlen %d patbuf %S\n",
+ c, (int)patbuf.len, patbuf.s);
#endif
LastCmd = (KEYCMD) c; /* Hack to stop c_hsetpat */
@@ -2879,9 +2870,7 @@ v_repeat_srch(c)
}
static CCRETVAL
-v_csearch_back(ch, count, tflag)
- Char ch;
- int count, tflag;
+v_csearch_back(Char ch, int count, int tflag)
{
Char *cp;
@@ -2912,9 +2901,7 @@ v_csearch_back(ch, count, tflag)
}
static CCRETVAL
-v_csearch_fwd(ch, count, tflag)
- Char ch;
- int count, tflag;
+v_csearch_fwd(Char ch, int count, int tflag)
{
Char *cp;
@@ -2945,8 +2932,7 @@ v_csearch_fwd(ch, count, tflag)
/*ARGSUSED*/
static CCRETVAL
-v_action(c)
- int c;
+v_action(int c)
{
Char *cp, *kp;
@@ -2989,9 +2975,7 @@ v_action(c)
#ifdef COMMENT
/* by: Brian Allison <uiucdcs!convex!allison@RUTGERS.EDU> */
static void
-c_get_word(begin, end)
- Char **begin;
- Char **end;
+c_get_word(Char **begin, Char **end)
{
Char *cp;
@@ -3009,8 +2993,7 @@ c_get_word(begin, end)
/*ARGSUSED*/
CCRETVAL
-e_uppercase(c)
- Char c;
+e_uppercase(Char c)
{
Char *cp, *end;
@@ -3030,8 +3013,7 @@ e_uppercase(c)
/*ARGSUSED*/
CCRETVAL
-e_capitolcase(c)
- Char c;
+e_capitolcase(Char c)
{
Char *cp, *end;
@@ -3059,8 +3041,7 @@ e_capitolcase(c)
/*ARGSUSED*/
CCRETVAL
-e_lowercase(c)
- Char c;
+e_lowercase(Char c)
{
Char *cp, *end;
@@ -3080,18 +3061,22 @@ e_lowercase(c)
/*ARGSUSED*/
CCRETVAL
-e_set_mark(c)
- Char c;
+e_set_mark(Char c)
{
USE(c);
+ if (adrof(STRhighlight) && MarkIsSet && Mark != Cursor) {
+ ClearLines();
+ ClearDisp();
+ Refresh();
+ }
Mark = Cursor;
+ MarkIsSet = 1;
return(CC_NORM);
}
/*ARGSUSED*/
CCRETVAL
-e_exchange_mark(c)
- Char c;
+e_exchange_mark(Char c)
{
Char *cp;
@@ -3105,8 +3090,7 @@ e_exchange_mark(c)
/*ARGSUSED*/
CCRETVAL
-e_argfour(c)
- Char c;
+e_argfour(Char c)
{ /* multiply current argument by 4 */
USE(c);
if (Argument > 1000000)
@@ -3116,18 +3100,25 @@ e_argfour(c)
return(CC_ARGHACK);
}
+static void
+quote_mode_cleanup(void *unused)
+{
+ USE(unused);
+ QuoteModeOff();
+}
+
/*ARGSUSED*/
CCRETVAL
-e_quote(c)
- Char c;
+e_quote(Char c)
{
Char ch;
int num;
USE(c);
QuoteModeOn();
+ cleanup_push(&c, quote_mode_cleanup); /* Using &c just as a mark */
num = GetNextChar(&ch);
- QuoteModeOff();
+ cleanup_until(&c);
if (num == 1)
return e_insert(ch);
else
@@ -3136,8 +3127,7 @@ e_quote(c)
/*ARGSUSED*/
CCRETVAL
-e_metanext(c)
- Char c;
+e_metanext(Char c)
{
USE(c);
MetaNext = 1;
@@ -3147,8 +3137,7 @@ e_metanext(c)
#ifdef notdef
/*ARGSUSED*/
CCRETVAL
-e_extendnext(c)
- Char c;
+e_extendnext(Char c)
{
CurrentKeyMap = CcAltMap;
return(CC_ARGHACK); /* preserve argument */
@@ -3158,8 +3147,7 @@ e_extendnext(c)
/*ARGSUSED*/
CCRETVAL
-v_insbeg(c)
- Char c;
+v_insbeg(Char c)
{ /* move to beginning of line and start vi
* insert mode */
USE(c);
@@ -3176,8 +3164,7 @@ v_insbeg(c)
/*ARGSUSED*/
CCRETVAL
-v_replone(c)
- Char c;
+v_replone(Char c)
{ /* vi mode overwrite one character */
USE(c);
c_alternativ_key_map(0);
@@ -3190,8 +3177,7 @@ v_replone(c)
/*ARGSUSED*/
CCRETVAL
-v_replmode(c)
- Char c;
+v_replmode(Char c)
{ /* vi mode start overwriting */
USE(c);
c_alternativ_key_map(0);
@@ -3204,8 +3190,7 @@ v_replmode(c)
/*ARGSUSED*/
CCRETVAL
-v_substchar(c)
- Char c;
+v_substchar(Char c)
{ /* vi mode substitute for one char */
USE(c);
c_delafter(Argument);
@@ -3215,8 +3200,7 @@ v_substchar(c)
/*ARGSUSED*/
CCRETVAL
-v_substline(c)
- Char c;
+v_substline(Char c)
{ /* vi mode replace whole line */
USE(c);
(void) e_killall(0);
@@ -3226,8 +3210,7 @@ v_substline(c)
/*ARGSUSED*/
CCRETVAL
-v_chgtoend(c)
- Char c;
+v_chgtoend(Char c)
{ /* vi mode change to end of line */
USE(c);
(void) e_killend(0);
@@ -3237,8 +3220,7 @@ v_chgtoend(c)
/*ARGSUSED*/
CCRETVAL
-v_insert(c)
- Char c;
+v_insert(Char c)
{ /* vi mode start inserting */
USE(c);
c_alternativ_key_map(0);
@@ -3252,8 +3234,7 @@ v_insert(c)
/*ARGSUSED*/
CCRETVAL
-v_add(c)
- Char c;
+v_add(Char c)
{ /* vi mode start adding */
USE(c);
c_alternativ_key_map(0);
@@ -3274,8 +3255,7 @@ v_add(c)
/*ARGSUSED*/
CCRETVAL
-v_addend(c)
- Char c;
+v_addend(Char c)
{ /* vi mode to add at end of line */
USE(c);
c_alternativ_key_map(0);
@@ -3291,8 +3271,7 @@ v_addend(c)
/*ARGSUSED*/
CCRETVAL
-v_change_case(cc)
- Char cc;
+v_change_case(Char cc)
{
Char c;
@@ -3317,8 +3296,7 @@ v_change_case(cc)
/*ARGSUSED*/
CCRETVAL
-e_expand(c)
- Char c;
+e_expand(Char c)
{
Char *p;
@@ -3335,8 +3313,7 @@ e_expand(c)
/*ARGSUSED*/
CCRETVAL
-e_startover(c)
- Char c;
+e_startover(Char c)
{ /* erase all of current line, start again */
USE(c);
ResetInLine(0); /* reset the input pointers */
@@ -3345,8 +3322,7 @@ e_startover(c)
/*ARGSUSED*/
CCRETVAL
-e_redisp(c)
- Char c;
+e_redisp(Char c)
{
USE(c);
ClearLines();
@@ -3356,8 +3332,7 @@ e_redisp(c)
/*ARGSUSED*/
CCRETVAL
-e_cleardisp(c)
- Char c;
+e_cleardisp(Char c)
{
USE(c);
ClearScreen(); /* clear the whole real screen */
@@ -3367,8 +3342,7 @@ e_cleardisp(c)
/*ARGSUSED*/
CCRETVAL
-e_tty_int(c)
- Char c;
+e_tty_int(Char c)
{
USE(c);
#if defined(_MINIX) || defined(WINNT_NATIVE)
@@ -3390,8 +3364,7 @@ e_tty_int(c)
*/
/*ARGSUSED*/
CCRETVAL
-e_stuff_char(c)
- Char c;
+e_stuff_char(Char c)
{
#ifdef TIOCSTI
int was_raw = Tty_raw_mode;
@@ -3401,13 +3374,13 @@ e_stuff_char(c)
if (was_raw)
(void) Cookedmode();
- (void) write(SHIN, "\n", 1);
+ (void) xwrite(SHIN, "\n", 1);
len = one_wctomb(buf, c & CHAR);
for (i = 0; i < len; i++)
(void) ioctl(SHIN, TIOCSTI, (ioctl_t) &buf[i]);
if (was_raw)
- (void) Rawmode();
+ (void) Rawmode();
return(e_redisp(c));
#else /* !TIOCSTI */
return(CC_ERROR);
@@ -3416,8 +3389,7 @@ e_stuff_char(c)
/*ARGSUSED*/
CCRETVAL
-e_insovr(c)
- Char c;
+e_insovr(Char c)
{
USE(c);
inputmode = (inputmode == MODE_INSERT ? MODE_REPLACE : MODE_INSERT);
@@ -3426,8 +3398,7 @@ e_insovr(c)
/*ARGSUSED*/
CCRETVAL
-e_tty_dsusp(c)
- Char c;
+e_tty_dsusp(Char c)
{
USE(c);
/* do no editing */
@@ -3436,8 +3407,7 @@ e_tty_dsusp(c)
/*ARGSUSED*/
CCRETVAL
-e_tty_flusho(c)
- Char c;
+e_tty_flusho(Char c)
{
USE(c);
/* do no editing */
@@ -3446,8 +3416,7 @@ e_tty_flusho(c)
/*ARGSUSED*/
CCRETVAL
-e_tty_quit(c)
- Char c;
+e_tty_quit(Char c)
{
USE(c);
/* do no editing */
@@ -3456,8 +3425,7 @@ e_tty_quit(c)
/*ARGSUSED*/
CCRETVAL
-e_tty_tsusp(c)
- Char c;
+e_tty_tsusp(Char c)
{
USE(c);
/* do no editing */
@@ -3466,8 +3434,7 @@ e_tty_tsusp(c)
/*ARGSUSED*/
CCRETVAL
-e_tty_stopo(c)
- Char c;
+e_tty_stopo(Char c)
{
USE(c);
/* do no editing */
@@ -3476,8 +3443,7 @@ e_tty_stopo(c)
/*ARGSUSED*/
CCRETVAL
-e_expand_history(c)
- Char c;
+e_expand_history(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -3487,8 +3453,7 @@ e_expand_history(c)
/*ARGSUSED*/
CCRETVAL
-e_magic_space(c)
- Char c;
+e_magic_space(Char c)
{
USE(c);
*LastChar = '\0'; /* just in case */
@@ -3498,29 +3463,48 @@ e_magic_space(c)
/*ARGSUSED*/
CCRETVAL
-e_inc_fwd(c)
- Char c;
+e_inc_fwd(Char c)
{
+ CCRETVAL ret;
+
USE(c);
- patlen = 0;
- return e_inc_search(F_DOWN_SEARCH_HIST);
+ patbuf.len = 0;
+ MarkIsSet = 0;
+ ret = e_inc_search(F_DOWN_SEARCH_HIST);
+ if (adrof(STRhighlight) && IncMatchLen) {
+ IncMatchLen = 0;
+ ClearLines();
+ ClearDisp();
+ Refresh();
+ }
+ IncMatchLen = 0;
+ return ret;
}
/*ARGSUSED*/
CCRETVAL
-e_inc_back(c)
- Char c;
+e_inc_back(Char c)
{
+ CCRETVAL ret;
+
USE(c);
- patlen = 0;
- return e_inc_search(F_UP_SEARCH_HIST);
+ patbuf.len = 0;
+ MarkIsSet = 0;
+ ret = e_inc_search(F_UP_SEARCH_HIST);
+ if (adrof(STRhighlight) && IncMatchLen) {
+ IncMatchLen = 0;
+ ClearLines();
+ ClearDisp();
+ Refresh();
+ }
+ IncMatchLen = 0;
+ return ret;
}
/*ARGSUSED*/
CCRETVAL
-e_copyprev(c)
- Char c;
+e_copyprev(Char c)
{
Char *cp, *oldc, *dp;
@@ -3544,8 +3528,7 @@ e_copyprev(c)
/*ARGSUSED*/
CCRETVAL
-e_tty_starto(c)
- Char c;
+e_tty_starto(Char c)
{
USE(c);
/* do no editing */
@@ -3554,8 +3537,7 @@ e_tty_starto(c)
/*ARGSUSED*/
CCRETVAL
-e_load_average(c)
- Char c;
+e_load_average(Char c)
{
USE(c);
PastBottom();
@@ -3572,8 +3554,7 @@ e_load_average(c)
/*ARGSUSED*/
CCRETVAL
-v_chgmeta(c)
- Char c;
+v_chgmeta(Char c)
{
USE(c);
/*
@@ -3585,8 +3566,7 @@ v_chgmeta(c)
/*ARGSUSED*/
CCRETVAL
-v_delmeta(c)
- Char c;
+v_delmeta(Char c)
{
USE(c);
return(v_action(TCSHOP_DELETE));
@@ -3595,8 +3575,7 @@ v_delmeta(c)
/*ARGSUSED*/
CCRETVAL
-v_endword(c)
- Char c;
+v_endword(Char c)
{
USE(c);
if (Cursor == LastChar)
@@ -3618,8 +3597,7 @@ v_endword(c)
/*ARGSUSED*/
CCRETVAL
-v_eword(c)
- Char c;
+v_eword(Char c)
{
USE(c);
if (Cursor == LastChar)
@@ -3640,8 +3618,7 @@ v_eword(c)
/*ARGSUSED*/
CCRETVAL
-v_char_fwd(c)
- Char c;
+v_char_fwd(Char c)
{
Char ch;
@@ -3658,8 +3635,7 @@ v_char_fwd(c)
/*ARGSUSED*/
CCRETVAL
-v_char_back(c)
- Char c;
+v_char_back(Char c)
{
Char ch;
@@ -3675,8 +3651,7 @@ v_char_back(c)
/*ARGSUSED*/
CCRETVAL
-v_charto_fwd(c)
- Char c;
+v_charto_fwd(Char c)
{
Char ch;
@@ -3690,8 +3665,7 @@ v_charto_fwd(c)
/*ARGSUSED*/
CCRETVAL
-v_charto_back(c)
- Char c;
+v_charto_back(Char c)
{
Char ch;
@@ -3704,8 +3678,7 @@ v_charto_back(c)
/*ARGSUSED*/
CCRETVAL
-v_rchar_fwd(c)
- Char c;
+v_rchar_fwd(Char c)
{
USE(c);
if (srch_char == 0)
@@ -3717,8 +3690,7 @@ v_rchar_fwd(c)
/*ARGSUSED*/
CCRETVAL
-v_rchar_back(c)
- Char c;
+v_rchar_back(Char c)
{
USE(c);
if (srch_char == 0)
@@ -3730,8 +3702,7 @@ v_rchar_back(c)
/*ARGSUSED*/
CCRETVAL
-v_undo(c)
- Char c;
+v_undo(Char c)
{
int loop;
Char *kp, *cp;
@@ -3793,8 +3764,7 @@ v_undo(c)
/*ARGSUSED*/
CCRETVAL
-v_ush_meta(c)
- Char c;
+v_ush_meta(Char c)
{
USE(c);
return v_search(F_UP_SEARCH_HIST);
@@ -3802,8 +3772,7 @@ v_ush_meta(c)
/*ARGSUSED*/
CCRETVAL
-v_dsh_meta(c)
- Char c;
+v_dsh_meta(Char c)
{
USE(c);
return v_search(F_DOWN_SEARCH_HIST);
@@ -3811,21 +3780,19 @@ v_dsh_meta(c)
/*ARGSUSED*/
CCRETVAL
-v_rsrch_fwd(c)
- Char c;
+v_rsrch_fwd(Char c)
{
USE(c);
- if (patlen == 0) return(CC_ERROR);
+ if (patbuf.len == 0) return(CC_ERROR);
return(v_repeat_srch(searchdir));
}
/*ARGSUSED*/
CCRETVAL
-v_rsrch_back(c)
- Char c;
+v_rsrch_back(Char c)
{
USE(c);
- if (patlen == 0) return(CC_ERROR);
+ if (patbuf.len == 0) return(CC_ERROR);
return(v_repeat_srch(searchdir == F_UP_SEARCH_HIST ?
F_DOWN_SEARCH_HIST : F_UP_SEARCH_HIST));
}
@@ -3835,45 +3802,39 @@ v_rsrch_back(c)
functions will keep the F_NUM_FNS consistent
*/
CCRETVAL
-e_copy_to_clipboard(c)
- Char c;
+e_copy_to_clipboard(Char c)
{
USE(c);
return CC_ERROR;
}
CCRETVAL
-e_paste_from_clipboard(c)
- Char c;
+e_paste_from_clipboard(Char c)
{
USE(c);
return (CC_ERROR);
}
CCRETVAL
-e_dosify_next(c)
- Char c;
+e_dosify_next(Char c)
{
USE(c);
return (CC_ERROR);
}
CCRETVAL
-e_dosify_prev(c)
- Char c;
+e_dosify_prev(Char c)
{
USE(c);
return (CC_ERROR);
}
CCRETVAL
-e_page_up(c)
- Char c;
+e_page_up(Char c)
{
USE(c);
return (CC_ERROR);
}
CCRETVAL
-e_page_down(c)
- Char c;
+e_page_down(Char c)
{
USE(c);
return (CC_ERROR);
@@ -3882,8 +3843,7 @@ e_page_down(c)
#ifdef notdef
void
-MoveCursor(n) /* move cursor + right - left char */
- int n;
+MoveCursor(int n) /* move cursor + right - left char */
{
Cursor = Cursor + n;
if (Cursor < InputBuf)
@@ -3894,14 +3854,13 @@ MoveCursor(n) /* move cursor + right - left char */
}
Char *
-GetCursor()
+GetCursor(void)
{
return(Cursor);
}
int
-PutCursor(p)
- Char *p;
+PutCursor(Char *p)
{
if (p < InputBuf || p > LastChar)
return 1; /* Error */
diff --git a/contrib/tcsh/ed.decls.h b/contrib/tcsh/ed.decls.h
index 2fac59a9a58f..a9628ce19b2b 100644
--- a/contrib/tcsh/ed.decls.h
+++ b/contrib/tcsh/ed.decls.h
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.decls.h,v 3.39 2005/01/18 20:24:50 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.decls.h,v 3.44 2006/08/23 15:03:13 christos Exp $ */
/*
* ed.decls.h: Editor external definitions
*/
@@ -36,240 +36,245 @@
/*
* ed.chared.c
*/
-extern int InsertStr __P((Char *));
-extern void DeleteBack __P((int));
-extern void SetKillRing __P((int));
+extern int InsertStr (Char *);
+extern void DeleteBack (int);
+extern void SetKillRing (int);
+extern CCRETVAL GetHistLine (void);
/*
* ed.init.c
*/
#ifdef SIG_WINDOW
-extern void check_window_size __P((int));
-extern RETSIGTYPE window_change __P((int));
+extern void check_window_size (int);
+extern void window_change (int);
#endif /* SIG_WINDOW */
-extern int ed_Setup __P((int));
-extern void ed_Init __P((void));
-extern int Cookedmode __P((void));
-extern int Rawmode __P((void));
-extern void ed_set_tty_eight_bit __P((void));
+extern int ed_Setup (int);
+extern void ed_Init (void);
+extern int Cookedmode (void);
+extern int Rawmode (void);
+extern void ed_set_tty_eight_bit (void);
-extern void QuoteModeOn __P((void));
-extern void QuoteModeOff __P((void));
-extern void ResetInLine __P((int));
-extern int Load_input_line __P((void));
+extern void QuoteModeOn (void);
+extern void QuoteModeOff (void);
+extern void ResetInLine (int);
+extern int Load_input_line (void);
/*
* ed.term.c:
*/
-extern void dosetty __P((Char **, struct command *));
-extern int tty_getty __P((int, ttydata_t *));
-extern int tty_setty __P((int, ttydata_t *));
-extern void tty_getchar __P((ttydata_t *, unsigned char *));
-extern void tty_setchar __P((ttydata_t *, unsigned char *));
-extern speed_t tty_getspeed __P((ttydata_t *));
-extern int tty_gettabs __P((ttydata_t *));
-extern int tty_geteightbit __P((ttydata_t *));
-extern int tty_cooked_mode __P((ttydata_t *));
+extern void dosetty (Char **, struct command *);
+extern int tty_getty (int, ttydata_t *);
+extern int tty_setty (int, ttydata_t *);
+extern void tty_getchar (ttydata_t *, unsigned char *);
+extern void tty_setchar (ttydata_t *, unsigned char *);
+extern speed_t tty_getspeed (ttydata_t *);
+extern int tty_gettabs (ttydata_t *);
+extern int tty_geteightbit (ttydata_t *);
+extern int tty_cooked_mode (ttydata_t *);
#ifdef _IBMR2
-extern void tty_setdisc __P((int, int));
+extern void tty_setdisc (int, int);
#endif /* _IBMR2 */
/*
* ed.screen.c
*/
-extern void terminit __P((void));
-extern void SetAttributes __P((Char));
-extern void so_write __P((Char *, int));
-extern void ClearScreen __P((void));
-extern void MoveToLine __P((int));
-extern void MoveToChar __P((int));
-extern void ClearEOL __P((int));
-extern void Insert_write __P((Char *, int));
-extern void DeleteChars __P((int));
-extern void TellTC __P((void));
-extern void SetTC __P((char *, char *));
-extern void EchoTC __P((Char **));
-extern int SetArrowKeys __P((CStr *, XmapVal *, int));
-extern int IsArrowKey __P((Char *));
-extern void ResetArrowKeys __P((void));
-extern void DefaultArrowKeys __P((void));
-extern int ClearArrowKeys __P((CStr *));
-extern void PrintArrowKeys __P((CStr *));
-extern void BindArrowKeys __P((void));
-extern void SoundBeep __P((void));
-extern int CanWeTab __P((void));
-extern void ChangeSize __P((int, int));
+extern void terminit (void);
+extern void SetAttributes (Char);
+extern void so_write (Char *, int);
+extern void ClearScreen (void);
+extern void MoveToLine (int);
+extern void MoveToChar (int);
+extern void ClearEOL (int);
+extern void Insert_write (Char *, int);
+extern void DeleteChars (int);
+extern void TellTC (void);
+extern void SetTC (char *, char *);
+extern void EchoTC (Char **);
+extern int SetArrowKeys (const CStr *, XmapVal *, int);
+extern int IsArrowKey (Char *);
+extern void ResetArrowKeys (void);
+extern void DefaultArrowKeys (void);
+extern int ClearArrowKeys (const CStr *);
+extern void PrintArrowKeys (const CStr *);
+extern void BindArrowKeys (void);
+extern void SoundBeep (void);
+extern int CanWeTab (void);
+extern void ChangeSize (int, int);
#ifdef SIG_WINDOW
-extern int GetSize __P((int *, int *));
+extern int GetSize (int *, int *);
#endif /* SIG_WINDOW */
-extern void ClearToBottom __P((void));
-extern void GetTermCaps __P((void));
+extern void ClearToBottom (void);
+extern void GetTermCaps (void);
+extern void StartHighlight (void);
+extern void StopHighlight (void);
/*
* ed.defns.c
*/
-extern void editinit __P((void));
-extern void ed_InitNLSMaps __P((void));
+extern void editinit (void);
+extern void ed_InitNLSMaps (void);
#ifdef DEBUG_EDIT
-extern void CheckMaps __P((void));
+extern void CheckMaps (void);
#endif
-extern void ed_InitMaps __P((void));
-extern void ed_InitEmacsMaps __P((void));
-extern void ed_InitVIMaps __P((void));
+extern void ed_InitMaps (void);
+extern void ed_InitEmacsMaps (void);
+extern void ed_InitVIMaps (void);
-extern CCRETVAL e_unassigned __P((Char));
-extern CCRETVAL e_insert __P((Char));
-extern CCRETVAL e_newline __P((Char));
-extern CCRETVAL e_delprev __P((Char));
-extern CCRETVAL e_delnext __P((Char));
+extern CCRETVAL e_unassigned (Char);
+extern CCRETVAL e_insert (Char);
+extern CCRETVAL e_newline (Char);
+extern CCRETVAL e_delprev (Char);
+extern CCRETVAL e_delnext (Char);
/* added by mtk@ari.ncl.omron.co.jp (920818) */
-extern CCRETVAL e_delnext_eof __P((Char));
-extern CCRETVAL e_delnext_list __P((Char));
-extern CCRETVAL e_delnext_list_eof __P((Char)); /* for ^D */
-extern CCRETVAL e_toend __P((Char));
-extern CCRETVAL e_tobeg __P((Char));
-extern CCRETVAL e_charback __P((Char));
-extern CCRETVAL e_charfwd __P((Char));
-extern CCRETVAL e_quote __P((Char));
-extern CCRETVAL e_startover __P((Char));
-extern CCRETVAL e_redisp __P((Char));
-extern CCRETVAL e_wordback __P((Char));
-extern CCRETVAL e_wordfwd __P((Char));
-extern CCRETVAL v_wordbegnext __P((Char));
-extern CCRETVAL e_uppercase __P((Char));
-extern CCRETVAL e_lowercase __P((Char));
-extern CCRETVAL e_capitolcase __P((Char));
-extern CCRETVAL e_cleardisp __P((Char));
-extern CCRETVAL e_complete __P((Char));
-extern CCRETVAL e_correct __P((Char));
-extern CCRETVAL e_correctl __P((Char));
-extern CCRETVAL e_up_hist __P((Char));
-extern CCRETVAL e_down_hist __P((Char));
-extern CCRETVAL e_up_search_hist __P((Char));
-extern CCRETVAL e_down_search_hist __P((Char));
-extern CCRETVAL e_helpme __P((Char));
-extern CCRETVAL e_list_choices __P((Char));
-extern CCRETVAL e_delwordprev __P((Char));
-extern CCRETVAL e_delwordnext __P((Char));
-extern CCRETVAL e_digit __P((Char));
-extern CCRETVAL e_argdigit __P((Char));
-extern CCRETVAL v_zero __P((Char));
-extern CCRETVAL e_killend __P((Char));
-extern CCRETVAL e_killbeg __P((Char));
-extern CCRETVAL e_metanext __P((Char));
+extern CCRETVAL e_delnext_eof (Char);
+extern CCRETVAL e_delnext_list (Char);
+extern CCRETVAL e_delnext_list_eof (Char); /* for ^D */
+extern CCRETVAL e_toend (Char);
+extern CCRETVAL e_tobeg (Char);
+extern CCRETVAL e_charback (Char);
+extern CCRETVAL e_charfwd (Char);
+extern CCRETVAL e_quote (Char);
+extern CCRETVAL e_startover (Char);
+extern CCRETVAL e_redisp (Char);
+extern CCRETVAL e_wordback (Char);
+extern CCRETVAL e_wordfwd (Char);
+extern CCRETVAL v_wordbegnext (Char);
+extern CCRETVAL e_uppercase (Char);
+extern CCRETVAL e_lowercase (Char);
+extern CCRETVAL e_capitolcase (Char);
+extern CCRETVAL e_cleardisp (Char);
+extern CCRETVAL e_complete (Char);
+extern CCRETVAL e_correct (Char);
+extern CCRETVAL e_correctl (Char);
+extern CCRETVAL e_up_hist (Char);
+extern CCRETVAL e_down_hist (Char);
+extern CCRETVAL e_up_search_hist (Char);
+extern CCRETVAL e_down_search_hist (Char);
+extern CCRETVAL e_helpme (Char);
+extern CCRETVAL e_list_choices (Char);
+extern CCRETVAL e_delwordprev (Char);
+extern CCRETVAL e_delwordnext (Char);
+extern CCRETVAL e_digit (Char);
+extern CCRETVAL e_argdigit (Char);
+extern CCRETVAL v_zero (Char);
+extern CCRETVAL e_killend (Char);
+extern CCRETVAL e_killbeg (Char);
+extern CCRETVAL e_metanext (Char);
#ifdef notdef
-extern CCRETVAL e_extendnext __P((Char));
+extern CCRETVAL e_extendnext (Char);
#endif
-extern CCRETVAL e_send_eof __P((Char));
-extern CCRETVAL e_charswitch __P((Char));
-extern CCRETVAL e_gcharswitch __P((Char));
-extern CCRETVAL e_which __P((Char));
-extern CCRETVAL e_yank_kill __P((Char));
-extern CCRETVAL e_tty_dsusp __P((Char));
-extern CCRETVAL e_tty_flusho __P((Char));
-extern CCRETVAL e_tty_quit __P((Char));
-extern CCRETVAL e_tty_tsusp __P((Char));
-extern CCRETVAL e_tty_stopo __P((Char));
-extern CCRETVAL e_tty_starto __P((Char));
-extern CCRETVAL e_argfour __P((Char));
-extern CCRETVAL e_set_mark __P((Char));
-extern CCRETVAL e_exchange_mark __P((Char));
-extern CCRETVAL e_last_item __P((Char));
-extern CCRETVAL v_cmd_mode __P((Char));
-extern CCRETVAL v_insert __P((Char));
-extern CCRETVAL v_replmode __P((Char));
-extern CCRETVAL v_replone __P((Char));
-extern CCRETVAL v_substline __P((Char));
-extern CCRETVAL v_substchar __P((Char));
-extern CCRETVAL v_add __P((Char));
-extern CCRETVAL v_addend __P((Char));
-extern CCRETVAL v_insbeg __P((Char));
-extern CCRETVAL v_chgtoend __P((Char));
-extern CCRETVAL e_killregion __P((Char));
-extern CCRETVAL e_killall __P((Char));
-extern CCRETVAL e_copyregion __P((Char));
-extern CCRETVAL e_tty_int __P((Char));
-extern CCRETVAL e_run_fg_editor __P((Char));
-extern CCRETVAL e_list_eof __P((Char));
-extern CCRETVAL e_expand_history __P((Char));
-extern CCRETVAL e_magic_space __P((Char));
-extern CCRETVAL e_list_glob __P((Char));
-extern CCRETVAL e_expand_glob __P((Char));
-extern CCRETVAL e_insovr __P((Char));
-extern CCRETVAL v_cm_complete __P((Char));
-extern CCRETVAL e_copyprev __P((Char));
-extern CCRETVAL v_change_case __P((Char));
-extern CCRETVAL e_expand __P((Char));
-extern CCRETVAL e_expand_vars __P((Char));
-extern CCRETVAL e_toggle_hist __P((Char));
-extern CCRETVAL e_load_average __P((Char));
-extern CCRETVAL v_delprev __P((Char));
-extern CCRETVAL v_delmeta __P((Char));
-extern CCRETVAL v_wordfwd __P((Char));
-extern CCRETVAL v_wordback __P((Char));
-extern CCRETVAL v_endword __P((Char));
-extern CCRETVAL v_eword __P((Char));
-extern CCRETVAL v_undo __P((Char));
-extern CCRETVAL v_ush_meta __P((Char));
-extern CCRETVAL v_dsh_meta __P((Char));
-extern CCRETVAL v_rsrch_fwd __P((Char));
-extern CCRETVAL v_rsrch_back __P((Char));
-extern CCRETVAL v_char_fwd __P((Char));
-extern CCRETVAL v_char_back __P((Char));
-extern CCRETVAL v_chgmeta __P((Char));
-extern CCRETVAL e_inc_fwd __P((Char));
-extern CCRETVAL e_inc_back __P((Char));
-extern CCRETVAL v_rchar_fwd __P((Char));
-extern CCRETVAL v_rchar_back __P((Char));
-extern CCRETVAL v_charto_fwd __P((Char));
-extern CCRETVAL v_charto_back __P((Char));
-extern CCRETVAL e_normalize_path __P((Char));
-extern CCRETVAL e_normalize_command __P((Char));
-extern CCRETVAL e_stuff_char __P((Char));
-extern CCRETVAL e_list_all __P((Char));
-extern CCRETVAL e_complete_all __P((Char));
-extern CCRETVAL e_complete_fwd __P((Char));
-extern CCRETVAL e_complete_back __P((Char));
-extern CCRETVAL e_dabbrev_expand __P((Char));
-extern CCRETVAL e_copy_to_clipboard __P((Char));
-extern CCRETVAL e_paste_from_clipboard __P((Char));
-extern CCRETVAL e_dosify_next __P((Char));
-extern CCRETVAL e_dosify_prev __P((Char));
-extern CCRETVAL e_page_up __P((Char));
-extern CCRETVAL e_page_down __P((Char));
-extern CCRETVAL e_yank_pop __P((Char));
+extern CCRETVAL e_send_eof (Char);
+extern CCRETVAL e_charswitch (Char);
+extern CCRETVAL e_gcharswitch (Char);
+extern CCRETVAL e_which (Char);
+extern CCRETVAL e_yank_kill (Char);
+extern CCRETVAL e_tty_dsusp (Char);
+extern CCRETVAL e_tty_flusho (Char);
+extern CCRETVAL e_tty_quit (Char);
+extern CCRETVAL e_tty_tsusp (Char);
+extern CCRETVAL e_tty_stopo (Char);
+extern CCRETVAL e_tty_starto (Char);
+extern CCRETVAL e_argfour (Char);
+extern CCRETVAL e_set_mark (Char);
+extern CCRETVAL e_exchange_mark (Char);
+extern CCRETVAL e_last_item (Char);
+extern CCRETVAL v_cmd_mode (Char);
+extern CCRETVAL v_insert (Char);
+extern CCRETVAL v_replmode (Char);
+extern CCRETVAL v_replone (Char);
+extern CCRETVAL v_substline (Char);
+extern CCRETVAL v_substchar (Char);
+extern CCRETVAL v_add (Char);
+extern CCRETVAL v_addend (Char);
+extern CCRETVAL v_insbeg (Char);
+extern CCRETVAL v_chgtoend (Char);
+extern CCRETVAL e_killregion (Char);
+extern CCRETVAL e_killall (Char);
+extern CCRETVAL e_copyregion (Char);
+extern CCRETVAL e_tty_int (Char);
+extern CCRETVAL e_run_fg_editor (Char);
+extern CCRETVAL e_list_eof (Char);
+extern CCRETVAL e_expand_history (Char);
+extern CCRETVAL e_magic_space (Char);
+extern CCRETVAL e_list_glob (Char);
+extern CCRETVAL e_expand_glob (Char);
+extern CCRETVAL e_insovr (Char);
+extern CCRETVAL v_cm_complete (Char);
+extern CCRETVAL e_copyprev (Char);
+extern CCRETVAL v_change_case (Char);
+extern CCRETVAL e_expand (Char);
+extern CCRETVAL e_expand_vars (Char);
+extern CCRETVAL e_toggle_hist (Char);
+extern CCRETVAL e_load_average (Char);
+extern CCRETVAL v_delprev (Char);
+extern CCRETVAL v_delmeta (Char);
+extern CCRETVAL v_wordfwd (Char);
+extern CCRETVAL v_wordback (Char);
+extern CCRETVAL v_endword (Char);
+extern CCRETVAL v_eword (Char);
+extern CCRETVAL v_undo (Char);
+extern CCRETVAL v_ush_meta (Char);
+extern CCRETVAL v_dsh_meta (Char);
+extern CCRETVAL v_rsrch_fwd (Char);
+extern CCRETVAL v_rsrch_back (Char);
+extern CCRETVAL v_char_fwd (Char);
+extern CCRETVAL v_char_back (Char);
+extern CCRETVAL v_chgmeta (Char);
+extern CCRETVAL e_inc_fwd (Char);
+extern CCRETVAL e_inc_back (Char);
+extern CCRETVAL v_rchar_fwd (Char);
+extern CCRETVAL v_rchar_back (Char);
+extern CCRETVAL v_charto_fwd (Char);
+extern CCRETVAL v_charto_back (Char);
+extern CCRETVAL e_normalize_path (Char);
+extern CCRETVAL e_normalize_command (Char);
+extern CCRETVAL e_stuff_char (Char);
+extern CCRETVAL e_list_all (Char);
+extern CCRETVAL e_complete_all (Char);
+extern CCRETVAL e_complete_fwd (Char);
+extern CCRETVAL e_complete_back (Char);
+extern CCRETVAL e_dabbrev_expand (Char);
+extern CCRETVAL e_copy_to_clipboard (Char);
+extern CCRETVAL e_paste_from_clipboard (Char);
+extern CCRETVAL e_dosify_next (Char);
+extern CCRETVAL e_dosify_prev (Char);
+extern CCRETVAL e_page_up (Char);
+extern CCRETVAL e_page_down (Char);
+extern CCRETVAL e_yank_pop (Char);
+extern CCRETVAL e_newline_hold (Char);
+extern CCRETVAL e_newline_down_hist (Char);
/*
* ed.inputl.c
*/
-extern int Inputl __P((void));
-extern int GetNextChar __P((Char *));
-extern void UngetNextChar __P((Char));
-extern void PushMacro __P((Char *));
+extern int Inputl (void);
+extern int GetNextChar (Char *);
+extern void UngetNextChar (Char);
+extern void PushMacro (Char *);
/*
* ed.refresh.c
*/
-extern void ClearLines __P((void));
-extern void ClearDisp __P((void));
-extern void Refresh __P((void));
-extern void RefCursor __P((void));
-extern void RefPlusOne __P((int));
-extern void PastBottom __P((void));
+extern void ClearLines (void);
+extern void ClearDisp (void);
+extern void Refresh (void);
+extern void RefCursor (void);
+extern void RefPlusOne (int);
+extern void PastBottom (void);
/*
* ed.xmap.c
*/
-extern XmapVal *XmapStr __P((CStr *));
-extern XmapVal *XmapCmd __P((int));
-extern void AddXkey __P((CStr *, XmapVal *, int));
-extern void ClearXkey __P((KEYCMD *, CStr *));
-extern int GetXkey __P((CStr *, XmapVal *));
-extern void ResetXmap __P((void));
-extern int DeleteXkey __P((CStr *));
-extern void PrintXkey __P((CStr *));
-extern int printOne __P((CStr *, XmapVal *, int));
-extern eChar parseescape __P((const Char **));
-extern unsigned char *unparsestring __P((CStr *, unsigned char *, Char *));
+extern XmapVal *XmapStr (CStr *);
+extern XmapVal *XmapCmd (int);
+extern void AddXkey (const CStr *, XmapVal *, int);
+extern void ClearXkey (KEYCMD *, const CStr *);
+extern int GetXkey (CStr *, XmapVal *);
+extern void ResetXmap (void);
+extern int DeleteXkey (const CStr *);
+extern void PrintXkey (const CStr *);
+extern void printOne (const Char *, const XmapVal *, int);
+extern eChar parseescape (const Char **);
+extern unsigned char *unparsestring (const CStr *, const Char *);
#endif /* _h_ed_decls */
diff --git a/contrib/tcsh/ed.defns.c b/contrib/tcsh/ed.defns.c
index ea2dbcd1c873..5124bde1de04 100644
--- a/contrib/tcsh/ed.defns.c
+++ b/contrib/tcsh/ed.defns.c
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.defns.c,v 3.42 2005/03/03 16:49:15 kim Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.defns.c,v 3.46 2006/03/02 18:46:44 christos Exp $ */
/*
* ed.defns.c: Editor function definitions and initialization
*/
@@ -32,11 +32,11 @@
*/
#include "sh.h"
-RCSID("$Id: ed.defns.c,v 3.42 2005/03/03 16:49:15 kim Exp $")
+RCSID("$tcsh: ed.defns.c,v 3.46 2006/03/02 18:46:44 christos Exp $")
#include "ed.h"
-static void ed_InitMetaBindings __P((void));
+static void ed_InitMetaBindings (void);
PFCmd CcFuncTbl[] = { /* table of available commands */
e_unassigned,
@@ -279,8 +279,12 @@ PFCmd CcFuncTbl[] = { /* table of available commands */
#define F_PAGE_DOWN 118
e_yank_pop,
#define F_YANK_POP 119
+ e_newline_hold,
+#define F_NEWLINE_HOLD 120
+ e_newline_down_hist,
+#define F_NEWLINE_DOWN_HIST 121
0 /* DUMMY VALUE */
-#define F_NUM_FNS 120
+#define F_NUM_FNS 122
};
@@ -493,7 +497,7 @@ KEYCMD CcEmacsMap[] = {
F_UNASSIGNED, /* M-> */
F_WHICH, /* M-? */
F_UNASSIGNED, /* M-@ */
- F_UNASSIGNED, /* M-A */
+ F_NEWLINE_HOLD, /* M-A */
F_WORDBACK, /* M-B */
F_CASECAPITAL, /* M-C */
F_DELWORDNEXT, /* M-D */
@@ -525,7 +529,7 @@ KEYCMD CcEmacsMap[] = {
F_UNASSIGNED, /* M-^ */
F_LAST_ITEM, /* M-_ */
F_UNASSIGNED, /* M-` */
- F_UNASSIGNED, /* M-a */
+ F_NEWLINE_HOLD, /* M-a */
F_WORDBACK, /* M-b */
F_CASECAPITAL, /* M-c */
F_DELWORDNEXT, /* M-d */
@@ -1120,7 +1124,7 @@ KEYCMD CcViCmdMap[] = {
void
-editinit()
+editinit(void)
{
struct KeyFuncs *f;
@@ -1128,7 +1132,7 @@ editinit()
int i;
for (i = 0; i < F_NUM_FUNCNAMES; i++)
- xfree((ptr_t) FuncNames[i].desc);
+ xfree((ptr_t)(intptr_t)FuncNames[i].desc);
#endif
f = FuncNames;
@@ -1408,6 +1412,16 @@ editinit()
f->desc = CSAVS(3, 52, "Execute command");
f++;
+ f->name = "newline-and-hold";
+ f->func = F_NEWLINE_HOLD;
+ f->desc = CSAVS(3, 122, "Execute command and keep current line");
+
+ f++;
+ f->name = "newline-and-down-history";
+ f->func = F_NEWLINE_DOWN_HIST;
+ f->desc = CSAVS(3, 123, "Execute command and move to next history line");
+
+ f++;
f->name = "normalize-path";
f->func = F_PATH_NORM;
f->desc = CSAVS(3, 53,
@@ -1785,7 +1799,7 @@ editinit()
#ifdef DEBUG_EDIT
void
-CheckMaps()
+CheckMaps(void)
{ /* check the size of the key maps */
int c1 = (NT_NUM_KEYS * sizeof(KEYCMD));
@@ -1817,7 +1831,7 @@ int NLSMapsAreInited = 0;
int NoNLSRebind;
void
-ed_InitNLSMaps()
+ed_InitNLSMaps(void)
{
int i;
@@ -1834,7 +1848,7 @@ ed_InitNLSMaps()
}
static void
-ed_InitMetaBindings()
+ed_InitMetaBindings(void)
{
Char buf[3];
int i;
@@ -1870,7 +1884,7 @@ ed_InitMetaBindings()
}
void
-ed_InitVIMaps()
+ed_InitVIMaps(void)
{
int i;
@@ -1887,7 +1901,7 @@ ed_InitVIMaps()
}
void
-ed_InitEmacsMaps()
+ed_InitEmacsMaps(void)
{
int i;
Char buf[3];
@@ -1930,7 +1944,7 @@ ed_InitEmacsMaps()
}
void
-ed_InitMaps()
+ed_InitMaps(void)
{
if (MapsAreInited)
return;
diff --git a/contrib/tcsh/ed.h b/contrib/tcsh/ed.h
index fba6299c85e7..10e519c25d54 100644
--- a/contrib/tcsh/ed.h
+++ b/contrib/tcsh/ed.h
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.h,v 3.44 2005/03/05 03:20:15 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.h,v 3.49 2006/08/23 15:03:13 christos Exp $ */
/*
* ed.h: Editor declarations and globals
*/
@@ -37,7 +37,6 @@
# define EXTERN extern
#endif
-#define TABSIZE 8 /* usually 8 spaces/tab */
#define MAXMACROLEVELS 10 /* max number of nested kbd macros */
#ifndef WINNT_NATIVE
@@ -54,7 +53,7 @@
#define KEYCMD unsigned char /* size needed to index into CcFuncTbl */
/* Must be unsigned */
-typedef CCRETVAL(*PFCmd) __P((Char)); /* pointer to function returning CCRETVAL */
+typedef CCRETVAL(*PFCmd) (Char); /* pointer to function returning CCRETVAL */
struct KeyFuncs { /* for the "bind" shell command */
const char *name; /* function name for bind command */
@@ -100,7 +99,7 @@ typedef struct {
int len;
} CStr;
-typedef union Xmapval { /* value passed to the Xkey routines */
+typedef union { /* value passed to the Xkey routines */
KEYCMD cmd;
CStr str;
} XmapVal;
@@ -118,13 +117,14 @@ EXTERN KEYCMD *CurrentKeyMap; /* current command key map */
EXTERN int inputmode; /* insert, replace, replace1 mode */
EXTERN Char GettingInput; /* true if getting an input line (mostly) */
EXTERN Char NeedsRedraw; /* for editor and twenex error messages */
-EXTERN Char InputBuf[INBUFSIZE]; /* the real input data */
+EXTERN Char InputBuf[INBUFSIZE]; /* the real input data *//*FIXBUF*/
EXTERN Char *LastChar, *Cursor; /* point to the next open space */
EXTERN Char *InputLim; /* limit of size of InputBuf */
EXTERN Char MetaNext; /* flags for ^V and ^[ functions */
EXTERN Char AltKeyMap; /* Using alternative command map (for vi mode) */
EXTERN Char VImode; /* true if running in vi mode (PWP 6-27-88) */
EXTERN Char *Mark; /* the emacs "mark" (dot is Cursor) */
+EXTERN char MarkIsSet; /* true if the mark has been set explicitly */
EXTERN Char DoingArg; /* true if we have an argument */
EXTERN int Argument; /* "universal" argument value */
EXTERN KEYCMD LastCmd; /* previous command executed */
@@ -134,18 +134,20 @@ EXTERN int KillRingLen; /* current length of kill ring */
EXTERN int KillPos; /* points to next kill */
EXTERN int YankPos; /* points to next yank */
-EXTERN Char UndoBuf[INBUFSIZE];
+EXTERN Char UndoBuf[INBUFSIZE];/*FIXBUF*/
EXTERN Char *UndoPtr;
EXTERN int UndoSize;
EXTERN int UndoAction;
-EXTERN Char HistBuf[INBUFSIZE]; /* history buffer */
-EXTERN Char *LastHist; /* points to end of history buffer */
+EXTERN struct Strbuf HistBuf; /* = Strbuf_INIT; history buffer */
EXTERN int Hist_num; /* what point up the history we are at now. */
-EXTERN Char WhichBuf[INBUFSIZE]; /* buffer for which command */
-EXTERN Char *LastWhich; /* points to end of which buffer */
-EXTERN Char *CursWhich; /* points to the cursor point in which buf */
-EXTERN int HistWhich; /* Hist_num is saved in this */
+/* buffer for which command and others */
+EXTERN struct Strbuf SavedBuf; /* = Strbuf_INIT; */
+EXTERN size_t LastSaved; /* points to end of saved buffer */
+EXTERN size_t CursSaved; /* points to the cursor point in saved buf */
+EXTERN int HistSaved; /* Hist_num is saved in this */
+EXTERN char RestoreSaved; /* true if SavedBuf should be restored */
+EXTERN int IncMatchLen; /* current match length during incremental search */
EXTERN char Expand; /* true if we are expanding a line */
extern Char HistLit; /* true if history lines are shown literal */
EXTERN Char CurrentHistLit; /* Literal status of current show history line */
@@ -176,14 +178,14 @@ EXTERN Char **Vdisplay; /* new buffer */
EXTERN int T_Lines, T_Cols; /* Rows and Cols of the terminal */
EXTERN Char T_CanIns; /* true if I can insert characters */
EXTERN Char T_CanDel; /* dito for delete characters */
-EXTERN Char T_Tabs; /* true if tty interface is passing tabs */
-EXTERN Char T_Margin;
+EXTERN char T_Tabs; /* true if tty interface is passing tabs */
+EXTERN char T_Margin;
#define MARGIN_AUTO 1 /* term has auto margins */
#define MARGIN_MAGIC 2 /* concept glitch */
EXTERN speed_t T_Speed; /* Tty input Baud rate */
EXTERN Char T_CanCEOL; /* true if we can clear to end of line */
EXTERN Char T_CanUP; /* true if this term can do reverse linefeen */
-EXTERN Char T_HasMeta; /* true if we have a meta key */
+EXTERN char T_HasMeta; /* true if we have a meta key */
/* note the extra characters in the Strchr() call in this macro */
#define isword(c) (Isalpha(c)||Isdigit(c)||Strchr(word_chars,c))
@@ -227,22 +229,22 @@ extern ttyperm_t ttylist;
/*
* We don't prototype these, cause some systems have them wrong!
*/
-extern int tgetent __P(());
-extern char *tgetstr __P(());
-extern int tgetflag __P(());
-extern int tgetnum __P(());
-extern char *tgoto __P(());
+extern int tgetent ();
+extern char *tgetstr ();
+extern int tgetflag ();
+extern int tgetnum ();
+extern char *tgoto ();
# define PUTPURE putpure
# define PUTRAW putraw
#else
-extern int tgetent __P((char *, const char *));
-extern char *tgetstr __P((const char *, char **));
-extern int tgetflag __P((const char *));
-extern int tgetnum __P((const char *));
-extern char *tgoto __P((const char *, int, int));
-extern void tputs __P((const char *, int, void (*)(int)));
-# define PUTPURE ((void (*)__P((int))) putpure)
-# define PUTRAW ((void (*)__P((int))) putraw)
+extern int tgetent (char *, const char *);
+extern char *tgetstr (const char *, char **);
+extern int tgetflag (const char *);
+extern int tgetnum (const char *);
+extern char *tgoto (const char *, int, int);
+extern void tputs (const char *, int, void (*)(int));
+# define PUTPURE ((void (*)(int)) putpure)
+# define PUTRAW ((void (*)(int)) putraw)
#endif
#endif /* _h_ed */
diff --git a/contrib/tcsh/ed.init.c b/contrib/tcsh/ed.init.c
index 192241a8e10c..c7dfcce95398 100644
--- a/contrib/tcsh/ed.init.c
+++ b/contrib/tcsh/ed.init.c
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.init.c,v 3.52 2005/01/18 20:24:50 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.init.c,v 3.60 2006/08/24 20:56:31 christos Exp $ */
/*
* ed.init.c: Editor initializations
*/
@@ -32,7 +32,7 @@
*/
#include "sh.h"
-RCSID("$Id: ed.init.c,v 3.52 2005/01/18 20:24:50 christos Exp $")
+RCSID("$tcsh: ed.init.c,v 3.60 2006/08/24 20:56:31 christos Exp $")
#include "ed.h"
#include "tc.h"
@@ -90,20 +90,13 @@ static unsigned char ttychars[NN_IO][C_NCC] = {
#ifdef SIG_WINDOW
void
-check_window_size(force)
- int force;
+check_window_size(int force)
{
-#ifdef BSDSIGS
- sigmask_t omask;
-#endif /* BSDSIGS */
int lins, cols;
/* don't want to confuse things here */
-#ifdef BSDSIGS
- omask = sigblock(sigmask(SIG_WINDOW)) & ~sigmask(SIG_WINDOW);
-#else /* BSDSIGS */
- (void) sighold(SIG_WINDOW);
-#endif /* BSDSIGS */
+ pintr_disabled++;
+ cleanup_push(&pintr_disabled, disabled_cleanup);
/*
* From: bret@shark.agps.lanl.gov (Bret Thaeler) Avoid sunview bug, where a
* partially hidden window gets a SIG_WINDOW every time the text is
@@ -121,32 +114,22 @@ check_window_size(force)
else
ChangeSize(lins, cols);
}
-#ifdef BSDSIGS
- (void) sigsetmask(omask); /* can change it again */
-#else /* BSDSIGS */
- (void) sigrelse(SIG_WINDOW);
-#endif /* BSDSIGS */
windowchg = 0;
+ cleanup_until(&pintr_disabled); /* can change it again */
}
-RETSIGTYPE
+void
/*ARGSUSED*/
-window_change(snum)
-int snum;
+window_change(int snum)
{
USE(snum);
-#ifdef UNRELSIGS
- /* If we were called as a signal handler, restore it. */
- if (snum > 0)
- sigset(snum, window_change);
-#endif /* UNRELSIGS */
windowchg = 1;
}
#endif /* SIG_WINDOW */
void
-ed_set_tty_eight_bit()
+ed_set_tty_eight_bit(void)
{
if (tty_getty(SHTTY, &extty) == -1) {
#ifdef DEBUG_TTY
@@ -159,8 +142,7 @@ ed_set_tty_eight_bit()
int
-ed_Setup(rst)
- int rst;
+ed_Setup(int rst)
{
static int havesetup = 0;
struct varent *imode;
@@ -279,8 +261,14 @@ ed_Setup(rst)
tty_setchar(&extty, ttychars[EX_IO]);
# ifdef SIG_WINDOW
- (void) sigset(SIG_WINDOW, window_change); /* for window systems */
-# endif
+ {
+ sigset_t set;
+ (void)signal(SIG_WINDOW, window_change); /* for window systems */
+ sigemptyset(&set);
+ sigaddset(&set, SIG_WINDOW);
+ (void)sigprocmask(SIG_UNBLOCK, &set, NULL);
+ }
+# endif
#else /* WINNT_NATIVE */
# ifdef DEBUG
if (rst)
@@ -292,7 +280,7 @@ ed_Setup(rst)
}
void
-ed_Init()
+ed_Init(void)
{
ResetInLine(1); /* reset the input pointers */
GettingInput = 0; /* just in case */
@@ -308,8 +296,7 @@ ed_Init()
{ /* no kill ring - why? */
int i;
for (i = 0; i < KillRingMax; i++) {
- if (KillRing[i].buf != NULL)
- xfree((ptr_t) KillRing[i].buf);
+ xfree(KillRing[i].buf);
KillRing[i].buf = NULL;
KillRing[i].len = 0;
}
@@ -376,7 +363,7 @@ ed_Init()
* Check and re-init the line. set the terminal into 1 char at a time mode.
*/
int
-Rawmode()
+Rawmode(void)
{
if (Tty_raw_mode)
return (0);
@@ -561,12 +548,13 @@ Rawmode()
}
int
-Cookedmode()
+Cookedmode(void)
{ /* set tty in normal setup */
#ifdef WINNT_NATIVE
do_nt_cooked_mode();
#else
- signalfun_t orig_intr;
+ sigset_t set, oset;
+ int res;
# ifdef _IBMR2
tty_setdisc(SHTTY, EX_IO);
@@ -576,45 +564,18 @@ Cookedmode()
return (0);
/* hold this for reseting tty */
-# ifdef BSDSIGS
- orig_intr = (signalfun_t) signal(SIGINT, SIG_IGN);
-# else
-# ifdef SIG_HOLD
- /*
- * sigset doesn't return the previous handler if the signal is held,
- * it will return SIG_HOLD instead. So instead of restoring the
- * the signal we would end up installing a blocked SIGINT with a
- * SIG_IGN signal handler. This is what happened when Cookedmode
- * was called from sched_run, disabling interrupt for the rest
- * of your session.
- *
- * This is what we do:
- * - if the signal is blocked, keep it that way
- * - else set it to SIG_IGN
- *
- * Casper Dik (casper@fwi.uva.nl)
- */
- orig_intr = (signalfun_t) sigset(SIGINT, SIG_HOLD);
- if (orig_intr != SIG_HOLD)
- (void) sigset(SIGINT, SIG_IGN); /* returns SIG_HOLD */
-# else /* !SIG_HOLD */
- /*
- * No SIG_HOLD; probably no reliable signals as well.
- */
- orig_intr = (signalfun_t) sigset(SIGINT, SIG_IGN);
-# endif /* SIG_HOLD */
-# endif /* BSDSIGS */
- if (tty_setty(SHTTY, &extty) == -1) {
+ sigemptyset(&set);
+ sigaddset(&set, SIGINT);
+ (void)sigprocmask(SIG_BLOCK, &set, &oset);
+ cleanup_push(&oset, sigprocmask_cleanup);
+ res = tty_setty(SHTTY, &extty);
+ cleanup_until(&oset);
+ if (res == -1) {
# ifdef DEBUG_TTY
xprintf("Cookedmode: tty_setty: %s\n", strerror(errno));
# endif /* DEBUG_TTY */
return -1;
}
-# ifdef BSDSIGS
- (void) signal(SIGINT, orig_intr); /* take these again */
-# else
- (void) sigset(SIGINT, orig_intr); /* take these again */
-# endif /* BSDSIGS */
#endif /* WINNT_NATIVE */
Tty_raw_mode = 0;
@@ -622,13 +583,13 @@ Cookedmode()
}
void
-ResetInLine(macro)
- int macro;
+ResetInLine(int macro)
{
Cursor = InputBuf; /* reset cursor */
LastChar = InputBuf;
- InputLim = &InputBuf[INBUFSIZE - 2];
+ InputLim = &InputBuf[INBUFSIZE - 2];/*FIXBUF*/
Mark = InputBuf;
+ MarkIsSet = 0;
MetaNext = 0;
CurrentKeyMap = CcKeyMap;
AltKeyMap = 0;
@@ -636,14 +597,15 @@ ResetInLine(macro)
DoingArg = 0;
Argument = 1;
LastCmd = F_UNASSIGNED; /* previous command executed */
+ IncMatchLen = 0;
if (macro)
MacroLvl = -1; /* no currently active macros */
}
-static Char *Input_Line = NULL;
int
-Load_input_line()
+Load_input_line(void)
{
+ static Char *Input_Line = NULL;
#ifdef SUNOS4
long chrs = 0;
#else /* !SUNOS4 */
@@ -655,7 +617,7 @@ Load_input_line()
#endif /* SUNOS4 */
if (Input_Line)
- xfree((ptr_t) Input_Line);
+ xfree(Input_Line);
Input_Line = NULL;
if (Tty_raw_mode)
@@ -664,9 +626,9 @@ Load_input_line()
#if defined(FIONREAD) && !defined(OREO)
(void) ioctl(SHIN, FIONREAD, (ioctl_t) &chrs);
if (chrs > 0) {
- char buf[BUFSIZE];
+ char buf[BUFSIZE];
- chrs = read(SHIN, buf, (size_t) min(chrs, BUFSIZE - 1));
+ chrs = xread(SHIN, buf, min(chrs, BUFSIZE - 1));
if (chrs > 0) {
buf[chrs] = '\0';
Input_Line = Strsave(str2short(buf));
@@ -692,7 +654,7 @@ Load_input_line()
* (via Hans J Albertsson (thanks))
*/
void
-QuoteModeOn()
+QuoteModeOn(void)
{
if (MacroLvl >= 0)
return;
@@ -731,7 +693,7 @@ QuoteModeOn()
}
void
-QuoteModeOff()
+QuoteModeOff(void)
{
if (!Tty_quote_mode)
return;
diff --git a/contrib/tcsh/ed.inputl.c b/contrib/tcsh/ed.inputl.c
index fb87f8b02dd8..a97058e1feee 100644
--- a/contrib/tcsh/ed.inputl.c
+++ b/contrib/tcsh/ed.inputl.c
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.inputl.c,v 3.57 2004/12/25 21:15:06 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.inputl.c,v 3.66 2006/11/29 22:32:24 christos Exp $ */
/*
* ed.inputl.c: Input line handling.
*/
@@ -32,13 +32,13 @@
*/
#include "sh.h"
-RCSID("$Id: ed.inputl.c,v 3.57 2004/12/25 21:15:06 christos Exp $")
+RCSID("$tcsh: ed.inputl.c,v 3.66 2006/11/29 22:32:24 christos Exp $")
#include "ed.h"
#include "ed.defns.h" /* for the function names */
#include "tw.h" /* for twenex stuff */
-#define OKCMD (INBUFSIZE+INBUFSIZE)
+#define OKCMD INT_MAX
/* ed.inputl -- routines to get a single line from the input. */
@@ -48,18 +48,18 @@ extern int MapsAreInited;
static Char mismatch[] =
{'!', '^' , '\\', '-', '%', '\0', '"', '\'', '`', '\0' };
-static int Repair __P((void));
-static int GetNextCommand __P((KEYCMD *, Char *));
-static int SpellLine __P((int));
-static int CompleteLine __P((void));
-static void RunCommand __P((Char *));
-static void doeval1 __P((Char **));
+static int Repair (void);
+static int GetNextCommand (KEYCMD *, Char *);
+static int SpellLine (int);
+static int CompleteLine (void);
+static void RunCommand (Char *);
+static void doeval1 (Char **);
static int rotate = 0;
static int
-Repair()
+Repair(void)
{
if (NeedsRedraw) {
ClearLines();
@@ -75,7 +75,7 @@ Repair()
/* CCRETVAL */
int
-Inputl()
+Inputl(void)
{
CCRETVAL retval;
KEYCMD cmdnum = 0;
@@ -88,7 +88,6 @@ Inputl()
struct varent *matchbeep = adrof(STRmatchbeep);
struct varent *imode = adrof(STRinputmode);
Char *SaveChar, *CorrChar;
- Char Origin[INBUFSIZE], Change[INBUFSIZE];
int matchval; /* from tenematch() */
COMMAND fn;
int curlen = 0;
@@ -132,13 +131,20 @@ Inputl()
GettingInput = 1;
NeedsRedraw = 0;
-
- if (tellwhat) {
- copyn(InputBuf, WhichBuf, INBUFSIZE);
- LastChar = InputBuf + (LastWhich - WhichBuf);
- Cursor = InputBuf + (CursWhich - WhichBuf);
- tellwhat = 0;
- Hist_num = HistWhich;
+ tellwhat = 0;
+
+ if (RestoreSaved) {
+ copyn(InputBuf, SavedBuf.s, INBUFSIZE);/*FIXBUF*/
+ LastChar = InputBuf + LastSaved;
+ Cursor = InputBuf + CursSaved;
+ Hist_num = HistSaved;
+ HistSaved = 0;
+ RestoreSaved = 0;
+ }
+ if (HistSaved) {
+ Hist_num = HistSaved;
+ GetHistLine();
+ HistSaved = 0;
}
if (Expand) {
(void) e_up_hist(0);
@@ -156,7 +162,7 @@ Inputl()
xprintf("Cursor > InputLim\r\n");
if (LastChar > InputLim)
xprintf("LastChar > InputLim\r\n");
- if (InputLim != &InputBuf[INBUFSIZE - 2])
+ if (InputLim != &InputBuf[INBUFSIZE - 2])/*FIXBUF*/
xprintf("InputLim != &InputBuf[INBUFSIZE-2]\r\n");
if ((!DoingArg) && (Argument != 1))
xprintf("(!DoingArg) && (Argument != 1)\r\n");
@@ -209,12 +215,7 @@ Inputl()
case CC_WHICH: /* tell what this command does */
tellwhat = 1;
- copyn(WhichBuf, InputBuf, INBUFSIZE);
- LastWhich = WhichBuf + (LastChar - InputBuf);
- CursWhich = WhichBuf + (Cursor - InputBuf);
*LastChar++ = '\n'; /* for the benifit of CSH */
- HistWhich = Hist_num;
- Hist_num = 0; /* for the history commands */
num = (int) (LastChar - InputBuf); /* number characters read */
break;
@@ -224,36 +225,45 @@ Inputl()
matchval = 1;
if (crct && crct->vec != NULL && (!Strcmp(*(crct->vec), STRcmd) ||
!Strcmp(*(crct->vec), STRall))) {
+ Char *Origin;
+
PastBottom();
- copyn(Origin, InputBuf, INBUFSIZE);
+ Origin = Strsave(InputBuf);
+ cleanup_push(Origin, xfree);
SaveChar = LastChar;
if (SpellLine(!Strcmp(*(crct->vec), STRcmd)) == 1) {
+ Char *Change;
+
PastBottom();
- copyn(Change, InputBuf, INBUFSIZE);
+ Change = Strsave(InputBuf);
+ cleanup_push(Change, xfree);
*Strchr(Change, '\n') = '\0';
CorrChar = LastChar; /* Save the corrected end */
LastChar = InputBuf; /* Null the current line */
SoundBeep();
printprompt(2, short2str(Change));
+ cleanup_until(Change);
Refresh();
- if (read(SHIN, (char *) &tch, 1) < 0)
+ if (xread(SHIN, &tch, 1) < 0) {
#ifdef convex
/*
* need to print error message in case file
* is migrated
*/
- if (errno && errno != EINTR)
+ if (errno)
stderror(ERR_SYSTEM, progname, strerror(errno));
#else
+ cleanup_until(Origin);
break;
#endif
+ }
ch = tch;
if (ch == 'y' || ch == ' ') {
LastChar = CorrChar; /* Restore the corrected end */
xprintf(CGETS(6, 2, "yes\n"));
}
else {
- copyn(InputBuf, Origin, INBUFSIZE);
+ Strcpy(InputBuf, Origin);
LastChar = SaveChar;
if (ch == 'e') {
xprintf(CGETS(6, 3, "edit\n"));
@@ -263,6 +273,7 @@ Inputl()
ClearLines();
ClearDisp();
Refresh();
+ cleanup_until(Origin);
break;
}
else if (ch == 'a') {
@@ -271,12 +282,14 @@ Inputl()
Cursor = LastChar;
printprompt(0, NULL);
Refresh();
+ cleanup_until(Origin);
break;
}
xprintf(CGETS(6, 5, "no\n"));
}
flush();
}
+ cleanup_until(Origin);
} else if (crct && crct->vec != NULL &&
!Strcmp(*(crct->vec), STRcomplete)) {
if (LastChar > InputBuf && LastChar[-1] == '\n') {
@@ -427,6 +440,14 @@ Inputl()
if (autol && autol->vec != NULL &&
(Strcmp(*(autol->vec), STRambiguous) != 0 ||
expnum == Cursor - InputBuf)) {
+ if (adrof(STRhighlight) && MarkIsSet) {
+ /* clear highlighting before showing completions */
+ MarkIsSet = 0;
+ ClearLines();
+ ClearDisp();
+ Refresh();
+ MarkIsSet = 1;
+ }
PastBottom();
fn = (retval == CC_COMPLETE_ALL) ? LIST_ALL : LIST;
(void) tenematch(InputBuf, Cursor-InputBuf, fn);
@@ -526,6 +547,11 @@ Inputl()
case CC_ERROR:
default: /* functions we don't know about */
+ if (adrof(STRhighlight)) {
+ ClearLines();
+ ClearDisp();
+ Refresh();
+ }
DoingArg = 0;
Argument = 1;
SoundBeep();
@@ -542,8 +568,7 @@ Inputl()
}
void
-PushMacro(str)
- Char *str;
+PushMacro(Char *str)
{
if (str != NULL && MacroLvl + 1 < MAXMACROLEVELS) {
MacroLvl++;
@@ -555,72 +580,60 @@ PushMacro(str)
}
}
-/*
- * Like eval, only using the current file descriptors
- */
-static Char **gv = NULL, **gav = NULL;
+struct eval1_state
+{
+ Char **evalvec, *evalp;
+};
static void
-doeval1(v)
- Char **v;
+eval1_cleanup(void *xstate)
{
- Char **oevalvec;
- Char *oevalp;
- int my_reenter;
- Char **savegv;
- jmp_buf_t osetexit;
+ struct eval1_state *state;
- oevalvec = evalvec;
- oevalp = evalp;
- savegv = gv;
- gav = v;
+ state = xstate;
+ evalvec = state->evalvec;
+ evalp = state->evalp;
+ doneinp = 0;
+}
+/*
+ * Like eval, only using the current file descriptors
+ */
+static void
+doeval1(Char **v)
+{
+ struct eval1_state state;
+ Char **gv;
+ int gflag;
- gflag = 0, tglob(gav);
+ gflag = tglob(v);
if (gflag) {
- gv = gav = globall(gav);
- gargv = 0;
- if (gav == 0)
+ gv = v = globall(v, gflag);
+ if (v == 0)
stderror(ERR_NOMATCH);
- gav = copyblk(gav);
+ v = copyblk(v);
}
else {
gv = NULL;
- gav = copyblk(gav);
- trim(gav);
- }
-
- getexit(osetexit);
-
- /* PWP: setjmp/longjmp bugfix for optimizing compilers */
-#ifdef cray
- my_reenter = 1; /* assume non-zero return val */
- if (setexit() == 0) {
- my_reenter = 0; /* Oh well, we were wrong */
-#else /* !cray */
- if ((my_reenter = setexit()) == 0) {
-#endif /* cray */
- evalvec = gav;
- evalp = 0;
- process(0);
+ v = copyblk(v);
+ trim(v);
}
-
- evalvec = oevalvec;
- evalp = oevalp;
- doneinp = 0;
-
if (gv)
- blkfree(gv);
-
- gv = savegv;
- resexit(osetexit);
- if (my_reenter)
- stderror(ERR_SILENT);
+ cleanup_push(gv, blk_cleanup);
+
+ state.evalvec = evalvec;
+ state.evalp = evalp;
+ evalvec = v;
+ evalp = 0;
+ cleanup_push(&state, eval1_cleanup);
+ process(0);
+ cleanup_until(&state);
+ if (gv)
+ cleanup_until(gv);
}
static void
-RunCommand(str)
- Char *str;
+RunCommand(Char *str)
{
Char *cmd[2];
@@ -633,7 +646,7 @@ RunCommand(str)
GettingInput = 0;
doeval1(cmd);
-
+
(void) Rawmode();
GettingInput = 1;
@@ -644,9 +657,7 @@ RunCommand(str)
}
static int
-GetNextCommand(cmdnum, ch)
- KEYCMD *cmdnum;
- Char *ch;
+GetNextCommand(KEYCMD *cmdnum, Char *ch)
{
KEYCMD cmd = 0;
int num;
@@ -688,7 +699,7 @@ GetNextCommand(cmdnum, ch)
XmapVal val;
CStr cstr;
cstr.buf = ch;
- cstr.len = Strlen(ch);
+ cstr.len = 1;
switch (GetXkey(&cstr, &val)) {
case XK_CMD:
cmd = val.cmd;
@@ -722,8 +733,7 @@ UngetNextChar(Char cp)
}
int
-GetNextChar(cp)
- Char *cp;
+GetNextChar(Char *cp)
{
int num_read;
int tried = 0;
@@ -763,16 +773,13 @@ GetNextChar(cp)
#endif /* SIG_WINDOW */
cbp = 0;
for (;;) {
- while ((num_read = read(SHIN, cbuf + cbp, 1)) == -1) {
- if (errno == EINTR)
- continue;
+ while ((num_read = xread(SHIN, cbuf + cbp, 1)) == -1) {
if (!tried && fixio(SHIN, errno) != -1)
tried = 1;
else {
# ifdef convex
/* need to print error message in case the file is migrated */
- if (errno != EINTR)
- stderror(ERR_SYSTEM, progname, strerror(errno));
+ stderror(ERR_SYSTEM, progname, strerror(errno));
# endif /* convex */
# ifdef WINNT_NATIVE
__nt_want_vcode = 0;
@@ -781,13 +788,17 @@ GetNextChar(cp)
return -1;
}
}
- cbp++;
- if (normal_mbtowc(cp, cbuf, cbp) == -1) {
- reset_mbtowc();
- if (cbp < MB_LEN_MAX)
- continue; /* Maybe a partial character */
- /* And drop the following bytes, if any */
- *cp = (unsigned char)*cbuf | INVALID_BYTE;
+ if (AsciiOnly) {
+ *cp = (unsigned char)*cbuf;
+ } else {
+ cbp++;
+ if (normal_mbtowc(cp, cbuf, cbp) == -1) {
+ reset_mbtowc();
+ if (cbp < MB_CUR_MAX)
+ continue; /* Maybe a partial character */
+ /* And drop the following bytes, if any */
+ *cp = (unsigned char)*cbuf | INVALID_BYTE;
+ }
}
break;
}
@@ -810,8 +821,7 @@ GetNextChar(cp)
* 1: Something was corrected
*/
static int
-SpellLine(cmdonly)
- int cmdonly;
+SpellLine(int cmdonly)
{
int endflag, matchval;
Char *argptr, *OldCursor, *OldLastChar;
@@ -893,7 +903,7 @@ SpellLine(cmdonly)
* 2: Several commands matched
*/
static int
-CompleteLine()
+CompleteLine(void)
{
int endflag, tmatch;
Char *argptr, *OldCursor, *OldLastChar;
diff --git a/contrib/tcsh/ed.refresh.c b/contrib/tcsh/ed.refresh.c
index 46e7622aaa8b..afba75ec5169 100644
--- a/contrib/tcsh/ed.refresh.c
+++ b/contrib/tcsh/ed.refresh.c
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.refresh.c,v 3.39 2005/02/15 21:09:02 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.refresh.c,v 3.46 2006/08/23 15:03:14 christos Exp $ */
/*
* ed.refresh.c: Lower level screen refreshing functions
*/
@@ -32,7 +32,7 @@
*/
#include "sh.h"
-RCSID("$Id: ed.refresh.c,v 3.39 2005/02/15 21:09:02 christos Exp $")
+RCSID("$tcsh: ed.refresh.c,v 3.46 2006/08/23 15:03:14 christos Exp $")
#include "ed.h"
/* #define DEBUG_UPDATE */
@@ -45,37 +45,35 @@ Char *litptr;
static int vcursor_h, vcursor_v;
static int rprompt_h, rprompt_v;
-static int MakeLiteral __P((Char *, int, Char));
-static int Draw __P((Char *, int));
-static void Vdraw __P((Char, int));
-static void RefreshPromptpart __P((Char *));
-static void update_line __P((Char *, Char *, int));
-static void str_insert __P((Char *, int, int, Char *, int));
-static void str_delete __P((Char *, int, int, int));
-static void str_cp __P((Char *, Char *, int));
+static int MakeLiteral (Char *, int, Char);
+static int Draw (Char *, int);
+static void Vdraw (Char, int);
+static void RefreshPromptpart (Char *);
+static void update_line (Char *, Char *, int);
+static void str_insert (Char *, int, int, Char *, int);
+static void str_delete (Char *, int, int, int);
+static void str_cp (Char *, Char *, int);
#ifndef WINNT_NATIVE
static
#else
extern
#endif
- void PutPlusOne __P((Char, int));
-static void cpy_pad_spaces __P((Char *, Char *, int));
+ 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 __P((char *, ...));
+static void dprintf (char *, ...);
#ifdef DEBUG_UPDATE
-static void dprintstr __P((char *, const Char *, const Char *));
+static void dprintstr (char *, const Char *, const Char *);
static void
-dprintstr(str, f, t)
-char *str;
-const Char *f, *t;
+dprintstr(char *str, const Char *f, const Char *t)
{
dprintf("%s:\"", str);
while (f < t) {
- if (*f & ~ASCII)
+ if (ASC(*f) & ~ASCII)
dprintf("[%x]", *f++);
else
- dprintf("%c", *f++ & ASCII);
+ dprintf("%c", CTL_ESC(ASCII & ASC(*f++)));
}
dprintf("\"\r\n");
}
@@ -87,12 +85,7 @@ const Char *f, *t;
* debugging cause you'll mangle up the file descriptors!
*/
static void
-#ifdef PROTOTYPES
dprintf(char *fmt, ...)
-#else
-dprintf(va_list)
- va_dcl
-#endif /* __STDC__ */
{
static int fd = -1;
char *dtty;
@@ -100,16 +93,10 @@ dprintf(va_list)
if ((dtty = getenv("DEBUGTTY"))) {
int o;
va_list va;
-#ifdef PROTOTYPES
va_start(va, fmt);
-#else
- char *fmt;
- va_start(va);
- fmt = va_arg(va, char *);
-#endif /* __STDC__ */
if (fd == -1)
- fd = open(dtty, O_RDWR);
+ fd = xopen(dtty, O_RDWR);
o = SHOUT;
flush();
SHOUT = fd;
@@ -123,10 +110,7 @@ dprintf(va_list)
static int litlen = 0, litalloc = 0;
-static int MakeLiteral(str, len, addlit)
- Char *str;
- int len;
- Char addlit;
+static int MakeLiteral(Char *str, int len, Char addlit)
{
int i, addlitlen = 0;
Char *addlitptr = 0;
@@ -152,10 +136,7 @@ static int MakeLiteral(str, len, addlit)
int add = 256;
while (len + addlitlen + 1 + (LIT_FACTOR - 1) > add)
add *= 2;
- if (litptr)
- newlitptr = (Char *)xrealloc(litptr, (litalloc + add) * sizeof(Char));
- else
- newlitptr = (Char *)xmalloc((litalloc + add) * sizeof(Char));
+ newlitptr = xrealloc(litptr, (litalloc + add) * sizeof(Char));
if (!newlitptr)
return '?';
litptr = newlitptr;
@@ -179,16 +160,13 @@ static int MakeLiteral(str, len, addlit)
}
static int
-Draw(cp, nocomb) /* draw char at cp, expand tabs, ctl chars */
- Char *cp;
- int nocomb;
+Draw(Char *cp, int nocomb) /* draw char at cp, expand tabs, ctl chars */
{
- int l, w, i, lv, lh;
- Char ch, attr;
- NLSChar c;
+ int w, i, lv, lh;
+ Char c, attr;
attr = *cp & ~CHAR;
- l = NLSFrom(cp, NLSZEROT, &c);
+ c = *cp & CHAR;
w = NLSClassify(c, nocomb);
switch (w) {
case NLSCLASS_NL:
@@ -215,11 +193,10 @@ Draw(cp, nocomb) /* draw char at cp, expand tabs, ctl chars */
}
break;
case NLSCLASS_ILLEGAL:
- ch = *cp & CHAR;
Vdraw('\\' | attr, 1);
- Vdraw((((ch >> 6) & 7) + '0') | attr, 1);
- Vdraw((((ch >> 3) & 7) + '0') | attr, 1);
- Vdraw(((ch & 7) + '0') | attr, 1);
+ Vdraw((((c >> 6) & 7) + '0') | attr, 1);
+ Vdraw((((c >> 3) & 7) + '0') | attr, 1);
+ Vdraw(((c & 7) + '0') | attr, 1);
break;
case NLSCLASS_ILLEGAL2:
case NLSCLASS_ILLEGAL3:
@@ -245,32 +222,23 @@ Draw(cp, nocomb) /* draw char at cp, expand tabs, ctl chars */
break;
}
if (lv < 0) {
- int l2 = l;
- for (; l2-- > 0; cp++) {
- ch = *cp & CHAR;
- Vdraw('\\' | attr, 1);
- Vdraw((((ch >> 6) & 7) + '0') | attr, 1);
- Vdraw((((ch >> 3) & 7) + '0') | attr, 1);
- Vdraw(((ch & 7) + '0') | attr, 1);
- }
- return l;
+ Vdraw('\\' | attr, 1);
+ Vdraw((((c >> 6) & 7) + '0') | attr, 1);
+ Vdraw((((c >> 3) & 7) + '0') | attr, 1);
+ Vdraw(((c & 7) + '0') | attr, 1);
+ break;
}
- Vdisplay[lv][lh] = MakeLiteral(cp, l, Vdisplay[lv][lh]);
+ Vdisplay[lv][lh] = MakeLiteral(cp, 1, Vdisplay[lv][lh]);
break;
default:
- if (l > 1)
- Vdraw(MakeLiteral(cp, l, 0), w);
- else
- Vdraw(*cp, w);
+ Vdraw(*cp, w);
break;
}
- return l;
+ return 1;
}
static void
-Vdraw(c, width) /* draw char c onto V lines */
- Char c;
- int width;
+Vdraw(Char c, int width) /* draw char c onto V lines */
{
#ifdef DEBUG_REFRESH
# ifdef SHORT_STRINGS
@@ -284,7 +252,7 @@ Vdraw(c, width) /* draw char c onto V lines */
that "span line breaks". */
while (vcursor_h + width > TermH)
Vdraw(' ', 1);
- Vdisplay[vcursor_v][vcursor_h] = (Char) c;
+ Vdisplay[vcursor_v][vcursor_h] = c;
if (width)
vcursor_h++; /* advance to next place */
while (--width > 0)
@@ -308,23 +276,22 @@ Vdraw(c, width) /* draw char c onto V lines */
* draws a prompt element, expanding literals (we know it's ASCIZ)
*/
static void
-RefreshPromptpart(buf)
- Char *buf;
+RefreshPromptpart(Char *buf)
{
Char *cp;
- NLSChar c;
- int l, w;
+ int w;
+ if (buf == NULL)
+ return;
for (cp = buf; *cp; ) {
if (*cp & LITERAL) {
Char *litstart = cp;
while (*cp & LITERAL)
cp++;
if (*cp) {
- l = NLSFrom(cp, NLSZEROT, &c);
- w = NLSWidth(c);
- Vdraw(MakeLiteral(litstart, cp + l - litstart, 0), w);
- cp += l;
+ w = NLSWidth(*cp & CHAR);
+ Vdraw(MakeLiteral(litstart, cp + 1 - litstart, 0), w);
+ cp++;
}
else {
/*
@@ -352,7 +319,7 @@ static
int OldvcV = 0;
void
-Refresh()
+Refresh(void)
{
int cur_line;
Char *cp;
@@ -361,7 +328,7 @@ Refresh()
Char oldgetting;
#ifdef DEBUG_REFRESH
- dprintf("PromptBuf = :%s:\r\n", short2str(PromptBuf));
+ dprintf("Prompt = :%s:\r\n", short2str(Prompt));
dprintf("InputBuf = :%s:\r\n", short2str(InputBuf));
#endif /* DEBUG_REFRESH */
oldgetting = GettingInput;
@@ -370,14 +337,14 @@ Refresh()
/* reset the Vdraw cursor, temporarily draw rprompt to calculate its size */
vcursor_h = 0;
vcursor_v = 0;
- RefreshPromptpart(RPromptBuf);
+ RefreshPromptpart(RPrompt);
rprompt_h = vcursor_h;
rprompt_v = vcursor_v;
/* reset the Vdraw cursor, draw prompt */
vcursor_h = 0;
vcursor_v = 0;
- RefreshPromptpart(PromptBuf);
+ RefreshPromptpart(Prompt);
cur_h = -1; /* set flag in case I'm not set */
/* draw the current input buffer */
@@ -404,7 +371,7 @@ Refresh()
*/
while (--rhdiff > 0) /* pad out with spaces */
Vdraw(' ', 1);
- RefreshPromptpart(RPromptBuf);
+ RefreshPromptpart(RPrompt);
}
else {
rprompt_h = 0; /* flag "not using rprompt" */
@@ -463,7 +430,7 @@ Refresh()
}
#ifdef notdef
-GotoBottom()
+GotoBottom(void)
{ /* used to go to last used screen line */
MoveToLine(OldvcV);
}
@@ -471,7 +438,7 @@ GotoBottom()
#endif
void
-PastBottom()
+PastBottom(void)
{ /* used to go to last used screen line */
MoveToLine(OldvcV);
(void) putraw('\r');
@@ -484,11 +451,7 @@ PastBottom()
/* insert num characters of s into d (in front of the character) at dat,
maximum length of d is dlen */
static void
-str_insert(d, dat, dlen, s, num)
- Char *d;
- int dat, dlen;
- Char *s;
- int num;
+str_insert(Char *d, int dat, int dlen, Char *s, int num)
{
Char *a, *b;
@@ -530,9 +493,7 @@ str_insert(d, dat, dlen, s, num)
/* delete num characters d at dat, maximum length of d is dlen */
static void
-str_delete(d, dat, dlen, num)
- Char *d;
- int dat, dlen, num;
+str_delete(Char *d, int dat, int dlen, int num)
{
Char *a, *b;
@@ -563,9 +524,7 @@ str_delete(d, dat, dlen, num)
}
static void
-str_cp(a, b, n)
- Char *a, *b;
- int n;
+str_cp(Char *a, Char *b, int n)
{
while (n-- && *b)
*a++ = *b++;
@@ -597,9 +556,7 @@ new: eddie> Oh, my little buggy says to me, as lurgid as
#define MIN_END_KEEP 4
static void /* could be changed to make it smarter */
-update_line(old, new, cur_line)
- Char *old, *new;
- int cur_line;
+update_line(Char *old, Char *new, int cur_line)
{
Char *o, *n, *p, c;
Char *ofd, *ols, *oe, *nfd, *nls, *ne;
@@ -617,29 +574,32 @@ update_line(old, new, cur_line)
/*
* Find the end of both old and new
*/
- while (*o)
- o++;
+ o = Strend(o);
+
/*
* Remove any trailing blanks off of the end, being careful not to
* back up past the beginning.
*/
+ if (!(adrof(STRhighlight) && MarkIsSet)) {
while (ofd < o) {
if (o[-1] != ' ')
break;
o--;
}
+ }
oe = o;
*oe = (Char) 0;
-
- while (*n)
- n++;
+
+ n = Strend(n);
/* remove blanks from end of new */
+ if (!(adrof(STRhighlight) && MarkIsSet)) {
while (nfd < n) {
if (n[-1] != ' ')
break;
n--;
}
+ }
ne = n;
*ne = (Char) 0;
@@ -1133,9 +1093,7 @@ update_line(old, new, cur_line)
static void
-cpy_pad_spaces(dst, src, width)
- Char *dst, *src;
- int width;
+cpy_pad_spaces(Char *dst, Char *src, int width)
{
int i;
@@ -1153,25 +1111,23 @@ cpy_pad_spaces(dst, src, width)
}
void
-RefCursor()
+RefCursor(void)
{ /* only move to new cursor pos */
Char *cp;
- NLSChar c;
- int l, w, h, th, v;
+ int w, h, th, v;
/* first we must find where the cursor is... */
h = 0;
v = 0;
th = TermH; /* optimize for speed */
- for (cp = PromptBuf; *cp; ) { /* do prompt */
+ for (cp = Prompt; cp != NULL && *cp; ) { /* do prompt */
if (*cp & LITERAL) {
cp++;
continue;
}
- l = NLSFrom(cp, NLSZEROT, &c);
- w = NLSClassify(c, cp == PromptBuf);
- cp += l;
+ w = NLSClassify(*cp & CHAR, cp == Prompt);
+ cp++;
switch(w) {
case NLSCLASS_NL:
h = 0;
@@ -1202,9 +1158,8 @@ RefCursor()
}
for (cp = InputBuf; cp < Cursor;) { /* do input buffer to Cursor */
- l = NLSFrom(cp, Cursor - cp, &c);
- w = NLSClassify(c, cp == InputBuf);
- cp += l;
+ w = NLSClassify(*cp & CHAR, cp == InputBuf);
+ cp++;
switch(w) {
case NLSCLASS_NL:
h = 0;
@@ -1237,14 +1192,17 @@ RefCursor()
/* now go there */
MoveToLine(v);
MoveToChar(h);
+ if (adrof(STRhighlight) && MarkIsSet) {
+ ClearLines();
+ ClearDisp();
+ Refresh();
+ }
flush();
}
#ifndef WINTT_NATIVE
static void
-PutPlusOne(c, width)
- Char c;
- int width;
+PutPlusOne(Char c, int width)
{
while (width > 1 && CursorH + width > TermH)
PutPlusOne(' ', 1);
@@ -1280,9 +1238,8 @@ void
RefPlusOne(int l)
{ /* we added just one char, handle it fast.
* assumes that screen cursor == real cursor */
- Char *cp;
+ Char *cp, c;
int w;
- NLSChar c;
if (Cursor != LastChar) {
Refresh(); /* too hard to handle */
@@ -1293,7 +1250,7 @@ RefPlusOne(int l)
return;
}
cp = Cursor - l;
- NLSFrom(cp, (size_t)l, &c);
+ c = *cp & CHAR;
w = NLSClassify(c, cp == InputBuf);
switch(w) {
case NLSCLASS_CTRL:
@@ -1316,10 +1273,14 @@ RefPlusOne(int l)
PutPlusOne((c & 7) + '0', 1);
break;
case 1:
+ if (adrof(STRhighlight) && MarkIsSet)
+ StartHighlight();
if (l > 1)
PutPlusOne(MakeLiteral(cp, l, 0), 1);
else
PutPlusOne(*cp, 1);
+ if (adrof(STRhighlight) && MarkIsSet)
+ StopHighlight();
break;
default:
Refresh(); /* too hard to handle */
@@ -1331,7 +1292,7 @@ RefPlusOne(int l)
/* clear the screen buffers so that new new prompt starts fresh. */
void
-ClearDisp()
+ClearDisp(void)
{
int i;
@@ -1344,7 +1305,7 @@ ClearDisp()
}
void
-ClearLines()
+ClearLines(void)
{ /* Make sure all lines are *really* blank */
int i;
diff --git a/contrib/tcsh/ed.screen.c b/contrib/tcsh/ed.screen.c
index 9dd7e7175470..c0ede7603e4d 100644
--- a/contrib/tcsh/ed.screen.c
+++ b/contrib/tcsh/ed.screen.c
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.screen.c,v 3.63 2005/01/18 20:43:30 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.screen.c,v 3.75 2006/08/24 20:56:31 christos Exp $ */
/*
* ed.screen.c: Editor/termcap-curses interface
*/
@@ -32,7 +32,7 @@
*/
#include "sh.h"
-RCSID("$Id: ed.screen.c,v 3.63 2005/01/18 20:43:30 christos Exp $")
+RCSID("$tcsh: ed.screen.c,v 3.75 2006/08/24 20:56:31 christos Exp $")
#include "ed.h"
#include "tc.h"
@@ -53,7 +53,7 @@ RCSID("$Id: ed.screen.c,v 3.63 2005/01/18 20:43:30 christos Exp $")
#define Str(a) tstr[a].str
#define Val(a) tval[a].val
-static struct {
+static const struct {
const char *b_name;
speed_t b_rate;
} baud_rate[] = {
@@ -124,45 +124,47 @@ static struct {
{ NULL, 0 }
};
-#define T_al 0
-#define T_bl 1
-#define T_cd 2
-#define T_ce 3
-#define T_ch 4
-#define T_cl 5
-#define T_dc 6
-#define T_dl 7
-#define T_dm 8
-#define T_ed 9
-#define T_ei 10
-#define T_fs 11
-#define T_ho 12
-#define T_ic 13
-#define T_im 14
-#define T_ip 15
-#define T_kd 16
-#define T_kl 17
-#define T_kr 18
-#define T_ku 19
-#define T_md 20
-#define T_me 21
-#define T_nd 22
-#define T_se 23
-#define T_so 24
-#define T_ts 25
-#define T_up 26
-#define T_us 27
-#define T_ue 28
-#define T_vb 29
-#define T_DC 30
-#define T_DO 31
-#define T_IC 32
-#define T_LE 33
-#define T_RI 34
-#define T_UP 35
-#define T_kh 36
-#define T_at7 37
-#define T_str 38
+#define T_at7 0
+#define T_al 1
+#define T_bl 2
+#define T_cd 3
+#define T_ce 4
+#define T_ch 5
+#define T_cl 6
+#define T_dc 7
+#define T_dl 8
+#define T_dm 9
+#define T_ed 10
+#define T_ei 11
+#define T_fs 12
+#define T_ho 13
+#define T_ic 14
+#define T_im 15
+#define T_ip 16
+#define T_kd 17
+#define T_kh 18
+#define T_kl 19
+#define T_kr 20
+#define T_ku 21
+#define T_md 22
+#define T_me 23
+#define T_mr 24
+#define T_nd 25
+#define T_se 26
+#define T_so 27
+#define T_ts 28
+#define T_up 29
+#define T_us 30
+#define T_ue 31
+#define T_vb 32
+#define T_DC 33
+#define T_DO 34
+#define T_IC 35
+#define T_LE 36
+#define T_RI 37
+#define T_UP 38
+#define T_str 39
+
static struct termcapstr {
const char *name;
const char *long_name;
@@ -184,16 +186,16 @@ static struct termcapval {
} tval[T_val + 1];
void
-terminit()
+terminit(void)
{
#ifdef NLS_CATALOGS
int i;
for (i = 0; i < T_str + 1; i++)
- xfree((ptr_t) tstr[i].long_name);
+ xfree((ptr_t)(intptr_t)tstr[i].long_name);
for (i = 0; i < T_val + 1; i++)
- xfree((ptr_t) tval[i].long_name);
+ xfree((ptr_t)(intptr_t)tval[i].long_name);
#endif
tstr[T_al].name = "al";
@@ -305,10 +307,13 @@ terminit()
tstr[T_UP].long_name = CSAVS(4, 36, "cursor up multiple");
tstr[T_kh].name = "kh";
- tstr[T_kh].long_name = CSAVS(4, 37, "send cursor home");
+ tstr[T_kh].long_name = CSAVS(4, 43, "send cursor home");
tstr[T_at7].name = "@7";
- tstr[T_at7].long_name = CSAVS(4, 38, "send cursor end");
+ tstr[T_at7].long_name = CSAVS(4, 44, "send cursor end");
+
+ tstr[T_mr].name = "mr";
+ tstr[T_mr].long_name = CSAVS(4, 45, "begin reverse video");
tstr[T_str].name = NULL;
tstr[T_str].long_name = NULL;
@@ -351,149 +356,93 @@ terminit()
static int me_all = 0; /* does two or more of the attributes use me */
-static void ReBufferDisplay __P((void));
-static void TCalloc __P((struct termcapstr *, char *));
+static void ReBufferDisplay (void);
+static void TCset (struct termcapstr *, const char *);
static void
-TCalloc(t, cap)
- struct termcapstr *t;
- char *cap;
+TCset(struct termcapstr *t, const char *cap)
{
- static char termcap_alloc[TC_BUFSIZE];
- char termbuf[TC_BUFSIZE];
- struct termcapstr *ts;
- static int tloc = 0;
- int tlen, clen;
-
if (cap == NULL || *cap == '\0') {
+ xfree(t->str);
t->str = NULL;
- return;
- }
- else
- clen = strlen(cap);
-
- if (t->str == NULL)
- tlen = 0;
- else
- tlen = strlen(t->str);
-
- /*
- * New string is shorter; no need to allocate space
- */
- if (clen <= tlen) {
- (void) strcpy(t->str, cap);
- return;
- }
-
- /*
- * New string is longer; see if we have enough space to append
- */
- if (tloc + 3 < TC_BUFSIZE) {
- (void) strcpy(t->str = &termcap_alloc[tloc], cap);
- tloc += clen + 1; /* one for \0 */
- return;
- }
-
- /*
- * Compact our buffer; no need to check compaction, cause we know it
- * fits...
- */
- tlen = 0;
- for (ts = tstr; ts->name != NULL; ts++)
- if (t != ts && ts->str != NULL && ts->str[0] != '\0') {
- char *ptr;
+ } else {
+ size_t size;
- for (ptr = ts->str; *ptr != '\0'; termbuf[tlen++] = *ptr++)
- continue;
- termbuf[tlen++] = '\0';
- }
- (void) memmove((ptr_t) termcap_alloc, (ptr_t) termbuf, (size_t) TC_BUFSIZE);
- tloc = tlen;
- if (tloc + 3 >= TC_BUFSIZE) {
- stderror(ERR_NAME | ERR_TCNOSTR);
- return;
+ size = strlen(cap) + 1;
+ t->str = xrealloc(t->str, size);
+ memcpy(t->str, cap, size);
}
- (void) strcpy(t->str = &termcap_alloc[tloc], cap);
- tloc += clen + 1; /* one for \0 */
- return;
}
/*ARGSUSED*/
void
-TellTC()
+TellTC(void)
{
struct termcapstr *t;
- char *s;
+ char *first, *s;
xprintf(CGETS(7, 1, "\n\tTcsh thinks your terminal has the\n"));
xprintf(CGETS(7, 2, "\tfollowing characteristics:\n\n"));
xprintf(CGETS(7, 3, "\tIt has %d columns and %d lines\n"),
Val(T_co), Val(T_li));
s = strsave(T_HasMeta ? CGETS(7, 5, "a") : CGETS(7, 6, "no"));
+ cleanup_push(s, xfree);
+ first = s;
xprintf(CGETS(7, 4, "\tIt has %s meta key\n"), s);
- xfree(s);
s = strsave(T_Tabs ? "" : CGETS(7, 8, " not"));
+ cleanup_push(s, xfree);
xprintf(CGETS(7, 7, "\tIt can%s use tabs\n"), s);
- xfree(s);
s = strsave((T_Margin&MARGIN_AUTO) ?
CGETS(7, 10, "has") : CGETS(7, 11, "does not have"));
+ cleanup_push(s, xfree);
xprintf(CGETS(7, 9, "\tIt %s automatic margins\n"), s);
- xfree(s);
if (T_Margin & MARGIN_AUTO) {
s = strsave((T_Margin & MARGIN_MAGIC) ?
CGETS(7, 10, "has") : CGETS(7, 11, "does not have"));
+ cleanup_push(s, xfree);
xprintf(CGETS(7, 12, "\tIt %s magic margins\n"), s);
- xfree(s);
}
for (t = tstr; t->name != NULL; t++) {
s = strsave(t->str && *t->str ? t->str : CGETS(7, 13, "(empty)"));
+ cleanup_push(s, xfree);
xprintf("\t%36s (%s) == %s\n", t->long_name, t->name, s);
- xfree(s);
+ cleanup_until(s);
}
xputchar('\n');
+ cleanup_until(first);
}
static void
-ReBufferDisplay()
+ReBufferDisplay(void)
{
int i;
Char **b;
- Char **bufp;
b = Display;
Display = NULL;
- if (b != NULL) {
- for (bufp = b; *bufp != NULL; bufp++)
- xfree((ptr_t) * bufp);
- xfree((ptr_t) b);
- }
+ blkfree(b);
b = Vdisplay;
Vdisplay = NULL;
- if (b != NULL) {
- for (bufp = b; *bufp != NULL; bufp++)
- xfree((ptr_t) * bufp);
- xfree((ptr_t) b);
- }
+ blkfree(b);
TermH = Val(T_co);
- TermV = (INBUFSIZE * 4) / TermH + 1;
- b = (Char **) xmalloc((size_t) (sizeof(*b) * (TermV + 1)));
+ TermV = (INBUFSIZE * 4) / TermH + 1;/*FIXBUF*/
+ b = xmalloc(sizeof(*b) * (TermV + 1));
for (i = 0; i < TermV; i++)
- b[i] = (Char *) xmalloc((size_t) (sizeof(*b[i]) * (TermH + 1)));
+ b[i] = xmalloc(sizeof(*b[i]) * (TermH + 1));
b[TermV] = NULL;
Display = b;
- b = (Char **) xmalloc((size_t) (sizeof(*b) * (TermV + 1)));
+ b = xmalloc(sizeof(*b) * (TermV + 1));
for (i = 0; i < TermV; i++)
- b[i] = (Char *) xmalloc((size_t) (sizeof(*b[i]) * (TermH + 1)));
+ b[i] = xmalloc(sizeof(*b[i]) * (TermH + 1));
b[TermV] = NULL;
Vdisplay = b;
}
void
-SetTC(what, how)
- char *what, *how;
+SetTC(char *what, char *how)
{
struct termcapstr *ts;
struct termcapval *tv;
@@ -506,7 +455,7 @@ SetTC(what, how)
if (strcmp(ts->name, what) == 0)
break;
if (ts->name != NULL) {
- TCalloc(ts, how);
+ TCset(ts, how);
/*
* Reset variables
*/
@@ -542,10 +491,10 @@ SetTC(what, how)
stderror(ERR_SETTCUS, tv->name);
return;
}
- T_Tabs = (Char) Val(T_pt);
- T_HasMeta = (Char) Val(T_km);
- T_Margin = (Char) Val(T_am) ? MARGIN_AUTO : 0;
- T_Margin |= (Char) Val(T_xn) ? MARGIN_MAGIC : 0;
+ T_Tabs = Val(T_pt);
+ T_HasMeta = Val(T_km);
+ T_Margin = Val(T_am) ? MARGIN_AUTO : 0;
+ T_Margin |= Val(T_xn) ? MARGIN_MAGIC : 0;
if (tv == &tval[T_am] || tv == &tval[T_xn])
ChangeSize(Val(T_li), Val(T_co));
return;
@@ -568,33 +517,27 @@ SetTC(what, how)
* Print the termcap string out with variable substitution
*/
void
-EchoTC(v)
- Char **v;
+EchoTC(Char **v)
{
- char *cap, *scap, cv[BUFSIZE];
+ char *cap, *scap, *cv;
int arg_need, arg_cols, arg_rows;
int verbose = 0, silent = 0;
char *area;
- static const char *fmts = "%s\n", *fmtd = "%d\n";
+ static const char fmts[] = "%s\n", fmtd[] = "%d\n";
struct termcapstr *t;
char buf[TC_BUFSIZE];
+ Char **globbed;
area = buf;
setname("echotc");
- tglob(v);
- if (gflag) {
- v = globall(v);
- if (v == 0)
- stderror(ERR_NAME | ERR_NOMATCH);
- }
- else
- v = gargv = saveblk(v);
- trim(v);
+ v = glob_all_or_error(v);
+ globbed = v;
+ cleanup_push(globbed, blk_cleanup);
if (!*v || *v[0] == '\0')
- return;
+ goto end;
if (v[0][0] == '-') {
switch (v[0][1]) {
case 'v':
@@ -610,31 +553,28 @@ EchoTC(v)
v++;
}
if (!*v || *v[0] == '\0')
- return;
- (void) strcpy(cv, short2str(*v));
+ goto end;
+ cv = strsave(short2str(*v));
+ cleanup_push(cv, xfree);
if (strcmp(cv, "tabs") == 0) {
xprintf(fmts, T_Tabs ? CGETS(7, 14, "yes") :
CGETS(7, 15, "no"));
- flush();
- return;
+ goto end_flush;
}
else if (strcmp(cv, "meta") == 0) {
xprintf(fmts, Val(T_km) ? CGETS(7, 14, "yes") :
CGETS(7, 15, "no"));
- flush();
- return;
+ goto end_flush;
}
else if (strcmp(cv, "xn") == 0) {
xprintf(fmts, T_Margin & MARGIN_MAGIC ? CGETS(7, 14, "yes") :
CGETS(7, 15, "no"));
- flush();
- return;
+ goto end_flush;
}
else if (strcmp(cv, "am") == 0) {
xprintf(fmts, T_Margin & MARGIN_AUTO ? CGETS(7, 14, "yes") :
CGETS(7, 15, "no"));
- flush();
- return;
+ goto end_flush;
}
else if (strcmp(cv, "baud") == 0) {
int i;
@@ -642,22 +582,19 @@ EchoTC(v)
for (i = 0; baud_rate[i].b_name != NULL; i++)
if (T_Speed == baud_rate[i].b_rate) {
xprintf(fmts, baud_rate[i].b_name);
- flush();
- return;
+ goto end_flush;
}
xprintf(fmtd, 0);
- flush();
- return;
+ goto end_flush;
}
- else if (strcmp(cv, "rows") == 0 || strcmp(cv, "lines") == 0) {
+ else if (strcmp(cv, "rows") == 0 || strcmp(cv, "lines") == 0 ||
+ strcmp(cv, "li") == 0) {
xprintf(fmtd, Val(T_li));
- flush();
- return;
+ goto end_flush;
}
- else if (strcmp(cv, "cols") == 0) {
+ else if (strcmp(cv, "cols") == 0 || strcmp(cv, "co") == 0) {
xprintf(fmtd, Val(T_co));
- flush();
- return;
+ goto end_flush;
}
/*
@@ -674,10 +611,10 @@ EchoTC(v)
if (!scap || scap[0] == '\0') {
if (tgetflag(cv)) {
xprintf(CGETS(7, 14, "yes\n"));
- return;
+ goto end;
}
if (silent)
- return;
+ goto end;
else
stderror(ERR_NAME | ERR_TCCAP, cv);
}
@@ -718,7 +655,7 @@ EchoTC(v)
v++;
if (*v && *v[0]) {
if (silent)
- return;
+ goto end;
else
stderror(ERR_NAME | ERR_TCARGS, cv, arg_need);
}
@@ -733,7 +670,7 @@ EchoTC(v)
v++;
if (*v && *v[0]) {
if (silent)
- return;
+ goto end;
else
stderror(ERR_NAME | ERR_TCARGS, cv, arg_need);
}
@@ -748,7 +685,7 @@ EchoTC(v)
v++;
if (!*v || *v[0] == '\0') {
if (silent)
- return;
+ goto end;
else
stderror(ERR_NAME | ERR_TCNARGS, cv, 2);
}
@@ -756,7 +693,7 @@ EchoTC(v)
v++;
if (!*v || *v[0] == '\0') {
if (silent)
- return;
+ goto end;
else
stderror(ERR_NAME | ERR_TCNARGS, cv, 2);
}
@@ -764,18 +701,17 @@ EchoTC(v)
v++;
if (*v && *v[0]) {
if (silent)
- return;
+ goto end;
else
stderror(ERR_NAME | ERR_TCARGS, cv, arg_need);
}
(void) tputs(tgoto(scap, arg_cols, arg_rows), arg_rows, PUTRAW);
break;
}
+ end_flush:
flush();
- if (gargv) {
- blkfree(gargv);
- gargv = 0;
- }
+ end:
+ cleanup_until(globbed);
}
int GotTermCaps = 0;
@@ -802,7 +738,7 @@ static struct {
#define A_K_NKEYS 6
void
-ResetArrowKeys()
+ResetArrowKeys(void)
{
arrow[A_K_DN].fun.cmd = F_DOWN_HIST;
arrow[A_K_DN].type = XK_CMD;
@@ -824,7 +760,7 @@ ResetArrowKeys()
}
void
-DefaultArrowKeys()
+DefaultArrowKeys(void)
{
static Char strA[] = {033, '[', 'A', '\0'};
static Char strB[] = {033, '[', 'B', '\0'};
@@ -892,10 +828,7 @@ DefaultArrowKeys()
int
-SetArrowKeys(name, fun, type)
- CStr *name;
- XmapVal *fun;
- int type;
+SetArrowKeys(const CStr *name, XmapVal *fun, int type)
{
int i;
for (i = 0; i < A_K_NKEYS; i++)
@@ -908,8 +841,7 @@ SetArrowKeys(name, fun, type)
}
int
-IsArrowKey(name)
- Char *name;
+IsArrowKey(Char *name)
{
int i;
for (i = 0; i < A_K_NKEYS; i++)
@@ -919,8 +851,7 @@ IsArrowKey(name)
}
int
-ClearArrowKeys(name)
- CStr *name;
+ClearArrowKeys(const CStr *name)
{
int i;
for (i = 0; i < A_K_NKEYS; i++)
@@ -932,24 +863,19 @@ ClearArrowKeys(name)
}
void
-PrintArrowKeys(name)
- CStr *name;
+PrintArrowKeys(const CStr *name)
{
int i;
for (i = 0; i < A_K_NKEYS; i++)
if (name->len == 0 || Strcmp(name->buf, arrow[i].name) == 0)
- if (arrow[i].type != XK_NOD) {
- CStr cs;
- cs.buf = arrow[i].name;
- cs.len = Strlen(cs.buf);
- (void) printOne(&cs, &arrow[i].fun, arrow[i].type);
- }
+ if (arrow[i].type != XK_NOD)
+ printOne(arrow[i].name, &arrow[i].fun, arrow[i].type);
}
void
-BindArrowKeys()
+BindArrowKeys(void)
{
KEYCMD *map, *dmap;
int i, j;
@@ -1000,8 +926,7 @@ BindArrowKeys()
static Char cur_atr = 0; /* current attributes */
void
-SetAttributes(atr)
- Char atr;
+SetAttributes(Char atr)
{
atr &= ATTRIBUTES;
if (atr != cur_atr) {
@@ -1066,16 +991,32 @@ SetAttributes(atr)
}
}
+int highlighting = 0;
+
+void
+StartHighlight()
+{
+ (void) tputs(Str(T_mr), 1, PUTPURE);
+ highlighting = 1;
+}
+
+void
+StopHighlight()
+{
+ (void) tputs(Str(T_me), 1, PUTPURE);
+ highlighting = 0;
+}
+
/* PWP 6-27-88 -- if the tty driver thinks that we can tab, we ask termcap */
int
-CanWeTab()
+CanWeTab(void)
{
return (Val(T_pt));
}
+/* move to line <where> (first line == 0) as efficiently as possible; */
void
-MoveToLine(where) /* move to line <where> (first line == 0) */
- int where; /* as efficiently as possible; */
+MoveToLine(int where)
{
int del;
@@ -1132,8 +1073,7 @@ MoveToLine(where) /* move to line <where> (first line == 0) */
}
void
-MoveToChar(where) /* move to character position (where) */
- int where;
+MoveToChar(int where) /* move to character position (where) */
{ /* as efficiently as possible */
int del;
@@ -1207,10 +1147,10 @@ mc_again:
}
void
-so_write(cp, n)
- Char *cp;
- int n;
+so_write(Char *cp, int n)
{
+ int cur_pos, prompt_len = 0, region_start = 0, region_end = 0;
+
if (n <= 0)
return; /* catch bugs */
@@ -1222,7 +1162,37 @@ so_write(cp, n)
return;
}
+ if (adrof(STRhighlight)) {
+ /* find length of prompt */
+ Char *promptc;
+ for (promptc = Prompt; *promptc; promptc++);
+ prompt_len = promptc - Prompt;
+
+ /* find region start and end points */
+ if (IncMatchLen) {
+ region_start = (Cursor - InputBuf) + prompt_len;
+ region_end = region_start + IncMatchLen;
+ } else if (MarkIsSet) {
+ region_start = (min(Cursor, Mark) - InputBuf) + prompt_len;
+ region_end = (max(Cursor, Mark) - InputBuf) + prompt_len;
+ }
+ }
+
do {
+ if (adrof(STRhighlight)) {
+ cur_pos = CursorV * TermH + CursorH;
+ if (!highlighting &&
+ cur_pos >= region_start && cur_pos < region_end)
+ StartHighlight();
+ else if (highlighting && cur_pos >= region_end)
+ StopHighlight();
+
+ /* don't highlight over the cursor. the highlighting's reverse
+ * video would cancel it out. :P */
+ if (highlighting && cur_pos == (Cursor - InputBuf) + prompt_len)
+ StopHighlight();
+ }
+
if (*cp != CHAR_DBWIDTH) {
if (*cp & LITERAL) {
Char *d;
@@ -1239,15 +1209,18 @@ so_write(cp, n)
CursorH++;
} while (--n);
+ if (adrof(STRhighlight) && highlighting)
+ StopHighlight();
+
if (CursorH >= TermH) { /* wrap? */
if (T_Margin & MARGIN_AUTO) { /* yes */
CursorH = 0;
CursorV++;
if (T_Margin & MARGIN_MAGIC) {
/* force the wrap to avoid the "magic" situation */
- Char c;
- if ((c = Display[CursorV][CursorH]) != '\0') {
- so_write(&c, 1);
+ Char xc;
+ if ((xc = Display[CursorV][CursorH]) != '\0') {
+ so_write(&xc, 1);
while(Display[CursorV][CursorH] == CHAR_DBWIDTH)
CursorH++;
}
@@ -1264,8 +1237,7 @@ so_write(cp, n)
void
-DeleteChars(num) /* deletes <num> characters */
- int num;
+DeleteChars(int num) /* deletes <num> characters */
{
if (num <= 0)
return;
@@ -1303,10 +1275,10 @@ DeleteChars(num) /* deletes <num> characters */
(void) tputs(Str(T_ed), 1, PUTPURE);
}
+/* Puts terminal in insert character mode, or inserts num characters in the
+ line */
void
-Insert_write(cp, num) /* Puts terminal in insert character mode, */
- Char *cp;
- int num; /* or inserts num characters in the line */
+Insert_write(Char *cp, int num)
{
if (num <= 0)
return;
@@ -1358,9 +1330,9 @@ Insert_write(cp, num) /* Puts terminal in insert character mode, */
}
+/* clear to end of line. There are num characters to clear */
void
-ClearEOL(num) /* clear to end of line. There are num */
- int num; /* characters to clear */
+ClearEOL(int num)
{
int i;
@@ -1377,7 +1349,7 @@ ClearEOL(num) /* clear to end of line. There are num */
}
void
-ClearScreen()
+ClearScreen(void)
{ /* clear the whole screen and home */
if (GoodStr(T_cl))
/* send the clear screen code */
@@ -1394,7 +1366,7 @@ ClearScreen()
}
void
-SoundBeep()
+SoundBeep(void)
{ /* produce a sound */
beep_cmd ();
if (adrof(STRnobeep))
@@ -1410,7 +1382,7 @@ SoundBeep()
}
void
-ClearToBottom()
+ClearToBottom(void)
{ /* clear to the bottom of the screen */
if (GoodStr(T_cd))
(void) tputs(Str(T_cd), Val(T_li), PUTPURE);
@@ -1419,7 +1391,7 @@ ClearToBottom()
}
void
-GetTermCaps()
+GetTermCaps(void)
{ /* read in the needed terminal capabilites */
int i;
const char *ptr;
@@ -1430,17 +1402,14 @@ GetTermCaps()
#ifdef SIG_WINDOW
-# ifdef BSDSIGS
- sigmask_t omask;
-# endif /* BSDSIGS */
+ sigset_t oset, set;
int lins, cols;
/* don't want to confuse things here */
-# ifdef BSDSIGS
- omask = sigblock(sigmask(SIG_WINDOW)) & ~sigmask(SIG_WINDOW);
-# else /* BSDSIGS */
- (void) sighold(SIG_WINDOW);
-# endif /* BSDSIGS */
+ sigemptyset(&set);
+ sigaddset(&set, SIG_WINDOW);
+ (void)sigprocmask(SIG_BLOCK, &set, &oset);
+ cleanup_push(&oset, sigprocmask_cleanup);
#endif /* SIG_WINDOW */
area = buf;
@@ -1480,7 +1449,7 @@ GetTermCaps()
Val(T_co) = 80; /* do a dumb terminal */
Val(T_pt) = Val(T_km) = Val(T_li) = 0;
for (t = tstr; t->name != NULL; t++)
- TCalloc(t, NULL);
+ TCset(t, NULL);
}
else {
/* Can we tab */
@@ -1492,7 +1461,7 @@ GetTermCaps()
Val(T_co) = tgetnum("co");
Val(T_li) = tgetnum("li");
for (t = tstr; t->name != NULL; t++)
- TCalloc(t, tgetstr(t->name, &area));
+ TCset(t, tgetstr(t->name, &area));
}
if (Val(T_co) < 2)
Val(T_co) = 80; /* just in case */
@@ -1502,10 +1471,10 @@ GetTermCaps()
T_Cols = (Char) Val(T_co);
T_Lines = (Char) Val(T_li);
if (T_Tabs)
- T_Tabs = (Char) Val(T_pt);
- T_HasMeta = (Char) Val(T_km);
- T_Margin = (Char) Val(T_am) ? MARGIN_AUTO : 0;
- T_Margin |= (Char) Val(T_xn) ? MARGIN_MAGIC : 0;
+ T_Tabs = Val(T_pt);
+ T_HasMeta = Val(T_km);
+ T_Margin = Val(T_am) ? MARGIN_AUTO : 0;
+ T_Margin |= Val(T_xn) ? MARGIN_MAGIC : 0;
T_CanCEOL = GoodStr(T_ce);
T_CanDel = GoodStr(T_dc) || GoodStr(T_DC);
T_CanIns = GoodStr(T_im) || GoodStr(T_ic) || GoodStr(T_IC);
@@ -1538,11 +1507,7 @@ GetTermCaps()
(void) GetSize(&lins, &cols); /* get the correct window size */
ChangeSize(lins, cols);
-# ifdef BSDSIGS
- (void) sigsetmask(omask); /* can change it again */
-# else /* BSDSIGS */
- (void) sigrelse(SIG_WINDOW);
-# endif /* BSDSIGS */
+ cleanup_until(&oset); /* can change it again */
#else /* SIG_WINDOW */
ChangeSize(Val(T_li), Val(T_co));
#endif /* SIG_WINDOW */
@@ -1557,8 +1522,7 @@ GetTermCaps()
* is not a tty, but it will work in most cases.
*/
int
-GetSize(lins, cols)
- int *lins, *cols;
+GetSize(int *lins, int *cols)
{
*cols = Val(T_co);
*lins = Val(T_li);
@@ -1596,11 +1560,10 @@ GetSize(lins, cols)
return (Val(T_co) != *cols || Val(T_li) != *lins);
}
-#endif /* SIGWINDOW */
+#endif /* SIG_WINDOW */
void
-ChangeSize(lins, cols)
- int lins, cols;
+ChangeSize(int lins, int cols)
{
/*
* Just in case
@@ -1620,26 +1583,31 @@ ChangeSize(lins, cols)
* our only chance to get the window size right.
*/
if (Val(T_co) == cols && Val(T_li) == lins) {
- Char buf[10];
+ Char *p;
char *tptr;
if (getenv("COLUMNS")) {
- (void) Itoa(Val(T_co), buf, 0, 0);
- tsetenv(STRCOLUMNS, buf);
+ p = Itoa(Val(T_co), 0, 0);
+ cleanup_push(p, xfree);
+ tsetenv(STRCOLUMNS, p);
+ cleanup_until(p);
}
if (getenv("LINES")) {
- (void) Itoa(Val(T_li), buf, 0, 0);
- tsetenv(STRLINES, buf);
+ p = Itoa(Val(T_li), 0, 0);
+ cleanup_push(p, xfree);
+ tsetenv(STRLINES, p);
+ cleanup_until(p);
}
if ((tptr = getenv("TERMCAP")) != NULL) {
/* Leave 64 characters slop in case we enlarge the termcap string */
- Char termcap[1024+64], backup[1024+64], *ptr;
+ Char termcap[TC_BUFSIZE+64], backup[TC_BUFSIZE+64], *ptr;
+ Char buf[4];
ptr = str2short(tptr);
- (void) Strncpy(termcap, ptr, 1024);
- termcap[1023] = '\0';
+ (void) Strncpy(termcap, ptr, TC_BUFSIZE);
+ termcap[TC_BUFSIZE-1] = '\0';
/* update termcap string; first do columns */
buf[0] = 'c';
@@ -1653,8 +1621,9 @@ ChangeSize(lins, cols)
size_t len = (ptr - termcap) + Strlen(buf);
(void) Strncpy(backup, termcap, len);
backup[len] = '\0';
- (void) Itoa(Val(T_co), buf, 0, 0);
- (void) Strcat(backup + len, buf);
+ p = Itoa(Val(T_co), 0, 0);
+ (void) Strcat(backup + len, p);
+ xfree(p);
ptr = Strchr(ptr, ':');
(void) Strcat(backup, ptr);
}
@@ -1671,16 +1640,17 @@ ChangeSize(lins, cols)
size_t len = (ptr - backup) + Strlen(buf);
(void) Strncpy(termcap, backup, len);
termcap[len] = '\0';
- (void) Itoa(Val(T_li), buf, 0, 0);
- (void) Strcat(termcap, buf);
+ 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 1024 characters to avoid core-dumps
- * in the termcap routines
+ * Chop the termcap string at TC_BUFSIZE-1 characters to avoid
+ * core-dumps in the termcap routines
*/
- termcap[1023] = '\0';
+ termcap[TC_BUFSIZE - 1] = '\0';
tsetenv(STRTERMCAP, termcap);
}
}
diff --git a/contrib/tcsh/ed.term.c b/contrib/tcsh/ed.term.c
index ae1169b284fd..a235e11c96dc 100644
--- a/contrib/tcsh/ed.term.c
+++ b/contrib/tcsh/ed.term.c
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.term.c,v 1.31 2004/11/23 02:10:48 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.term.c,v 1.36 2006/03/02 18:46:44 christos Exp $ */
/*
* ed.term.c: Low level terminal interface
*/
@@ -33,7 +33,7 @@
#include "sh.h"
#ifndef WINNT_NATIVE
-RCSID("$Id: ed.term.c,v 1.31 2004/11/23 02:10:48 christos Exp $")
+RCSID("$tcsh: ed.term.c,v 1.36 2006/03/02 18:46:44 christos Exp $")
#include "ed.h"
@@ -84,7 +84,7 @@ ttyperm_t ttylist = {
}
};
-static struct tcshmodes {
+static const struct tcshmodes {
const char *m_name;
#ifdef SOLARIS2
unsigned long m_value;
@@ -568,33 +568,35 @@ static struct tcshmodes {
#endif
/* Retry a system call */
-static int count;
-#define RETRY(x) \
- for (count = 0;; count++) \
- if ((x) == -1) { \
- if (OKERROR(errno) || KLUDGE) \
- continue; \
- else \
- return -1; \
- } \
- else \
- break \
+#define RETRY(x) \
+do { \
+ int count; \
+ \
+ for (count = 0;; count++) \
+ if ((x) == -1) { \
+ if (OKERROR(errno) || KLUDGE) \
+ continue; \
+ else \
+ return -1; \
+ } \
+ else \
+ break; \
+} while (0)
/*ARGSUSED*/
void
-dosetty(v, t)
- Char **v;
- struct command *t;
+dosetty(Char **v, struct command *t)
{
- struct tcshmodes *m;
- char x, *d;
+ const struct tcshmodes *m;
+ char x, *d, *cmdname;
int aflag = 0;
Char *s;
int z = EX_IO;
- char cmdname[BUFSIZE];
USE(t);
- setname(strcpy(cmdname, short2str(*v++)));
+ cmdname = strsave(short2str(*v++));
+ cleanup_push(cmdname, xfree);
+ setname(cmdname);
while (v && *v && v[0][0] == '-' && v[0][2] == '\0')
switch (v[0][1]) {
@@ -615,7 +617,7 @@ dosetty(v, t)
z = QU_IO;
break;
default:
- stderror(ERR_NAME | ERR_SYSTEM, short2str(v[0]),
+ stderror(ERR_NAME | ERR_SYSTEM, short2str(v[0]),
CGETS(8, 1, "Unknown switch"));
break;
}
@@ -626,7 +628,7 @@ dosetty(v, t)
int len = 0, st = 0, cu;
for (m = modelist; m->m_name; m++) {
if (m->m_type != i) {
- xprintf("%s%s", i != -1 ? "\n" : "",
+ xprintf("%s%s", i != -1 ? "\n" : "",
ttylist[z][m->m_type].t_name);
i = m->m_type;
st = len = strlen(ttylist[z][m->m_type].t_name);
@@ -637,7 +639,7 @@ dosetty(v, t)
if (x != '\0' || aflag) {
cu = strlen(m->m_name) + (x != '\0') + 1;
- if (len + cu >= T_Cols) {
+ if (len + cu >= TermH) {
xprintf("\n%*s", st, "");
len = st + cu;
}
@@ -650,6 +652,7 @@ dosetty(v, t)
}
}
xputchar('\n');
+ cleanup_until(cmdname);
return;
}
while (v && (s = *v++)) {
@@ -684,12 +687,11 @@ dosetty(v, t)
break;
}
}
+ cleanup_until(cmdname);
} /* end dosetty */
int
-tty_getty(fd, td)
- int fd;
- ttydata_t *td;
+tty_getty(int fd, ttydata_t *td)
{
#ifdef POSIX
RETRY(tcgetattr(fd, &td->d_t));
@@ -720,12 +722,10 @@ tty_getty(fd, td)
}
int
-tty_setty(fd, td)
- int fd;
- ttydata_t *td;
+tty_setty(int fd, ttydata_t *td)
{
#ifdef POSIX
- RETRY(tcsetattr(fd, TCSADRAIN, &td->d_t));
+ RETRY(xtcsetattr(fd, TCSADRAIN, &td->d_t));
#else
# ifdef TERMIO
RETRY(ioctl(fd, TCSETAW, (ioctl_t) &td->d_t));
@@ -753,9 +753,7 @@ tty_setty(fd, td)
}
void
-tty_getchar(td, s)
- ttydata_t *td;
- unsigned char *s;
+tty_getchar(ttydata_t *td, unsigned char *s)
{
#ifdef TIOCGLTC
{
@@ -891,9 +889,7 @@ tty_getchar(td, s)
void
-tty_setchar(td, s)
- ttydata_t *td;
- unsigned char *s;
+tty_setchar(ttydata_t *td, unsigned char *s)
{
#ifdef TIOCGLTC
{
@@ -1030,8 +1026,7 @@ tty_setchar(td, s)
} /* tty_setchar */
speed_t
-tty_getspeed(td)
- ttydata_t *td;
+tty_getspeed(ttydata_t *td)
{
speed_t spd;
@@ -1054,8 +1049,7 @@ tty_getspeed(td)
} /* end tty_getspeed */
int
-tty_gettabs(td)
- ttydata_t *td;
+tty_gettabs(ttydata_t *td)
{
#if defined(POSIX) || defined(TERMIO)
return ((td->d_t.c_oflag & TAB3) == TAB3) ? 0 : 1;
@@ -1065,8 +1059,7 @@ tty_gettabs(td)
} /* end tty_gettabs */
int
-tty_geteightbit(td)
- ttydata_t *td;
+tty_geteightbit(ttydata_t *td)
{
#if defined(POSIX) || defined(TERMIO)
return (td->d_t.c_cflag & CSIZE) == CS8;
@@ -1076,8 +1069,7 @@ tty_geteightbit(td)
} /* end tty_geteightbit */
int
-tty_cooked_mode(td)
- ttydata_t *td;
+tty_cooked_mode(ttydata_t *td)
{
#if defined(POSIX) || defined(TERMIO)
return (td->d_t.c_lflag & ICANON);
@@ -1088,9 +1080,7 @@ tty_cooked_mode(td)
#ifdef _IBMR2
void
-tty_setdisc(fd, dis)
- int fd;
- int dis;
+tty_setdisc(int fd, int dis)
{
static int edit_discipline = 0;
static union txname tx_disc;
@@ -1124,8 +1114,7 @@ tty_setdisc(fd, dis)
#ifdef DEBUG_TTY
static void
-tty_printchar(s)
- unsigned char *s;
+tty_printchar(unsigned char *s)
{
struct tcshmodes *m;
int i;
@@ -1144,8 +1133,7 @@ tty_printchar(s)
#endif /* DEBUG_TTY */
#else /* WINNT_NATIVE */
int
-tty_cooked_mode(td)
- void *td;
+tty_cooked_mode(void *td)
{
return do_nt_check_cooked_mode();
}
diff --git a/contrib/tcsh/ed.term.h b/contrib/tcsh/ed.term.h
index 564b10b36d9a..c61013097013 100644
--- a/contrib/tcsh/ed.term.h
+++ b/contrib/tcsh/ed.term.h
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.term.h,v 1.17 2004/12/25 21:15:06 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.term.h,v 1.17 2004/12/25 21:15:06 christos Exp $ */
/*
* ed.term.h: Local terminal header
*/
diff --git a/contrib/tcsh/ed.xmap.c b/contrib/tcsh/ed.xmap.c
index 5d01ed6e818f..866bc83233a0 100644
--- a/contrib/tcsh/ed.xmap.c
+++ b/contrib/tcsh/ed.xmap.c
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.xmap.c,v 3.28 2005/01/05 18:06:43 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/ed.xmap.c,v 3.36 2006/11/29 22:30:09 christos Exp $ */
/*
* ed.xmap.c: This module contains the procedures for maintaining
* the extended-key map.
@@ -88,7 +88,7 @@
*/
#include "sh.h"
-RCSID("$Id: ed.xmap.c,v 3.28 2005/01/05 18:06:43 christos Exp $")
+RCSID("$tcsh: ed.xmap.c,v 3.36 2006/11/29 22:30:09 christos Exp $")
#include "ed.h"
#include "ed.defns.h"
@@ -112,24 +112,22 @@ typedef struct Xmapnode {
} XmapNode;
static XmapNode *Xmap = NULL; /* the current Xmap */
-#define MAXXKEY 100 /* max length of a Xkey for print putposes */
-static Char printbuf[MAXXKEY]; /* buffer for printing */
/* Some declarations of procedures */
-static int TraverseMap __P((XmapNode *, CStr *, XmapVal *));
-static int TryNode __P((XmapNode *, CStr *, XmapVal *, int));
-static XmapNode *GetFreeNode __P((CStr *));
-static void PutFreeNode __P((XmapNode *));
-static int TryDeleteNode __P((XmapNode **, CStr *));
-static int Lookup __P((CStr *, XmapNode *, int));
-static int Enumerate __P((XmapNode *, int));
-static int unparsech __P((int, Char *));
+static int TraverseMap (XmapNode *, CStr *, XmapVal *);
+static int TryNode (XmapNode *, CStr *, XmapVal *, int);
+static XmapNode *GetFreeNode (CStr *);
+static void PutFreeNode (XmapNode *);
+static int TryDeleteNode (XmapNode **, CStr *);
+static int Lookup (struct Strbuf *, const CStr *,
+ const XmapNode *);
+static void Enumerate (struct Strbuf *, const XmapNode *);
+static void unparsech (struct Strbuf *, Char);
XmapVal *
-XmapCmd(cmd)
- int cmd;
+XmapCmd(int cmd)
{
static XmapVal xm;
xm.cmd = (KEYCMD) cmd;
@@ -137,8 +135,7 @@ XmapCmd(cmd)
}
XmapVal *
-XmapStr(str)
- CStr *str;
+XmapStr(CStr *str)
{
static XmapVal xm;
xm.str.len = str->len;
@@ -151,7 +148,7 @@ XmapStr(str)
* initializes Xmap with arrow keys
*/
void
-ResetXmap()
+ResetXmap(void)
{
PutFreeNode(Xmap);
Xmap = NULL;
@@ -165,9 +162,7 @@ ResetXmap()
* Calls the recursive function with entry point Xmap
*/
int
-GetXkey(ch, val)
- CStr *ch;
- XmapVal *val;
+GetXkey(CStr *ch, XmapVal *val)
{
return (TraverseMap(Xmap, ch, val));
}
@@ -177,10 +172,7 @@ GetXkey(ch, val)
* found. May read in more characters.
*/
static int
-TraverseMap(ptr, ch, val)
- XmapNode *ptr;
- CStr *ch;
- XmapVal *val;
+TraverseMap(XmapNode *ptr, CStr *ch, XmapVal *val)
{
Char tch;
@@ -218,10 +210,7 @@ TraverseMap(ptr, ch, val)
}
void
-AddXkey(Xkey, val, ntype)
- CStr *Xkey;
- XmapVal *val;
- int ntype;
+AddXkey(const CStr *Xkey, XmapVal *val, int ntype)
{
CStr cs;
cs.buf = Xkey->buf;
@@ -246,11 +235,7 @@ AddXkey(Xkey, val, ntype)
}
static int
-TryNode(ptr, str, val, ntype)
- XmapNode *ptr;
- CStr *str;
- XmapVal *val;
- int ntype;
+TryNode(XmapNode *ptr, CStr *str, XmapVal *val, int ntype)
{
/*
* Find a node that matches *string or allocate a new one
@@ -269,6 +254,8 @@ TryNode(ptr, str, val, ntype)
str->buf++;
str->len--;
if (str->len == 0) {
+ size_t len;
+
/* we're there */
if (ptr->next != NULL) {
PutFreeNode(ptr->next); /* lose longer Xkeys with this prefix */
@@ -278,8 +265,7 @@ TryNode(ptr, str, val, ntype)
switch (ptr->type) {
case XK_STR:
case XK_EXE:
- if (ptr->val.str.buf != NULL)
- xfree((ptr_t) ptr->val.str.buf);
+ xfree(ptr->val.str.buf);
ptr->val.str.len = 0;
break;
case XK_NOD:
@@ -296,11 +282,10 @@ TryNode(ptr, str, val, ntype)
break;
case XK_STR:
case XK_EXE:
- ptr->val.str.len = (val->str.len + 1) * sizeof(Char);
- ptr->val.str.buf = (Char *) xmalloc((size_t) ptr->val.str.len);
- (void) memmove((ptr_t) ptr->val.str.buf, (ptr_t) val->str.buf,
- (size_t) ptr->val.str.len);
ptr->val.str.len = val->str.len;
+ len = (val->str.len + 1) * sizeof(*ptr->val.str.buf);
+ ptr->val.str.buf = xmalloc(len);
+ (void) memcpy(ptr->val.str.buf, val->str.buf, len);
break;
default:
abort();
@@ -317,9 +302,7 @@ TryNode(ptr, str, val, ntype)
}
void
-ClearXkey(map, in)
- KEYCMD *map;
- CStr *in;
+ClearXkey(KEYCMD *map, const CStr *in)
{
unsigned char c = (unsigned char) *(in->buf);
if ((map[c] == F_XKEY) &&
@@ -329,10 +312,12 @@ ClearXkey(map, in)
}
int
-DeleteXkey(Xkey)
- CStr *Xkey;
+DeleteXkey(const CStr *Xkey)
{
- if (Xkey->len == 0) {
+ CStr s;
+
+ s = *Xkey;
+ if (s.len == 0) {
xprintf(CGETS(9, 3, "DeleteXkey: Null extended-key not allowed.\n"));
return (-1);
}
@@ -340,17 +325,15 @@ DeleteXkey(Xkey)
if (Xmap == NULL)
return (0);
- (void) TryDeleteNode(&Xmap, Xkey);
+ (void) TryDeleteNode(&Xmap, &s);
return (0);
}
+/* Destroys str */
static int
-TryDeleteNode(inptr, str)
- XmapNode **inptr;
- CStr *str;
+TryDeleteNode(XmapNode **inptr, CStr *str)
{
XmapNode *ptr;
- XmapNode *prev_ptr = NULL;
ptr = *inptr;
/*
@@ -364,7 +347,7 @@ TryDeleteNode(inptr, str)
break;
if (xm->sibling == NULL)
return (0);
- prev_ptr = xm;
+ inptr = &xm->sibling;
ptr = xm->sibling;
}
@@ -373,10 +356,7 @@ TryDeleteNode(inptr, str)
if (str->len == 0) {
/* we're there */
- if (prev_ptr == NULL)
- *inptr = ptr->sibling;
- else
- prev_ptr->sibling = ptr->sibling;
+ *inptr = ptr->sibling;
ptr->sibling = NULL;
PutFreeNode(ptr);
return (1);
@@ -384,10 +364,7 @@ TryDeleteNode(inptr, str)
else if (ptr->next != NULL && TryDeleteNode(&ptr->next, str) == 1) {
if (ptr->next != NULL)
return (0);
- if (prev_ptr == NULL)
- *inptr = ptr->sibling;
- else
- prev_ptr->sibling = ptr->sibling;
+ *inptr = ptr->sibling;
ptr->sibling = NULL;
PutFreeNode(ptr);
return (1);
@@ -401,8 +378,7 @@ TryDeleteNode(inptr, str)
* Puts a tree of nodes onto free list using free(3).
*/
static void
-PutFreeNode(ptr)
- XmapNode *ptr;
+PutFreeNode(XmapNode *ptr)
{
if (ptr == NULL)
return;
@@ -420,14 +396,13 @@ PutFreeNode(ptr)
break;
case XK_EXE:
case XK_STR:
- if (ptr->val.str.buf != NULL)
- xfree((ptr_t) ptr->val.str.buf);
+ xfree(ptr->val.str.buf);
break;
default:
abort();
break;
}
- xfree((ptr_t) ptr);
+ xfree(ptr);
}
@@ -435,12 +410,11 @@ PutFreeNode(ptr)
* Returns pointer to an XmapNode for ch.
*/
static XmapNode *
-GetFreeNode(ch)
- CStr *ch;
+GetFreeNode(CStr *ch)
{
XmapNode *ptr;
- ptr = (XmapNode *) xmalloc((size_t) sizeof(XmapNode));
+ ptr = xmalloc(sizeof(XmapNode));
ptr->ch = ch->buf[0];
ptr->type = XK_NOD;
ptr->val.str.buf = NULL;
@@ -456,9 +430,9 @@ GetFreeNode(ch)
* Print entire Xmap if null
*/
void
-PrintXkey(key)
- CStr *key;
+PrintXkey(const CStr *key)
{
+ struct Strbuf buf = Strbuf_INIT;
CStr cs;
if (key) {
@@ -473,11 +447,12 @@ PrintXkey(key)
if (Xmap == NULL && cs.len == 0)
return;
- printbuf[0] = '"';
- if (Lookup(&cs, Xmap, 1) <= -1)
+ Strbuf_append1(&buf, '"');
+ cleanup_push(&buf, Strbuf_cleanup);
+ if (Lookup(&buf, &cs, Xmap) <= -1)
/* key is not bound */
xprintf(CGETS(9, 4, "Unbound extended key \"%S\"\n"), cs.buf);
- return;
+ cleanup_until(&buf);
}
/* Lookup():
@@ -485,42 +460,34 @@ PrintXkey(key)
* Print if last node
*/
static int
-Lookup(str, ptr, cnt)
- CStr *str;
- XmapNode *ptr;
- int cnt;
+Lookup(struct Strbuf *buf, const CStr *str, const XmapNode *ptr)
{
- int ncnt;
-
if (ptr == NULL)
return (-1); /* cannot have null ptr */
if (str->len == 0) {
/* no more chars in string. Enumerate from here. */
- (void) Enumerate(ptr, cnt);
+ Enumerate(buf, ptr);
return (0);
}
else {
- /* If match put this char into printbuf. Recurse */
+ /* If match put this char into buf. Recurse */
if (ptr->ch == *(str->buf)) {
/* match found */
- ncnt = unparsech(cnt, &ptr->ch);
+ unparsech(buf, ptr->ch);
if (ptr->next != NULL) {
/* not yet at leaf */
CStr tstr;
tstr.buf = str->buf + 1;
tstr.len = str->len - 1;
- return (Lookup(&tstr, ptr->next, ncnt + 1));
+ return (Lookup(buf, &tstr, ptr->next));
}
else {
/* next node is null so key should be complete */
if (str->len == 1) {
- CStr pb;
- printbuf[ncnt + 1] = '"';
- printbuf[ncnt + 2] = '\0';
- pb.buf = printbuf;
- pb.len = ncnt + 2;
- (void) printOne(&pb, &ptr->val, ptr->type);
+ Strbuf_append1(buf, '"');
+ Strbuf_terminate(buf);
+ printOne(buf->s, &ptr->val, ptr->type);
return (0);
}
else
@@ -530,53 +497,41 @@ Lookup(str, ptr, cnt)
else {
/* no match found try sibling */
if (ptr->sibling)
- return (Lookup(str, ptr->sibling, cnt));
+ return (Lookup(buf, str, ptr->sibling));
else
return (-1);
}
}
}
-static int
-Enumerate(ptr, cnt)
- XmapNode *ptr;
- int cnt;
+static void
+Enumerate(struct Strbuf *buf, const XmapNode *ptr)
{
- int ncnt;
-
- if (cnt >= MAXXKEY - 5) { /* buffer too small */
- printbuf[++cnt] = '"';
- printbuf[++cnt] = '\0';
- xprintf(CGETS(9, 5,
- "Some extended keys too long for internal print buffer"));
- xprintf(" \"%S...\"\n", printbuf);
- return (0);
- }
+ size_t old_len;
if (ptr == NULL) {
#ifdef DEBUG_EDIT
xprintf(CGETS(9, 6, "Enumerate: BUG!! Null ptr passed\n!"));
#endif
- return (-1);
+ return;
}
- ncnt = unparsech(cnt, &ptr->ch); /* put this char at end of string */
+ old_len = buf->len;
+ unparsech(buf, ptr->ch); /* put this char at end of string */
if (ptr->next == NULL) {
- CStr pb;
/* print this Xkey and function */
- printbuf[++ncnt] = '"';
- printbuf[++ncnt] = '\0';
- pb.buf = printbuf;
- pb.len = ncnt;
- (void) printOne(&pb, &ptr->val, ptr->type);
+ Strbuf_append1(buf, '"');
+ Strbuf_terminate(buf);
+ printOne(buf->s, &ptr->val, ptr->type);
}
else
- (void) Enumerate(ptr->next, ncnt + 1);
+ Enumerate(buf, ptr->next);
/* go to sibling if there is one */
- if (ptr->sibling)
- (void) Enumerate(ptr->sibling, cnt);
- return (0);
+ if (ptr->sibling) {
+ buf->len = old_len;
+ Enumerate(buf, ptr->sibling);
+ }
}
@@ -584,24 +539,25 @@ Enumerate(ptr, cnt)
* Print the specified key and its associated
* function specified by val
*/
-int
-printOne(key, val, ntype)
- CStr *key;
- XmapVal *val;
- int ntype;
+void
+printOne(const Char *key, const XmapVal *val, int ntype)
{
struct KeyFuncs *fp;
- unsigned char unparsbuf[200];
static const char *fmt = "%s\n";
- xprintf("%-15S-> ", key->buf);
+ xprintf("%-15S-> ", key);
if (val != NULL)
switch (ntype) {
case XK_STR:
- case XK_EXE:
- xprintf(fmt, unparsestring(&val->str, unparsbuf,
- ntype == XK_STR ? STRQQ : STRBB));
+ case XK_EXE: {
+ unsigned char *p;
+
+ p = unparsestring(&val->str, ntype == XK_STR ? STRQQ : STRBB);
+ cleanup_push(p, xfree);
+ xprintf(fmt, p);
+ cleanup_until(p);
break;
+ }
case XK_CMD:
for (fp = FuncNames; fp->name; fp++)
if (val->cmd == fp->func)
@@ -612,72 +568,46 @@ printOne(key, val, ntype)
break;
}
else
- xprintf(fmt, key, CGETS(9, 7, "no input"));
- return (0);
+ xprintf(fmt, CGETS(9, 7, "no input"));
}
-static int
-unparsech(cnt, ch)
- int cnt;
- Char *ch;
+static void
+unparsech(struct Strbuf *buf, Char ch)
{
if (ch == 0) {
- printbuf[cnt++] = '^';
- printbuf[cnt] = '@';
- return cnt;
+ Strbuf_append1(buf, '^');
+ Strbuf_append1(buf, '@');
}
-
- if (Iscntrl(*ch)) {
-#ifdef IS_ASCII
- printbuf[cnt++] = '^';
- if (*ch == CTL_ESC('\177'))
- printbuf[cnt] = '?';
+ else if (Iscntrl(ch)) {
+ Strbuf_append1(buf, '^');
+ if (ch == CTL_ESC('\177'))
+ Strbuf_append1(buf, '?');
else
- printbuf[cnt] = *ch | 0100;
+#ifdef IS_ASCII
+ Strbuf_append1(buf, ch | 0100);
#else
- if (*ch == CTL_ESC('\177'))
- {
- printbuf[cnt++] = '^';
- printbuf[cnt] = '?';
- }
- else if (Isupper(_toebcdic[_toascii[*ch]|0100])
- || strchr("@[\\]^_", _toebcdic[_toascii[*ch]|0100]) != NULL)
- {
- printbuf[cnt++] = '^';
- printbuf[cnt] = _toebcdic[_toascii[*ch]|0100];
- }
- else
- {
- printbuf[cnt++] = '\\';
- printbuf[cnt++] = ((*ch >> 6) & 7) + '0';
- printbuf[cnt++] = ((*ch >> 3) & 7) + '0';
- printbuf[cnt] = (*ch & 7) + '0';
- }
+ Strbuf_append1(buf, _toebcdic[_toascii[ch]|0100]);
#endif
}
- else if (*ch == '^') {
- printbuf[cnt++] = '\\';
- printbuf[cnt] = '^';
- }
- else if (*ch == '\\') {
- printbuf[cnt++] = '\\';
- printbuf[cnt] = '\\';
- }
- else if (*ch == ' ' || (Isprint(*ch) && !Isspace(*ch))) {
- printbuf[cnt] = *ch;
+ else if (ch == '^') {
+ Strbuf_append1(buf, '\\');
+ Strbuf_append1(buf, '^');
+ } else if (ch == '\\') {
+ Strbuf_append1(buf, '\\');
+ Strbuf_append1(buf, '\\');
+ } else if (ch == ' ' || (Isprint(ch) && !Isspace(ch))) {
+ Strbuf_append1(buf, ch);
}
else {
- printbuf[cnt++] = '\\';
- printbuf[cnt++] = ((*ch >> 6) & 7) + '0';
- printbuf[cnt++] = ((*ch >> 3) & 7) + '0';
- printbuf[cnt] = (*ch & 7) + '0';
+ Strbuf_append1(buf, '\\');
+ Strbuf_append1(buf, ((ch >> 6) & 7) + '0');
+ Strbuf_append1(buf, ((ch >> 3) & 7) + '0');
+ Strbuf_append1(buf, (ch & 7) + '0');
}
- return cnt;
}
eChar
-parseescape(ptr)
- const Char **ptr;
+parseescape(const Char **ptr)
{
const Char *p;
Char c;
@@ -685,7 +615,7 @@ parseescape(ptr)
p = *ptr;
if ((p[1] & CHAR) == 0) {
- xprintf(CGETS(9, 8, "Something must follow: %c\n"), *p);
+ xprintf(CGETS(9, 8, "Something must follow: %c\n"), (char)*p);
return CHAR_ERR;
}
if ((*p & CHAR) == '\\') {
@@ -738,7 +668,7 @@ parseescape(ptr)
}
val = (val << 3) | (ch - '0');
}
- if ((val & 0xffffff00) != 0) {
+ if ((val & ~0xff) != 0) {
xprintf(CGETS(9, 9,
"Octal constant does not fit in a char.\n"));
return 0;
@@ -777,15 +707,14 @@ parseescape(ptr)
unsigned char *
-unparsestring(str, buf, sep)
- CStr *str;
- unsigned char *buf;
- Char *sep;
+unparsestring(const CStr *str, const Char *sep)
{
- unsigned char *b;
+ unsigned char *buf, *b;
Char p;
int l;
+ /* Worst-case is "\uuu" or result of wctomb() for each char from str */
+ buf = xmalloc((str->len + 1) * max(4, MB_LEN_MAX));
b = buf;
if (sep[0])
#ifndef WINNT_NATIVE
@@ -797,26 +726,14 @@ unparsestring(str, buf, sep)
for (l = 0; l < str->len; l++) {
p = str->buf[l];
if (Iscntrl(p)) {
-#ifdef IS_ASCII
*b++ = '^';
if (p == CTL_ESC('\177'))
*b++ = '?';
else
+#ifdef IS_ASCII
*b++ = (unsigned char) (p | 0100);
#else
- if (_toascii[p] == '\177' || Isupper(_toebcdic[_toascii[p]|0100])
- || strchr("@[\\]^_", _toebcdic[_toascii[p]|0100]) != NULL)
- {
- *b++ = '^';
- *b++ = (_toascii[p] == '\177') ? '?' : _toebcdic[_toascii[p]|0100];
- }
- else
- {
- *b++ = '\\';
- *b++ = ((p >> 6) & 7) + '0';
- *b++ = ((p >> 3) & 7) + '0';
- *b++ = (p & 7) + '0';
- }
+ *b++ = _toebcdic[_toascii[p]|0100];
#endif
}
else if (p == '^' || p == '\\') {
diff --git a/contrib/tcsh/eight-bit.me b/contrib/tcsh/eight-bit.me
index 466f0116d9c8..0359d8b040fb 100644
--- a/contrib/tcsh/eight-bit.me
+++ b/contrib/tcsh/eight-bit.me
@@ -1,4 +1,4 @@
-.\" $Id: eight-bit.me,v 3.1 1991/09/12 09:25:57 christos Exp $
+.\" $tcsh: eight-bit.me,v 3.2 2006/03/02 18:46:44 christos Exp $
How to use 8 bit characters
by
Johan Widen
diff --git a/contrib/tcsh/gethost.c b/contrib/tcsh/gethost.c
index 91527753abad..efc095b8702f 100644
--- a/contrib/tcsh/gethost.c
+++ b/contrib/tcsh/gethost.c
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/gethost.c,v 1.10 2005/01/05 16:06:13 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/gethost.c,v 1.12 2006/03/02 18:46:44 christos Exp $ */
/*
* gethost.c: Create version file from prototype
*/
@@ -32,7 +32,7 @@
*/
#include "sh.h"
-RCSID("$Id: gethost.c,v 1.10 2005/01/05 16:06:13 christos Exp $")
+RCSID("$tcsh: gethost.c,v 1.12 2006/03/02 18:46:44 christos Exp $")
#ifdef SCO
# define perror __perror
@@ -89,17 +89,16 @@ static const char *keyword[] =
#define S_CODE 2
#define S_KEYWORD 3
-static int findtoken __P((char *));
-static char *gettoken __P((char **, char *));
+static int findtoken (char *);
+static char *gettoken (char **, char *);
-int main __P((int, char *[]));
+int main (int, char *[]);
/* findtoken():
* Return the token number of the given token
*/
static int
-findtoken(ptr)
- char *ptr;
+findtoken(char *ptr)
{
int i;
@@ -118,9 +117,7 @@ findtoken(ptr)
* Get : delimited token and remove leading/trailing blanks/newlines
*/
static char *
-gettoken(pptr, token)
- char **pptr;
- char *token;
+gettoken(char **pptr, char *token)
{
char *ptr = *pptr;
char *tok = token;
@@ -147,9 +144,7 @@ gettoken(pptr, token)
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
char line[INBUFSIZE];
char *pname;
diff --git a/contrib/tcsh/glob.c b/contrib/tcsh/glob.c
index b56e22015330..844ee36754a6 100644
--- a/contrib/tcsh/glob.c
+++ b/contrib/tcsh/glob.c
@@ -63,7 +63,6 @@ static char sccsid[] = "@(#)glob.c 5.12 (Berkeley) 6/24/91";
#undef QUOTE
#undef TILDE
#undef META
-#undef CHAR
#undef ismeta
#undef Strchr
@@ -81,23 +80,22 @@ static char sccsid[] = "@(#)glob.c 5.12 (Berkeley) 6/24/91";
typedef unsigned short Char;
-static int glob1 __P((Char *, glob_t *, int));
-static int glob2 __P((Char *, Char *, Char *, glob_t *, int));
-static int glob3 __P((Char *, Char *, Char *, Char *,
- glob_t *, int));
-static int globextend __P((Char *, glob_t *));
-static int match __P((Char *, Char *, Char *, int));
-#ifndef __clipper__
-static int compare __P((const ptr_t, const ptr_t));
-#endif
-static DIR *Opendir __P((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);
+static void globextend (const char *, glob_t *);
+static int match (const char *, const Char *, const Char *,
+ int);
+static int compare (const void *, const void *);
+static DIR *Opendir (const char *);
#ifdef S_IFLNK
-static int Lstat __P((Char *, struct stat *));
+static int Lstat (const char *, struct stat *);
#endif
-static int Stat __P((Char *, struct stat *sb));
-static Char *Strchr __P((Char *, int));
+static int Stat (const char *, struct stat *sb);
+static Char *Strchr (Char *, int);
#ifdef DEBUG
-static void qprintf __P((Char *));
+static void qprintf (const Char *);
#endif
#define DOLLAR '$'
@@ -120,7 +118,7 @@ static void qprintf __P((Char *));
#define M_MASK 0xffff
#define M_ASCII 0x00ff
-#define CHAR(c) ((c)&M_ASCII)
+#define LCHAR(c) ((c)&M_ASCII)
#define META(c) ((c)|M_META)
#define M_ALL META('*')
#define M_END META(']')
@@ -131,19 +129,11 @@ static void qprintf __P((Char *));
#define M_SET META('[')
#define ismeta(c) (((c)&M_META) != 0)
-#ifndef BUFSIZE
-#define GLOBBUFLEN MAXPATHLEN
-#else
-#define GLOBBUFLEN BUFSIZE
-#endif
-
int
-globcharcoll(c1, c2, cs)
- NLSChar c1, c2;
- int cs;
+globcharcoll(__Char c1, __Char c2, int cs)
{
-#if defined(NLS) && defined(LC_COLLATE) && !defined(NOSTRCOLL)
-# if defined(SHORT_STRINGS)
+#if defined(NLS) && defined(LC_COLLATE) && defined(HAVE_STRCOLL)
+# if defined(WIDE_STRINGS)
wchar_t s1[2], s2[2];
if (c1 == c2)
@@ -163,7 +153,7 @@ globcharcoll(c1, c2, cs)
s2[0] = c2;
s1[1] = s2[1] = '\0';
return wcscoll(s1, s2);
-# else /* not SHORT_STRINGS */
+# else /* not WIDE_STRINGS */
char s1[2], s2[2];
if (c1 == c2)
@@ -199,85 +189,56 @@ globcharcoll(c1, c2, cs)
*/
static DIR *
-Opendir(str)
- Char *str;
+Opendir(const char *str)
{
- char buf[GLOBBUFLEN];
- char *dc = buf;
#if defined(hpux) || defined(__hpux)
struct stat st;
#endif
if (!*str)
return (opendir("."));
- while ((*dc++ = *str++) != '\0')
- continue;
#if defined(hpux) || defined(__hpux)
/*
* Opendir on some device files hangs, so avoid it
*/
- if (stat(buf, &st) == -1 || !S_ISDIR(st.st_mode))
+ if (stat(str, &st) == -1 || !S_ISDIR(st.st_mode))
return NULL;
#endif
- return (opendir(buf));
+ return opendir(str);
}
#ifdef S_IFLNK
static int
-Lstat(fn, sb)
- Char *fn;
- struct stat *sb;
+Lstat(const char *fn, struct stat *sb)
{
- char buf[GLOBBUFLEN];
- char *dc = buf;
+ int st;
- while ((*dc++ = *fn++) != '\0')
- continue;
+ st = lstat(fn, sb);
# ifdef NAMEI_BUG
- {
- int st;
-
- st = lstat(buf, sb);
- if (*buf)
- dc--;
- return (*--dc == '/' && !S_ISDIR(sb->st_mode) ? -1 : st);
- }
-# else
- return (lstat(buf, sb));
+ if (*fn != 0 && strend(fn)[-1] == '/' && !S_ISDIR(sb->st_mode))
+ st = -1;
# endif /* NAMEI_BUG */
+ return st;
}
#else
#define Lstat Stat
#endif /* S_IFLNK */
static int
-Stat(fn, sb)
- Char *fn;
- struct stat *sb;
+Stat(const char *fn, struct stat *sb)
{
- char buf[GLOBBUFLEN];
- char *dc = buf;
+ int st;
- while ((*dc++ = *fn++) != '\0')
- continue;
+ st = stat(fn, sb);
#ifdef NAMEI_BUG
- {
- int st;
-
- st = stat(buf, sb);
- if (*buf)
- dc--;
- return (*--dc == '/' && !S_ISDIR(sb->st_mode) ? -1 : st);
- }
-#else
- return (stat(buf, sb));
+ if (*fn != 0 && strend(fn)[-1] == '/' && !S_ISDIR(sb->st_mode))
+ st = -1;
#endif /* NAMEI_BUG */
+ return st;
}
static Char *
-Strchr(str, ch)
- Char *str;
- int ch;
+Strchr(Char *str, int ch)
{
do
if (*str == ch)
@@ -288,10 +249,9 @@ Strchr(str, ch)
#ifdef DEBUG
static void
-qprintf(s)
-Char *s;
+qprintf(const Char *s)
{
- Char *p;
+ const Char *p;
for (p = s; *p; p++)
printf("%c", *p & 0xff);
@@ -306,16 +266,13 @@ Char *s;
#endif /* DEBUG */
static int
-compare(p, q)
- const ptr_t p, q;
+compare(const void *p, const void *q)
{
-#if defined(NLS) && !defined(NOSTRCOLL)
- errno = 0; /* strcoll sets errno, another brain-damage */
-
- return (strcoll(*(char **) p, *(char **) q));
+#if defined(NLS) && defined(HAVE_STRCOLL)
+ return (strcoll(*(char *const *) p, *(char *const *) q));
#else
- return (strcmp(*(char **) p, *(char **) q));
-#endif /* NLS && !NOSTRCOLL */
+ return (strcmp(*(char *const *) p, *(char *const *) q));
+#endif /* NLS && HAVE_STRCOLL */
}
/*
@@ -326,22 +283,14 @@ compare(p, q)
* to find no matches.
*/
int
-glob(pattern, flags, errfunc, pglob)
- const char *pattern;
- int flags;
- int (*errfunc) __P((const char *, int));
- glob_t *pglob;
+glob(const char *pattern, int flags, int (*errfunc) (const char *, int),
+ glob_t *pglob)
{
int err, oldpathc;
- Char *bufnext, *bufend, *compilebuf, m_not;
- const unsigned char *compilepat, *patnext;
+ Char *bufnext, m_not;
+ const unsigned char *patnext;
int c, not;
- Char *qpatnext;
-#ifdef WIDE_STRINGS
- Char patbuf[GLOBBUFLEN + MB_LEN_MAX + 1];
-#else
- Char patbuf[GLOBBUFLEN + 1];
-#endif
+ Char *qpatnext, *patbuf;
int no_match;
patnext = (const unsigned char *) pattern;
@@ -365,10 +314,8 @@ glob(pattern, flags, errfunc, pglob)
m_not = M_NOT;
}
+ patbuf = xmalloc((strlen(pattern) + 1) * sizeof(*patbuf));
bufnext = patbuf;
- bufend = bufnext + GLOBBUFLEN;
- compilebuf = bufnext;
- compilepat = patnext;
no_match = *patnext == not;
if (no_match)
@@ -376,7 +323,7 @@ glob(pattern, flags, errfunc, pglob)
if (flags & GLOB_QUOTE) {
/* Protect the quoted characters */
- while (bufnext < bufend && (c = *patnext++) != EOS) {
+ while ((c = *patnext++) != EOS) {
#ifdef WIDE_STRINGS
int len;
@@ -400,14 +347,13 @@ glob(pattern, flags, errfunc, pglob)
*bufnext++ = (Char) c;
}
}
- else
- while (bufnext < bufend && (c = *patnext++) != EOS)
+ else
+ while ((c = *patnext++) != EOS)
*bufnext++ = (Char) c;
*bufnext = EOS;
bufnext = patbuf;
qpatnext = patbuf;
- /* we don't need to check for buffer overflow any more */
while ((c = *qpatnext++) != EOS) {
switch (c) {
case LBRACKET:
@@ -427,11 +373,11 @@ glob(pattern, flags, errfunc, pglob)
*bufnext++ = m_not;
c = *qpatnext++;
do {
- *bufnext++ = CHAR(c);
+ *bufnext++ = LCHAR(c);
if (*qpatnext == RANGE &&
(c = qpatnext[1]) != RBRACKET) {
*bufnext++ = M_RNG;
- *bufnext++ = CHAR(c);
+ *bufnext++ = LCHAR(c);
qpatnext += 2;
}
} while ((c = *qpatnext++) != RBRACKET);
@@ -450,7 +396,7 @@ glob(pattern, flags, errfunc, pglob)
*bufnext++ = M_ALL;
break;
default:
- *bufnext++ = CHAR(c);
+ *bufnext++ = LCHAR(c);
break;
}
}
@@ -459,8 +405,10 @@ glob(pattern, flags, errfunc, pglob)
qprintf(patbuf);
#endif
- if ((err = glob1(patbuf, pglob, no_match)) != 0)
+ if ((err = glob1(patbuf, pglob, no_match)) != 0) {
+ xfree(patbuf);
return (err);
+ }
/*
* If there was no match we are going to append the pattern
@@ -471,50 +419,51 @@ glob(pattern, flags, errfunc, pglob)
if (pglob->gl_pathc == oldpathc &&
((flags & GLOB_NOCHECK) ||
((flags & GLOB_NOMAGIC) && !(pglob->gl_flags & GLOB_MAGCHAR)))) {
- if (!(flags & GLOB_QUOTE)) {
- Char *dp = compilebuf;
- const unsigned char *sp = compilepat;
-
- while ((*dp++ = *sp++) != '\0')
- continue;
- }
+ if (!(flags & GLOB_QUOTE))
+ globextend(pattern, pglob);
else {
- /*
- * copy pattern, interpreting quotes; this is slightly different
- * than the interpretation of quotes above -- which should prevail?
- */
- while (*compilepat != EOS) {
- if (*compilepat == QUOTE) {
- if (*++compilepat == EOS)
- --compilepat;
+ char *copy, *dest;
+ const char *src;
+
+ /* copy pattern, interpreting quotes */
+ copy = xmalloc(strlen(pattern) + 1);
+ dest = copy;
+ src = pattern;
+ while (*src != EOS) {
+ if (*src == QUOTE) {
+ if (*++src == EOS)
+ --src;
}
- *compilebuf++ = (unsigned char) *compilepat++;
+ *dest++ = *src++;
}
- *compilebuf = EOS;
+ *dest = EOS;
+ globextend(copy, pglob);
+ xfree(copy);
}
- return (globextend(patbuf, pglob));
+ xfree(patbuf);
+ return 0;
}
else if (!(flags & GLOB_NOSORT) && (pglob->gl_pathc != oldpathc))
- qsort((char *) (pglob->gl_pathv + pglob->gl_offs + oldpathc),
- pglob->gl_pathc - oldpathc, sizeof(char *),
- (int (*) __P((const void *, const void *))) compare);
+ qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc,
+ pglob->gl_pathc - oldpathc, sizeof(char *), compare);
+ xfree(patbuf);
return (0);
}
static int
-glob1(pattern, pglob, no_match)
- Char *pattern;
- glob_t *pglob;
- int no_match;
+glob1(Char *pattern, glob_t *pglob, int no_match)
{
- Char pathbuf[GLOBBUFLEN + 1];
+ struct strbuf pathbuf = strbuf_INIT;
+ int err;
/*
* a null pathname is invalid -- POSIX 1003.1 sect. 2.4.
*/
if (*pattern == EOS)
return (0);
- return (glob2(pathbuf, pathbuf, pattern, pglob, no_match));
+ err = glob2(&pathbuf, pattern, pglob, no_match);
+ xfree(pathbuf.s);
+ return err;
}
/*
@@ -523,14 +472,12 @@ glob1(pattern, pglob, no_match)
* more meta characters.
*/
static int
-glob2(pathbuf, pathend, pattern, pglob, no_match)
- Char *pathbuf, *pathend, *pattern;
- glob_t *pglob;
- int no_match;
+glob2(struct strbuf *pathbuf, const Char *pattern, glob_t *pglob, int no_match)
{
struct stat sbuf;
int anymeta;
- Char *p, *q;
+ const Char *p;
+ size_t orig_len;
/*
* loop over pattern segments until end of pattern or until segment with
@@ -539,69 +486,67 @@ glob2(pathbuf, pathend, pattern, pglob, no_match)
anymeta = 0;
for (;;) {
if (*pattern == EOS) { /* end of pattern? */
- *pathend = EOS;
+ strbuf_terminate(pathbuf);
- if (Lstat(pathbuf, &sbuf))
+ if (Lstat(pathbuf->s, &sbuf))
return (0);
if (((pglob->gl_flags & GLOB_MARK) &&
- pathend[-1] != SEP) &&
+ pathbuf->s[pathbuf->len - 1] != SEP) &&
(S_ISDIR(sbuf.st_mode)
#ifdef S_IFLNK
|| (S_ISLNK(sbuf.st_mode) &&
- (Stat(pathbuf, &sbuf) == 0) &&
+ (Stat(pathbuf->s, &sbuf) == 0) &&
S_ISDIR(sbuf.st_mode))
#endif
)) {
- *pathend++ = SEP;
- *pathend = EOS;
+ strbuf_append1(pathbuf, SEP);
+ strbuf_terminate(pathbuf);
}
++pglob->gl_matchc;
- return (globextend(pathbuf, pglob));
+ globextend(pathbuf->s, pglob);
+ return 0;
}
- /* find end of next segment, copy tentatively to pathend */
- q = pathend;
+ /* find end of next segment, tentatively copy to pathbuf */
p = pattern;
+ orig_len = pathbuf->len;
while (*p != EOS && *p != SEP) {
if (ismeta(*p))
anymeta = 1;
- *q++ = *p++;
+ strbuf_append1(pathbuf, *p++);
}
if (!anymeta) { /* no expansion, do next segment */
- pathend = q;
pattern = p;
while (*pattern == SEP)
- *pathend++ = *pattern++;
+ strbuf_append1(pathbuf, *pattern++);
+ }
+ else { /* need expansion, recurse */
+ pathbuf->len = orig_len;
+ return (glob3(pathbuf, pattern, p, pglob, no_match));
}
- else /* need expansion, recurse */
- return (glob3(pathbuf, pathend, pattern, p, pglob, no_match));
}
/* NOTREACHED */
}
static int
-glob3(pathbuf, pathend, pattern, restpattern, pglob, no_match)
- Char *pathbuf, *pathend, *pattern, *restpattern;
- glob_t *pglob;
- int no_match;
+glob3(struct strbuf *pathbuf, const Char *pattern, const Char *restpattern,
+ glob_t *pglob, int no_match)
{
DIR *dirp;
struct dirent *dp;
int err;
Char m_not = (pglob->gl_flags & GLOB_ALTNOT) ? M_ALTNOT : M_NOT;
- char cpathbuf[GLOBBUFLEN], *ptr;;
+ size_t orig_len;
- *pathend = EOS;
+ strbuf_terminate(pathbuf);
errno = 0;
- if (!(dirp = Opendir(pathbuf))) {
+ if (!(dirp = Opendir(pathbuf->s))) {
/* todo: don't call for ENOENT or ENOTDIR? */
- for (ptr = cpathbuf; (*ptr++ = (char) *pathbuf++) != EOS;)
- continue;
- if ((pglob->gl_errfunc && (*pglob->gl_errfunc) (cpathbuf, errno)) ||
+ if ((pglob->gl_errfunc && (*pglob->gl_errfunc) (pathbuf->s, errno)) ||
(pglob->gl_flags & GLOB_ERR))
return (GLOB_ABEND);
else
@@ -610,27 +555,24 @@ glob3(pathbuf, pathend, pattern, restpattern, pglob, no_match)
err = 0;
+ orig_len = pathbuf->len;
/* search directory for matching names */
while ((dp = readdir(dirp)) != NULL) {
- unsigned char *sc;
- Char *dc;
-
/* initial DOT must be matched literally */
if (dp->d_name[0] == DOT && *pattern != DOT)
continue;
- for (sc = (unsigned char *) dp->d_name, dc = pathend;
- (*dc++ = *sc++) != '\0';)
+ 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;
- if (match(pathend, pattern, restpattern, (int) m_not) == no_match) {
- *pathend = EOS;
- continue;
- }
- err = glob2(pathbuf, --dc, restpattern, pglob, no_match);
+ err = glob2(pathbuf, restpattern, pglob, no_match);
if (err)
break;
}
/* todo: check error from readdir? */
- (void) closedir(dirp);
+ closedir(dirp);
return (err);
}
@@ -649,23 +591,15 @@ glob3(pathbuf, pathend, pattern, restpattern, pglob, no_match)
* Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and
* gl_pathv points to (gl_offs + gl_pathc + 1) items.
*/
-static int
-globextend(path, pglob)
- Char *path;
- glob_t *pglob;
+static void
+globextend(const char *path, glob_t *pglob)
{
char **pathv;
int i;
- unsigned int newsize;
- char *copy;
- Char *p;
+ size_t newsize;
newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
- pathv = (char **) (pglob->gl_pathv ?
- xrealloc((ptr_t) pglob->gl_pathv, (size_t) newsize) :
- xmalloc((size_t) newsize));
- if (pathv == NULL)
- return (GLOB_NOSPACE);
+ pathv = xrealloc(pglob->gl_pathv, newsize);
if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
/* first time around -- clear initial gl_offs items */
@@ -675,23 +609,12 @@ globextend(path, pglob)
}
pglob->gl_pathv = pathv;
- for (p = path; *p++;)
- continue;
- if ((copy = (char *) xmalloc((size_t) (p - path))) != NULL) {
- char *dc = copy;
- Char *sc = path;
-
- while ((*dc++ = *sc++) != '\0')
- continue;
- pathv[pglob->gl_offs + pglob->gl_pathc++] = copy;
- }
+ pathv[pglob->gl_offs + pglob->gl_pathc++] = strsave(path);
pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
- return ((copy == NULL) ? GLOB_NOSPACE : 0);
}
-
static size_t
-One_mbtowc(NLSChar *pwc, const Char *s, size_t n)
+One_Char_mbtowc(__Char *pwc, const Char *s, size_t n)
{
#ifdef WIDE_STRINGS
char buf[MB_LEN_MAX], *p;
@@ -699,11 +622,12 @@ One_mbtowc(NLSChar *pwc, const Char *s, size_t n)
if (n > MB_LEN_MAX)
n = MB_LEN_MAX;
p = buf;
- while (p < buf + n && (*p++ = CHAR(*s++)) != 0)
+ while (p < buf + n && (*p++ = LCHAR(*s++)) != 0)
;
return one_mbtowc(pwc, buf, n);
#else
- return NLSFrom(s, n, pwc);
+ *pwc = *s & CHAR;
+ return 1;
#endif
}
@@ -712,21 +636,18 @@ One_mbtowc(NLSChar *pwc, const Char *s, size_t n)
* pattern causes a recursion level.
*/
static int
-match(name, pat, patend, m_not)
- Char *name, *pat, *patend;
- int m_not;
+match(const char *name, const Char *pat, const Char *patend, int m_not)
{
int ok, negate_range;
- Char c, k;
+ Char c;
while (pat < patend) {
size_t lwk;
- NLSChar wc, wk;
+ __Char wc, wk;
- USE(k);
c = *pat; /* Only for M_MASK bits */
- pat += One_mbtowc(&wc, pat, MB_LEN_MAX);
- lwk = One_mbtowc(&wk, name, MB_LEN_MAX);
+ pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
+ lwk = one_mbtowc(&wk, name, MB_LEN_MAX);
switch (c & M_MASK) {
case M_ALL:
if (pat == patend)
@@ -737,7 +658,7 @@ match(name, pat, patend, m_not)
if (*name == EOS)
break;
name += lwk;
- lwk = One_mbtowc(&wk, name, MB_LEN_MAX);
+ lwk = one_mbtowc(&wk, name, MB_LEN_MAX);
}
return (0);
case M_ONE:
@@ -753,19 +674,19 @@ match(name, pat, patend, m_not)
if ((negate_range = ((*pat & M_MASK) == m_not)) != 0)
++pat;
while ((*pat & M_MASK) != M_END) {
- pat += One_mbtowc(&wc, pat, MB_LEN_MAX);
+ pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
if ((*pat & M_MASK) == M_RNG) {
- NLSChar wc2;
-
+ __Char wc2;
+
pat++;
- pat += One_mbtowc(&wc2, pat, MB_LEN_MAX);
+ pat += One_Char_mbtowc(&wc2, pat, MB_LEN_MAX);
if (globcharcoll(wc, wk, 0) <= 0 &&
globcharcoll(wk, wc2, 0) <= 0)
ok = 1;
} else if (wc == wk)
ok = 1;
}
- pat += One_mbtowc(&wc, pat, MB_LEN_MAX);
+ pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
if (ok == negate_range)
return (0);
break;
@@ -781,8 +702,7 @@ match(name, pat, patend, m_not)
/* free allocated data belonging to a glob_t structure */
void
-globfree(pglob)
- glob_t *pglob;
+globfree(glob_t *pglob)
{
int i;
char **pp;
@@ -791,7 +711,7 @@ globfree(pglob)
pp = pglob->gl_pathv + pglob->gl_offs;
for (i = pglob->gl_pathc; i--; ++pp)
if (*pp)
- xfree((ptr_t) *pp), *pp = NULL;
- xfree((ptr_t) pglob->gl_pathv), pglob->gl_pathv = NULL;
+ xfree(*pp), *pp = NULL;
+ xfree(pglob->gl_pathv), pglob->gl_pathv = NULL;
}
}
diff --git a/contrib/tcsh/glob.h b/contrib/tcsh/glob.h
index bb5bd3d78aac..0a6fd39722ae 100644
--- a/contrib/tcsh/glob.h
+++ b/contrib/tcsh/glob.h
@@ -44,18 +44,18 @@ typedef struct {
int gl_flags; /* Copy of flags parameter to glob. */
char **gl_pathv; /* List of paths matching pattern. */
/* Copy of errfunc parameter to glob. */
- int (*gl_errfunc) __P((const char *, int));
+ int (*gl_errfunc) (const char *, int);
/*
* Alternate filesystem access methods for glob; replacement
* versions of closedir(3), readdir(3), opendir(3), stat(2)
* and lstat(2).
*/
- void (*gl_closedir) __P((void *));
- struct dirent *(*gl_readdir) __P((void *));
- void *(*gl_opendir) __P((const char *));
- int (*gl_lstat) __P((const char *, struct stat *));
- int (*gl_stat) __P((const char *, struct stat *));
+ void (*gl_closedir) (void *);
+ struct dirent *(*gl_readdir) (void *);
+ void *(*gl_opendir) (const char *);
+ int (*gl_lstat) (const char *, struct stat *);
+ int (*gl_stat) (const char *, struct stat *);
} glob_t;
#define GLOB_APPEND 0x0001 /* Append to output from previous call. */
@@ -84,10 +84,8 @@ typedef struct {
#define GLOB_ABEND GLOB_ABORTED /* source compatibility */
/* #endif */
-#include "tc.nls.h"
-
-int glob __P((const char *, int, int (*)(const char *, int), glob_t *));
-void globfree __P((glob_t *));
-int globcharcoll __P((NLSChar, NLSChar, int));
+int glob (const char *, int, int (*)(const char *, int), glob_t *);
+void globfree (glob_t *);
+int globcharcoll (Char, Char, int);
#endif /* !_GLOB_H_ */
diff --git a/contrib/tcsh/host.defs b/contrib/tcsh/host.defs
index f56a9559b7d1..60b18e84d865 100644
--- a/contrib/tcsh/host.defs
+++ b/contrib/tcsh/host.defs
@@ -1,5 +1,5 @@
newcode :
-/* $Header: /src/pub/tcsh/host.defs,v 1.40 2005/03/03 16:49:15 kim Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/host.defs,v 1.43 2006/03/02 18:46:44 christos Exp $ */
/*
* host.defs: Hosttype/Machtype etc.
*/
@@ -33,7 +33,7 @@ newcode :
*/
#include "sh.h"
-RCSID("$Id: host.defs,v 1.40 2005/03/03 16:49:15 kim Exp $")
+RCSID("$tcsh: host.defs,v 1.43 2006/03/02 18:46:44 christos Exp $")
endcode :
@@ -49,8 +49,7 @@ macro : M_intel : (defined(M_i386) || defined(M_i486) || defined(M_i586))
newdef : defined(ns32000)
newcode :
static char *
-isamultimax(flag)
- int flag;
+isamultimax(int flag)
{
if (access("/Umax.image", F_OK) == 0)
return "multimax";
@@ -73,7 +72,7 @@ newcode :
/* From: hpa@hook.eecs.nwu.edu (H. Peter Anvin) */
static char *
-getcray()
+getcray(void)
{
# ifdef MC_GET_SYSTEM /* If we have target() */
struct target data;
@@ -115,7 +114,7 @@ newcode :
/* From: fox@convex.com (David DeSimone) */
static char *
-getconvex()
+getconvex(void)
{
struct system_information sysinfo;
static char result[8];
@@ -172,7 +171,7 @@ enddef :
newcode :
void
-getmachine()
+getmachine(void)
{
const char *hosttype;
const char *ostype;
@@ -446,8 +445,7 @@ 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 : !defined(PPC) : "linux"
-ostype : defined(PPC) : "mklinux"
+ostype : : "linux"
machtype: defined(__ia64__) : "ia64"
machtype: defined(__powerpc64__) : "powerpc64"
machtype: defined(__s390x__) : "s390x"
diff --git a/contrib/tcsh/imake.config b/contrib/tcsh/imake.config
index 4278a46db0b8..c8e6d1039877 100644
--- a/contrib/tcsh/imake.config
+++ b/contrib/tcsh/imake.config
@@ -1,5 +1,5 @@
/*
- * $Id: imake.config,v 1.4 1995/03/05 03:18:09 christos Exp $
+ * $tcsh: imake.config,v 1.5 2006/03/02 18:46:44 christos Exp $
*
* config.Imakefile for for tcsh 6.00
* Marc Horowitz, MIT SIPB
diff --git a/contrib/tcsh/ma.setp.c b/contrib/tcsh/ma.setp.c
index e55c41f66d80..1036fa95ad1b 100644
--- a/contrib/tcsh/ma.setp.c
+++ b/contrib/tcsh/ma.setp.c
@@ -82,7 +82,7 @@
**********************************************************************
*/
#include "sh.h"
-RCSID("$Id: ma.setp.c,v 1.14 2004/08/04 17:12:28 christos Exp $")
+RCSID("$tcsh: ma.setp.c,v 1.18 2006/03/02 18:46:44 christos Exp $")
#ifdef MACH
@@ -132,29 +132,28 @@ static int eflag;
return(-1); \
}
-static int initpaths __P((char **));
-static void savepaths __P((char **));
-static void freepaths __P((void));
-static void rcmd __P((char *));
-static void icmd __P((char *, char *));
-static void iacmd __P((char *, char *));
-static void ibcmd __P((char *, char *));
-static void incmd __P((char *, int));
-static void insert __P((struct pelem *, int, char *));
-static void dcmd __P((char *));
-static void dncmd __P((int));
-static void delete __P((struct pelem *, int));
-static void ccmd __P((char *, char *));
-static void cncmd __P((char *, int));
-static void change __P((struct pelem *, int, char *));
-static int locate __P((struct pelem *, char *));
+static int initpaths (char **);
+static void savepaths (char **);
+static void freepaths (void);
+static void rcmd (char *);
+static void icmd (char *, char *);
+static void iacmd (char *, char *);
+static void ibcmd (char *, char *);
+static void incmd (char *, int);
+static void insert (struct pelem *, int, char *);
+static void dcmd (char *);
+static void dncmd (int);
+static void delete (struct pelem *, int);
+static void ccmd (char *, char *);
+static void cncmd (char *, int);
+static void change (struct pelem *, int, char *);
+static int locate (struct pelem *, char *);
int
-setpath(paths, cmds, localsyspath, dosuffix, printerrors)
-char **paths, **cmds, *localsyspath;
-int dosuffix, printerrors;
+setpath(char **paths, char **cmds, char *localsyspath, int dosuffix,
+ int printerrors)
{
char *cmd, *cmd1, *cmd2;
int ncmd;
@@ -230,8 +229,7 @@ int dosuffix, printerrors;
}
static int
-initpaths(paths)
-char **paths;
+initpaths(char **paths)
{
char *path, *val, *p, *q;
int i, done;
@@ -248,8 +246,8 @@ char **paths;
return(-1);
}
*val++ = '\0';
- pe = (struct pelem *)xmalloc((unsigned)(sizeof(struct pelem)));
- setzero((char *) pe, sizeof(struct pelem));
+ pe = xmalloc(sizeof(struct pelem));
+ setzero(pe, sizeof(struct pelem));
if (pathhead == NULL)
pathhead = pathend = pe;
else {
@@ -283,8 +281,7 @@ char **paths;
}
static void
-savepaths(paths)
-char **paths;
+savepaths(char **paths)
{
char *p, *q;
int npath, i, len;
@@ -312,7 +309,7 @@ char **paths;
}
static void
-freepaths()
+freepaths(void)
{
char *p;
int i;
@@ -345,13 +342,12 @@ freepaths()
***********************************************/
static void
-rcmd(localsyspath) /* reset path with localsyspath */
-char *localsyspath;
+rcmd(char *localsyspath) /* reset path with localsyspath */
{
int n, done;
char *new, *p;
struct pelem *pe;
- char newbuf[MAXPATHLEN+1];
+ char newbuf[MAXPATHLEN+1];/*FIXBUF*/
for (pe = pathhead; pe; pe = pe->pnext) {
new = newbuf;
@@ -389,13 +385,12 @@ char *localsyspath;
***********************************************/
static void
-icmd(path, localsyspath) /* insert path before localsyspath */
-char *path, *localsyspath;
+icmd(char *path, char *localsyspath) /* insert path before localsyspath */
{
int n;
char *new;
struct pelem *pe;
- char newbuf[MAXPATHLEN+1];
+ char newbuf[MAXPATHLEN+1];/*FIXBUF*/
for (pe = pathhead; pe; pe = pe->pnext) {
if (sflag)
@@ -414,8 +409,7 @@ char *path, *localsyspath;
}
static void
-iacmd(inpath, path) /* insert path after inpath */
-char *inpath, *path;
+iacmd(char *inpath, char *path) /* insert path after inpath */
{
int n;
struct pelem *pe;
@@ -431,8 +425,7 @@ char *inpath, *path;
}
static void
-ibcmd(inpath, path) /* insert path before inpath */
-char *inpath, *path;
+ibcmd(char *inpath, char *path) /* insert path before inpath */
{
int n;
struct pelem *pe;
@@ -448,9 +441,7 @@ char *inpath, *path;
}
static void
-incmd(path, n) /* insert path at position n */
-char *path;
-int n;
+incmd(char *path, int n) /* insert path at position n */
{
struct pelem *pe;
@@ -459,14 +450,11 @@ int n;
}
static void
-insert(pe, loc, key)
-struct pelem *pe;
-int loc;
-char *key;
+insert(struct pelem *pe, int loc, char *key)
{
int i;
char *new;
- char newbuf[2000];
+ char newbuf[2000];/*FIXBUF*/
if (sflag) { /* add suffix */
new = newbuf;
@@ -488,8 +476,7 @@ char *key;
***********************************************/
static void
-dcmd(path) /* delete path */
-char *path;
+dcmd(char *path) /* delete path */
{
int n;
struct pelem *pe;
@@ -505,8 +492,7 @@ char *path;
}
static void
-dncmd(n) /* delete at position n */
-int n;
+dncmd(int n) /* delete at position n */
{
struct pelem *pe;
@@ -521,9 +507,7 @@ int n;
}
static void
-delete(pe, n)
-struct pelem *pe;
-int n;
+delete(struct pelem *pe, int n)
{
int d;
@@ -538,8 +522,7 @@ int n;
***********************************************/
static void
-ccmd(inpath, path) /* change inpath to path */
-char *inpath, *path;
+ccmd(char *inpath, char *path) /* change inpath to path */
{
int n;
struct pelem *pe;
@@ -555,9 +538,7 @@ char *inpath, *path;
}
static void
-cncmd(path, n) /* change at position n to path */
-char *path;
-int n;
+cncmd(char *path, int n) /* change at position n to path */
{
struct pelem *pe;
@@ -572,13 +553,10 @@ int n;
}
static void
-change(pe, loc, key)
-struct pelem *pe;
-int loc;
-char *key;
+change(struct pelem *pe, int loc, char *key)
{
char *new;
- char newbuf[MAXPATHLEN+1];
+ char newbuf[MAXPATHLEN+1];/*FIXBUF*/
if (sflag) { /* append suffix */
new = newbuf;
@@ -596,13 +574,11 @@ char *key;
***************************************/
static int
-locate(pe, key)
-struct pelem *pe;
-char *key;
+locate(struct pelem *pe, char *key)
{
int i;
char *realkey;
- char keybuf[MAXPATHLEN+1];
+ char keybuf[MAXPATHLEN+1];/*FIXBUF*/
if (sflag) {
realkey = keybuf;
diff --git a/contrib/tcsh/mi.termios.c b/contrib/tcsh/mi.termios.c
index 87e375e36256..40250671f8c0 100644
--- a/contrib/tcsh/mi.termios.c
+++ b/contrib/tcsh/mi.termios.c
@@ -1,10 +1,10 @@
-/* $Header: /src/pub/tcsh/mi.termios.c,v 1.4 2000/07/04 19:38:14 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/mi.termios.c,v 1.5 2006/03/02 18:46:44 christos Exp $ */
/* termios.c - fake termios interface using sgtty interface
* by Magnus Doell and Bruce Evans.
*
*/
#include "sh.h"
-RCSID("$Id: mi.termios.c,v 1.4 2000/07/04 19:38:14 christos Exp $")
+RCSID("$tcsh: mi.termios.c,v 1.5 2006/03/02 18:46:44 christos Exp $")
#if defined(_MINIX) && !defined(_MINIX_VMD)
diff --git a/contrib/tcsh/mi.varargs.h b/contrib/tcsh/mi.varargs.h
index 7377075d3dc1..0a9dfb5731db 100644
--- a/contrib/tcsh/mi.varargs.h
+++ b/contrib/tcsh/mi.varargs.h
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/mi.varargs.h,v 1.2 1996/04/26 19:18:39 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/mi.varargs.h,v 1.2 1996/04/26 19:18:39 christos Exp $ */
/*
* mi.varargs.h: Correct varargs for minix
*/
diff --git a/contrib/tcsh/nls/C/set1 b/contrib/tcsh/nls/C/set1
index 6053155d8948..d63a04669a16 100644
--- a/contrib/tcsh/nls/C/set1
+++ b/contrib/tcsh/nls/C/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.5 1998/06/27 12:27:55 christos Exp $
+$ $tcsh: set1,v 1.6 2006/03/02 18:46:45 christos Exp $
$ Error messages
$set 1
1 Syntax Error
diff --git a/contrib/tcsh/nls/C/set10 b/contrib/tcsh/nls/C/set10
index 56a96b27eacc..49648eca52af 100644
--- a/contrib/tcsh/nls/C/set10
+++ b/contrib/tcsh/nls/C/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set10,v 1.3 2006/03/02 18:46:45 christos Exp $
$ ma.setp.c
$set 10
1 setpath: invalid command '%s'.\n
diff --git a/contrib/tcsh/nls/C/set11 b/contrib/tcsh/nls/C/set11
index 069ed41d73fe..865500195419 100644
--- a/contrib/tcsh/nls/C/set11
+++ b/contrib/tcsh/nls/C/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.3 2005/03/21 21:26:37 kim Exp $
+$ $tcsh: set11,v 1.4 2006/03/02 18:46:45 christos Exp $
$ sh.c
$set 11
1 Warning: no access to tty (%s).\n
diff --git a/contrib/tcsh/nls/C/set12 b/contrib/tcsh/nls/C/set12
index e0b44a733589..31e97835691c 100644
--- a/contrib/tcsh/nls/C/set12
+++ b/contrib/tcsh/nls/C/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.3 1996/04/26 20:31:52 christos Exp $
+$ $tcsh: set12,v 1.4 2006/03/02 18:46:45 christos Exp $
$ sh.dir.c
$set 12
1 %s: Trying to start from "%s"\n
diff --git a/contrib/tcsh/nls/C/set13 b/contrib/tcsh/nls/C/set13
index af1de4ef3d53..69a42d2fc2fd 100644
--- a/contrib/tcsh/nls/C/set13
+++ b/contrib/tcsh/nls/C/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set13,v 1.3 2006/03/02 18:46:45 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/C/set14 b/contrib/tcsh/nls/C/set14
index d1b86a8376b5..dc39600cc496 100644
--- a/contrib/tcsh/nls/C/set14
+++ b/contrib/tcsh/nls/C/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.3 1998/11/24 18:18:06 christos Exp $
+$ $tcsh: set14,v 1.4 2006/03/02 18:46:45 christos Exp $
$ sh.file.c
$set 14
1 \nYikes!! Too many %s!!\n
diff --git a/contrib/tcsh/nls/C/set15 b/contrib/tcsh/nls/C/set15
index 1fb89120f4ac..7f51d77b726c 100644
--- a/contrib/tcsh/nls/C/set15
+++ b/contrib/tcsh/nls/C/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.3 1996/10/19 17:52:32 christos Exp $
+$ $tcsh: set15,v 1.4 2006/03/02 18:46:45 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: Can't %s%s limit\n
diff --git a/contrib/tcsh/nls/C/set16 b/contrib/tcsh/nls/C/set16
index 67b1eb85dca1..4c078f8cbc17 100644
--- a/contrib/tcsh/nls/C/set16
+++ b/contrib/tcsh/nls/C/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.3 1996/04/26 20:31:55 christos Exp $
+$ $tcsh: set16,v 1.4 2006/03/02 18:46:45 christos Exp $
$ sh.lex.c
$set 16
1 Reset tty pgrp from %d to %d\n
diff --git a/contrib/tcsh/nls/C/set17 b/contrib/tcsh/nls/C/set17
index 0bef721f3b74..a7ed6348e88c 100644
--- a/contrib/tcsh/nls/C/set17
+++ b/contrib/tcsh/nls/C/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.5 2003/02/08 20:03:26 christos Exp $
+$ $tcsh: set17,v 1.6 2006/03/02 18:46:45 christos Exp $
$ sh.proc.c
$set 17
1 BUG: waiting for background job!\n
diff --git a/contrib/tcsh/nls/C/set18 b/contrib/tcsh/nls/C/set18
index f00c4f6e8715..7ef5f80cccf8 100644
--- a/contrib/tcsh/nls/C/set18
+++ b/contrib/tcsh/nls/C/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set18,v 1.3 2006/03/02 18:46:45 christos Exp $
$ sh.set.c
$set 18
1 Warning: ridiculously long PATH truncated\n
diff --git a/contrib/tcsh/nls/C/set19 b/contrib/tcsh/nls/C/set19
index 15e17eeb0d91..1f1033631101 100644
--- a/contrib/tcsh/nls/C/set19
+++ b/contrib/tcsh/nls/C/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.3 1996/04/26 20:31:58 christos Exp $
+$ $tcsh: set19,v 1.4 2006/03/02 18:46:45 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: Out of memory\n
diff --git a/contrib/tcsh/nls/C/set2 b/contrib/tcsh/nls/C/set2
index 8fff30c352ac..62df2324a677 100644
--- a/contrib/tcsh/nls/C/set2
+++ b/contrib/tcsh/nls/C/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.4 1998/10/25 15:12:38 christos Exp $
+$ $tcsh: set2,v 1.5 2006/03/02 18:46:45 christos Exp $
$ Signal names
$set 2
1 Null signal
diff --git a/contrib/tcsh/nls/C/set20 b/contrib/tcsh/nls/C/set20
index 1be271474fc6..7fb4d6610b11 100644
--- a/contrib/tcsh/nls/C/set20
+++ b/contrib/tcsh/nls/C/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set20,v 1.3 2006/03/02 18:46:45 christos Exp $
$ tc.bind.c
$set 20
1 Invalid key name `%S'\n
diff --git a/contrib/tcsh/nls/C/set21 b/contrib/tcsh/nls/C/set21
index 9484ba07ed6e..579506162e35 100644
--- a/contrib/tcsh/nls/C/set21
+++ b/contrib/tcsh/nls/C/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set21,v 1.3 2006/03/02 18:46:45 christos Exp $
$ tc.disc.c
$set 21
1 Couldn't get local chars.\n
diff --git a/contrib/tcsh/nls/C/set22 b/contrib/tcsh/nls/C/set22
index 6aa8a2905c05..daf4ec1f65b1 100644
--- a/contrib/tcsh/nls/C/set22
+++ b/contrib/tcsh/nls/C/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set22,v 1.3 2006/03/02 18:46:45 christos Exp $
$ tc.func.c
$set 22
1 %S: \t aliased to
diff --git a/contrib/tcsh/nls/C/set23 b/contrib/tcsh/nls/C/set23
index 4f8e560526c4..176853db0c1b 100644
--- a/contrib/tcsh/nls/C/set23
+++ b/contrib/tcsh/nls/C/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.3 1996/04/26 20:32:00 christos Exp $
+$ $tcsh: set23,v 1.4 2006/03/02 18:46:45 christos Exp $
$ tc.os.c
$set 23
1 Bad cpu/site name
diff --git a/contrib/tcsh/nls/C/set24 b/contrib/tcsh/nls/C/set24
index 2896947ae36a..1a45f01e12f3 100644
--- a/contrib/tcsh/nls/C/set24
+++ b/contrib/tcsh/nls/C/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set24,v 1.3 2006/03/02 18:46:45 christos Exp $
$ tc.sched.c
$set 24
1 kludge
diff --git a/contrib/tcsh/nls/C/set25 b/contrib/tcsh/nls/C/set25
index 063e8d6c2f67..9e48309e3e12 100644
--- a/contrib/tcsh/nls/C/set25
+++ b/contrib/tcsh/nls/C/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set25,v 1.3 2006/03/02 18:46:45 christos Exp $
$ tc.sig.c
$set 25
1 our wait %d\n
diff --git a/contrib/tcsh/nls/C/set26 b/contrib/tcsh/nls/C/set26
index aa854ad34bab..5921cf7f732d 100644
--- a/contrib/tcsh/nls/C/set26
+++ b/contrib/tcsh/nls/C/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set26,v 1.3 2006/03/02 18:46:45 christos Exp $
$ tc.who.c
$set 26
1 cannot stat %s. Please "unset watch".\n
diff --git a/contrib/tcsh/nls/C/set27 b/contrib/tcsh/nls/C/set27
index 52664d97bc49..3aea7b48d9fd 100644
--- a/contrib/tcsh/nls/C/set27
+++ b/contrib/tcsh/nls/C/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set27,v 1.3 2006/03/02 18:46:45 christos Exp $
$ tw.comp.c
$set 27
1 command
diff --git a/contrib/tcsh/nls/C/set29 b/contrib/tcsh/nls/C/set29
index 040e881ce87b..b3c4f11e7e2d 100644
--- a/contrib/tcsh/nls/C/set29
+++ b/contrib/tcsh/nls/C/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set29,v 1.3 2006/03/02 18:46:45 christos Exp $
$ tw.help.c
$set 29
1 No help file for %S\n
diff --git a/contrib/tcsh/nls/C/set3 b/contrib/tcsh/nls/C/set3
index 7a46f5f6e51d..7841e252af4f 100644
--- a/contrib/tcsh/nls/C/set3
+++ b/contrib/tcsh/nls/C/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.4 2001/04/26 19:07:48 kim Exp $
+$ $tcsh: set3,v 1.6 2006/03/02 18:46:45 christos Exp $
$ Editor function descriptions
$set 3
1 Move back a character
@@ -122,3 +122,5 @@ $set 3
119 (WIN32 only) Convert each '/' in previous word to '\\\\'
120 (WIN32 only) Page visible console window up
121 (WIN32 only) Page visible console window down
+122 Execute command and keep current line
+123 Execute command and move to next history line
diff --git a/contrib/tcsh/nls/C/set30 b/contrib/tcsh/nls/C/set30
index b9e6216f426d..99aa3ff35d4c 100644
--- a/contrib/tcsh/nls/C/set30
+++ b/contrib/tcsh/nls/C/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.4 1996/10/19 17:52:34 christos Exp $
+$ $tcsh: set30,v 1.5 2006/03/02 18:46:45 christos Exp $
$ tw.parse.c
$set 30
1 starting_a_command %d\n
diff --git a/contrib/tcsh/nls/C/set31 b/contrib/tcsh/nls/C/set31
index 36412510ecf3..9a30f269b17f 100644
--- a/contrib/tcsh/nls/C/set31
+++ b/contrib/tcsh/nls/C/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set31,v 1.3 2006/03/02 18:46:45 christos Exp $
$ vms.termcap.c
$set 31
1 Can't open TERMCAP: [%s]\n
diff --git a/contrib/tcsh/nls/C/set4 b/contrib/tcsh/nls/C/set4
index a7d289cf83f2..69da635fd5c5 100644
--- a/contrib/tcsh/nls/C/set4
+++ b/contrib/tcsh/nls/C/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set4,v 1.3 2006/03/02 18:46:45 christos Exp $
$ Termcap strings
$set 4
1 add new blank line
diff --git a/contrib/tcsh/nls/C/set5 b/contrib/tcsh/nls/C/set5
index b684bb88ef2d..d06b29eda52e 100644
--- a/contrib/tcsh/nls/C/set5
+++ b/contrib/tcsh/nls/C/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set5,v 1.3 2006/03/02 18:46:45 christos Exp $
$ ed.chared.c
$set 5
1 Load average unavailable\n
diff --git a/contrib/tcsh/nls/C/set6 b/contrib/tcsh/nls/C/set6
index 03206ad514cd..80469397e63c 100644
--- a/contrib/tcsh/nls/C/set6
+++ b/contrib/tcsh/nls/C/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set6,v 1.3 2006/03/02 18:46:45 christos Exp $
$ ed.inputl.c
$set 6
1 ERROR: illegal command from key 0%o\r\n
diff --git a/contrib/tcsh/nls/C/set7 b/contrib/tcsh/nls/C/set7
index 26e14132829a..8de5768fae7e 100644
--- a/contrib/tcsh/nls/C/set7
+++ b/contrib/tcsh/nls/C/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.3 1996/04/26 20:32:04 christos Exp $
+$ $tcsh: set7,v 1.4 2006/03/02 18:46:45 christos Exp $
$ ed.screen.c
$set 7
1 \n\tTcsh thinks your terminal has the\n
diff --git a/contrib/tcsh/nls/C/set8 b/contrib/tcsh/nls/C/set8
index 36cb350dd63c..7003bdde9916 100644
--- a/contrib/tcsh/nls/C/set8
+++ b/contrib/tcsh/nls/C/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set8,v 1.3 2006/03/02 18:46:45 christos Exp $
$ ed.term.c
$set 8
1 Unknown switch
diff --git a/contrib/tcsh/nls/C/set9 b/contrib/tcsh/nls/C/set9
index 72511b4fca19..284411dc1623 100644
--- a/contrib/tcsh/nls/C/set9
+++ b/contrib/tcsh/nls/C/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set9,v 1.3 2006/03/02 18:46:45 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: Null extended-key not allowed.\n
diff --git a/contrib/tcsh/nls/Makefile b/contrib/tcsh/nls/Makefile
index 57611b43e984..1bcb436c5de8 100644
--- a/contrib/tcsh/nls/Makefile
+++ b/contrib/tcsh/nls/Makefile
@@ -1,8 +1,9 @@
+# $tcsh: Makefile,v 1.14 2006/03/02 18:46:45 christos Exp $
SUBDIRS= C et finnish french german greek italian ja pl russian \
spanish ukrainian
#GENCAT= gencat --new
-#CHARSET= charset
+CHARSET= charset
GENCAT= gencat
catalogs:
diff --git a/contrib/tcsh/nls/et/set1 b/contrib/tcsh/nls/et/set1
index bd44bb3cc983..03864df1905c 100644
--- a/contrib/tcsh/nls/et/set1
+++ b/contrib/tcsh/nls/et/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.2 2001/01/11 13:25:24 christos Exp $
+$ $tcsh: set1,v 1.3 2006/03/02 18:46:45 christos Exp $
$ Error messages
$set 1
1 Sntaksi viga
diff --git a/contrib/tcsh/nls/et/set10 b/contrib/tcsh/nls/et/set10
index 50b486a16394..d330cdb7a6c1 100644
--- a/contrib/tcsh/nls/et/set10
+++ b/contrib/tcsh/nls/et/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.1 2001/01/04 18:46:02 christos Exp $
+$ $tcsh: set10,v 1.2 2006/03/02 18:46:45 christos Exp $
$ ma.setp.c
$set 10
1 setpath: vigane ksk '%s'.\n
diff --git a/contrib/tcsh/nls/et/set11 b/contrib/tcsh/nls/et/set11
index 7328a0d73201..ca851616a55e 100644
--- a/contrib/tcsh/nls/et/set11
+++ b/contrib/tcsh/nls/et/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.1 2001/01/04 18:46:02 christos Exp $
+$ $tcsh: set11,v 1.2 2006/03/02 18:46:45 christos Exp $
$ sh.c
$set 11
1 Hoiatus: tty (%s) pole kttesaadav.\n
diff --git a/contrib/tcsh/nls/et/set12 b/contrib/tcsh/nls/et/set12
index de459481c199..9c6b1be9cdc2 100644
--- a/contrib/tcsh/nls/et/set12
+++ b/contrib/tcsh/nls/et/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.1 2001/01/04 18:46:02 christos Exp $
+$ $tcsh: set12,v 1.2 2006/03/02 18:46:45 christos Exp $
$ sh.dir.c
$set 12
1 %s: Proovin startida kataloogist "%s"\n
diff --git a/contrib/tcsh/nls/et/set13 b/contrib/tcsh/nls/et/set13
index 02ff2bb3eae4..a71a9afd311f 100644
--- a/contrib/tcsh/nls/et/set13
+++ b/contrib/tcsh/nls/et/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.1 2001/01/04 18:46:02 christos Exp $
+$ $tcsh: set13,v 1.2 2006/03/02 18:46:45 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/et/set14 b/contrib/tcsh/nls/et/set14
index dedcc68ad5c2..95b36c5bc9b7 100644
--- a/contrib/tcsh/nls/et/set14
+++ b/contrib/tcsh/nls/et/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.1 2001/01/04 18:46:03 christos Exp $
+$ $tcsh: set14,v 1.2 2006/03/02 18:46:45 christos Exp $
$ sh.file.c
$set 14
1 \nhh!! Liiga palju %s!!\n
diff --git a/contrib/tcsh/nls/et/set15 b/contrib/tcsh/nls/et/set15
index f638275026df..4f5561f61975 100644
--- a/contrib/tcsh/nls/et/set15
+++ b/contrib/tcsh/nls/et/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.1 2001/01/04 18:46:03 christos Exp $
+$ $tcsh: set15,v 1.2 2006/03/02 18:46:45 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: Ei nnestu %s%s piirangut\n
diff --git a/contrib/tcsh/nls/et/set16 b/contrib/tcsh/nls/et/set16
index e2f26be92586..15965680e3fd 100644
--- a/contrib/tcsh/nls/et/set16
+++ b/contrib/tcsh/nls/et/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.1 2001/01/04 18:46:03 christos Exp $
+$ $tcsh: set16,v 1.2 2006/03/02 18:46:45 christos Exp $
$ sh.lex.c
$set 16
1 Seadsin tty pgrp numbrilt %d numbrile %d\n
diff --git a/contrib/tcsh/nls/et/set17 b/contrib/tcsh/nls/et/set17
index ae536c315a95..e154d7b3b997 100644
--- a/contrib/tcsh/nls/et/set17
+++ b/contrib/tcsh/nls/et/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.2 2003/02/08 20:03:26 christos Exp $
+$ $tcsh: set17,v 1.3 2006/03/02 18:46:45 christos Exp $
$ sh.proc.c
$set 17
1 BUG: ootan taustat jrel!\n
diff --git a/contrib/tcsh/nls/et/set18 b/contrib/tcsh/nls/et/set18
index b91a437cece7..fc313469d68a 100644
--- a/contrib/tcsh/nls/et/set18
+++ b/contrib/tcsh/nls/et/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.1 2001/01/04 18:46:03 christos Exp $
+$ $tcsh: set18,v 1.2 2006/03/02 18:46:45 christos Exp $
$ sh.set.c
$set 18
1 Hoiatus: nmedalt pikk PATH sai lhendatud\n
diff --git a/contrib/tcsh/nls/et/set19 b/contrib/tcsh/nls/et/set19
index 8891ab9f8a4c..6f653d05bb8d 100644
--- a/contrib/tcsh/nls/et/set19
+++ b/contrib/tcsh/nls/et/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.1 2001/01/04 18:46:03 christos Exp $
+$ $tcsh: set19,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: Mlu on otsas\n
diff --git a/contrib/tcsh/nls/et/set2 b/contrib/tcsh/nls/et/set2
index 691339f775fa..ea1f4c97a98b 100644
--- a/contrib/tcsh/nls/et/set2
+++ b/contrib/tcsh/nls/et/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.1 2001/01/04 18:46:03 christos Exp $
+$ $tcsh: set2,v 1.2 2006/03/02 18:46:45 christos Exp $
$ Signal names
$set 2
1 Null signaal
diff --git a/contrib/tcsh/nls/et/set20 b/contrib/tcsh/nls/et/set20
index 0587f75ff692..3ba741bad448 100644
--- a/contrib/tcsh/nls/et/set20
+++ b/contrib/tcsh/nls/et/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.1 2001/01/04 18:46:03 christos Exp $
+$ $tcsh: set20,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tc.bind.c
$set 20
1 Vigane klahvi nimi `%S'\n
diff --git a/contrib/tcsh/nls/et/set21 b/contrib/tcsh/nls/et/set21
index ba9a344b4c04..e435c1a5cb1a 100644
--- a/contrib/tcsh/nls/et/set21
+++ b/contrib/tcsh/nls/et/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.1 2001/01/04 18:46:03 christos Exp $
+$ $tcsh: set21,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tc.disc.c
$set 21
1 Lokaalseid smboleid ei nnestu lugeda.\n
diff --git a/contrib/tcsh/nls/et/set22 b/contrib/tcsh/nls/et/set22
index 92e3f3aae648..e619e53d360c 100644
--- a/contrib/tcsh/nls/et/set22
+++ b/contrib/tcsh/nls/et/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.1 2001/01/04 18:46:04 christos Exp $
+$ $tcsh: set22,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tc.func.c
$set 22
1 %S: \t on tegelikult
diff --git a/contrib/tcsh/nls/et/set23 b/contrib/tcsh/nls/et/set23
index eb0609d40c00..72432d00fcc0 100644
--- a/contrib/tcsh/nls/et/set23
+++ b/contrib/tcsh/nls/et/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.1 2001/01/04 18:46:04 christos Exp $
+$ $tcsh: set23,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tc.os.c
$set 23
1 Vigane cpu/saidi nimi
diff --git a/contrib/tcsh/nls/et/set24 b/contrib/tcsh/nls/et/set24
index a7fb2dec398f..4c3e6378797d 100644
--- a/contrib/tcsh/nls/et/set24
+++ b/contrib/tcsh/nls/et/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.1 2001/01/04 18:46:04 christos Exp $
+$ $tcsh: set24,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tc.sched.c
$set 24
1 Hkk!
diff --git a/contrib/tcsh/nls/et/set25 b/contrib/tcsh/nls/et/set25
index a95f6f60cd83..c35deb7aa1b2 100644
--- a/contrib/tcsh/nls/et/set25
+++ b/contrib/tcsh/nls/et/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.1 2001/01/04 18:46:04 christos Exp $
+$ $tcsh: set25,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tc.sig.c
$set 25
1 our wait %d\n
diff --git a/contrib/tcsh/nls/et/set26 b/contrib/tcsh/nls/et/set26
index 729c77647c13..e5b3967b12fb 100644
--- a/contrib/tcsh/nls/et/set26
+++ b/contrib/tcsh/nls/et/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.1 2001/01/04 18:46:04 christos Exp $
+$ $tcsh: set26,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tc.who.c
$set 26
1 Ei saa lugeda %s atribuute. Anna ksk "unset watch".\n
diff --git a/contrib/tcsh/nls/et/set27 b/contrib/tcsh/nls/et/set27
index 53828e48716d..57bd18f6ce5e 100644
--- a/contrib/tcsh/nls/et/set27
+++ b/contrib/tcsh/nls/et/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.1 2001/01/04 18:46:04 christos Exp $
+$ $tcsh: set27,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tw.comp.c
$set 27
1 ksk
diff --git a/contrib/tcsh/nls/et/set29 b/contrib/tcsh/nls/et/set29
index 2ec61dd61dfa..8e0f6dacb9be 100644
--- a/contrib/tcsh/nls/et/set29
+++ b/contrib/tcsh/nls/et/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.1 2001/01/04 18:46:04 christos Exp $
+$ $tcsh: set29,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tw.help.c
$set 29
1 %S'ile pole abiteksti\n
diff --git a/contrib/tcsh/nls/et/set3 b/contrib/tcsh/nls/et/set3
index 170da71d97d8..4c06d3945727 100644
--- a/contrib/tcsh/nls/et/set3
+++ b/contrib/tcsh/nls/et/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.2 2001/04/26 19:07:48 kim Exp $
+$ $tcsh: set3,v 1.3 2006/03/02 18:46:45 christos Exp $
$ Editor function descriptions
$set 3
1 Liigu smbol tagasi
diff --git a/contrib/tcsh/nls/et/set30 b/contrib/tcsh/nls/et/set30
index 8438f462ab28..f629dc8e063d 100644
--- a/contrib/tcsh/nls/et/set30
+++ b/contrib/tcsh/nls/et/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.1 2001/01/04 18:46:04 christos Exp $
+$ $tcsh: set30,v 1.2 2006/03/02 18:46:45 christos Exp $
$ tw.parse.c
$set 30
1 starting_a_command %d\n
diff --git a/contrib/tcsh/nls/et/set31 b/contrib/tcsh/nls/et/set31
index f701daaa367e..500c1dbccfc6 100644
--- a/contrib/tcsh/nls/et/set31
+++ b/contrib/tcsh/nls/et/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.1 2001/01/04 18:46:04 christos Exp $
+$ $tcsh: set31,v 1.2 2006/03/02 18:46:45 christos Exp $
$ vms.termcap.c
$set 31
1 TERMCAP ei saa avada: [%s]\n
diff --git a/contrib/tcsh/nls/et/set4 b/contrib/tcsh/nls/et/set4
index cc9cb1952281..3ec5b44a53e2 100644
--- a/contrib/tcsh/nls/et/set4
+++ b/contrib/tcsh/nls/et/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.1 2001/01/04 18:46:04 christos Exp $
+$ $tcsh: set4,v 1.2 2006/03/02 18:46:45 christos Exp $
$ Termcap strings
$set 4
1 lisa uus thi rida
diff --git a/contrib/tcsh/nls/et/set5 b/contrib/tcsh/nls/et/set5
index 013f1b72e0d4..aecf6e8e9a83 100644
--- a/contrib/tcsh/nls/et/set5
+++ b/contrib/tcsh/nls/et/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.1 2001/01/04 18:46:05 christos Exp $
+$ $tcsh: set5,v 1.2 2006/03/02 18:46:45 christos Exp $
$ ed.chared.c
$set 5
1 Tjrjekorra koormuse info puudub\n
diff --git a/contrib/tcsh/nls/et/set6 b/contrib/tcsh/nls/et/set6
index c97d381f85e4..3b6c6cdc3af6 100644
--- a/contrib/tcsh/nls/et/set6
+++ b/contrib/tcsh/nls/et/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.1 2001/01/04 18:46:05 christos Exp $
+$ $tcsh: set6,v 1.2 2006/03/02 18:46:45 christos Exp $
$ ed.inputl.c
$set 6
1 VIGA: vigane ksk klahvilt 0%o\r\n
diff --git a/contrib/tcsh/nls/et/set7 b/contrib/tcsh/nls/et/set7
index 32d3e63e1ca3..f1da7b39a4a5 100644
--- a/contrib/tcsh/nls/et/set7
+++ b/contrib/tcsh/nls/et/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.1 2001/01/04 18:46:05 christos Exp $
+$ $tcsh: set7,v 1.2 2006/03/02 18:46:45 christos Exp $
$ ed.screen.c
$set 7
1 \n\tTcsh arvab, et teie terminal omab\n
diff --git a/contrib/tcsh/nls/et/set8 b/contrib/tcsh/nls/et/set8
index dd44350d0631..0ac4be44fd6a 100644
--- a/contrib/tcsh/nls/et/set8
+++ b/contrib/tcsh/nls/et/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.1 2001/01/04 18:46:05 christos Exp $
+$ $tcsh: set8,v 1.2 2006/03/02 18:46:45 christos Exp $
$ ed.term.c
$set 8
1 Tundmatu vti
diff --git a/contrib/tcsh/nls/et/set9 b/contrib/tcsh/nls/et/set9
index 877460b1a2cf..f8e157a23d0b 100644
--- a/contrib/tcsh/nls/et/set9
+++ b/contrib/tcsh/nls/et/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.1 2001/01/04 18:46:05 christos Exp $
+$ $tcsh: set9,v 1.2 2006/03/02 18:46:45 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: Null pikkusega laiend-klahv ei ole lubatud.\n
diff --git a/contrib/tcsh/nls/finnish/set1 b/contrib/tcsh/nls/finnish/set1
index c5e61cf1953d..98c89b38fb75 100644
--- a/contrib/tcsh/nls/finnish/set1
+++ b/contrib/tcsh/nls/finnish/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.2 2001/09/03 02:13:26 kim Exp $
+$ $tcsh: set1,v 1.3 2006/03/02 18:46:46 christos Exp $
$ Error messages
$set 1
1 Kielioppivirhe
diff --git a/contrib/tcsh/nls/finnish/set10 b/contrib/tcsh/nls/finnish/set10
index 5aaae1e44594..7d1a72e0814c 100644
--- a/contrib/tcsh/nls/finnish/set10
+++ b/contrib/tcsh/nls/finnish/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.1 2000/01/14 22:57:31 christos Exp $
+$ $tcsh: set10,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ma.setp.c
$set 10
1 setpath: Virheellinen komento '%s'.\n
diff --git a/contrib/tcsh/nls/finnish/set11 b/contrib/tcsh/nls/finnish/set11
index 31e1772f42b0..dc1617e472bd 100644
--- a/contrib/tcsh/nls/finnish/set11
+++ b/contrib/tcsh/nls/finnish/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.1 2000/01/14 22:57:32 christos Exp $
+$ $tcsh: set11,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.c
$set 11
1 Varoitus: ei yhteytt ptteeseen (%s).\n
diff --git a/contrib/tcsh/nls/finnish/set12 b/contrib/tcsh/nls/finnish/set12
index ca4b5b81d060..87bf07a38511 100644
--- a/contrib/tcsh/nls/finnish/set12
+++ b/contrib/tcsh/nls/finnish/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.1 2000/01/14 22:57:32 christos Exp $
+$ $tcsh: set12,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.dir.c
$set 12
1 %s: Yritetn kynnist hakemistosta "%s"\n
diff --git a/contrib/tcsh/nls/finnish/set13 b/contrib/tcsh/nls/finnish/set13
index 66a688a7e568..08a9f4cc999b 100644
--- a/contrib/tcsh/nls/finnish/set13
+++ b/contrib/tcsh/nls/finnish/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.1 2000/01/14 22:57:32 christos Exp $
+$ $tcsh: set13,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/finnish/set14 b/contrib/tcsh/nls/finnish/set14
index 220bdc4489fc..23fefed27e32 100644
--- a/contrib/tcsh/nls/finnish/set14
+++ b/contrib/tcsh/nls/finnish/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.2 2003/05/26 07:11:07 christos Exp $
+$ $tcsh: set14,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.file.c
$set 14
1 \nAuts!! Liian monta %s!!\n
diff --git a/contrib/tcsh/nls/finnish/set15 b/contrib/tcsh/nls/finnish/set15
index 3312184b9cbe..684a5dd9b638 100644
--- a/contrib/tcsh/nls/finnish/set15
+++ b/contrib/tcsh/nls/finnish/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.1 2000/01/14 22:57:32 christos Exp $
+$ $tcsh: set15,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: rajoitusta ei voida %s %s\n
diff --git a/contrib/tcsh/nls/finnish/set16 b/contrib/tcsh/nls/finnish/set16
index e3d2a03d05e0..4a61d02248ea 100644
--- a/contrib/tcsh/nls/finnish/set16
+++ b/contrib/tcsh/nls/finnish/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.1 2000/01/14 22:57:32 christos Exp $
+$ $tcsh: set16,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.lex.c
$set 16
1 Ptteen prosessiryhm vaihdettu arvosta %d %d:ksi.\n
diff --git a/contrib/tcsh/nls/finnish/set17 b/contrib/tcsh/nls/finnish/set17
index a737f404f8d3..4657343e4f84 100644
--- a/contrib/tcsh/nls/finnish/set17
+++ b/contrib/tcsh/nls/finnish/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.2 2003/02/08 20:03:27 christos Exp $
+$ $tcsh: set17,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.proc.c
$set 17
1 VIKA: taustatyt!\n
diff --git a/contrib/tcsh/nls/finnish/set18 b/contrib/tcsh/nls/finnish/set18
index 06a88cb55d2f..d29d38d89f01 100644
--- a/contrib/tcsh/nls/finnish/set18
+++ b/contrib/tcsh/nls/finnish/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.1 2000/01/14 22:57:32 christos Exp $
+$ $tcsh: set18,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.set.c
$set 18
1 Varoitus: Kohtuuttoman pitk hakupolku (PATH) katkaistu.\n
diff --git a/contrib/tcsh/nls/finnish/set19 b/contrib/tcsh/nls/finnish/set19
index ad98544e6355..8e6621f96346 100644
--- a/contrib/tcsh/nls/finnish/set19
+++ b/contrib/tcsh/nls/finnish/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.1 2000/01/14 22:57:32 christos Exp $
+$ $tcsh: set19,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: Muisti loppu\n
diff --git a/contrib/tcsh/nls/finnish/set2 b/contrib/tcsh/nls/finnish/set2
index 0a306a73a33b..e3bc86e8599a 100644
--- a/contrib/tcsh/nls/finnish/set2
+++ b/contrib/tcsh/nls/finnish/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.1 2000/01/14 22:57:32 christos Exp $
+$ $tcsh: set2,v 1.2 2006/03/02 18:46:46 christos Exp $
$ Signal names
$set 2
1 Null-signaali
diff --git a/contrib/tcsh/nls/finnish/set20 b/contrib/tcsh/nls/finnish/set20
index 94314dba29fd..4bbc86ab805b 100644
--- a/contrib/tcsh/nls/finnish/set20
+++ b/contrib/tcsh/nls/finnish/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.2 2001/09/03 02:14:04 kim Exp $
+$ $tcsh: set20,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.bind.c
$set 20
1 Invalid key name `%S'\n
diff --git a/contrib/tcsh/nls/finnish/set21 b/contrib/tcsh/nls/finnish/set21
index 67fa0c0691a2..7d42da16d1a9 100644
--- a/contrib/tcsh/nls/finnish/set21
+++ b/contrib/tcsh/nls/finnish/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.1 2000/01/14 22:57:32 christos Exp $
+$ $tcsh: set21,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.disc.c
$set 21
1 Couldn't get local chars.\n
diff --git a/contrib/tcsh/nls/finnish/set22 b/contrib/tcsh/nls/finnish/set22
index 7008372884d5..f0b3abf55ccd 100644
--- a/contrib/tcsh/nls/finnish/set22
+++ b/contrib/tcsh/nls/finnish/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.2 2001/04/26 19:06:01 kim Exp $
+$ $tcsh: set22,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.func.c
$set 22
1 %S: \t on alias komennolle
diff --git a/contrib/tcsh/nls/finnish/set23 b/contrib/tcsh/nls/finnish/set23
index acf4ac15faa9..0bf9797b0b8f 100644
--- a/contrib/tcsh/nls/finnish/set23
+++ b/contrib/tcsh/nls/finnish/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.1 2000/01/14 22:57:33 christos Exp $
+$ $tcsh: set23,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.os.c
$set 23
1 Virheellinen solmun nimi
diff --git a/contrib/tcsh/nls/finnish/set24 b/contrib/tcsh/nls/finnish/set24
index 2d7904d06971..23f90fd729bc 100644
--- a/contrib/tcsh/nls/finnish/set24
+++ b/contrib/tcsh/nls/finnish/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.1 2000/01/14 22:57:33 christos Exp $
+$ $tcsh: set24,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.sched.c
$set 24
1 jippo (kludge)
diff --git a/contrib/tcsh/nls/finnish/set25 b/contrib/tcsh/nls/finnish/set25
index 15fecd8a8673..9e6a00832496 100644
--- a/contrib/tcsh/nls/finnish/set25
+++ b/contrib/tcsh/nls/finnish/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.1 2000/01/14 22:57:33 christos Exp $
+$ $tcsh: set25,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.sig.c
$set 25
1 our wait %d\n
diff --git a/contrib/tcsh/nls/finnish/set26 b/contrib/tcsh/nls/finnish/set26
index 5db9ffda2f91..d20e9f7af9af 100644
--- a/contrib/tcsh/nls/finnish/set26
+++ b/contrib/tcsh/nls/finnish/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.1 2000/01/14 22:57:33 christos Exp $
+$ $tcsh: set26,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.who.c
$set 26
1 Testaaminen ei onnistu: stat(%s). Ole hyv ja suorita "unset watch".\n
diff --git a/contrib/tcsh/nls/finnish/set27 b/contrib/tcsh/nls/finnish/set27
index a99a18aa802b..decc69a621d8 100644
--- a/contrib/tcsh/nls/finnish/set27
+++ b/contrib/tcsh/nls/finnish/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.1 2000/01/14 22:57:33 christos Exp $
+$ $tcsh: set27,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tw.comp.c
$set 27
1 komento
diff --git a/contrib/tcsh/nls/finnish/set29 b/contrib/tcsh/nls/finnish/set29
index 65d943dda8ad..7ccd214cc48c 100644
--- a/contrib/tcsh/nls/finnish/set29
+++ b/contrib/tcsh/nls/finnish/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.1 2000/01/14 22:57:33 christos Exp $
+$ $tcsh: set29,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tw.help.c
$set 29
1 Ei lydy aputiedostoa komennolle %S\n
diff --git a/contrib/tcsh/nls/finnish/set3 b/contrib/tcsh/nls/finnish/set3
index b88051874868..3ce02ba84a0a 100644
--- a/contrib/tcsh/nls/finnish/set3
+++ b/contrib/tcsh/nls/finnish/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.2 2001/04/26 19:07:49 kim Exp $
+$ $tcsh: set3,v 1.3 2006/03/02 18:46:46 christos Exp $
$ Editor function descriptions
$set 3
1 Siirry taaksepin yksi merkki
diff --git a/contrib/tcsh/nls/finnish/set30 b/contrib/tcsh/nls/finnish/set30
index 6f61db587a76..5e8957bc9ded 100644
--- a/contrib/tcsh/nls/finnish/set30
+++ b/contrib/tcsh/nls/finnish/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.2 2001/04/26 19:06:01 kim Exp $
+$ $tcsh: set30,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tw.parse.c
$set 30
1 starting_a_command %d\n
diff --git a/contrib/tcsh/nls/finnish/set31 b/contrib/tcsh/nls/finnish/set31
index fa9748774f36..e7b14140d194 100644
--- a/contrib/tcsh/nls/finnish/set31
+++ b/contrib/tcsh/nls/finnish/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.1 2000/01/14 22:57:33 christos Exp $
+$ $tcsh: set31,v 1.2 2006/03/02 18:46:46 christos Exp $
$ vms.termcap.c
$set 31
1 Can't open TERMCAP: [%s]\n
diff --git a/contrib/tcsh/nls/finnish/set4 b/contrib/tcsh/nls/finnish/set4
index 518fbb1fe56a..7a86315f29a7 100644
--- a/contrib/tcsh/nls/finnish/set4
+++ b/contrib/tcsh/nls/finnish/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.1 2000/01/14 22:57:33 christos Exp $
+$ $tcsh: set4,v 1.2 2006/03/02 18:46:46 christos Exp $
$ Termcap strings
$set 4
1 add new blank line
diff --git a/contrib/tcsh/nls/finnish/set5 b/contrib/tcsh/nls/finnish/set5
index 4aeba2809f54..c584aabc48f7 100644
--- a/contrib/tcsh/nls/finnish/set5
+++ b/contrib/tcsh/nls/finnish/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.1 2000/01/14 22:57:33 christos Exp $
+$ $tcsh: set5,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ed.chared.c
$set 5
1 Kuormituskeskiarvoja ei ole saatavilla\n
diff --git a/contrib/tcsh/nls/finnish/set6 b/contrib/tcsh/nls/finnish/set6
index 83ba9ba3fdae..f26af6f8d18b 100644
--- a/contrib/tcsh/nls/finnish/set6
+++ b/contrib/tcsh/nls/finnish/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.1 2000/01/14 22:57:34 christos Exp $
+$ $tcsh: set6,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ed.inputl.c
$set 6
1 VIKA: Virheellinen komento nppimelt 0%o\r\n
diff --git a/contrib/tcsh/nls/finnish/set7 b/contrib/tcsh/nls/finnish/set7
index 6ac2a2f852f8..954a75eb6ad3 100644
--- a/contrib/tcsh/nls/finnish/set7
+++ b/contrib/tcsh/nls/finnish/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.1 2000/01/14 22:57:34 christos Exp $
+$ $tcsh: set7,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ed.screen.c
$set 7
1 \n\tTcsh:n mielest ptteellsi on\n
diff --git a/contrib/tcsh/nls/finnish/set8 b/contrib/tcsh/nls/finnish/set8
index abff0ad26ab5..ae231a8d00b6 100644
--- a/contrib/tcsh/nls/finnish/set8
+++ b/contrib/tcsh/nls/finnish/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.1 2000/01/14 22:57:34 christos Exp $
+$ $tcsh: set8,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ed.term.c
$set 8
1 Tuntematon valitsin
diff --git a/contrib/tcsh/nls/finnish/set9 b/contrib/tcsh/nls/finnish/set9
index 857dce9f7450..befc4a85a6ad 100644
--- a/contrib/tcsh/nls/finnish/set9
+++ b/contrib/tcsh/nls/finnish/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.1 2000/01/14 22:57:34 christos Exp $
+$ $tcsh: set9,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: Null extended-key not allowed.\n
diff --git a/contrib/tcsh/nls/french/set1 b/contrib/tcsh/nls/french/set1
index 9d8764aca1f4..111cfed52254 100644
--- a/contrib/tcsh/nls/french/set1
+++ b/contrib/tcsh/nls/french/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.3 1998/06/27 12:27:57 christos Exp $
+$ $tcsh: set1,v 1.4 2006/03/02 18:46:46 christos Exp $
$ Messages d 'erreur
$set 1
1 Erreur de syntaxe
diff --git a/contrib/tcsh/nls/french/set10 b/contrib/tcsh/nls/french/set10
index 191462aabbde..8df42bd3317d 100644
--- a/contrib/tcsh/nls/french/set10
+++ b/contrib/tcsh/nls/french/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set10,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ma.setp.c
$set 10
1 setpath: commande incorrecte '%s'.\n
diff --git a/contrib/tcsh/nls/french/set11 b/contrib/tcsh/nls/french/set11
index d5c4aa46358d..1f58163c4052 100644
--- a/contrib/tcsh/nls/french/set11
+++ b/contrib/tcsh/nls/french/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.2 2003/05/26 07:11:07 christos Exp $
+$ $tcsh: set11,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.c
$set 11
1 Attention: pas d'accs au tty (%s).\n
diff --git a/contrib/tcsh/nls/french/set12 b/contrib/tcsh/nls/french/set12
index ccc1396d21d3..8b04a6a3c157 100644
--- a/contrib/tcsh/nls/french/set12
+++ b/contrib/tcsh/nls/french/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.2 1996/04/26 20:45:51 christos Exp $
+$ $tcsh: set12,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.dir.c
$set 12
1 %s: Essaie de dmarrer partir de "%s"\n
diff --git a/contrib/tcsh/nls/french/set13 b/contrib/tcsh/nls/french/set13
index aeefa40abe57..fd768abb6fa6 100644
--- a/contrib/tcsh/nls/french/set13
+++ b/contrib/tcsh/nls/french/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set13,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/french/set14 b/contrib/tcsh/nls/french/set14
index dd168909ab24..a543a0ba9845 100644
--- a/contrib/tcsh/nls/french/set14
+++ b/contrib/tcsh/nls/french/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set14,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.file.c
$set 14
1 \nTrop de %s !!\n
diff --git a/contrib/tcsh/nls/french/set15 b/contrib/tcsh/nls/french/set15
index 4a59b546c32e..9d4004487ffe 100644
--- a/contrib/tcsh/nls/french/set15
+++ b/contrib/tcsh/nls/french/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set15,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: ne peut %s la limite%s\n
diff --git a/contrib/tcsh/nls/french/set16 b/contrib/tcsh/nls/french/set16
index 0ce1081f6d01..e5a18c6470aa 100644
--- a/contrib/tcsh/nls/french/set16
+++ b/contrib/tcsh/nls/french/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.2 1996/04/26 20:45:55 christos Exp $
+$ $tcsh: set16,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.lex.c
$set 16
1 Rinitialise le groupe de processus des terminaux de %d %d\n
diff --git a/contrib/tcsh/nls/french/set17 b/contrib/tcsh/nls/french/set17
index 0f8c66fb0a39..ad57470fe243 100644
--- a/contrib/tcsh/nls/french/set17
+++ b/contrib/tcsh/nls/french/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.3 2003/02/08 20:03:27 christos Exp $
+$ $tcsh: set17,v 1.4 2006/03/02 18:46:46 christos Exp $
$ sh.proc.c
$set 17
1 BUG: attente de travail en tche de fond !\n
diff --git a/contrib/tcsh/nls/french/set18 b/contrib/tcsh/nls/french/set18
index 0d6c50f75cf6..c0caa262cf74 100644
--- a/contrib/tcsh/nls/french/set18
+++ b/contrib/tcsh/nls/french/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set18,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.set.c
$set 18
1 Attention: le PATH exagrment long est tronqu\n
diff --git a/contrib/tcsh/nls/french/set19 b/contrib/tcsh/nls/french/set19
index c24da8a85005..cafc9602fbd8 100644
--- a/contrib/tcsh/nls/french/set19
+++ b/contrib/tcsh/nls/french/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.2 1996/04/26 20:45:59 christos Exp $
+$ $tcsh: set19,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: Plus de mmoire\n
diff --git a/contrib/tcsh/nls/french/set2 b/contrib/tcsh/nls/french/set2
index e5bf6173c71b..c6b0eebb2059 100644
--- a/contrib/tcsh/nls/french/set2
+++ b/contrib/tcsh/nls/french/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.2 1997/10/27 23:33:53 christos Exp $
+$ $tcsh: set2,v 1.3 2006/03/02 18:46:46 christos Exp $
$ Messages Signaux
$set 2
1 Signal nul
diff --git a/contrib/tcsh/nls/french/set20 b/contrib/tcsh/nls/french/set20
index 0f26862392bd..2595d06402c6 100644
--- a/contrib/tcsh/nls/french/set20
+++ b/contrib/tcsh/nls/french/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set20,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.bind.c
$set 20
1 Nom de touche incorrect `%S'\n
diff --git a/contrib/tcsh/nls/french/set21 b/contrib/tcsh/nls/french/set21
index 78c8c1a468e9..670e9e51b4bb 100644
--- a/contrib/tcsh/nls/french/set21
+++ b/contrib/tcsh/nls/french/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set21,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.disc.c
$set 21
1 ne peut obtenir les caractres locaux.\n
diff --git a/contrib/tcsh/nls/french/set22 b/contrib/tcsh/nls/french/set22
index 94f4131f621c..c59fe9719375 100644
--- a/contrib/tcsh/nls/french/set22
+++ b/contrib/tcsh/nls/french/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set22,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.func.c
$set 22
1 %S: \t a comme alias
diff --git a/contrib/tcsh/nls/french/set23 b/contrib/tcsh/nls/french/set23
index 187db0f6862c..5fb6339c99e8 100644
--- a/contrib/tcsh/nls/french/set23
+++ b/contrib/tcsh/nls/french/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.2 1996/04/26 20:46:04 christos Exp $
+$ $tcsh: set23,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.os.c
$set 23
1 Mauvais nom de cpu/site
diff --git a/contrib/tcsh/nls/french/set24 b/contrib/tcsh/nls/french/set24
index 4c89c35ec4ad..f97ef1c30e7d 100644
--- a/contrib/tcsh/nls/french/set24
+++ b/contrib/tcsh/nls/french/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set24,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.sched.c
$set 24
1 kludge
diff --git a/contrib/tcsh/nls/french/set25 b/contrib/tcsh/nls/french/set25
index f5efff557b0c..7bf62acf8f74 100644
--- a/contrib/tcsh/nls/french/set25
+++ b/contrib/tcsh/nls/french/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set25,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.sig.c
$set 25
1 notre attente %d\n
diff --git a/contrib/tcsh/nls/french/set26 b/contrib/tcsh/nls/french/set26
index c42cb3cd9577..b5139e7995e0 100644
--- a/contrib/tcsh/nls/french/set26
+++ b/contrib/tcsh/nls/french/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set26,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.who.c
$set 26
1 ne peut effectuer stat %s. S.V.P effectuez "unset watch".\n
diff --git a/contrib/tcsh/nls/french/set27 b/contrib/tcsh/nls/french/set27
index 3f2932164545..e86b26c3fa52 100644
--- a/contrib/tcsh/nls/french/set27
+++ b/contrib/tcsh/nls/french/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set27,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tw.comp.c
$set 27
1 commande
diff --git a/contrib/tcsh/nls/french/set29 b/contrib/tcsh/nls/french/set29
index 7309fe40e135..b90aeae43bf9 100644
--- a/contrib/tcsh/nls/french/set29
+++ b/contrib/tcsh/nls/french/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set29,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tw.help.c
$set 29
1 Pas de fichier d'aide pour %S\n
diff --git a/contrib/tcsh/nls/french/set3 b/contrib/tcsh/nls/french/set3
index 7e6c95223052..797524a632ac 100644
--- a/contrib/tcsh/nls/french/set3
+++ b/contrib/tcsh/nls/french/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.2 2001/04/26 19:07:49 kim Exp $
+$ $tcsh: set3,v 1.3 2006/03/02 18:46:46 christos Exp $
$ Description des fonctions diteur
$set 3
1 Recule d'un caractre
diff --git a/contrib/tcsh/nls/french/set30 b/contrib/tcsh/nls/french/set30
index 27ab9c9fae3a..e35a39a4068f 100644
--- a/contrib/tcsh/nls/french/set30
+++ b/contrib/tcsh/nls/french/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.2 1996/04/26 20:46:09 christos Exp $
+$ $tcsh: set30,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tw.parse.c
$set 30
1 dmarre une commande %d\n
diff --git a/contrib/tcsh/nls/french/set31 b/contrib/tcsh/nls/french/set31
index 211c5bf0d5b6..e63d2d4b72ef 100644
--- a/contrib/tcsh/nls/french/set31
+++ b/contrib/tcsh/nls/french/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set31,v 1.2 2006/03/02 18:46:46 christos Exp $
$ vms.termcap.c
$set 31
1 Ne peut ouvrir TERMCAP: [%s]\n
diff --git a/contrib/tcsh/nls/french/set4 b/contrib/tcsh/nls/french/set4
index bff6be317774..8e63fb109b99 100644
--- a/contrib/tcsh/nls/french/set4
+++ b/contrib/tcsh/nls/french/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set4,v 1.2 2006/03/02 18:46:46 christos Exp $
$ Termcap strings
$set 4
1 ajoute une nouvelle ligne vide
diff --git a/contrib/tcsh/nls/french/set5 b/contrib/tcsh/nls/french/set5
index d2caaea113ae..edf169c97879 100644
--- a/contrib/tcsh/nls/french/set5
+++ b/contrib/tcsh/nls/french/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set5,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ed.chared.c
$set 5
1 Charge moyenne indisponible\n
diff --git a/contrib/tcsh/nls/french/set6 b/contrib/tcsh/nls/french/set6
index f766687eb2ac..886832eda92c 100644
--- a/contrib/tcsh/nls/french/set6
+++ b/contrib/tcsh/nls/french/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set6,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ed.inputl.c
$set 6
1 ERREUR: commande interdite de la touche 0%o\r\n
diff --git a/contrib/tcsh/nls/french/set7 b/contrib/tcsh/nls/french/set7
index 104eb4b24293..9971ea6bcb84 100644
--- a/contrib/tcsh/nls/french/set7
+++ b/contrib/tcsh/nls/french/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.2 1996/04/26 20:46:12 christos Exp $
+$ $tcsh: set7,v 1.3 2006/03/02 18:46:46 christos Exp $
$ ed.screen.c
$set 7
1 \n\tTcsh a dtermin que votre terminal a les\n
diff --git a/contrib/tcsh/nls/french/set8 b/contrib/tcsh/nls/french/set8
index 3c089f8abb88..4ab49b950787 100644
--- a/contrib/tcsh/nls/french/set8
+++ b/contrib/tcsh/nls/french/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set8,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ed.term.c
$set 8
1 Slecteur inconnu
diff --git a/contrib/tcsh/nls/french/set9 b/contrib/tcsh/nls/french/set9
index b776d6b1b9ac..a47cf625d340 100644
--- a/contrib/tcsh/nls/french/set9
+++ b/contrib/tcsh/nls/french/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.1 1995/04/25 14:04:35 christos Exp $
+$ $tcsh: set9,v 1.2 2006/03/02 18:46:46 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: touche d'extension nulle pas autoris.\n
diff --git a/contrib/tcsh/nls/german/set1 b/contrib/tcsh/nls/german/set1
index 616e5a12bcfd..e6f75ad7f2a2 100644
--- a/contrib/tcsh/nls/german/set1
+++ b/contrib/tcsh/nls/german/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.5 1998/06/27 12:27:59 christos Exp $
+$ $tcsh: set1,v 1.6 2006/03/02 18:46:46 christos Exp $
$ Error messages
$set 1
1 Syntaxfehler
diff --git a/contrib/tcsh/nls/german/set10 b/contrib/tcsh/nls/german/set10
index 27f8a66a9ccc..185aa61e4bcf 100644
--- a/contrib/tcsh/nls/german/set10
+++ b/contrib/tcsh/nls/german/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.4 2001/04/26 19:09:18 kim Exp $
+$ $tcsh: set10,v 1.5 2006/03/02 18:46:46 christos Exp $
$ ma.setp.c
$set 10
1 setpath: ungltiger Befehl '%s'.\n
diff --git a/contrib/tcsh/nls/german/set11 b/contrib/tcsh/nls/german/set11
index 793e4d4a4759..603eb518d060 100644
--- a/contrib/tcsh/nls/german/set11
+++ b/contrib/tcsh/nls/german/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.4 1996/10/19 17:52:49 christos Exp $
+$ $tcsh: set11,v 1.5 2006/03/02 18:46:46 christos Exp $
$ sh.c
$set 11
1 Warnung: kein Zugriff auf Tty (%s).\n
diff --git a/contrib/tcsh/nls/german/set12 b/contrib/tcsh/nls/german/set12
index fefab671611e..101b1785eda4 100644
--- a/contrib/tcsh/nls/german/set12
+++ b/contrib/tcsh/nls/german/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.3 1996/04/26 20:54:21 christos Exp $
+$ $tcsh: set12,v 1.4 2006/03/02 18:46:46 christos Exp $
$ sh.dir.c
$set 12
1 %s: Versuche von "%s" zu starten.\n
diff --git a/contrib/tcsh/nls/german/set13 b/contrib/tcsh/nls/german/set13
index e03203a8210a..5da0fd24c575 100644
--- a/contrib/tcsh/nls/german/set13
+++ b/contrib/tcsh/nls/german/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set13,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/german/set14 b/contrib/tcsh/nls/german/set14
index e8828771e685..e5b65df63bca 100644
--- a/contrib/tcsh/nls/german/set14
+++ b/contrib/tcsh/nls/german/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.3 1996/10/19 17:52:50 christos Exp $
+$ $tcsh: set14,v 1.4 2006/03/02 18:46:46 christos Exp $
$ sh.file.c
$set 14
1 \nAuweia!! Zu viele %s!!\n
diff --git a/contrib/tcsh/nls/german/set15 b/contrib/tcsh/nls/german/set15
index 3113808994fd..bc215c86f117 100644
--- a/contrib/tcsh/nls/german/set15
+++ b/contrib/tcsh/nls/german/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.3 1996/10/19 17:52:51 christos Exp $
+$ $tcsh: set15,v 1.4 2006/03/02 18:46:46 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: Kann Begrenzung nicht %s%s\n
diff --git a/contrib/tcsh/nls/german/set16 b/contrib/tcsh/nls/german/set16
index e43d5a8e9416..bc261080f168 100644
--- a/contrib/tcsh/nls/german/set16
+++ b/contrib/tcsh/nls/german/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set16,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.lex.c
$set 16
1 Setze Prozegruppe des Terminals von %d auf %d\n
diff --git a/contrib/tcsh/nls/german/set17 b/contrib/tcsh/nls/german/set17
index 537239219f91..e00de87f0772 100644
--- a/contrib/tcsh/nls/german/set17
+++ b/contrib/tcsh/nls/german/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.4 2003/02/08 20:03:27 christos Exp $
+$ $tcsh: set17,v 1.5 2006/03/02 18:46:46 christos Exp $
$ sh.proc.c
$set 17
1 FEHLER: Warte auf Hintergrund-Job!\n
diff --git a/contrib/tcsh/nls/german/set18 b/contrib/tcsh/nls/german/set18
index 016e6700a505..40e56d892c0d 100644
--- a/contrib/tcsh/nls/german/set18
+++ b/contrib/tcsh/nls/german/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set18,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.set.c
$set 18
1 Warnung: lcherlich langer PATH abgeschnitten\n
diff --git a/contrib/tcsh/nls/german/set19 b/contrib/tcsh/nls/german/set19
index 376ce3009b1e..d852451e34c9 100644
--- a/contrib/tcsh/nls/german/set19
+++ b/contrib/tcsh/nls/german/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set19,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: Out of memory\n
diff --git a/contrib/tcsh/nls/german/set2 b/contrib/tcsh/nls/german/set2
index 08af0c76ccf9..6f36bc676921 100644
--- a/contrib/tcsh/nls/german/set2
+++ b/contrib/tcsh/nls/german/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.4 1997/10/27 23:33:55 christos Exp $
+$ $tcsh: set2,v 1.5 2006/03/02 18:46:46 christos Exp $
$ Signal names
$set 2
1 Null signal
diff --git a/contrib/tcsh/nls/german/set20 b/contrib/tcsh/nls/german/set20
index 877367179004..638c00ea40e9 100644
--- a/contrib/tcsh/nls/german/set20
+++ b/contrib/tcsh/nls/german/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set20,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.bind.c
$set 20
1 Ungltiger Tastenname `%S'\n
diff --git a/contrib/tcsh/nls/german/set21 b/contrib/tcsh/nls/german/set21
index 509887f06371..32a277413606 100644
--- a/contrib/tcsh/nls/german/set21
+++ b/contrib/tcsh/nls/german/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set21,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.disc.c
$set 21
1 Kann lokale Sonderzeichen nicht auslesen.\n
diff --git a/contrib/tcsh/nls/german/set22 b/contrib/tcsh/nls/german/set22
index d7521bd77e13..0e93b38c1438 100644
--- a/contrib/tcsh/nls/german/set22
+++ b/contrib/tcsh/nls/german/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set22,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.func.c
$set 22
1 %S: \t ein Alias fr
diff --git a/contrib/tcsh/nls/german/set23 b/contrib/tcsh/nls/german/set23
index f2bd825f346b..42a9cbd271a0 100644
--- a/contrib/tcsh/nls/german/set23
+++ b/contrib/tcsh/nls/german/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.3 1996/04/26 20:54:22 christos Exp $
+$ $tcsh: set23,v 1.4 2006/03/02 18:46:46 christos Exp $
$ tc.os.c
$set 23
1 Falscher Cpu/Site-Name
diff --git a/contrib/tcsh/nls/german/set24 b/contrib/tcsh/nls/german/set24
index 96ecbb4f5859..dee8054ea657 100644
--- a/contrib/tcsh/nls/german/set24
+++ b/contrib/tcsh/nls/german/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set24,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.sched.c
$set 24
1 Hack!
diff --git a/contrib/tcsh/nls/german/set25 b/contrib/tcsh/nls/german/set25
index 443104ae6cfc..a034603f48a6 100644
--- a/contrib/tcsh/nls/german/set25
+++ b/contrib/tcsh/nls/german/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set25,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.sig.c
$set 25
1 unser wait %d\n
diff --git a/contrib/tcsh/nls/german/set26 b/contrib/tcsh/nls/german/set26
index 548b534eafe6..c9d1270abd0f 100644
--- a/contrib/tcsh/nls/german/set26
+++ b/contrib/tcsh/nls/german/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.3 1996/10/19 17:52:52 christos Exp $
+$ $tcsh: set26,v 1.4 2006/03/02 18:46:46 christos Exp $
$ tc.who.c
$set 26
1 Kein Zugriff auf %s. Bitte "unset watch" eingeben.\n
diff --git a/contrib/tcsh/nls/german/set27 b/contrib/tcsh/nls/german/set27
index d5a646088a46..9ad802f7a0d4 100644
--- a/contrib/tcsh/nls/german/set27
+++ b/contrib/tcsh/nls/german/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set27,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tw.comp.c
$set 27
1 Befehl
diff --git a/contrib/tcsh/nls/german/set29 b/contrib/tcsh/nls/german/set29
index 490b5324c931..16ef38ab7608 100644
--- a/contrib/tcsh/nls/german/set29
+++ b/contrib/tcsh/nls/german/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set29,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tw.help.c
$set 29
1 Keine Hilfe-Datei fr %S\n
diff --git a/contrib/tcsh/nls/german/set3 b/contrib/tcsh/nls/german/set3
index 43688180181b..f2b642c72291 100644
--- a/contrib/tcsh/nls/german/set3
+++ b/contrib/tcsh/nls/german/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.5 2001/04/26 19:07:50 kim Exp $
+$ $tcsh: set3,v 1.6 2006/03/02 18:46:46 christos Exp $
$ Editor function descriptions
$set 3
1 Ein Zeichen zurck
diff --git a/contrib/tcsh/nls/german/set30 b/contrib/tcsh/nls/german/set30
index 0657670f30e5..534886e5fe4d 100644
--- a/contrib/tcsh/nls/german/set30
+++ b/contrib/tcsh/nls/german/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.3 1996/04/26 20:54:24 christos Exp $
+$ $tcsh: set30,v 1.4 2006/03/02 18:46:46 christos Exp $
$ tw.parse.c
$set 30
1 Anfangsbefehl %d\n
diff --git a/contrib/tcsh/nls/german/set31 b/contrib/tcsh/nls/german/set31
index 88f3dcc7b256..95322564e2fd 100644
--- a/contrib/tcsh/nls/german/set31
+++ b/contrib/tcsh/nls/german/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set31,v 1.3 2006/03/02 18:46:46 christos Exp $
$ vms.termcap.c
$set 31
1 Kann TERMCAP nicht ffnen: [%s]\n
diff --git a/contrib/tcsh/nls/german/set4 b/contrib/tcsh/nls/german/set4
index c11e71269b71..baee5521516b 100644
--- a/contrib/tcsh/nls/german/set4
+++ b/contrib/tcsh/nls/german/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set4,v 1.3 2006/03/02 18:46:46 christos Exp $
$ Termcap strings
$set 4
1 fge neue, leere Zeile hinzu
diff --git a/contrib/tcsh/nls/german/set5 b/contrib/tcsh/nls/german/set5
index 195c72e62c1c..2161749e2033 100644
--- a/contrib/tcsh/nls/german/set5
+++ b/contrib/tcsh/nls/german/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set5,v 1.3 2006/03/02 18:46:46 christos Exp $
$ ed.chared.c
$set 5
1 Durchschnittliche Last nicht verfgbar\n
diff --git a/contrib/tcsh/nls/german/set6 b/contrib/tcsh/nls/german/set6
index df99266afb46..350b1d084899 100644
--- a/contrib/tcsh/nls/german/set6
+++ b/contrib/tcsh/nls/german/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set6,v 1.3 2006/03/02 18:46:46 christos Exp $
$ ed.inputl.c
$set 6
1 FEHLER: Illegaler Befehl von Taste 0%o\r\n
diff --git a/contrib/tcsh/nls/german/set7 b/contrib/tcsh/nls/german/set7
index 188bf64854af..8aee38d12fda 100644
--- a/contrib/tcsh/nls/german/set7
+++ b/contrib/tcsh/nls/german/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.4 1996/10/19 17:52:53 christos Exp $
+$ $tcsh: set7,v 1.5 2006/03/02 18:46:46 christos Exp $
$ ed.screen.c
$set 7
1 \n\tTcsh meint, Ihr Endgert hat die\n
diff --git a/contrib/tcsh/nls/german/set8 b/contrib/tcsh/nls/german/set8
index ba7f030fc8e0..4e09b22296a7 100644
--- a/contrib/tcsh/nls/german/set8
+++ b/contrib/tcsh/nls/german/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.2 1995/03/19 18:09:24 christos Exp $
+$ $tcsh: set8,v 1.3 2006/03/02 18:46:46 christos Exp $
$ ed.term.c
$set 8
1 Unbekannter Schalter
diff --git a/contrib/tcsh/nls/german/set9 b/contrib/tcsh/nls/german/set9
index b987d11e36c4..e8607a388858 100644
--- a/contrib/tcsh/nls/german/set9
+++ b/contrib/tcsh/nls/german/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.3 1996/10/19 17:52:54 christos Exp $
+$ $tcsh: set9,v 1.4 2006/03/02 18:46:46 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: Null extended-key not allowed.\n
diff --git a/contrib/tcsh/nls/greek/set1 b/contrib/tcsh/nls/greek/set1
index 17c857312f94..3599c3412858 100644
--- a/contrib/tcsh/nls/greek/set1
+++ b/contrib/tcsh/nls/greek/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.3 1998/09/18 15:31:57 christos Exp $
+$ $tcsh: set1,v 1.4 2006/03/02 18:46:46 christos Exp $
$ Error messages
$set 1
1
diff --git a/contrib/tcsh/nls/greek/set10 b/contrib/tcsh/nls/greek/set10
index 33a00def0c68..a215d49302ae 100644
--- a/contrib/tcsh/nls/greek/set10
+++ b/contrib/tcsh/nls/greek/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.2 1998/09/18 15:31:58 christos Exp $
+$ $tcsh: set10,v 1.3 2006/03/02 18:46:46 christos Exp $
$ ma.setp.c
$set 10
1 setpath: '%s'.\n
diff --git a/contrib/tcsh/nls/greek/set11 b/contrib/tcsh/nls/greek/set11
index 1ab395117c53..82c188884b07 100644
--- a/contrib/tcsh/nls/greek/set11
+++ b/contrib/tcsh/nls/greek/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.1 1996/04/26 19:24:11 christos Exp $
+$ $tcsh: set11,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.c
$set 11
1 : tty (%s).\n
diff --git a/contrib/tcsh/nls/greek/set12 b/contrib/tcsh/nls/greek/set12
index 09cfdc6d3c5b..379ae7820596 100644
--- a/contrib/tcsh/nls/greek/set12
+++ b/contrib/tcsh/nls/greek/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.2 1998/09/18 15:31:59 christos Exp $
+$ $tcsh: set12,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.dir.c
$set 12
1 %s: "%s"\n
diff --git a/contrib/tcsh/nls/greek/set13 b/contrib/tcsh/nls/greek/set13
index 6e6963a4d68a..9ec55e1ca3a9 100644
--- a/contrib/tcsh/nls/greek/set13
+++ b/contrib/tcsh/nls/greek/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.1 1996/04/26 19:24:15 christos Exp $
+$ $tcsh: set13,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/greek/set14 b/contrib/tcsh/nls/greek/set14
index 282f639d98ac..05479401ae0e 100644
--- a/contrib/tcsh/nls/greek/set14
+++ b/contrib/tcsh/nls/greek/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.2 1998/11/24 18:18:11 christos Exp $
+$ $tcsh: set14,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.file.c
$set 14
1 \n!! %s!!\n
diff --git a/contrib/tcsh/nls/greek/set15 b/contrib/tcsh/nls/greek/set15
index f92fef4ce8db..ff17a6e7bbe1 100644
--- a/contrib/tcsh/nls/greek/set15
+++ b/contrib/tcsh/nls/greek/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.1 1996/04/26 19:24:18 christos Exp $
+$ $tcsh: set15,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: %s%s \n
diff --git a/contrib/tcsh/nls/greek/set16 b/contrib/tcsh/nls/greek/set16
index 18d92e25c9aa..e4dcca8b4833 100644
--- a/contrib/tcsh/nls/greek/set16
+++ b/contrib/tcsh/nls/greek/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.2 1998/09/18 15:32:00 christos Exp $
+$ $tcsh: set16,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.lex.c
$set 16
1 tty %d %d\n
diff --git a/contrib/tcsh/nls/greek/set17 b/contrib/tcsh/nls/greek/set17
index 9a6c9d132dba..4ac01061ccd2 100644
--- a/contrib/tcsh/nls/greek/set17
+++ b/contrib/tcsh/nls/greek/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.2 2003/02/08 20:03:27 christos Exp $
+$ $tcsh: set17,v 1.3 2006/03/02 18:46:46 christos Exp $
$ sh.proc.c
$set 17
1 BUG: wait !\n
diff --git a/contrib/tcsh/nls/greek/set18 b/contrib/tcsh/nls/greek/set18
index ad0a5e6c1bf4..ffd82b65c791 100644
--- a/contrib/tcsh/nls/greek/set18
+++ b/contrib/tcsh/nls/greek/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.1 1996/04/26 19:24:26 christos Exp $
+$ $tcsh: set18,v 1.2 2006/03/02 18:46:46 christos Exp $
$ sh.set.c
$set 18
1 : PATH , \n
diff --git a/contrib/tcsh/nls/greek/set19 b/contrib/tcsh/nls/greek/set19
index e1d15200d182..718b43f5ebec 100644
--- a/contrib/tcsh/nls/greek/set19
+++ b/contrib/tcsh/nls/greek/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.1 1996/04/26 19:24:27 christos Exp $
+$ $tcsh: set19,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: \n
diff --git a/contrib/tcsh/nls/greek/set2 b/contrib/tcsh/nls/greek/set2
index 35a14b2d2d70..d54db2f9c9d8 100644
--- a/contrib/tcsh/nls/greek/set2
+++ b/contrib/tcsh/nls/greek/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.2 1997/10/27 23:33:56 christos Exp $
+$ $tcsh: set2,v 1.3 2006/03/02 18:46:46 christos Exp $
$ Signal names
$set 2
1 signal
diff --git a/contrib/tcsh/nls/greek/set20 b/contrib/tcsh/nls/greek/set20
index 9ff678db53f1..077a3a0d3a91 100644
--- a/contrib/tcsh/nls/greek/set20
+++ b/contrib/tcsh/nls/greek/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.3 1998/09/18 15:32:01 christos Exp $
+$ $tcsh: set20,v 1.4 2006/03/02 18:46:46 christos Exp $
$ tc.bind.c
$set 20
1 `%S'\n
diff --git a/contrib/tcsh/nls/greek/set21 b/contrib/tcsh/nls/greek/set21
index 0e2933f8922c..3ef206b08b95 100644
--- a/contrib/tcsh/nls/greek/set21
+++ b/contrib/tcsh/nls/greek/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.1 1996/04/26 19:24:32 christos Exp $
+$ $tcsh: set21,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.disc.c
$set 21
1 local chars.\n
diff --git a/contrib/tcsh/nls/greek/set22 b/contrib/tcsh/nls/greek/set22
index 70d389a3bfad..239503112940 100644
--- a/contrib/tcsh/nls/greek/set22
+++ b/contrib/tcsh/nls/greek/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.1 1996/04/26 19:24:35 christos Exp $
+$ $tcsh: set22,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.func.c
$set 22
1 %S: \t
diff --git a/contrib/tcsh/nls/greek/set23 b/contrib/tcsh/nls/greek/set23
index 4fb299839768..813c2b17dab8 100644
--- a/contrib/tcsh/nls/greek/set23
+++ b/contrib/tcsh/nls/greek/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.2 1998/09/18 15:32:02 christos Exp $
+$ $tcsh: set23,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.os.c
$set 23
1 cpu/site
diff --git a/contrib/tcsh/nls/greek/set24 b/contrib/tcsh/nls/greek/set24
index f1a811b175d6..f97ef1c30e7d 100644
--- a/contrib/tcsh/nls/greek/set24
+++ b/contrib/tcsh/nls/greek/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.1 1996/04/26 19:24:44 christos Exp $
+$ $tcsh: set24,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.sched.c
$set 24
1 kludge
diff --git a/contrib/tcsh/nls/greek/set25 b/contrib/tcsh/nls/greek/set25
index 316c20f7bb18..406d7106e7e0 100644
--- a/contrib/tcsh/nls/greek/set25
+++ b/contrib/tcsh/nls/greek/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.1 1996/04/26 19:24:47 christos Exp $
+$ $tcsh: set25,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tc.sig.c
$set 25
1 our wait %d\n
diff --git a/contrib/tcsh/nls/greek/set26 b/contrib/tcsh/nls/greek/set26
index 4449a6515594..d081bbc615c2 100644
--- a/contrib/tcsh/nls/greek/set26
+++ b/contrib/tcsh/nls/greek/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.2 1998/09/18 15:32:02 christos Exp $
+$ $tcsh: set26,v 1.3 2006/03/02 18:46:46 christos Exp $
$ tc.who.c
$set 26
1 stat %s. "unset watch".\n
diff --git a/contrib/tcsh/nls/greek/set27 b/contrib/tcsh/nls/greek/set27
index fba464481414..4e9141640323 100644
--- a/contrib/tcsh/nls/greek/set27
+++ b/contrib/tcsh/nls/greek/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.1 1996/04/26 19:24:51 christos Exp $
+$ $tcsh: set27,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tw.comp.c
$set 27
1
diff --git a/contrib/tcsh/nls/greek/set29 b/contrib/tcsh/nls/greek/set29
index 6f30288e331c..cf0b9ebadaeb 100644
--- a/contrib/tcsh/nls/greek/set29
+++ b/contrib/tcsh/nls/greek/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.1 1996/04/26 19:24:55 christos Exp $
+$ $tcsh: set29,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tw.help.c
$set 29
1 %S\n
diff --git a/contrib/tcsh/nls/greek/set3 b/contrib/tcsh/nls/greek/set3
index 3a3f56a81eb9..b66cc1aadf3a 100644
--- a/contrib/tcsh/nls/greek/set3
+++ b/contrib/tcsh/nls/greek/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.3 2001/04/26 19:07:50 kim Exp $
+$ $tcsh: set3,v 1.4 2006/03/02 18:46:46 christos Exp $
$ Editor function descriptions
$set 3
1
diff --git a/contrib/tcsh/nls/greek/set30 b/contrib/tcsh/nls/greek/set30
index 121cfc34ae87..473f3313c93f 100644
--- a/contrib/tcsh/nls/greek/set30
+++ b/contrib/tcsh/nls/greek/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.1 1996/04/26 19:25:06 christos Exp $
+$ $tcsh: set30,v 1.2 2006/03/02 18:46:46 christos Exp $
$ tw.parse.c
$set 30
1 starting_a_command %d\n
diff --git a/contrib/tcsh/nls/greek/set31 b/contrib/tcsh/nls/greek/set31
index 95f3e0da8eb8..d23de88e22a2 100644
--- a/contrib/tcsh/nls/greek/set31
+++ b/contrib/tcsh/nls/greek/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.1 1996/04/26 19:25:15 christos Exp $
+$ $tcsh: set31,v 1.2 2006/03/02 18:46:47 christos Exp $
$ vms.termcap.c
$set 31
1 TERMCAP: [%s]\n
diff --git a/contrib/tcsh/nls/greek/set4 b/contrib/tcsh/nls/greek/set4
index b982ed1a680b..84fbc921739e 100644
--- a/contrib/tcsh/nls/greek/set4
+++ b/contrib/tcsh/nls/greek/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.2 1998/09/18 15:32:04 christos Exp $
+$ $tcsh: set4,v 1.3 2006/03/02 18:46:47 christos Exp $
$ Termcap strings
$set 4
1
diff --git a/contrib/tcsh/nls/greek/set5 b/contrib/tcsh/nls/greek/set5
index 6d4834b9b3b6..1125e850d43f 100644
--- a/contrib/tcsh/nls/greek/set5
+++ b/contrib/tcsh/nls/greek/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.1 1996/04/26 19:25:27 christos Exp $
+$ $tcsh: set5,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.chared.c
$set 5
1 \n
diff --git a/contrib/tcsh/nls/greek/set6 b/contrib/tcsh/nls/greek/set6
index 8d6da29294f3..0a494c1812af 100644
--- a/contrib/tcsh/nls/greek/set6
+++ b/contrib/tcsh/nls/greek/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.1 1996/04/26 19:25:29 christos Exp $
+$ $tcsh: set6,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.inputl.c
$set 6
1 : 0%o\r\n
diff --git a/contrib/tcsh/nls/greek/set7 b/contrib/tcsh/nls/greek/set7
index 4eea77f49c75..b88d2ffabbec 100644
--- a/contrib/tcsh/nls/greek/set7
+++ b/contrib/tcsh/nls/greek/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.2 1998/09/18 15:32:05 christos Exp $
+$ $tcsh: set7,v 1.3 2006/03/02 18:46:47 christos Exp $
$ ed.screen.c
$set 7
1 \n\t %s \n
diff --git a/contrib/tcsh/nls/greek/set8 b/contrib/tcsh/nls/greek/set8
index 376a8cd34aac..23fb6c8fd147 100644
--- a/contrib/tcsh/nls/greek/set8
+++ b/contrib/tcsh/nls/greek/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.1 1996/04/26 19:25:32 christos Exp $
+$ $tcsh: set8,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.term.c
$set 8
1 switch
diff --git a/contrib/tcsh/nls/greek/set9 b/contrib/tcsh/nls/greek/set9
index 1ec07317d065..9ed5f7c5b2dd 100644
--- a/contrib/tcsh/nls/greek/set9
+++ b/contrib/tcsh/nls/greek/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.2 1998/09/18 15:32:06 christos Exp $
+$ $tcsh: set9,v 1.3 2006/03/02 18:46:47 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: extended-key.\n
diff --git a/contrib/tcsh/nls/italian/set1 b/contrib/tcsh/nls/italian/set1
index 0f772ec1ab28..de09941af233 100644
--- a/contrib/tcsh/nls/italian/set1
+++ b/contrib/tcsh/nls/italian/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.1 1998/09/03 22:03:13 christos Exp $
+$ $tcsh: set1,v 1.2 2006/03/02 18:46:47 christos Exp $
$ Error messages
$set 1
1 Errore di Sintassi
diff --git a/contrib/tcsh/nls/italian/set10 b/contrib/tcsh/nls/italian/set10
index 1fcda2471f9e..531565b2381d 100644
--- a/contrib/tcsh/nls/italian/set10
+++ b/contrib/tcsh/nls/italian/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.1 1998/09/03 22:03:14 christos Exp $
+$ $tcsh: set10,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ma.setp.c
$set 10
1 setpath: comando '%s' non valido.\n
diff --git a/contrib/tcsh/nls/italian/set11 b/contrib/tcsh/nls/italian/set11
index a558b2c4abdc..70a5192beca8 100644
--- a/contrib/tcsh/nls/italian/set11
+++ b/contrib/tcsh/nls/italian/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.1 1998/09/03 22:03:14 christos Exp $
+$ $tcsh: set11,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.c
$set 11
1 Attenzione: accesso negato al terminale (%s).\n
diff --git a/contrib/tcsh/nls/italian/set12 b/contrib/tcsh/nls/italian/set12
index f07486bff9b6..5a3c19b77bbe 100644
--- a/contrib/tcsh/nls/italian/set12
+++ b/contrib/tcsh/nls/italian/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.1 1998/09/03 22:03:16 christos Exp $
+$ $tcsh: set12,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.dir.c
$set 12
1 %s: sto tentando di partire da "%s"\n
diff --git a/contrib/tcsh/nls/italian/set13 b/contrib/tcsh/nls/italian/set13
index 65b46bbaba98..ed5f7971765b 100644
--- a/contrib/tcsh/nls/italian/set13
+++ b/contrib/tcsh/nls/italian/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.1 1998/09/03 22:03:17 christos Exp $
+$ $tcsh: set13,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/italian/set14 b/contrib/tcsh/nls/italian/set14
index 0c9539051587..a3b3bc2693a7 100644
--- a/contrib/tcsh/nls/italian/set14
+++ b/contrib/tcsh/nls/italian/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.1 1998/09/03 22:03:18 christos Exp $
+$ $tcsh: set14,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.file.c
$set 14
1 \nAccipicchia!! Troppi %s!!\n
diff --git a/contrib/tcsh/nls/italian/set15 b/contrib/tcsh/nls/italian/set15
index 8ed2234a570c..3db0bc36a3e9 100644
--- a/contrib/tcsh/nls/italian/set15
+++ b/contrib/tcsh/nls/italian/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.1 1998/09/03 22:03:18 christos Exp $
+$ $tcsh: set15,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: non si pu %s il limite%s\n
diff --git a/contrib/tcsh/nls/italian/set16 b/contrib/tcsh/nls/italian/set16
index 1d11fbf3e4ee..0ec4eaa982e5 100644
--- a/contrib/tcsh/nls/italian/set16
+++ b/contrib/tcsh/nls/italian/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.1 1998/09/03 22:03:19 christos Exp $
+$ $tcsh: set16,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.lex.c
$set 16
1 Reinizializzato il gruppo di processi di terminale da %d a %d\n
diff --git a/contrib/tcsh/nls/italian/set17 b/contrib/tcsh/nls/italian/set17
index 12f05317f939..40e2868eec40 100644
--- a/contrib/tcsh/nls/italian/set17
+++ b/contrib/tcsh/nls/italian/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.2 2003/02/08 20:03:27 christos Exp $
+$ $tcsh: set17,v 1.3 2006/03/02 18:46:47 christos Exp $
$ sh.proc.c
$set 17
1 BACO: sto aspettando un lavoro in background!\n
diff --git a/contrib/tcsh/nls/italian/set18 b/contrib/tcsh/nls/italian/set18
index a8a80f256146..83a612c9a260 100644
--- a/contrib/tcsh/nls/italian/set18
+++ b/contrib/tcsh/nls/italian/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.1 1998/09/03 22:03:21 christos Exp $
+$ $tcsh: set18,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.set.c
$set 18
1 Attenzione: PATH indecorosamente lungo troncato\n
diff --git a/contrib/tcsh/nls/italian/set19 b/contrib/tcsh/nls/italian/set19
index caa052da1ace..9226ef6a1a5a 100644
--- a/contrib/tcsh/nls/italian/set19
+++ b/contrib/tcsh/nls/italian/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.1 1998/09/03 22:03:21 christos Exp $
+$ $tcsh: set19,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: Memoria esaurita\n
diff --git a/contrib/tcsh/nls/italian/set2 b/contrib/tcsh/nls/italian/set2
index 07925f582241..cbf9a058a06e 100644
--- a/contrib/tcsh/nls/italian/set2
+++ b/contrib/tcsh/nls/italian/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.1 1998/09/03 22:03:22 christos Exp $
+$ $tcsh: set2,v 1.2 2006/03/02 18:46:47 christos Exp $
$ Signal names
$set 2
1 Segnale nullo
diff --git a/contrib/tcsh/nls/italian/set20 b/contrib/tcsh/nls/italian/set20
index 25aadb729965..5d33ccaafa74 100644
--- a/contrib/tcsh/nls/italian/set20
+++ b/contrib/tcsh/nls/italian/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.1 1998/09/03 22:03:23 christos Exp $
+$ $tcsh: set20,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.bind.c
$set 20
1 Nome di tasto non corretto `%S'\n
diff --git a/contrib/tcsh/nls/italian/set21 b/contrib/tcsh/nls/italian/set21
index 564e91a24679..9bc2e0435bbb 100644
--- a/contrib/tcsh/nls/italian/set21
+++ b/contrib/tcsh/nls/italian/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.2 1998/09/09 10:30:21 christos Exp $
+$ $tcsh: set21,v 1.3 2006/03/02 18:46:47 christos Exp $
$ tc.disc.c
$set 21
1 Non si possono ottenere i caratteri locali\n
diff --git a/contrib/tcsh/nls/italian/set22 b/contrib/tcsh/nls/italian/set22
index 1187251f5c2a..ab9443364974 100644
--- a/contrib/tcsh/nls/italian/set22
+++ b/contrib/tcsh/nls/italian/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.1 1998/09/03 22:03:24 christos Exp $
+$ $tcsh: set22,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.func.c
$set 22
1 %S: \t un alias per
diff --git a/contrib/tcsh/nls/italian/set23 b/contrib/tcsh/nls/italian/set23
index 661e7e6ef003..8b716498f096 100644
--- a/contrib/tcsh/nls/italian/set23
+++ b/contrib/tcsh/nls/italian/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.1 1998/09/03 22:03:25 christos Exp $
+$ $tcsh: set23,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.os.c
$set 23
1 Nome di cpu/macchina non corretto
diff --git a/contrib/tcsh/nls/italian/set24 b/contrib/tcsh/nls/italian/set24
index d74e53295d6d..95457cc4601e 100644
--- a/contrib/tcsh/nls/italian/set24
+++ b/contrib/tcsh/nls/italian/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.1 1998/09/03 22:03:26 christos Exp $
+$ $tcsh: set24,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.sched.c
$set 24
1 accrocchio
diff --git a/contrib/tcsh/nls/italian/set25 b/contrib/tcsh/nls/italian/set25
index e20766ad299c..2cc50a8bb1b7 100644
--- a/contrib/tcsh/nls/italian/set25
+++ b/contrib/tcsh/nls/italian/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.1 1998/09/03 22:03:27 christos Exp $
+$ $tcsh: set25,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.sig.c
$set 25
1 ourwait %d\n
diff --git a/contrib/tcsh/nls/italian/set26 b/contrib/tcsh/nls/italian/set26
index f2ff82db7410..911cb6c1fb72 100644
--- a/contrib/tcsh/nls/italian/set26
+++ b/contrib/tcsh/nls/italian/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.1 1998/09/03 22:03:28 christos Exp $
+$ $tcsh: set26,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.who.c
$set 26
1 non posso usare stat per %s. Per piet dai un "unset watch".\n
diff --git a/contrib/tcsh/nls/italian/set27 b/contrib/tcsh/nls/italian/set27
index 856c2cc4e320..4a42895ffdb6 100644
--- a/contrib/tcsh/nls/italian/set27
+++ b/contrib/tcsh/nls/italian/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.1 1998/09/03 22:03:28 christos Exp $
+$ $tcsh: set27,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tw.comp.c
$set 27
1 comando
diff --git a/contrib/tcsh/nls/italian/set29 b/contrib/tcsh/nls/italian/set29
index 5bf6016c29d2..9519a4ddfeff 100644
--- a/contrib/tcsh/nls/italian/set29
+++ b/contrib/tcsh/nls/italian/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.1 1998/09/03 22:03:29 christos Exp $
+$ $tcsh: set29,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tw.help.c
$set 29
1 Non esiste il file di aiuto per %S\n
diff --git a/contrib/tcsh/nls/italian/set3 b/contrib/tcsh/nls/italian/set3
index fdab68ddee7d..eaff36aebeab 100644
--- a/contrib/tcsh/nls/italian/set3
+++ b/contrib/tcsh/nls/italian/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.2 2001/04/26 19:07:51 kim Exp $
+$ $tcsh: set3,v 1.3 2006/03/02 18:46:47 christos Exp $
$ Editor function descriptions
$set 3
1 Retrocede di un carattere
diff --git a/contrib/tcsh/nls/italian/set30 b/contrib/tcsh/nls/italian/set30
index b5e7ee381d99..b118429405f8 100644
--- a/contrib/tcsh/nls/italian/set30
+++ b/contrib/tcsh/nls/italian/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.1 1998/09/03 22:03:31 christos Exp $
+$ $tcsh: set30,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tw.parse.c
$set 30
1 inizio_il_comando %d\n
diff --git a/contrib/tcsh/nls/italian/set31 b/contrib/tcsh/nls/italian/set31
index 07cdef207c68..046f1bacb353 100644
--- a/contrib/tcsh/nls/italian/set31
+++ b/contrib/tcsh/nls/italian/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.1 1998/09/03 22:03:31 christos Exp $
+$ $tcsh: set31,v 1.2 2006/03/02 18:46:47 christos Exp $
$ vms.termcap.c
$set 31
1 Non posso aprire il TERMCAP: [%s]\n
diff --git a/contrib/tcsh/nls/italian/set4 b/contrib/tcsh/nls/italian/set4
index fbd56048d416..5e96ba37b1c1 100644
--- a/contrib/tcsh/nls/italian/set4
+++ b/contrib/tcsh/nls/italian/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.1 1998/09/03 22:03:32 christos Exp $
+$ $tcsh: set4,v 1.2 2006/03/02 18:46:47 christos Exp $
$ Termcap strings
$set 4
1 aggiunge una linea vuota
diff --git a/contrib/tcsh/nls/italian/set5 b/contrib/tcsh/nls/italian/set5
index 788d52ca560b..40dcae8bacc3 100644
--- a/contrib/tcsh/nls/italian/set5
+++ b/contrib/tcsh/nls/italian/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.1 1998/09/03 22:03:33 christos Exp $
+$ $tcsh: set5,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.chared.c
$set 5
1 Media di carico non disponibile\n
diff --git a/contrib/tcsh/nls/italian/set6 b/contrib/tcsh/nls/italian/set6
index 6686b011cd8d..68994a60de1f 100644
--- a/contrib/tcsh/nls/italian/set6
+++ b/contrib/tcsh/nls/italian/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.1 1998/09/03 22:03:34 christos Exp $
+$ $tcsh: set6,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.inputl.c
$set 6
1 ERRORE: comando illegale per il tasto 0%o\r\n
diff --git a/contrib/tcsh/nls/italian/set7 b/contrib/tcsh/nls/italian/set7
index f09b3dd98e20..0e843a7a248b 100644
--- a/contrib/tcsh/nls/italian/set7
+++ b/contrib/tcsh/nls/italian/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.1 1998/09/03 22:03:34 christos Exp $
+$ $tcsh: set7,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.screen.c
$set 7
1 \n\tLa tcsh ipotizza che il tuo terminale abbia\n
diff --git a/contrib/tcsh/nls/italian/set8 b/contrib/tcsh/nls/italian/set8
index ca5ce8d59fc0..f5b210bd2261 100644
--- a/contrib/tcsh/nls/italian/set8
+++ b/contrib/tcsh/nls/italian/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.1 1998/09/03 22:03:35 christos Exp $
+$ $tcsh: set8,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.term.c
$set 8
1 Commutatore sconosciuto
diff --git a/contrib/tcsh/nls/italian/set9 b/contrib/tcsh/nls/italian/set9
index 745aad233228..f4e50ff6ade5 100644
--- a/contrib/tcsh/nls/italian/set9
+++ b/contrib/tcsh/nls/italian/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.1 1998/09/03 22:03:36 christos Exp $
+$ $tcsh: set9,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: tasto esteso nullo non ammesso.\n
diff --git a/contrib/tcsh/nls/ja/set1 b/contrib/tcsh/nls/ja/set1
index 0be6a77dda99..c53da1d4e427 100644
--- a/contrib/tcsh/nls/ja/set1
+++ b/contrib/tcsh/nls/ja/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.4 2004/12/25 22:24:58 christos Exp $
+$ $tcsh: set1,v 1.5 2006/03/02 18:46:47 christos Exp $
$ Error messages
$set 1
1 ʸˡְäƤޤ
diff --git a/contrib/tcsh/nls/ja/set10 b/contrib/tcsh/nls/ja/set10
index d76ae2e90d89..e09a8e507f00 100644
--- a/contrib/tcsh/nls/ja/set10
+++ b/contrib/tcsh/nls/ja/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.1 1998/09/03 22:04:03 christos Exp $
+$ $tcsh: set10,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ma.setp.c
$set 10
1 setpath: ޥɤǤ '%s'.\n
diff --git a/contrib/tcsh/nls/ja/set11 b/contrib/tcsh/nls/ja/set11
index 1e619ba93626..bc00dbfd3eee 100644
--- a/contrib/tcsh/nls/ja/set11
+++ b/contrib/tcsh/nls/ja/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.1 1998/09/03 22:04:04 christos Exp $
+$ $tcsh: set11,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.c
$set 11
1 ٹ: tty˥Ǥޤ (%s).\n
diff --git a/contrib/tcsh/nls/ja/set12 b/contrib/tcsh/nls/ja/set12
index ef990cfed41f..d3a331830b49 100644
--- a/contrib/tcsh/nls/ja/set12
+++ b/contrib/tcsh/nls/ja/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.1 1998/09/03 22:04:05 christos Exp $
+$ $tcsh: set12,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.dir.c
$set 12
1 %s: "%s"μ¹Ԥޤ\n
diff --git a/contrib/tcsh/nls/ja/set13 b/contrib/tcsh/nls/ja/set13
index 3f0644143acc..cc8c20f40b76 100644
--- a/contrib/tcsh/nls/ja/set13
+++ b/contrib/tcsh/nls/ja/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.1 1998/09/03 22:04:05 christos Exp $
+$ $tcsh: set13,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/ja/set15 b/contrib/tcsh/nls/ja/set15
index d0049cc45f08..5cfb860a52ca 100644
--- a/contrib/tcsh/nls/ja/set15
+++ b/contrib/tcsh/nls/ja/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.1 1998/09/03 22:04:06 christos Exp $
+$ $tcsh: set15,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: %s ޤ. (%s )\n
diff --git a/contrib/tcsh/nls/ja/set16 b/contrib/tcsh/nls/ja/set16
index 644e388f207a..7edcc43bc802 100644
--- a/contrib/tcsh/nls/ja/set16
+++ b/contrib/tcsh/nls/ja/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.2 1998/09/09 10:30:26 christos Exp $
+$ $tcsh: set16,v 1.3 2006/03/02 18:46:47 christos Exp $
$ sh.lex.c
$set 16
1 tty pgrp %d %d˺ꤷޤ\n
diff --git a/contrib/tcsh/nls/ja/set17 b/contrib/tcsh/nls/ja/set17
index b0ad507c9d0f..bf9de54ae799 100644
--- a/contrib/tcsh/nls/ja/set17
+++ b/contrib/tcsh/nls/ja/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.2 2003/02/08 20:03:28 christos Exp $
+$ $tcsh: set17,v 1.3 2006/03/02 18:46:47 christos Exp $
$ sh.proc.c
$set 17
1 㳲: Хå饦ɥ֤ԤäƤޤ\n
diff --git a/contrib/tcsh/nls/ja/set18 b/contrib/tcsh/nls/ja/set18
index 9f29795e2306..b9364ac141eb 100644
--- a/contrib/tcsh/nls/ja/set18
+++ b/contrib/tcsh/nls/ja/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.1 1998/09/03 22:04:09 christos Exp $
+$ $tcsh: set18,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.set.c
$set 18
1 ٹ: ԼĹ PATH ڤΤƤޤ\n
diff --git a/contrib/tcsh/nls/ja/set2 b/contrib/tcsh/nls/ja/set2
index c1e5ea2c5602..34e780ce968a 100644
--- a/contrib/tcsh/nls/ja/set2
+++ b/contrib/tcsh/nls/ja/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.1 1998/09/03 22:04:10 christos Exp $
+$ $tcsh: set2,v 1.2 2006/03/02 18:46:47 christos Exp $
$ Signal names
$set 2
1 ̥륷ʥ
diff --git a/contrib/tcsh/nls/ja/set21 b/contrib/tcsh/nls/ja/set21
index 29ae51c3bc96..9a7783ec070d 100644
--- a/contrib/tcsh/nls/ja/set21
+++ b/contrib/tcsh/nls/ja/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.1 1998/09/03 22:04:10 christos Exp $
+$ $tcsh: set21,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.disc.c
$set 21
1 륭Ǥޤ.\n
diff --git a/contrib/tcsh/nls/ja/set24 b/contrib/tcsh/nls/ja/set24
index debb53f8e0ba..0c3ca907c33d 100644
--- a/contrib/tcsh/nls/ja/set24
+++ b/contrib/tcsh/nls/ja/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.1 1998/09/03 22:04:11 christos Exp $
+$ $tcsh: set24,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.sched.c
$set 24
1 kludge
diff --git a/contrib/tcsh/nls/ja/set29 b/contrib/tcsh/nls/ja/set29
index b67a7c77134c..9f67ef664316 100644
--- a/contrib/tcsh/nls/ja/set29
+++ b/contrib/tcsh/nls/ja/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.2 1999/05/11 13:08:30 christos Exp $
+$ $tcsh: set29,v 1.3 2006/03/02 18:46:47 christos Exp $
$ tw.help.c
$set 29
1 %S ѤΥإץե뤬ޤ\n
diff --git a/contrib/tcsh/nls/ja/set3 b/contrib/tcsh/nls/ja/set3
index 0db172640b71..cc3dc3bcb535 100644
--- a/contrib/tcsh/nls/ja/set3
+++ b/contrib/tcsh/nls/ja/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.4 2001/04/26 19:07:48 kim Exp $
+$ $tcsh: set3,v 1.4 2001/04/26 19:07:48 kim Exp $
$ Editor function descriptions
$set 3
1 1ʸ
diff --git a/contrib/tcsh/nls/ja/set30 b/contrib/tcsh/nls/ja/set30
index d7ad9b29497a..d48bdc30a166 100644
--- a/contrib/tcsh/nls/ja/set30
+++ b/contrib/tcsh/nls/ja/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.1 1998/09/03 22:04:13 christos Exp $
+$ $tcsh: set30,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tw.parse.c
$set 30
1 ޥɳ %d\n
diff --git a/contrib/tcsh/nls/ja/set4 b/contrib/tcsh/nls/ja/set4
index 9c29143bbc88..3743178a474e 100644
--- a/contrib/tcsh/nls/ja/set4
+++ b/contrib/tcsh/nls/ja/set4
@@ -1,18 +1,18 @@
-$ $Id: set4,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set4,v 1.2 1995/03/19 18:07:15 christos Exp $
$ Termcap strings
$set 4
-1 ɲ
-2 İ٥
-3 DzԤޤǥꥢ
-4 ޤǥꥢ
+1
+2 İ٥
+3 ޤǾõ
+4 ޤǾõ
5 ʿư
-6 ̥ꥢ
+6 ̾õ
7 1ʸ
8 1Ժ
9 ⡼ɳ
10 ⡼ɽλ
11 ⡼ɽλ
-12 cursor from status line
+12 ơԤ饫
13 ֤ۡ
14 ʸ
15 ⡼ɳ
@@ -21,16 +21,16 @@ $set 4
18 뺸ư
19 뱦ư
20 ư
-21 ܡɳ
+21
22 °λ
23 ʬػ߶
24 Ĵλ
25 Ĵ
-26 򥹥ƥԤ
+26 򥹥ơԤ
27 1ľ
28
29 λ
-30 Ū٥
+30 Ļ٥
31 ʣʸ
32 벼ư(multiple)
33 ʣʸ
diff --git a/contrib/tcsh/nls/ja/set5 b/contrib/tcsh/nls/ja/set5
index d6d5e808ef91..924181848d79 100644
--- a/contrib/tcsh/nls/ja/set5
+++ b/contrib/tcsh/nls/ja/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.1 1998/09/03 22:04:14 christos Exp $
+$ $tcsh: set5,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.chared.c
$set 5
1 ƥɽϻѤǤޤ\n
diff --git a/contrib/tcsh/nls/ja/set6 b/contrib/tcsh/nls/ja/set6
index 66dcbf666bda..203f6644b39f 100644
--- a/contrib/tcsh/nls/ja/set6
+++ b/contrib/tcsh/nls/ja/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.1 1998/09/03 22:04:14 christos Exp $
+$ $tcsh: set6,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.inputl.c
$set 6
1 顼: ʥΥޥ 0%o\r\n
diff --git a/contrib/tcsh/nls/ja/set7 b/contrib/tcsh/nls/ja/set7
index 3c01263a74ff..911ad750d964 100644
--- a/contrib/tcsh/nls/ja/set7
+++ b/contrib/tcsh/nls/ja/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.1 2005/03/23 01:25:47 kim Exp $
+$ $tcsh: set7,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.screen.c
$set 7
1 \n\tTcsh ο¬Ǥϡʤü\n
diff --git a/contrib/tcsh/nls/ja/set8 b/contrib/tcsh/nls/ja/set8
index b23588f192f9..f979f4e683a5 100644
--- a/contrib/tcsh/nls/ja/set8
+++ b/contrib/tcsh/nls/ja/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.1 1998/09/03 22:04:16 christos Exp $
+$ $tcsh: set8,v 1.2 2006/03/02 18:46:47 christos Exp $
$ ed.term.c
$set 8
1 switch
diff --git a/contrib/tcsh/nls/pl/set1 b/contrib/tcsh/nls/pl/set1
index 277a5966f1b8..d9106f57a5dc 100644
--- a/contrib/tcsh/nls/pl/set1
+++ b/contrib/tcsh/nls/pl/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.5 1998/06/27 12:27:55 christos Exp $
+$ $tcsh: set1,v 1.5 1998/06/27 12:27:55 christos Exp $
$ Error messages
$set 1
1 Bd skadni
diff --git a/contrib/tcsh/nls/pl/set10 b/contrib/tcsh/nls/pl/set10
index 4283408251d9..0c9dfb70de67 100644
--- a/contrib/tcsh/nls/pl/set10
+++ b/contrib/tcsh/nls/pl/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set10,v 1.2 1995/03/19 18:07:15 christos Exp $
$ ma.setp.c
$set 10
1 setpath: nieprawidowe polecenie '%s'.\n
diff --git a/contrib/tcsh/nls/pl/set11 b/contrib/tcsh/nls/pl/set11
index 97fac7d9c1f7..aade2f9498ac 100644
--- a/contrib/tcsh/nls/pl/set11
+++ b/contrib/tcsh/nls/pl/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set11,v 1.2 1995/03/19 18:07:15 christos Exp $
$ sh.c
$set 11
1 Uwaga: brak dostpu do tty (%s).\n
diff --git a/contrib/tcsh/nls/pl/set12 b/contrib/tcsh/nls/pl/set12
index f9f35ea34a95..afbb1465adf2 100644
--- a/contrib/tcsh/nls/pl/set12
+++ b/contrib/tcsh/nls/pl/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.3 1996/04/26 20:31:52 christos Exp $
+$ $tcsh: set12,v 1.3 1996/04/26 20:31:52 christos Exp $
$ sh.dir.c
$set 12
1 %s: Prbuj wystartowa z "%s"\n
diff --git a/contrib/tcsh/nls/pl/set13 b/contrib/tcsh/nls/pl/set13
index c3143b4d906a..4d44a0b43e83 100644
--- a/contrib/tcsh/nls/pl/set13
+++ b/contrib/tcsh/nls/pl/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set13,v 1.2 1995/03/19 18:07:15 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/pl/set14 b/contrib/tcsh/nls/pl/set14
index d3dd53c85022..b456721648f6 100644
--- a/contrib/tcsh/nls/pl/set14
+++ b/contrib/tcsh/nls/pl/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.3 1998/11/24 18:18:06 christos Exp $
+$ $tcsh: set14,v 1.3 1998/11/24 18:18:06 christos Exp $
$ sh.file.c
$set 14
1 \nKurcze!! Zbyt wiele %s!!\n
diff --git a/contrib/tcsh/nls/pl/set15 b/contrib/tcsh/nls/pl/set15
index 51b62acae111..8f04af3bc876 100644
--- a/contrib/tcsh/nls/pl/set15
+++ b/contrib/tcsh/nls/pl/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.3 1996/10/19 17:52:32 christos Exp $
+$ $tcsh: set15,v 1.3 1996/10/19 17:52:32 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: Nie mog limitowa %s%s\n
diff --git a/contrib/tcsh/nls/pl/set16 b/contrib/tcsh/nls/pl/set16
index 0d8197d78d8a..2d07f5fb65d9 100644
--- a/contrib/tcsh/nls/pl/set16
+++ b/contrib/tcsh/nls/pl/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.3 1996/04/26 20:31:55 christos Exp $
+$ $tcsh: set16,v 1.3 1996/04/26 20:31:55 christos Exp $
$ sh.lex.c
$set 16
1 Reset tty pgrp from %d to %d\n
diff --git a/contrib/tcsh/nls/pl/set17 b/contrib/tcsh/nls/pl/set17
index 74ebbcb2c7fc..e72adaa4e16a 100644
--- a/contrib/tcsh/nls/pl/set17
+++ b/contrib/tcsh/nls/pl/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.3 1996/10/19 17:52:33 christos Exp $
+$ $tcsh: set17,v 1.3 1996/10/19 17:52:33 christos Exp $
$ sh.proc.c
$set 17
1 PLUSKWA: czekam na zadanie pracujce w tle!\n
diff --git a/contrib/tcsh/nls/pl/set18 b/contrib/tcsh/nls/pl/set18
index 55671a79b377..02b3d75991a0 100644
--- a/contrib/tcsh/nls/pl/set18
+++ b/contrib/tcsh/nls/pl/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set18,v 1.2 1995/03/19 18:07:15 christos Exp $
$ sh.set.c
$set 18
1 Uwaga: miesznie duga PATH zostaa obcita\n
diff --git a/contrib/tcsh/nls/pl/set19 b/contrib/tcsh/nls/pl/set19
index dff95c53c624..6170f4b8c494 100644
--- a/contrib/tcsh/nls/pl/set19
+++ b/contrib/tcsh/nls/pl/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.3 1996/04/26 20:31:58 christos Exp $
+$ $tcsh: set19,v 1.3 1996/04/26 20:31:58 christos Exp $
$ tc.alloc.c
$set 19
1 n-bajtw=%d: Brak pamici\n
diff --git a/contrib/tcsh/nls/pl/set2 b/contrib/tcsh/nls/pl/set2
index ae25b6904c45..549c0b70627c 100644
--- a/contrib/tcsh/nls/pl/set2
+++ b/contrib/tcsh/nls/pl/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.4 1998/10/25 15:12:38 christos Exp $
+$ $tcsh: set2,v 1.4 1998/10/25 15:12:38 christos Exp $
$ Signal names
$set 2
1 Pusty sygna
diff --git a/contrib/tcsh/nls/pl/set20 b/contrib/tcsh/nls/pl/set20
index 1be271474fc6..370e41aa8b66 100644
--- a/contrib/tcsh/nls/pl/set20
+++ b/contrib/tcsh/nls/pl/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set20,v 1.2 1995/03/19 18:07:15 christos Exp $
$ tc.bind.c
$set 20
1 Invalid key name `%S'\n
diff --git a/contrib/tcsh/nls/pl/set21 b/contrib/tcsh/nls/pl/set21
index 9484ba07ed6e..bed58d206fcb 100644
--- a/contrib/tcsh/nls/pl/set21
+++ b/contrib/tcsh/nls/pl/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set21,v 1.2 1995/03/19 18:07:15 christos Exp $
$ tc.disc.c
$set 21
1 Couldn't get local chars.\n
diff --git a/contrib/tcsh/nls/pl/set22 b/contrib/tcsh/nls/pl/set22
index 6aa8a2905c05..a4436bdf6a33 100644
--- a/contrib/tcsh/nls/pl/set22
+++ b/contrib/tcsh/nls/pl/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set22,v 1.2 1995/03/19 18:07:15 christos Exp $
$ tc.func.c
$set 22
1 %S: \t aliased to
diff --git a/contrib/tcsh/nls/pl/set23 b/contrib/tcsh/nls/pl/set23
index b350f59e7948..4f90b8fe147a 100644
--- a/contrib/tcsh/nls/pl/set23
+++ b/contrib/tcsh/nls/pl/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.3 1996/04/26 20:32:00 christos Exp $
+$ $tcsh: set23,v 1.3 1996/04/26 20:32:00 christos Exp $
$ tc.os.c
$set 23
1 Bad cpu/site name
diff --git a/contrib/tcsh/nls/pl/set24 b/contrib/tcsh/nls/pl/set24
index 2896947ae36a..4e8e6d379730 100644
--- a/contrib/tcsh/nls/pl/set24
+++ b/contrib/tcsh/nls/pl/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set24,v 1.2 1995/03/19 18:07:15 christos Exp $
$ tc.sched.c
$set 24
1 kludge
diff --git a/contrib/tcsh/nls/pl/set25 b/contrib/tcsh/nls/pl/set25
index 063e8d6c2f67..704b47d5de33 100644
--- a/contrib/tcsh/nls/pl/set25
+++ b/contrib/tcsh/nls/pl/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set25,v 1.2 1995/03/19 18:07:15 christos Exp $
$ tc.sig.c
$set 25
1 our wait %d\n
diff --git a/contrib/tcsh/nls/pl/set26 b/contrib/tcsh/nls/pl/set26
index aa854ad34bab..40e95f8a3106 100644
--- a/contrib/tcsh/nls/pl/set26
+++ b/contrib/tcsh/nls/pl/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set26,v 1.2 1995/03/19 18:07:15 christos Exp $
$ tc.who.c
$set 26
1 cannot stat %s. Please "unset watch".\n
diff --git a/contrib/tcsh/nls/pl/set27 b/contrib/tcsh/nls/pl/set27
index 489f0de260b5..2f444182b922 100644
--- a/contrib/tcsh/nls/pl/set27
+++ b/contrib/tcsh/nls/pl/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set27,v 1.2 1995/03/19 18:07:15 christos Exp $
$ tw.comp.c
$set 27
1 polecenie
diff --git a/contrib/tcsh/nls/pl/set29 b/contrib/tcsh/nls/pl/set29
index 559bc5e70787..a9a0836294a3 100644
--- a/contrib/tcsh/nls/pl/set29
+++ b/contrib/tcsh/nls/pl/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set29,v 1.2 1995/03/19 18:07:15 christos Exp $
$ tw.help.c
$set 29
1 Brak pliku pomocy dla %S\n
diff --git a/contrib/tcsh/nls/pl/set3 b/contrib/tcsh/nls/pl/set3
index 6ab0639c2f42..0873bb92c620 100644
--- a/contrib/tcsh/nls/pl/set3
+++ b/contrib/tcsh/nls/pl/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.3 1995/04/24 14:12:51 christos Exp $
+$ $tcsh: set3,v 1.3 1995/04/24 14:12:51 christos Exp $
$ Editor function descriptions
$set 3
1 Przejd znak wstecz
diff --git a/contrib/tcsh/nls/pl/set30 b/contrib/tcsh/nls/pl/set30
index 2b7c32afc01c..45145e0b8662 100644
--- a/contrib/tcsh/nls/pl/set30
+++ b/contrib/tcsh/nls/pl/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.4 1996/10/19 17:52:34 christos Exp $
+$ $tcsh: set30,v 1.4 1996/10/19 17:52:34 christos Exp $
$ tw.parse.c
$set 30
1 starting_a_command %d\n
diff --git a/contrib/tcsh/nls/pl/set31 b/contrib/tcsh/nls/pl/set31
index 029171e3ab7c..89e901557d08 100644
--- a/contrib/tcsh/nls/pl/set31
+++ b/contrib/tcsh/nls/pl/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set31,v 1.2 1995/03/19 18:07:15 christos Exp $
$ vms.termcap.c
$set 31
1 Nie mog otworzy TERMCAP: [%s]\n
diff --git a/contrib/tcsh/nls/pl/set4 b/contrib/tcsh/nls/pl/set4
index a7d289cf83f2..997fed4dd794 100644
--- a/contrib/tcsh/nls/pl/set4
+++ b/contrib/tcsh/nls/pl/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set4,v 1.2 1995/03/19 18:07:15 christos Exp $
$ Termcap strings
$set 4
1 add new blank line
diff --git a/contrib/tcsh/nls/pl/set5 b/contrib/tcsh/nls/pl/set5
index c888b3e4a0f7..9dbe6d2a4958 100644
--- a/contrib/tcsh/nls/pl/set5
+++ b/contrib/tcsh/nls/pl/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set5,v 1.2 1995/03/19 18:07:15 christos Exp $
$ ed.chared.c
$set 5
1 rednie obcienie niedostpne\n
diff --git a/contrib/tcsh/nls/pl/set6 b/contrib/tcsh/nls/pl/set6
index ed9d982a4783..bcbfcfbfd400 100644
--- a/contrib/tcsh/nls/pl/set6
+++ b/contrib/tcsh/nls/pl/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set6,v 1.2 1995/03/19 18:07:15 christos Exp $
$ ed.inputl.c
$set 6
1 ERROR: illegal command from key 0%o\r\n
diff --git a/contrib/tcsh/nls/pl/set7 b/contrib/tcsh/nls/pl/set7
index 26e14132829a..1bd60d02d4aa 100644
--- a/contrib/tcsh/nls/pl/set7
+++ b/contrib/tcsh/nls/pl/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.3 1996/04/26 20:32:04 christos Exp $
+$ $tcsh: set7,v 1.3 1996/04/26 20:32:04 christos Exp $
$ ed.screen.c
$set 7
1 \n\tTcsh thinks your terminal has the\n
diff --git a/contrib/tcsh/nls/pl/set8 b/contrib/tcsh/nls/pl/set8
index bfda403a858f..06867212fa35 100644
--- a/contrib/tcsh/nls/pl/set8
+++ b/contrib/tcsh/nls/pl/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set8,v 1.2 1995/03/19 18:07:15 christos Exp $
$ ed.term.c
$set 8
1 Nieprawidowy przecznik
diff --git a/contrib/tcsh/nls/pl/set9 b/contrib/tcsh/nls/pl/set9
index 72511b4fca19..8e3aeec72488 100644
--- a/contrib/tcsh/nls/pl/set9
+++ b/contrib/tcsh/nls/pl/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.2 1995/03/19 18:07:15 christos Exp $
+$ $tcsh: set9,v 1.2 1995/03/19 18:07:15 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: Null extended-key not allowed.\n
diff --git a/contrib/tcsh/nls/russian/set1 b/contrib/tcsh/nls/russian/set1
index 416af779e9f5..7acaf448a835 100644
--- a/contrib/tcsh/nls/russian/set1
+++ b/contrib/tcsh/nls/russian/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.3 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set1,v 1.4 2006/03/02 18:46:47 christos Exp $
$ Error messages
$set 1
1
diff --git a/contrib/tcsh/nls/russian/set10 b/contrib/tcsh/nls/russian/set10
index 4cf387ee63c9..273abd266a9a 100644
--- a/contrib/tcsh/nls/russian/set10
+++ b/contrib/tcsh/nls/russian/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set10,v 1.3 2006/03/02 18:46:47 christos Exp $
$ ma.setp.c
$set 10
1 setpath: '%s'.\n
diff --git a/contrib/tcsh/nls/russian/set11 b/contrib/tcsh/nls/russian/set11
index 164b2a039a74..b165bd72d173 100644
--- a/contrib/tcsh/nls/russian/set11
+++ b/contrib/tcsh/nls/russian/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.1 2001/03/18 19:06:36 christos Exp $
+$ $tcsh: set11,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.c
$set 11
1 : tty (%s).\n
diff --git a/contrib/tcsh/nls/russian/set12 b/contrib/tcsh/nls/russian/set12
index 29714f83733c..b676c6c53723 100644
--- a/contrib/tcsh/nls/russian/set12
+++ b/contrib/tcsh/nls/russian/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.1 2001/03/18 19:06:36 christos Exp $
+$ $tcsh: set12,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.dir.c
$set 12
1 %s: "%s"\n
diff --git a/contrib/tcsh/nls/russian/set13 b/contrib/tcsh/nls/russian/set13
index 7bb54d120d72..206ea895ccf9 100644
--- a/contrib/tcsh/nls/russian/set13
+++ b/contrib/tcsh/nls/russian/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set13,v 1.3 2006/03/02 18:46:47 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/russian/set14 b/contrib/tcsh/nls/russian/set14
index 6014f28b2988..d9632d8a108c 100644
--- a/contrib/tcsh/nls/russian/set14
+++ b/contrib/tcsh/nls/russian/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.1 2001/03/18 19:06:37 christos Exp $
+$ $tcsh: set14,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.file.c
$set 14
1 \nYikes!! %s!!\n
diff --git a/contrib/tcsh/nls/russian/set15 b/contrib/tcsh/nls/russian/set15
index d4847a4406a0..60c2a36a56b2 100644
--- a/contrib/tcsh/nls/russian/set15
+++ b/contrib/tcsh/nls/russian/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.1 2001/03/18 19:06:37 christos Exp $
+$ $tcsh: set15,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: %s%s \n
diff --git a/contrib/tcsh/nls/russian/set16 b/contrib/tcsh/nls/russian/set16
index cd03c74767ab..877acbe75c3e 100644
--- a/contrib/tcsh/nls/russian/set16
+++ b/contrib/tcsh/nls/russian/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.1 2001/03/18 19:06:37 christos Exp $
+$ $tcsh: set16,v 1.2 2006/03/02 18:46:47 christos Exp $
$ sh.lex.c
$set 16
1 Reset tty pgrp from %d to %d\n
diff --git a/contrib/tcsh/nls/russian/set17 b/contrib/tcsh/nls/russian/set17
index 162c0e515e53..8d7384da80ba 100644
--- a/contrib/tcsh/nls/russian/set17
+++ b/contrib/tcsh/nls/russian/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.3 2003/02/08 20:03:28 christos Exp $
+$ $tcsh: set17,v 1.4 2006/03/02 18:46:47 christos Exp $
$ sh.proc.c
$set 17
1 BUG: waiting for background job!\n
diff --git a/contrib/tcsh/nls/russian/set18 b/contrib/tcsh/nls/russian/set18
index 075aa75f0cb6..277af0de5065 100644
--- a/contrib/tcsh/nls/russian/set18
+++ b/contrib/tcsh/nls/russian/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set18,v 1.3 2006/03/02 18:46:47 christos Exp $
$ sh.set.c
$set 18
1 : PATH \n
diff --git a/contrib/tcsh/nls/russian/set19 b/contrib/tcsh/nls/russian/set19
index 676d8108865a..2824aba57d87 100644
--- a/contrib/tcsh/nls/russian/set19
+++ b/contrib/tcsh/nls/russian/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set19,v 1.3 2006/03/02 18:46:47 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: \n
diff --git a/contrib/tcsh/nls/russian/set2 b/contrib/tcsh/nls/russian/set2
index 0fa8fba80539..1466e731eb9a 100644
--- a/contrib/tcsh/nls/russian/set2
+++ b/contrib/tcsh/nls/russian/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set2,v 1.3 2006/03/02 18:46:47 christos Exp $
$ Signal names
$set 2
1
diff --git a/contrib/tcsh/nls/russian/set20 b/contrib/tcsh/nls/russian/set20
index 78359940e1cb..d8df302be476 100644
--- a/contrib/tcsh/nls/russian/set20
+++ b/contrib/tcsh/nls/russian/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.4 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set20,v 1.5 2006/03/02 18:46:47 christos Exp $
$ tc.bind.c
$set 20
1 `%S'\n
diff --git a/contrib/tcsh/nls/russian/set21 b/contrib/tcsh/nls/russian/set21
index 75533f8accc2..38562a9cd8fa 100644
--- a/contrib/tcsh/nls/russian/set21
+++ b/contrib/tcsh/nls/russian/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.1 2001/03/18 19:06:39 christos Exp $
+$ $tcsh: set21,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.disc.c
$set 21
1 Couldn't get local chars.\n
diff --git a/contrib/tcsh/nls/russian/set22 b/contrib/tcsh/nls/russian/set22
index b1d4e054dd95..02b53f5f23bc 100644
--- a/contrib/tcsh/nls/russian/set22
+++ b/contrib/tcsh/nls/russian/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.3 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set22,v 1.4 2006/03/02 18:46:47 christos Exp $
$ tc.func.c
$set 22
1 %S: \t
diff --git a/contrib/tcsh/nls/russian/set23 b/contrib/tcsh/nls/russian/set23
index 3134bb76f396..7d77ab86687c 100644
--- a/contrib/tcsh/nls/russian/set23
+++ b/contrib/tcsh/nls/russian/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set23,v 1.3 2006/03/02 18:46:47 christos Exp $
$ tc.os.c
$set 23
1 Bad cpu/site name
diff --git a/contrib/tcsh/nls/russian/set24 b/contrib/tcsh/nls/russian/set24
index dffed27be135..0c3ca907c33d 100644
--- a/contrib/tcsh/nls/russian/set24
+++ b/contrib/tcsh/nls/russian/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.1 2001/03/18 19:06:40 christos Exp $
+$ $tcsh: set24,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.sched.c
$set 24
1 kludge
diff --git a/contrib/tcsh/nls/russian/set25 b/contrib/tcsh/nls/russian/set25
index 481ecfd9847c..ff9aab92676e 100644
--- a/contrib/tcsh/nls/russian/set25
+++ b/contrib/tcsh/nls/russian/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.1 2001/03/18 19:06:40 christos Exp $
+$ $tcsh: set25,v 1.2 2006/03/02 18:46:47 christos Exp $
$ tc.sig.c
$set 25
1 our wait %d\n
diff --git a/contrib/tcsh/nls/russian/set26 b/contrib/tcsh/nls/russian/set26
index f351f29e4efb..5aefd2290aaa 100644
--- a/contrib/tcsh/nls/russian/set26
+++ b/contrib/tcsh/nls/russian/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set26,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tc.who.c
$set 26
1 stat %s. , "unset watch".\n
diff --git a/contrib/tcsh/nls/russian/set27 b/contrib/tcsh/nls/russian/set27
index 42de51813734..a995389674a0 100644
--- a/contrib/tcsh/nls/russian/set27
+++ b/contrib/tcsh/nls/russian/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.3 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set27,v 1.4 2006/03/02 18:46:48 christos Exp $
$ tw.comp.c
$set 27
1
diff --git a/contrib/tcsh/nls/russian/set29 b/contrib/tcsh/nls/russian/set29
index 66b554b31a92..b7b4da92ab4c 100644
--- a/contrib/tcsh/nls/russian/set29
+++ b/contrib/tcsh/nls/russian/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.1 2001/03/18 19:06:41 christos Exp $
+$ $tcsh: set29,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tw.help.c
$set 29
1 %S\n
diff --git a/contrib/tcsh/nls/russian/set3 b/contrib/tcsh/nls/russian/set3
index 9442f1ff8e9a..1eb6471850df 100644
--- a/contrib/tcsh/nls/russian/set3
+++ b/contrib/tcsh/nls/russian/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.3 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set3,v 1.4 2006/03/02 18:46:48 christos Exp $
$ Editor function descriptions
$set 3
1 Move back a character
diff --git a/contrib/tcsh/nls/russian/set30 b/contrib/tcsh/nls/russian/set30
index 39e02fafc7c5..7ac5fe61f43a 100644
--- a/contrib/tcsh/nls/russian/set30
+++ b/contrib/tcsh/nls/russian/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.3 2003/05/26 07:11:07 christos Exp $
+$ $tcsh: set30,v 1.4 2006/03/02 18:46:48 christos Exp $
$ tw.parse.c
$set 30
1 starting_a_command %d\n
diff --git a/contrib/tcsh/nls/russian/set31 b/contrib/tcsh/nls/russian/set31
index 432810a26508..908cb023aba0 100644
--- a/contrib/tcsh/nls/russian/set31
+++ b/contrib/tcsh/nls/russian/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set31,v 1.3 2006/03/02 18:46:48 christos Exp $
$ vms.termcap.c
$set 31
1 TERMCAP: [%s]\n
diff --git a/contrib/tcsh/nls/russian/set4 b/contrib/tcsh/nls/russian/set4
index dd01982ee73b..58d84158cd2b 100644
--- a/contrib/tcsh/nls/russian/set4
+++ b/contrib/tcsh/nls/russian/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set4,v 1.3 2006/03/02 18:46:48 christos Exp $
$ Termcap strings
$set 4
1
diff --git a/contrib/tcsh/nls/russian/set5 b/contrib/tcsh/nls/russian/set5
index c237e84e8546..6e488980808b 100644
--- a/contrib/tcsh/nls/russian/set5
+++ b/contrib/tcsh/nls/russian/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.1 2001/03/18 19:06:43 christos Exp $
+$ $tcsh: set5,v 1.2 2006/03/02 18:46:48 christos Exp $
$ ed.chared.c
$set 5
1 \n
diff --git a/contrib/tcsh/nls/russian/set6 b/contrib/tcsh/nls/russian/set6
index 2d05145c52b4..bffc35e16d2a 100644
--- a/contrib/tcsh/nls/russian/set6
+++ b/contrib/tcsh/nls/russian/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set6,v 1.3 2006/03/02 18:46:48 christos Exp $
$ ed.inputl.c
$set 6
1 : 0%o\r\n
diff --git a/contrib/tcsh/nls/russian/set7 b/contrib/tcsh/nls/russian/set7
index d3788ae5694f..7f7cbc7cee6b 100644
--- a/contrib/tcsh/nls/russian/set7
+++ b/contrib/tcsh/nls/russian/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set7,v 1.3 2006/03/02 18:46:48 christos Exp $
$ ed.screen.c
$set 7
1 \n\tTcsh thinks your terminal has the\n
diff --git a/contrib/tcsh/nls/russian/set8 b/contrib/tcsh/nls/russian/set8
index bf5b6afe530d..80bede0c3a69 100644
--- a/contrib/tcsh/nls/russian/set8
+++ b/contrib/tcsh/nls/russian/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.1 2001/03/18 19:06:44 christos Exp $
+$ $tcsh: set8,v 1.2 2006/03/02 18:46:48 christos Exp $
$ ed.term.c
$set 8
1
diff --git a/contrib/tcsh/nls/russian/set9 b/contrib/tcsh/nls/russian/set9
index cc65c73b7240..cef9379d2699 100644
--- a/contrib/tcsh/nls/russian/set9
+++ b/contrib/tcsh/nls/russian/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.2 2002/03/08 17:46:50 christos Exp $
+$ $tcsh: set9,v 1.3 2006/03/02 18:46:48 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: Null extended-key not allowed.\n
diff --git a/contrib/tcsh/nls/spanish/set1 b/contrib/tcsh/nls/spanish/set1
index 8c1b663ab2dd..0accb679eb65 100644
--- a/contrib/tcsh/nls/spanish/set1
+++ b/contrib/tcsh/nls/spanish/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.2 1998/06/27 12:28:02 christos Exp $
+$ $tcsh: set1,v 1.3 2006/03/02 18:46:48 christos Exp $
$ Mensajes de Error
$set 1
1 Error de sintaxis
diff --git a/contrib/tcsh/nls/spanish/set10 b/contrib/tcsh/nls/spanish/set10
index 867c7943da1a..8d5b0577dfbf 100644
--- a/contrib/tcsh/nls/spanish/set10
+++ b/contrib/tcsh/nls/spanish/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.1 1998/04/08 17:59:51 christos Exp $
+$ $tcsh: set10,v 1.2 2006/03/02 18:46:48 christos Exp $
$ ma.setp.c
$set 10
1 setpath: comando '%s' incorrecto.\n
diff --git a/contrib/tcsh/nls/spanish/set11 b/contrib/tcsh/nls/spanish/set11
index d54fddc60052..cb96ec8ada3d 100644
--- a/contrib/tcsh/nls/spanish/set11
+++ b/contrib/tcsh/nls/spanish/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.1 1998/04/08 17:59:52 christos Exp $
+$ $tcsh: set11,v 1.2 2006/03/02 18:46:48 christos Exp $
$ sh.c
$set 11
1 Aviso: no se puede acceder a la tty (%s).\n
diff --git a/contrib/tcsh/nls/spanish/set12 b/contrib/tcsh/nls/spanish/set12
index 5e24d3b9b79f..06f43f4c0462 100644
--- a/contrib/tcsh/nls/spanish/set12
+++ b/contrib/tcsh/nls/spanish/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.1 1998/04/08 17:59:53 christos Exp $
+$ $tcsh: set12,v 1.2 2006/03/02 18:46:48 christos Exp $
$ sh.dir.c
$set 12
1 %s: Tratando de empezar desde "%s"\n
diff --git a/contrib/tcsh/nls/spanish/set13 b/contrib/tcsh/nls/spanish/set13
index 5a49329a7bc2..12b32b0c24a2 100644
--- a/contrib/tcsh/nls/spanish/set13
+++ b/contrib/tcsh/nls/spanish/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.1 1998/04/08 17:59:54 christos Exp $
+$ $tcsh: set13,v 1.2 2006/03/02 18:46:48 christos Exp $
$ sh.exec.c
$set 13
1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/spanish/set14 b/contrib/tcsh/nls/spanish/set14
index 62db4cd5bc7c..5bb621e5c6bb 100644
--- a/contrib/tcsh/nls/spanish/set14
+++ b/contrib/tcsh/nls/spanish/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.1 1998/04/08 17:59:55 christos Exp $
+$ $tcsh: set14,v 1.2 2006/03/02 18:46:48 christos Exp $
$ sh.file.c
$set 14
1 \nQu asco!! Hay demasiados %s!!\n
diff --git a/contrib/tcsh/nls/spanish/set15 b/contrib/tcsh/nls/spanish/set15
index 7408500c7eef..825af2eccad5 100644
--- a/contrib/tcsh/nls/spanish/set15
+++ b/contrib/tcsh/nls/spanish/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.1 1998/04/08 17:59:56 christos Exp $
+$ $tcsh: set15,v 1.2 2006/03/02 18:46:48 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: No se puede %s el lmite %s\n
diff --git a/contrib/tcsh/nls/spanish/set16 b/contrib/tcsh/nls/spanish/set16
index 58f8d5bed004..0482ffa02ed1 100644
--- a/contrib/tcsh/nls/spanish/set16
+++ b/contrib/tcsh/nls/spanish/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.1 1998/04/08 17:59:56 christos Exp $
+$ $tcsh: set16,v 1.2 2006/03/02 18:46:48 christos Exp $
$ sh.lex.c
$set 16
1 Se ha reinicializado el grupo de procesos de las terminales de %d a %d\n
diff --git a/contrib/tcsh/nls/spanish/set17 b/contrib/tcsh/nls/spanish/set17
index ce9621a44265..02df1879ead4 100644
--- a/contrib/tcsh/nls/spanish/set17
+++ b/contrib/tcsh/nls/spanish/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.2 2003/02/08 20:03:28 christos Exp $
+$ $tcsh: set17,v 1.3 2006/03/02 18:46:48 christos Exp $
$ sh.proc.c
$set 17
1 BUG: en espera de un trabajo en segundo plano!\n
diff --git a/contrib/tcsh/nls/spanish/set18 b/contrib/tcsh/nls/spanish/set18
index 6db63432109a..b2d7736c6c4e 100644
--- a/contrib/tcsh/nls/spanish/set18
+++ b/contrib/tcsh/nls/spanish/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.1 1998/04/08 17:59:58 christos Exp $
+$ $tcsh: set18,v 1.2 2006/03/02 18:46:48 christos Exp $
$ sh.set.c
$set 18
1 Aviso: PATH de tamao ridculo ha sido truncado\n
diff --git a/contrib/tcsh/nls/spanish/set19 b/contrib/tcsh/nls/spanish/set19
index 842441272644..fdce85da1a87 100644
--- a/contrib/tcsh/nls/spanish/set19
+++ b/contrib/tcsh/nls/spanish/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.1 1998/04/08 17:59:59 christos Exp $
+$ $tcsh: set19,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: Se ha agotado la memoria\n
diff --git a/contrib/tcsh/nls/spanish/set2 b/contrib/tcsh/nls/spanish/set2
index a8761d008bc9..b73c6930feab 100644
--- a/contrib/tcsh/nls/spanish/set2
+++ b/contrib/tcsh/nls/spanish/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.1 1998/04/08 17:59:59 christos Exp $
+$ $tcsh: set2,v 1.2 2006/03/02 18:46:48 christos Exp $
$ Nombres de seales
$set 2
1 Seal nula
diff --git a/contrib/tcsh/nls/spanish/set20 b/contrib/tcsh/nls/spanish/set20
index 3709ce430cc2..9458fef24046 100644
--- a/contrib/tcsh/nls/spanish/set20
+++ b/contrib/tcsh/nls/spanish/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.2 2001/04/26 19:09:19 kim Exp $
+$ $tcsh: set20,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tc.bind.c
$set 20
1 Nombre de tecla no vlido `%S'\n
diff --git a/contrib/tcsh/nls/spanish/set21 b/contrib/tcsh/nls/spanish/set21
index 5e4a734bb70a..706127b2b776 100644
--- a/contrib/tcsh/nls/spanish/set21
+++ b/contrib/tcsh/nls/spanish/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.1 1998/04/08 18:00:02 christos Exp $
+$ $tcsh: set21,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tc.disc.c
$set 21
1 No he podido leer los caracteres locales.\n
diff --git a/contrib/tcsh/nls/spanish/set22 b/contrib/tcsh/nls/spanish/set22
index 268e307d2e65..fb311ae466bf 100644
--- a/contrib/tcsh/nls/spanish/set22
+++ b/contrib/tcsh/nls/spanish/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.1 1998/04/08 18:00:03 christos Exp $
+$ $tcsh: set22,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tc.func.c
$set 22
1 %S: \t es un alias de
diff --git a/contrib/tcsh/nls/spanish/set23 b/contrib/tcsh/nls/spanish/set23
index 08eb8df0754f..86a81e4d957b 100644
--- a/contrib/tcsh/nls/spanish/set23
+++ b/contrib/tcsh/nls/spanish/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.1 1998/04/08 18:00:03 christos Exp $
+$ $tcsh: set23,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tc.os.c
$set 23
1 Nombre de cpu/mquina incorrecto
diff --git a/contrib/tcsh/nls/spanish/set24 b/contrib/tcsh/nls/spanish/set24
index 9da94eeddbc5..b12289d873ea 100644
--- a/contrib/tcsh/nls/spanish/set24
+++ b/contrib/tcsh/nls/spanish/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.1 1998/04/08 18:00:04 christos Exp $
+$ $tcsh: set24,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tc.sched.c
$set 24
1 chapuza
diff --git a/contrib/tcsh/nls/spanish/set25 b/contrib/tcsh/nls/spanish/set25
index 2b9630033d90..c81ef4aea948 100644
--- a/contrib/tcsh/nls/spanish/set25
+++ b/contrib/tcsh/nls/spanish/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.1 1998/04/08 18:00:05 christos Exp $
+$ $tcsh: set25,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tc.sig.c
$set 25
1 nuestro wait %d\n
diff --git a/contrib/tcsh/nls/spanish/set26 b/contrib/tcsh/nls/spanish/set26
index a4fed2c29f13..74c990e77a80 100644
--- a/contrib/tcsh/nls/spanish/set26
+++ b/contrib/tcsh/nls/spanish/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.1 1998/04/08 18:00:06 christos Exp $
+$ $tcsh: set26,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tc.who.c
$set 26
1 No se puede completar stat %s. Por favor, ejecute "unset watch".\n
diff --git a/contrib/tcsh/nls/spanish/set27 b/contrib/tcsh/nls/spanish/set27
index 8cc991ea8f55..6f75760080df 100644
--- a/contrib/tcsh/nls/spanish/set27
+++ b/contrib/tcsh/nls/spanish/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.1 1998/04/08 18:00:07 christos Exp $
+$ $tcsh: set27,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tw.comp.c
$set 27
1 comando
diff --git a/contrib/tcsh/nls/spanish/set29 b/contrib/tcsh/nls/spanish/set29
index 712d6b57e650..c7a4921d62a1 100644
--- a/contrib/tcsh/nls/spanish/set29
+++ b/contrib/tcsh/nls/spanish/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.1 1998/04/08 18:00:07 christos Exp $
+$ $tcsh: set29,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tw.help.c
$set 29
1 No hay archivo de ayuda sobre %S\n
diff --git a/contrib/tcsh/nls/spanish/set3 b/contrib/tcsh/nls/spanish/set3
index 196a8ebf9b2a..2465dec3785d 100644
--- a/contrib/tcsh/nls/spanish/set3
+++ b/contrib/tcsh/nls/spanish/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.2 2001/04/26 19:07:51 kim Exp $
+$ $tcsh: set3,v 1.3 2006/03/02 18:46:48 christos Exp $
$ Descripcin de las funciones de edicin
$set 3
1 Retroceder un carcter
diff --git a/contrib/tcsh/nls/spanish/set30 b/contrib/tcsh/nls/spanish/set30
index d89e7082fc69..ea9e5be912da 100644
--- a/contrib/tcsh/nls/spanish/set30
+++ b/contrib/tcsh/nls/spanish/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.1 1998/04/08 18:00:09 christos Exp $
+$ $tcsh: set30,v 1.2 2006/03/02 18:46:48 christos Exp $
$ tw.parse.c
$set 30
1 comienzo_de_comando %d\n
diff --git a/contrib/tcsh/nls/spanish/set31 b/contrib/tcsh/nls/spanish/set31
index 00cb2956235b..52a50b9b33d4 100644
--- a/contrib/tcsh/nls/spanish/set31
+++ b/contrib/tcsh/nls/spanish/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.1 1998/04/08 18:00:10 christos Exp $
+$ $tcsh: set31,v 1.2 2006/03/02 18:46:48 christos Exp $
$ vms.termcap.c
$set 31
1 No se puede abrir TERMCAP: [%s]\n
diff --git a/contrib/tcsh/nls/spanish/set4 b/contrib/tcsh/nls/spanish/set4
index 04c1766aac5e..1ca3b69a6230 100644
--- a/contrib/tcsh/nls/spanish/set4
+++ b/contrib/tcsh/nls/spanish/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.1 1998/04/08 18:00:11 christos Exp $
+$ $tcsh: set4,v 1.2 2006/03/02 18:46:48 christos Exp $
$ cadenas de Termcap
$set 4
1 aade una lnea vaca
diff --git a/contrib/tcsh/nls/spanish/set5 b/contrib/tcsh/nls/spanish/set5
index ba7a18f8baaa..4ec38af9459f 100644
--- a/contrib/tcsh/nls/spanish/set5
+++ b/contrib/tcsh/nls/spanish/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.1 1998/04/08 18:00:11 christos Exp $
+$ $tcsh: set5,v 1.2 2006/03/02 18:46:48 christos Exp $
$ ed.chared.c
$set 5
1 No est disponible la carga media\n
diff --git a/contrib/tcsh/nls/spanish/set6 b/contrib/tcsh/nls/spanish/set6
index 134ecebf80f1..06ded32829d8 100644
--- a/contrib/tcsh/nls/spanish/set6
+++ b/contrib/tcsh/nls/spanish/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.1 1998/04/08 18:00:12 christos Exp $
+$ $tcsh: set6,v 1.2 2006/03/02 18:46:48 christos Exp $
$ ed.inputl.c
$set 6
1 ERROR: comando ilegal asignado a la tecla 0%o\r\n
diff --git a/contrib/tcsh/nls/spanish/set7 b/contrib/tcsh/nls/spanish/set7
index 7fe22f5db08a..a50dbcd8038c 100644
--- a/contrib/tcsh/nls/spanish/set7
+++ b/contrib/tcsh/nls/spanish/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.1 1998/04/08 18:00:13 christos Exp $
+$ $tcsh: set7,v 1.2 2006/03/02 18:46:48 christos Exp $
$ ed.screen.c
$set 7
1 \n\tTcsh cree que su terminal tiene las\n
diff --git a/contrib/tcsh/nls/spanish/set8 b/contrib/tcsh/nls/spanish/set8
index b997466fea60..abda41517746 100644
--- a/contrib/tcsh/nls/spanish/set8
+++ b/contrib/tcsh/nls/spanish/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.1 1998/04/08 18:00:14 christos Exp $
+$ $tcsh: set8,v 1.2 2006/03/02 18:46:48 christos Exp $
$ ed.term.c
$set 8
1 Interruptor desconocido
diff --git a/contrib/tcsh/nls/spanish/set9 b/contrib/tcsh/nls/spanish/set9
index 14e46293f92a..c94db0884ee6 100644
--- a/contrib/tcsh/nls/spanish/set9
+++ b/contrib/tcsh/nls/spanish/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.1 1998/04/08 18:00:14 christos Exp $
+$ $tcsh: set9,v 1.2 2006/03/02 18:46:48 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: No se permite una tecla extendida nula.\n
diff --git a/contrib/tcsh/nls/ukrainian/set1 b/contrib/tcsh/nls/ukrainian/set1
index edf93be89582..2a4aa95d6ed4 100644
--- a/contrib/tcsh/nls/ukrainian/set1
+++ b/contrib/tcsh/nls/ukrainian/set1
@@ -1,4 +1,4 @@
-$ $Id: set1,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set1,v 1.3 2006/03/02 18:46:48 christos Exp $
$ Error messages
$set 1
1
diff --git a/contrib/tcsh/nls/ukrainian/set10 b/contrib/tcsh/nls/ukrainian/set10
index 3b95c5181d5e..a406c5125605 100644
--- a/contrib/tcsh/nls/ukrainian/set10
+++ b/contrib/tcsh/nls/ukrainian/set10
@@ -1,4 +1,4 @@
-$ $Id: set10,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set10,v 1.3 2006/03/02 18:46:48 christos Exp $
$ ma.setp.c
$set 10
1 setpath: צ '%s'.\n
diff --git a/contrib/tcsh/nls/ukrainian/set11 b/contrib/tcsh/nls/ukrainian/set11
index d9bd51a6f19b..4fa15f6d5dac 100644
--- a/contrib/tcsh/nls/ukrainian/set11
+++ b/contrib/tcsh/nls/ukrainian/set11
@@ -1,4 +1,4 @@
-$ $Id: set11,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set11,v 1.3 2006/03/02 18:46:48 christos Exp $
$ sh.c
$set 11
1 : tty (%s).\n
diff --git a/contrib/tcsh/nls/ukrainian/set12 b/contrib/tcsh/nls/ukrainian/set12
index 595bd951941a..d55bcfaccbba 100644
--- a/contrib/tcsh/nls/ukrainian/set12
+++ b/contrib/tcsh/nls/ukrainian/set12
@@ -1,4 +1,4 @@
-$ $Id: set12,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set12,v 1.3 2006/03/02 18:46:48 christos Exp $
$ sh.dir.c
$set 12
1 %s: "%s"\n
diff --git a/contrib/tcsh/nls/ukrainian/set13 b/contrib/tcsh/nls/ukrainian/set13
index 65549666269d..a7f08b3499c2 100644
--- a/contrib/tcsh/nls/ukrainian/set13
+++ b/contrib/tcsh/nls/ukrainian/set13
@@ -1,4 +1,4 @@
-$ $Id: set13,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set13,v 1.3 2006/03/02 18:46:48 christos Exp $
$ sh.exec.c
$set 13
1 =%-4d dir=%-2d prog=%s\n
diff --git a/contrib/tcsh/nls/ukrainian/set14 b/contrib/tcsh/nls/ukrainian/set14
index 5989b93e46ff..faa6ac6a2d54 100644
--- a/contrib/tcsh/nls/ukrainian/set14
+++ b/contrib/tcsh/nls/ukrainian/set14
@@ -1,4 +1,4 @@
-$ $Id: set14,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set14,v 1.3 2006/03/02 18:46:48 christos Exp $
$ sh.file.c
$set 14
1 \n!! %s!!\n
diff --git a/contrib/tcsh/nls/ukrainian/set15 b/contrib/tcsh/nls/ukrainian/set15
index ff2ab104382a..498362fcec4f 100644
--- a/contrib/tcsh/nls/ukrainian/set15
+++ b/contrib/tcsh/nls/ukrainian/set15
@@ -1,4 +1,4 @@
-$ $Id: set15,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set15,v 1.3 2006/03/02 18:46:48 christos Exp $
$ sh.func.c
$set 15
1 %s: %s: %s%s ̦ͦ\n
diff --git a/contrib/tcsh/nls/ukrainian/set16 b/contrib/tcsh/nls/ukrainian/set16
index fc0e60912640..f5cb670a3ae0 100644
--- a/contrib/tcsh/nls/ukrainian/set16
+++ b/contrib/tcsh/nls/ukrainian/set16
@@ -1,4 +1,4 @@
-$ $Id: set16,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set16,v 1.3 2006/03/02 18:46:48 christos Exp $
$ sh.lex.c
$set 16
1 Reset tty pgrp from %d to %d\n
diff --git a/contrib/tcsh/nls/ukrainian/set17 b/contrib/tcsh/nls/ukrainian/set17
index a286b38ab255..f790544659b5 100644
--- a/contrib/tcsh/nls/ukrainian/set17
+++ b/contrib/tcsh/nls/ukrainian/set17
@@ -1,4 +1,4 @@
-$ $Id: set17,v 1.3 2003/02/08 20:03:28 christos Exp $
+$ $tcsh: set17,v 1.4 2006/03/02 18:46:48 christos Exp $
$ sh.proc.c
$set 17
1 : ަ ϧ ަ!\n
diff --git a/contrib/tcsh/nls/ukrainian/set18 b/contrib/tcsh/nls/ukrainian/set18
index 53128aa0b656..c3d82bf4ad35 100644
--- a/contrib/tcsh/nls/ukrainian/set18
+++ b/contrib/tcsh/nls/ukrainian/set18
@@ -1,4 +1,4 @@
-$ $Id: set18,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set18,v 1.3 2006/03/02 18:46:48 christos Exp $
$ sh.set.c
$set 18
1 : PATH Ҧ\n
diff --git a/contrib/tcsh/nls/ukrainian/set19 b/contrib/tcsh/nls/ukrainian/set19
index 220b359e8ad7..ae57dfa13c28 100644
--- a/contrib/tcsh/nls/ukrainian/set19
+++ b/contrib/tcsh/nls/ukrainian/set19
@@ -1,4 +1,4 @@
-$ $Id: set19,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set19,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: 'Ԧ\n
diff --git a/contrib/tcsh/nls/ukrainian/set2 b/contrib/tcsh/nls/ukrainian/set2
index 2ecef12518c0..b25777f6ae01 100644
--- a/contrib/tcsh/nls/ukrainian/set2
+++ b/contrib/tcsh/nls/ukrainian/set2
@@ -1,4 +1,4 @@
-$ $Id: set2,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set2,v 1.3 2006/03/02 18:46:48 christos Exp $
$ Signal names
$set 2
1
diff --git a/contrib/tcsh/nls/ukrainian/set20 b/contrib/tcsh/nls/ukrainian/set20
index 7fd91c8908f2..64be44e56036 100644
--- a/contrib/tcsh/nls/ukrainian/set20
+++ b/contrib/tcsh/nls/ukrainian/set20
@@ -1,4 +1,4 @@
-$ $Id: set20,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set20,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tc.bind.c
$set 20
1 Invalid key name `%S'\n
diff --git a/contrib/tcsh/nls/ukrainian/set21 b/contrib/tcsh/nls/ukrainian/set21
index 4f6c139a54ef..8d6c3a8ae626 100644
--- a/contrib/tcsh/nls/ukrainian/set21
+++ b/contrib/tcsh/nls/ukrainian/set21
@@ -1,4 +1,4 @@
-$ $Id: set21,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set21,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tc.disc.c
$set 21
1 Couldn't get local chars.\n
diff --git a/contrib/tcsh/nls/ukrainian/set22 b/contrib/tcsh/nls/ukrainian/set22
index e0cb878e65b3..534298ee510c 100644
--- a/contrib/tcsh/nls/ukrainian/set22
+++ b/contrib/tcsh/nls/ukrainian/set22
@@ -1,4 +1,4 @@
-$ $Id: set22,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set22,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tc.func.c
$set 22
1 %S: \t
diff --git a/contrib/tcsh/nls/ukrainian/set23 b/contrib/tcsh/nls/ukrainian/set23
index 4b8a5430db20..f62702b46e36 100644
--- a/contrib/tcsh/nls/ukrainian/set23
+++ b/contrib/tcsh/nls/ukrainian/set23
@@ -1,4 +1,4 @@
-$ $Id: set23,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set23,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tc.os.c
$set 23
1 Bad cpu/site name
diff --git a/contrib/tcsh/nls/ukrainian/set24 b/contrib/tcsh/nls/ukrainian/set24
index d0460de0286c..80482f619f53 100644
--- a/contrib/tcsh/nls/ukrainian/set24
+++ b/contrib/tcsh/nls/ukrainian/set24
@@ -1,4 +1,4 @@
-$ $Id: set24,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set24,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tc.sched.c
$set 24
1 kludge
diff --git a/contrib/tcsh/nls/ukrainian/set25 b/contrib/tcsh/nls/ukrainian/set25
index 9b5a9e1e041c..076952195ea0 100644
--- a/contrib/tcsh/nls/ukrainian/set25
+++ b/contrib/tcsh/nls/ukrainian/set25
@@ -1,4 +1,4 @@
-$ $Id: set25,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set25,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tc.sig.c
$set 25
1 our wait %d\n
diff --git a/contrib/tcsh/nls/ukrainian/set26 b/contrib/tcsh/nls/ukrainian/set26
index 4f8b7f524002..4c28ab21bf98 100644
--- a/contrib/tcsh/nls/ukrainian/set26
+++ b/contrib/tcsh/nls/ukrainian/set26
@@ -1,4 +1,4 @@
-$ $Id: set26,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set26,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tc.who.c
$set 26
1 cannot stat %s. Please "unset watch".\n
diff --git a/contrib/tcsh/nls/ukrainian/set27 b/contrib/tcsh/nls/ukrainian/set27
index 4417820c58d5..2670e902f8ed 100644
--- a/contrib/tcsh/nls/ukrainian/set27
+++ b/contrib/tcsh/nls/ukrainian/set27
@@ -1,4 +1,4 @@
-$ $Id: set27,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set27,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tw.comp.c
$set 27
1
diff --git a/contrib/tcsh/nls/ukrainian/set29 b/contrib/tcsh/nls/ukrainian/set29
index fa1902f58dc7..02c4746d9fdf 100644
--- a/contrib/tcsh/nls/ukrainian/set29
+++ b/contrib/tcsh/nls/ukrainian/set29
@@ -1,4 +1,4 @@
-$ $Id: set29,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set29,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tw.help.c
$set 29
1 Φ צ %S\n
diff --git a/contrib/tcsh/nls/ukrainian/set3 b/contrib/tcsh/nls/ukrainian/set3
index af8f410bfdfd..615c9d87e282 100644
--- a/contrib/tcsh/nls/ukrainian/set3
+++ b/contrib/tcsh/nls/ukrainian/set3
@@ -1,4 +1,4 @@
-$ $Id: set3,v 1.3 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set3,v 1.4 2006/03/02 18:46:48 christos Exp $
$ Editor function descriptions
$set 3
1 Move back a character
diff --git a/contrib/tcsh/nls/ukrainian/set30 b/contrib/tcsh/nls/ukrainian/set30
index 689f407ddf8e..8b835de9076e 100644
--- a/contrib/tcsh/nls/ukrainian/set30
+++ b/contrib/tcsh/nls/ukrainian/set30
@@ -1,4 +1,4 @@
-$ $Id: set30,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set30,v 1.3 2006/03/02 18:46:48 christos Exp $
$ tw.parse.c
$set 30
1 starting_a_command %d\n
diff --git a/contrib/tcsh/nls/ukrainian/set31 b/contrib/tcsh/nls/ukrainian/set31
index 1349b96a5e7d..f0b875252cd2 100644
--- a/contrib/tcsh/nls/ukrainian/set31
+++ b/contrib/tcsh/nls/ukrainian/set31
@@ -1,4 +1,4 @@
-$ $Id: set31,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set31,v 1.3 2006/03/02 18:46:48 christos Exp $
$ vms.termcap.c
$set 31
1 צ TERMCAP: [%s]\n
diff --git a/contrib/tcsh/nls/ukrainian/set4 b/contrib/tcsh/nls/ukrainian/set4
index 868617a64379..a407091e8765 100644
--- a/contrib/tcsh/nls/ukrainian/set4
+++ b/contrib/tcsh/nls/ukrainian/set4
@@ -1,4 +1,4 @@
-$ $Id: set4,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set4,v 1.3 2006/03/02 18:46:48 christos Exp $
$ Termcap strings
$set 4
1 add new blank line
diff --git a/contrib/tcsh/nls/ukrainian/set5 b/contrib/tcsh/nls/ukrainian/set5
index ca041e2fce50..8540d1d4144c 100644
--- a/contrib/tcsh/nls/ukrainian/set5
+++ b/contrib/tcsh/nls/ukrainian/set5
@@ -1,4 +1,4 @@
-$ $Id: set5,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set5,v 1.3 2006/03/02 18:46:48 christos Exp $
$ ed.chared.c
$set 5
1 : Τ \n
diff --git a/contrib/tcsh/nls/ukrainian/set6 b/contrib/tcsh/nls/ukrainian/set6
index 65be467d3feb..a86cef763c4f 100644
--- a/contrib/tcsh/nls/ukrainian/set6
+++ b/contrib/tcsh/nls/ukrainian/set6
@@ -1,4 +1,4 @@
-$ $Id: set6,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set6,v 1.3 2006/03/02 18:46:48 christos Exp $
$ ed.inputl.c
$set 6
1 ERROR: illegal command from key 0%o\r\n
diff --git a/contrib/tcsh/nls/ukrainian/set7 b/contrib/tcsh/nls/ukrainian/set7
index 2c43d69557c9..8a1bcbf2e68d 100644
--- a/contrib/tcsh/nls/ukrainian/set7
+++ b/contrib/tcsh/nls/ukrainian/set7
@@ -1,4 +1,4 @@
-$ $Id: set7,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set7,v 1.3 2006/03/02 18:46:48 christos Exp $
$ ed.screen.c
$set 7
1 \n\tTcsh thinks your terminal has the\n
diff --git a/contrib/tcsh/nls/ukrainian/set8 b/contrib/tcsh/nls/ukrainian/set8
index 4d7b8c251fa3..693f9b02ee66 100644
--- a/contrib/tcsh/nls/ukrainian/set8
+++ b/contrib/tcsh/nls/ukrainian/set8
@@ -1,4 +1,4 @@
-$ $Id: set8,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set8,v 1.3 2006/03/02 18:46:48 christos Exp $
$ ed.term.c
$set 8
1 צ
diff --git a/contrib/tcsh/nls/ukrainian/set9 b/contrib/tcsh/nls/ukrainian/set9
index 5b6146825395..97971f59c777 100644
--- a/contrib/tcsh/nls/ukrainian/set9
+++ b/contrib/tcsh/nls/ukrainian/set9
@@ -1,4 +1,4 @@
-$ $Id: set9,v 1.2 2002/07/01 20:50:22 christos Exp $
+$ $tcsh: set9,v 1.3 2006/03/02 18:46:48 christos Exp $
$ ed.xmap.c
$set 9
1 AddXkey: Null extended-key not allowed.\n
diff --git a/contrib/tcsh/patchlevel.h b/contrib/tcsh/patchlevel.h
index d25322c1fd50..f1c5a106d505 100644
--- a/contrib/tcsh/patchlevel.h
+++ b/contrib/tcsh/patchlevel.h
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/patchlevel.h,v 3.151 2005/03/25 17:36:08 kim Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/patchlevel.h,v 3.161 2007/03/03 20:01:26 christos Exp $ */
/*
* patchlevel.h: Our life story.
*/
@@ -7,8 +7,8 @@
#define ORIGIN "Astron"
#define REV 6
-#define VERS 14
+#define VERS 15
#define PATCHLEVEL 0
-#define DATE "2005-03-25"
+#define DATE "2007-03-03"
#endif /* _h_patchlevel */
diff --git a/contrib/tcsh/pathnames.h b/contrib/tcsh/pathnames.h
index 38027e8baf82..80d86ebe1704 100644
--- a/contrib/tcsh/pathnames.h
+++ b/contrib/tcsh/pathnames.h
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/pathnames.h,v 3.18 2002/03/08 17:36:46 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/pathnames.h,v 3.18 2002/03/08 17:36:46 christos Exp $ */
/*
* pathnames.h: Location of things to find
*/
diff --git a/contrib/tcsh/sh.c b/contrib/tcsh/sh.c
index 178b9728a878..57b1befcc39a 100644
--- a/contrib/tcsh/sh.c
+++ b/contrib/tcsh/sh.c
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/sh.c,v 3.123 2005/03/21 21:26:36 kim Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/sh.c,v 3.136 2007/02/22 21:57:37 christos Exp $ */
/*
* sh.c: Main shell routines
*/
@@ -39,7 +39,7 @@ char copyright[] =
All rights reserved.\n";
#endif /* not lint */
-RCSID("$Id: sh.c,v 3.123 2005/03/21 21:26:36 kim Exp $")
+RCSID("$tcsh: sh.c,v 3.136 2007/02/22 21:57:37 christos Exp $")
#include "tc.h"
#include "ed.h"
@@ -81,12 +81,9 @@ extern int NLSMapsAreInited;
jmp_buf_t reslab INIT_ZERO_STRUCT;
static const char tcshstr[] = "tcsh";
-#ifdef WINNT_NATIVE
-static const char tcshstr_nt[] = "tcsh.exe";
-#endif /* WINNT_NATIVE */
-signalfun_t parintr = 0; /* Parents interrupt catch */
-signalfun_t parterm = 0; /* Parents terminate catch */
+struct sigaction parintr; /* Parents interrupt catch */
+struct sigaction parterm; /* Parents terminate catch */
#ifdef TESLA
int do_logout = 0;
@@ -103,14 +100,7 @@ static Char INVCHAR;
Char *INVPTR = &INVCHAR;
Char **INVPPTR = &INVPTR;
-static int nofile = 0;
-static int reenter = 0;
-static int nverbose = 0;
-static int nexececho = 0;
-static int quitit = 0;
-static int rdirs = 0;
-int fast = 0;
-static int batch = 0;
+static int fast = 0;
static int mflag = 0;
static int prompt = 1;
int enterhist = 0;
@@ -123,7 +113,6 @@ int exitset = 0;
static time_t chktim; /* Time mail last checked */
char *progname;
int tcsh;
-extern char **environ;
/*
* This preserves the input state of the shell. It is used by
@@ -146,54 +135,48 @@ struct saved_state {
int onelflg;
int enterhist;
Char **argv;
+ Char **av;
Char HIST;
int cantell;
struct Bin B;
- /* These keep signal state and setjump state */
-#ifdef BSDSIGS
- sigmask_t mask;
-#endif
- jmp_buf_t oldexit;
- int reenter;
};
-static int srccat __P((Char *, Char *));
+static int srccat (Char *, Char *);
#ifndef WINNT_NATIVE
-static int srcfile __P((const char *, int, int, Char **));
+static int srcfile (const char *, int, int, Char **);
#else
-int srcfile __P((const char *, int, int, Char **));
+int srcfile (const char *, int, int, Char **);
#endif /*WINNT_NATIVE*/
-static RETSIGTYPE phup __P((int));
-static void srcunit __P((int, int, int, Char **));
-static void mailchk __P((void));
+static void srcunit (int, int, int, Char **);
+static void mailchk (void);
#ifndef _PATH_DEFPATH
-static Char **defaultpath __P((void));
+static Char **defaultpath (void);
#endif
-static void record __P((void));
-static void st_save __P((struct saved_state *, int, int,
- Char **, Char **));
-static void st_restore __P((struct saved_state *, Char **));
+static void record (void);
+static void st_save (struct saved_state *, int, int,
+ Char **, Char **);
+static void st_restore (void *);
- int main __P((int, char **));
+ int main (int, char **);
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char **argv)
{
+ int batch = 0;
+ volatile int nexececho = 0;
+ int nofile = 0;
+ volatile int nverbose = 0;
+ volatile int rdirs = 0;
+ int quitit = 0;
Char *cp;
#ifdef AUTOLOGOUT
Char *cp2;
#endif
char *tcp, *ttyn;
- int f;
+ int f, reenter;
char **tempv;
int osetintr;
- signalfun_t oparintr;
-
-#ifdef BSDSIGS
- sigvec_t osv;
-#endif /* BSDSIGS */
+ struct sigaction oparintr;
#ifdef WINNT_NATIVE
nt_init();
@@ -211,7 +194,7 @@ main(argc, argv)
nlsinit();
#ifdef MALLOC_TRACE
- mal_setstatsfile(fdopen(dmove(open("/tmp/tcsh.trace",
+ mal_setstatsfile(fdopen(dmove(xopen("/tmp/tcsh.trace",
O_WRONLY|O_CREAT|O_LARGEFILE, 0666), 25), "w"));
mal_trace(1);
#endif /* MALLOC_TRACE */
@@ -239,11 +222,11 @@ main(argc, argv)
*/
{
do
- if ((f = open(_PATH_DEVNULL, O_RDONLY|O_LARGEFILE)) == -1 &&
- (f = open("/", O_RDONLY|O_LARGEFILE)) == -1)
+ if ((f = xopen(_PATH_DEVNULL, O_RDONLY|O_LARGEFILE)) == -1 &&
+ (f = xopen("/", O_RDONLY|O_LARGEFILE)) == -1)
exit(1);
while (f < 3);
- (void) close(f);
+ xclose(f);
}
#ifdef O_TEXT
@@ -295,7 +278,7 @@ main(argc, argv)
bslash_quote = 0; /* PWP: do tcsh-style backslash quoting? */
/* Default history size to 100 */
- set(STRhistory, SAVE("100"), VAR_READWRITE);
+ setcopy(STRhistory, str2short("100"), VAR_READWRITE);
tempv = argv;
ffile = SAVE(tempv[0]);
@@ -322,22 +305,21 @@ main(argc, argv)
#endif /* _VMS_POSIX */
if (loginsh && **tempv != '-') {
+ char *argv0;
+
/*
* Mangle the argv space
*/
tempv[1][0] = '\0';
tempv[1][1] = '\0';
tempv[1] = NULL;
- for (tcp = *tempv; *tcp++;)
- continue;
- for (tcp--; tcp >= *tempv; tcp--)
- tcp[1] = tcp[0];
- *++tcp = '-';
+ argv0 = strspl("-", *tempv);
+ *tempv = argv0;
argc--;
}
if (loginsh) {
(void) time(&chktim);
- set(STRloginsh, Strsave(STRNULL), VAR_READWRITE);
+ setNS(STRloginsh);
}
AsciiOnly = 1;
@@ -360,7 +342,7 @@ main(argc, argv)
{
int k;
- for (k = 0200; k <= 0377 && !Isprint(k); k++)
+ for (k = 0200; k <= 0377 && !Isprint(CTL_ESC(k)); k++)
continue;
AsciiOnly = MB_CUR_MAX == 1 && k > 0377;
}
@@ -398,9 +380,9 @@ main(argc, argv)
* 2. reenable the control terminal
*/
if (loginsh && isatty(SHIN)) {
- ttyn = (char *) ttyname(SHIN);
- (void) close(SHIN);
- SHIN = open(ttyn, O_RDWR|O_LARGEFILE);
+ ttyn = ttyname(SHIN);
+ xclose(SHIN);
+ SHIN = xopen(ttyn, O_RDWR|O_LARGEFILE);
shpgrp = getpid();
(void) ioctl (SHIN, TIOCSPGRP, (ioctl_t) &shpgrp);
(void) setpgid(0, shpgrp);
@@ -424,12 +406,12 @@ main(argc, argv)
* utmp, so we keep it too.
*/
if (strncmp(ttyn, "/dev/", 5) == 0)
- set(STRtty, cp = SAVE(ttyn + 5), VAR_READWRITE);
+ setv(STRtty, cp = SAVE(ttyn + 5), VAR_READWRITE);
else
- set(STRtty, cp = SAVE(ttyn), VAR_READWRITE);
+ setv(STRtty, cp = SAVE(ttyn), VAR_READWRITE);
}
else
- set(STRtty, cp = SAVE(""), VAR_READWRITE);
+ setv(STRtty, cp = SAVE(""), VAR_READWRITE);
/*
* Initialize the shell variables. ARGV and PROMPT are initialized later.
* STATUS is also munged in several places. CHILD is munged when
@@ -463,14 +445,13 @@ main(argc, argv)
*/
#ifdef AUTOLOGOUT
# ifdef convex
- if (uid == 0) {
+ if (uid == 0)
/* root always has a 15 minute autologout */
- set(STRautologout, Strsave(STRrootdefautologout), VAR_READWRITE);
- }
+ setcopy(STRautologout, STRrootdefautologout, VAR_READWRITE);
else
if (loginsh)
/* users get autologout set to 0 */
- set(STRautologout, Strsave(STR0), VAR_READWRITE);
+ setcopy(STRautologout, STR0, VAR_READWRITE);
# else /* convex */
if (loginsh || (uid == 0)) {
if (*cp) {
@@ -484,8 +465,7 @@ main(argc, argv)
((Strncmp(cp, STRpts, 3) == 0) && cp[3] == '/'))) {
if (getenv("DISPLAY") == NULL) {
/* NOT on X window shells */
- set(STRautologout, Strsave(STRdefautologout),
- VAR_READWRITE);
+ setcopy(STRautologout, STRdefautologout, VAR_READWRITE);
}
}
}
@@ -493,9 +473,9 @@ main(argc, argv)
# endif /* convex */
#endif /* AUTOLOGOUT */
- (void) sigset(SIGALRM, alrmcatch);
+ sigset_interrupting(SIGALRM, queue_alrmcatch);
- set(STRstatus, Strsave(STR0), VAR_READWRITE);
+ setcopy(STRstatus, STR0, VAR_READWRITE);
/*
* get and set machine specific environment variables
@@ -509,42 +489,32 @@ main(argc, argv)
#if ECHO_STYLE != BSD_ECHO
if (tcsh) {
# if ECHO_STYLE == NONE_ECHO
- set(STRecho_style, Strsave(STRnone), VAR_READWRITE);
+ setcopy(STRecho_style, STRnone, VAR_READWRITE);
# endif /* ECHO_STYLE == NONE_ECHO */
# if ECHO_STYLE == SYSV_ECHO
- set(STRecho_style, Strsave(STRsysv), VAR_READWRITE);
+ setcopy(STRecho_style, STRsysv, VAR_READWRITE);
# endif /* ECHO_STYLE == SYSV_ECHO */
# if ECHO_STYLE == BOTH_ECHO
- set(STRecho_style, Strsave(STRboth), VAR_READWRITE);
+ setcopy(STRecho_style, STRboth, VAR_READWRITE);
# endif /* ECHO_STYLE == BOTH_ECHO */
} else
#endif /* ECHO_STYLE != BSD_ECHO */
- set(STRecho_style, Strsave(STRbsd), VAR_READWRITE);
+ setcopy(STRecho_style, STRbsd, VAR_READWRITE);
/*
* increment the shell level.
*/
shlvl(1);
- if ((tcp = getenv("HOME")) != NULL) {
- if (strlen(tcp) >= MAXPATHLEN) {
- struct passwd *pw;
- if ((pw = getpwuid(getuid())) != NULL)
- cp = quote(SAVE(pw->pw_dir));
- else {
- tcp[MAXPATHLEN-1] = '\0';
- cp = quote(SAVE(tcp));
- }
- } else {
- cp = quote(SAVE(tcp));
- }
- } else
+ if ((tcp = getenv("HOME")) != NULL)
+ cp = quote(SAVE(tcp));
+ else
cp = NULL;
if (cp == NULL)
fast = 1; /* No home -> can't read scripts */
else
- set(STRhome, cp, VAR_READWRITE);
+ setv(STRhome, cp, VAR_READWRITE);
dinit(cp); /* dinit thinks that HOME == cwd in a login
* shell */
@@ -554,7 +524,6 @@ main(argc, argv)
*/
{
char *cln, *cus, *cgr;
- Char buff[BUFSIZE];
struct passwd *pw;
struct group *gr;
@@ -562,26 +531,23 @@ main(argc, argv)
#ifdef apollo
int oid = getoid();
- (void) Itoa(oid, buff, 0, 0);
- set(STRoid, Strsave(buff), VAR_READWRITE);
+ setv(STRoid, Itoa(oid, 0, 0), VAR_READWRITE);
#endif /* apollo */
- (void) Itoa(uid, buff, 0, 0);
- set(STRuid, Strsave(buff), VAR_READWRITE);
+ setv(STRuid, Itoa(uid, 0, 0), VAR_READWRITE);
- (void) Itoa(gid, buff, 0, 0);
- set(STRgid, Strsave(buff), VAR_READWRITE);
+ setv(STRgid, Itoa(gid, 0, 0), VAR_READWRITE);
cln = getenv("LOGNAME");
cus = getenv("USER");
if (cus != NULL)
- set(STRuser, quote(SAVE(cus