Author: brooks
Date: Tue Oct 8 20:59:31 2019
New Revision: 353325
URL: https://svnweb.freebsd.org/changeset/base/353325
Log:
Update tcsh to 6.21.00.
This is a bugfix release with no new features. A number of these fixes
were previously merged into our tree.
Sponsored by: DARPA, AFRL
Added:
head/contrib/tcsh/README.md
- copied unchanged from r353317, vendor/tcsh/dist/README.md
Deleted:
head/contrib/tcsh/README
head/contrib/tcsh/README.imake
Modified:
head/contrib/tcsh/Fixes
head/contrib/tcsh/Imakefile
head/contrib/tcsh/MAKEDIFFS
head/contrib/tcsh/MAKESHAR
head/contrib/tcsh/Makefile.in
head/contrib/tcsh/Makefile.std
head/contrib/tcsh/Makefile.vms
head/contrib/tcsh/Ported
head/contrib/tcsh/complete.tcsh
head/contrib/tcsh/config_f.h
head/contrib/tcsh/configure
head/contrib/tcsh/dotlock.c
head/contrib/tcsh/ed.chared.c
head/contrib/tcsh/ed.decls.h
head/contrib/tcsh/ed.defns.c
head/contrib/tcsh/ed.h
head/contrib/tcsh/ed.init.c
head/contrib/tcsh/ed.inputl.c
head/contrib/tcsh/ed.refresh.c
head/contrib/tcsh/ed.screen.c
head/contrib/tcsh/ed.term.c
head/contrib/tcsh/ed.term.h
head/contrib/tcsh/ed.xmap.c
head/contrib/tcsh/eight-bit.me
head/contrib/tcsh/gethost.c
head/contrib/tcsh/glob.3
head/contrib/tcsh/glob.c
head/contrib/tcsh/glob.h
head/contrib/tcsh/host.defs
head/contrib/tcsh/imake.config
head/contrib/tcsh/ma.setp.c
head/contrib/tcsh/mi.termios.c
head/contrib/tcsh/mi.varargs.h
head/contrib/tcsh/nls/C/set1
head/contrib/tcsh/nls/C/set10
head/contrib/tcsh/nls/C/set11
head/contrib/tcsh/nls/C/set12
head/contrib/tcsh/nls/C/set13
head/contrib/tcsh/nls/C/set14
head/contrib/tcsh/nls/C/set15
head/contrib/tcsh/nls/C/set16
head/contrib/tcsh/nls/C/set17
head/contrib/tcsh/nls/C/set18
head/contrib/tcsh/nls/C/set19
head/contrib/tcsh/nls/C/set2
head/contrib/tcsh/nls/C/set20
head/contrib/tcsh/nls/C/set21
head/contrib/tcsh/nls/C/set22
head/contrib/tcsh/nls/C/set23
head/contrib/tcsh/nls/C/set24
head/contrib/tcsh/nls/C/set25
head/contrib/tcsh/nls/C/set26
head/contrib/tcsh/nls/C/set27
head/contrib/tcsh/nls/C/set29
head/contrib/tcsh/nls/C/set3
head/contrib/tcsh/nls/C/set30
head/contrib/tcsh/nls/C/set31
head/contrib/tcsh/nls/C/set4
head/contrib/tcsh/nls/C/set5
head/contrib/tcsh/nls/C/set6
head/contrib/tcsh/nls/C/set7
head/contrib/tcsh/nls/C/set8
head/contrib/tcsh/nls/C/set9
head/contrib/tcsh/nls/Makefile.in
head/contrib/tcsh/nls/catgen
head/contrib/tcsh/nls/et/set1
head/contrib/tcsh/nls/et/set10
head/contrib/tcsh/nls/et/set11
head/contrib/tcsh/nls/et/set12
head/contrib/tcsh/nls/et/set13
head/contrib/tcsh/nls/et/set14
head/contrib/tcsh/nls/et/set15
head/contrib/tcsh/nls/et/set16
head/contrib/tcsh/nls/et/set17
head/contrib/tcsh/nls/et/set18
head/contrib/tcsh/nls/et/set19
head/contrib/tcsh/nls/et/set2
head/contrib/tcsh/nls/et/set20
head/contrib/tcsh/nls/et/set21
head/contrib/tcsh/nls/et/set22
head/contrib/tcsh/nls/et/set23
head/contrib/tcsh/nls/et/set24
head/contrib/tcsh/nls/et/set25
head/contrib/tcsh/nls/et/set26
head/contrib/tcsh/nls/et/set27
head/contrib/tcsh/nls/et/set29
head/contrib/tcsh/nls/et/set3
head/contrib/tcsh/nls/et/set30
head/contrib/tcsh/nls/et/set31
head/contrib/tcsh/nls/et/set4
head/contrib/tcsh/nls/et/set5
head/contrib/tcsh/nls/et/set6
head/contrib/tcsh/nls/et/set7
head/contrib/tcsh/nls/et/set8
head/contrib/tcsh/nls/et/set9
head/contrib/tcsh/nls/finnish/set1
head/contrib/tcsh/nls/finnish/set10
head/contrib/tcsh/nls/finnish/set11
head/contrib/tcsh/nls/finnish/set12
head/contrib/tcsh/nls/finnish/set13
head/contrib/tcsh/nls/finnish/set14
head/contrib/tcsh/nls/finnish/set15
head/contrib/tcsh/nls/finnish/set16
head/contrib/tcsh/nls/finnish/set17
head/contrib/tcsh/nls/finnish/set18
head/contrib/tcsh/nls/finnish/set19
head/contrib/tcsh/nls/finnish/set2
head/contrib/tcsh/nls/finnish/set20
head/contrib/tcsh/nls/finnish/set21
head/contrib/tcsh/nls/finnish/set22
head/contrib/tcsh/nls/finnish/set23
head/contrib/tcsh/nls/finnish/set24
head/contrib/tcsh/nls/finnish/set25
head/contrib/tcsh/nls/finnish/set26
head/contrib/tcsh/nls/finnish/set27
head/contrib/tcsh/nls/finnish/set29
head/contrib/tcsh/nls/finnish/set3
head/contrib/tcsh/nls/finnish/set30
head/contrib/tcsh/nls/finnish/set31
head/contrib/tcsh/nls/finnish/set4
head/contrib/tcsh/nls/finnish/set5
head/contrib/tcsh/nls/finnish/set6
head/contrib/tcsh/nls/finnish/set7
head/contrib/tcsh/nls/finnish/set8
head/contrib/tcsh/nls/finnish/set9
head/contrib/tcsh/nls/french/set1
head/contrib/tcsh/nls/french/set10
head/contrib/tcsh/nls/french/set11
head/contrib/tcsh/nls/french/set12
head/contrib/tcsh/nls/french/set13
head/contrib/tcsh/nls/french/set14
head/contrib/tcsh/nls/french/set15
head/contrib/tcsh/nls/french/set16
head/contrib/tcsh/nls/french/set17
head/contrib/tcsh/nls/french/set18
head/contrib/tcsh/nls/french/set19
head/contrib/tcsh/nls/french/set2
head/contrib/tcsh/nls/french/set20
head/contrib/tcsh/nls/french/set21
head/contrib/tcsh/nls/french/set22
head/contrib/tcsh/nls/french/set23
head/contrib/tcsh/nls/french/set24
head/contrib/tcsh/nls/french/set25
head/contrib/tcsh/nls/french/set26
head/contrib/tcsh/nls/french/set27
head/contrib/tcsh/nls/french/set29
head/contrib/tcsh/nls/french/set3
head/contrib/tcsh/nls/french/set30
head/contrib/tcsh/nls/french/set31
head/contrib/tcsh/nls/french/set4
head/contrib/tcsh/nls/french/set5
head/contrib/tcsh/nls/french/set6
head/contrib/tcsh/nls/french/set7
head/contrib/tcsh/nls/french/set8
head/contrib/tcsh/nls/french/set9
head/contrib/tcsh/nls/german/set1
head/contrib/tcsh/nls/german/set10
head/contrib/tcsh/nls/german/set11
head/contrib/tcsh/nls/german/set12
head/contrib/tcsh/nls/german/set13
head/contrib/tcsh/nls/german/set14
head/contrib/tcsh/nls/german/set15
head/contrib/tcsh/nls/german/set16
head/contrib/tcsh/nls/german/set17
head/contrib/tcsh/nls/german/set18
head/contrib/tcsh/nls/german/set19
head/contrib/tcsh/nls/german/set2
head/contrib/tcsh/nls/german/set20
head/contrib/tcsh/nls/german/set21
head/contrib/tcsh/nls/german/set22
head/contrib/tcsh/nls/german/set23
head/contrib/tcsh/nls/german/set24
head/contrib/tcsh/nls/german/set25
head/contrib/tcsh/nls/german/set26
head/contrib/tcsh/nls/german/set27
head/contrib/tcsh/nls/german/set29
head/contrib/tcsh/nls/german/set3
head/contrib/tcsh/nls/german/set30
head/contrib/tcsh/nls/german/set31
head/contrib/tcsh/nls/german/set4
head/contrib/tcsh/nls/german/set5
head/contrib/tcsh/nls/german/set6
head/contrib/tcsh/nls/german/set7
head/contrib/tcsh/nls/german/set8
head/contrib/tcsh/nls/german/set9
head/contrib/tcsh/nls/greek/set1
head/contrib/tcsh/nls/greek/set10
head/contrib/tcsh/nls/greek/set11
head/contrib/tcsh/nls/greek/set12
head/contrib/tcsh/nls/greek/set13
head/contrib/tcsh/nls/greek/set14
head/contrib/tcsh/nls/greek/set15
head/contrib/tcsh/nls/greek/set16
head/contrib/tcsh/nls/greek/set17
head/contrib/tcsh/nls/greek/set18
head/contrib/tcsh/nls/greek/set19
head/contrib/tcsh/nls/greek/set2
head/contrib/tcsh/nls/greek/set20
head/contrib/tcsh/nls/greek/set21
head/contrib/tcsh/nls/greek/set22
head/contrib/tcsh/nls/greek/set23
head/contrib/tcsh/nls/greek/set24
head/contrib/tcsh/nls/greek/set25
head/contrib/tcsh/nls/greek/set26
head/contrib/tcsh/nls/greek/set27
head/contrib/tcsh/nls/greek/set29
head/contrib/tcsh/nls/greek/set3
head/contrib/tcsh/nls/greek/set30
head/contrib/tcsh/nls/greek/set31
head/contrib/tcsh/nls/greek/set4
head/contrib/tcsh/nls/greek/set5
head/contrib/tcsh/nls/greek/set6
head/contrib/tcsh/nls/greek/set7
head/contrib/tcsh/nls/greek/set8
head/contrib/tcsh/nls/greek/set9
head/contrib/tcsh/nls/italian/set1
head/contrib/tcsh/nls/italian/set10
head/contrib/tcsh/nls/italian/set11
head/contrib/tcsh/nls/italian/set12
head/contrib/tcsh/nls/italian/set13
head/contrib/tcsh/nls/italian/set14
head/contrib/tcsh/nls/italian/set15
head/contrib/tcsh/nls/italian/set16
head/contrib/tcsh/nls/italian/set17
head/contrib/tcsh/nls/italian/set18
head/contrib/tcsh/nls/italian/set19
head/contrib/tcsh/nls/italian/set2
head/contrib/tcsh/nls/italian/set20
head/contrib/tcsh/nls/italian/set21
head/contrib/tcsh/nls/italian/set22
head/contrib/tcsh/nls/italian/set23
head/contrib/tcsh/nls/italian/set24
head/contrib/tcsh/nls/italian/set25
head/contrib/tcsh/nls/italian/set26
head/contrib/tcsh/nls/italian/set27
head/contrib/tcsh/nls/italian/set29
head/contrib/tcsh/nls/italian/set3
head/contrib/tcsh/nls/italian/set30
head/contrib/tcsh/nls/italian/set31
head/contrib/tcsh/nls/italian/set4
head/contrib/tcsh/nls/italian/set5
head/contrib/tcsh/nls/italian/set6
head/contrib/tcsh/nls/italian/set7
head/contrib/tcsh/nls/italian/set8
head/contrib/tcsh/nls/italian/set9
head/contrib/tcsh/nls/ja/set1
head/contrib/tcsh/nls/ja/set10
head/contrib/tcsh/nls/ja/set11
head/contrib/tcsh/nls/ja/set12
head/contrib/tcsh/nls/ja/set13
head/contrib/tcsh/nls/ja/set15
head/contrib/tcsh/nls/ja/set16
head/contrib/tcsh/nls/ja/set17
head/contrib/tcsh/nls/ja/set18
head/contrib/tcsh/nls/ja/set2
head/contrib/tcsh/nls/ja/set21
head/contrib/tcsh/nls/ja/set24
head/contrib/tcsh/nls/ja/set29
head/contrib/tcsh/nls/ja/set3
head/contrib/tcsh/nls/ja/set30
head/contrib/tcsh/nls/ja/set4
head/contrib/tcsh/nls/ja/set5
head/contrib/tcsh/nls/ja/set6
head/contrib/tcsh/nls/ja/set7
head/contrib/tcsh/nls/ja/set8
head/contrib/tcsh/nls/russian/set1
head/contrib/tcsh/nls/russian/set10
head/contrib/tcsh/nls/russian/set11
head/contrib/tcsh/nls/russian/set12
head/contrib/tcsh/nls/russian/set13
head/contrib/tcsh/nls/russian/set14
head/contrib/tcsh/nls/russian/set15
head/contrib/tcsh/nls/russian/set16
head/contrib/tcsh/nls/russian/set17
head/contrib/tcsh/nls/russian/set18
head/contrib/tcsh/nls/russian/set19
head/contrib/tcsh/nls/russian/set2
head/contrib/tcsh/nls/russian/set20
head/contrib/tcsh/nls/russian/set21
head/contrib/tcsh/nls/russian/set22
head/contrib/tcsh/nls/russian/set23
head/contrib/tcsh/nls/russian/set24
head/contrib/tcsh/nls/russian/set25
head/contrib/tcsh/nls/russian/set26
head/contrib/tcsh/nls/russian/set27
head/contrib/tcsh/nls/russian/set29
head/contrib/tcsh/nls/russian/set3
head/contrib/tcsh/nls/russian/set30
head/contrib/tcsh/nls/russian/set31
head/contrib/tcsh/nls/russian/set4
head/contrib/tcsh/nls/russian/set5
head/contrib/tcsh/nls/russian/set6
head/contrib/tcsh/nls/russian/set7
head/contrib/tcsh/nls/russian/set8
head/contrib/tcsh/nls/russian/set9
head/contrib/tcsh/nls/spanish/set1
head/contrib/tcsh/nls/spanish/set10
head/contrib/tcsh/nls/spanish/set11
head/contrib/tcsh/nls/spanish/set12
head/contrib/tcsh/nls/spanish/set13
head/contrib/tcsh/nls/spanish/set14
head/contrib/tcsh/nls/spanish/set15
head/contrib/tcsh/nls/spanish/set16
head/contrib/tcsh/nls/spanish/set17
head/contrib/tcsh/nls/spanish/set18
head/contrib/tcsh/nls/spanish/set19
head/contrib/tcsh/nls/spanish/set2
head/contrib/tcsh/nls/spanish/set20
head/contrib/tcsh/nls/spanish/set21
head/contrib/tcsh/nls/spanish/set22
head/contrib/tcsh/nls/spanish/set23
head/contrib/tcsh/nls/spanish/set24
head/contrib/tcsh/nls/spanish/set25
head/contrib/tcsh/nls/spanish/set26
head/contrib/tcsh/nls/spanish/set27
head/contrib/tcsh/nls/spanish/set29
head/contrib/tcsh/nls/spanish/set3
head/contrib/tcsh/nls/spanish/set30
head/contrib/tcsh/nls/spanish/set31
head/contrib/tcsh/nls/spanish/set4
head/contrib/tcsh/nls/spanish/set5
head/contrib/tcsh/nls/spanish/set6
head/contrib/tcsh/nls/spanish/set7
head/contrib/tcsh/nls/spanish/set8
head/contrib/tcsh/nls/spanish/set9
head/contrib/tcsh/nls/ukrainian/set1
head/contrib/tcsh/nls/ukrainian/set10
head/contrib/tcsh/nls/ukrainian/set11
head/contrib/tcsh/nls/ukrainian/set12
head/contrib/tcsh/nls/ukrainian/set13
head/contrib/tcsh/nls/ukrainian/set14
head/contrib/tcsh/nls/ukrainian/set15
head/contrib/tcsh/nls/ukrainian/set16
head/contrib/tcsh/nls/ukrainian/set17
head/contrib/tcsh/nls/ukrainian/set18
head/contrib/tcsh/nls/ukrainian/set19
head/contrib/tcsh/nls/ukrainian/set2
head/contrib/tcsh/nls/ukrainian/set20
head/contrib/tcsh/nls/ukrainian/set21
head/contrib/tcsh/nls/ukrainian/set22
head/contrib/tcsh/nls/ukrainian/set23
head/contrib/tcsh/nls/ukrainian/set24
head/contrib/tcsh/nls/ukrainian/set25
head/contrib/tcsh/nls/ukrainian/set26
head/contrib/tcsh/nls/ukrainian/set27
head/contrib/tcsh/nls/ukrainian/set29
head/contrib/tcsh/nls/ukrainian/set3
head/contrib/tcsh/nls/ukrainian/set30
head/contrib/tcsh/nls/ukrainian/set31
head/contrib/tcsh/nls/ukrainian/set4
head/contrib/tcsh/nls/ukrainian/set5
head/contrib/tcsh/nls/ukrainian/set6
head/contrib/tcsh/nls/ukrainian/set7
head/contrib/tcsh/nls/ukrainian/set8
head/contrib/tcsh/nls/ukrainian/set9
head/contrib/tcsh/patchlevel.h
head/contrib/tcsh/pathnames.h
head/contrib/tcsh/sh.c
head/contrib/tcsh/sh.char.c
head/contrib/tcsh/sh.char.h
head/contrib/tcsh/sh.decls.h
head/contrib/tcsh/sh.dir.c
head/contrib/tcsh/sh.dir.h
head/contrib/tcsh/sh.dol.c
head/contrib/tcsh/sh.err.c
head/contrib/tcsh/sh.exec.c
head/contrib/tcsh/sh.exp.c
head/contrib/tcsh/sh.file.c
head/contrib/tcsh/sh.func.c
head/contrib/tcsh/sh.glob.c
head/contrib/tcsh/sh.h
head/contrib/tcsh/sh.hist.c
head/contrib/tcsh/sh.init.c
head/contrib/tcsh/sh.lex.c
head/contrib/tcsh/sh.misc.c
head/contrib/tcsh/sh.parse.c
head/contrib/tcsh/sh.print.c
head/contrib/tcsh/sh.proc.c
head/contrib/tcsh/sh.proc.h
head/contrib/tcsh/sh.sem.c
head/contrib/tcsh/sh.set.c
head/contrib/tcsh/sh.time.c
head/contrib/tcsh/sh.types.h
head/contrib/tcsh/snames.h
head/contrib/tcsh/tc.alloc.c
head/contrib/tcsh/tc.bind.c
head/contrib/tcsh/tc.const.c
head/contrib/tcsh/tc.decls.h
head/contrib/tcsh/tc.disc.c
head/contrib/tcsh/tc.func.c
head/contrib/tcsh/tc.h
head/contrib/tcsh/tc.nls.c
head/contrib/tcsh/tc.nls.h
head/contrib/tcsh/tc.os.c
head/contrib/tcsh/tc.os.h
head/contrib/tcsh/tc.printf.c
head/contrib/tcsh/tc.prompt.c
head/contrib/tcsh/tc.sched.c
head/contrib/tcsh/tc.sig.c
head/contrib/tcsh/tc.sig.h
head/contrib/tcsh/tc.str.c
head/contrib/tcsh/tc.vers.c
head/contrib/tcsh/tc.wait.h
head/contrib/tcsh/tc.who.c
head/contrib/tcsh/tcsh.man
head/contrib/tcsh/tcsh.man.new
head/contrib/tcsh/tcsh.man2html
head/contrib/tcsh/termcap.vms
head/contrib/tcsh/tw.color.c
head/contrib/tcsh/tw.comp.c
head/contrib/tcsh/tw.decls.h
head/contrib/tcsh/tw.h
head/contrib/tcsh/tw.help.c
head/contrib/tcsh/tw.init.c
head/contrib/tcsh/tw.parse.c
head/contrib/tcsh/tw.spell.c
head/contrib/tcsh/vms.termcap.c
Directory Properties:
head/contrib/tcsh/ (props changed)
Modified: head/contrib/tcsh/Fixes
==============================================================================
--- head/contrib/tcsh/Fixes Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/Fixes Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,4 +1,18 @@
- 22. Fix type of read in prompt confirmation (eg. rmstar) (David Kaspar)
+ 12. V6.21.00 - 20190508
+ 11. Abort history loading on words and lines too long
+ https://bugzilla.redhat.com/show_bug.cgi?id=1598502
+ 10. PR/37: Introduce GetCmdChar() to avoid open coding array access.
+ 9. make closem() not close sockets so as not to affect nss_ldap.
+ tcsh never creates sockets so that's ok (Miloslav Trmac)
+ 8. PR/597: Make rmstar work with aliased rm
+ 7. convert match() from recursive to backtracking.
+ 6. Handle 8 bit characters in bindkey (Werner Fink)
+ 5. Look for tgetent in libtinfo as well (Werner Fink)
+ 4. Don't play pointer tricks that are undefined in modern c (Brooks Davis)
+ 3. Fix out of bounds read (Brooks Davis)
+ 2. Fix type of read in prompt confirmation (eg. rmstar) (David Kaspar)
+ 1. PR/471: Delay arginp parsing
+
20. V6.20.00 - 20161124
19. Don't resize the screen if it did not change size.
18. V6.19.01 - 20161025
Modified: head/contrib/tcsh/Imakefile
==============================================================================
--- head/contrib/tcsh/Imakefile Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/Imakefile Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,6 +1,4 @@
XCOMM
-XCOMM $tcsh: Imakefile,v 1.88 2014/07/07 20:34:58 christos Exp $
-XCOMM
XCOMM Imakefile for tcsh 6.12
XCOMM Marc Horowitz, MIT SIPB
XCOMM
@@ -522,12 +520,11 @@ TCOBJS= tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF}
tc.prompt.${SUF} tc.sched.${SUF} tc.sig.${SUF} tc.str.${SUF} \
tc.vers.${SUF} tc.who.${SUF}
-MISCF = Makefile.std 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 Makefile.vms termcap.vms \
- snames.h host.defs gethost.c tcsh.man2html Makefile.in configure.ac \
- Makefile.win32 aclocal.m4
+MISCF = Makefile.std BUILDING Fixes MAKEDIFFS MAKESHAR NewThings README.md \
+ FAQ WishList config_f.h eight-bit.me glob.3 patchlevel.h pathnames.h \
+ tcsh.man Ported src.desc Imakefile imake.config complete.tcsh \
+ Makefile.vms termcap.vms snames.h host.defs gethost.c tcsh.man2html \
+ Makefile.in configure.ac Makefile.win32 aclocal.m4
CONFSRCS=config/[a-z]*
Modified: head/contrib/tcsh/MAKEDIFFS
==============================================================================
--- head/contrib/tcsh/MAKEDIFFS Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/MAKEDIFFS Tue Oct 8 20:59:31 2019 (r353325)
@@ -2,7 +2,6 @@
#
# MAKEDIFFS.sh: Make context diffs for the csh sources
#
-# $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
Modified: head/contrib/tcsh/MAKESHAR
==============================================================================
--- head/contrib/tcsh/MAKESHAR Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/MAKESHAR Tue Oct 8 20:59:31 2019 (r353325)
@@ -2,7 +2,6 @@
#
# MAKESHAR.sh: Make a shar file for the sources
#
-# $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
Modified: head/contrib/tcsh/Makefile.in
==============================================================================
--- head/contrib/tcsh/Makefile.in Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/Makefile.in Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,5 +1,3 @@
-# $tcsh: Makefile.in,v 3.59 2015/08/24 20:09:04 kim Exp $
-# Makefile.in 4.3 6/11/83
#
# C Shell with process control; VM/UNIX VAX Makefile
# Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -407,11 +405,11 @@ TCOBJS= tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF}
tc.vers.${SUF} tc.who.${SUF}
PVSRCS= Makefile.std Makefile.vms Makefile.in Makefile.win32
-AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \
+AVSRCS= BUILDING Fixes MAKEDIFFS MAKESHAR NewThings README.md 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.ac configure config.h.in \
+ complete.tcsh vmsreadme.txt termcap.vms snames.h host.defs \
+ gethost.c tcsh.man2html configure.ac configure config.h.in \
tests/testsuite.at aclocal.m4
TESTFILES= tests/aliases.at tests/arguments.at tests/commands.at \
tests/expr.at tests/lexical.at tests/mb-eucjp.at \
@@ -449,7 +447,7 @@ pure:$(P) ${OBJS}
gethost: gethost.c sh.err.h tc.const.h sh.h
rm -f gethost
- ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} $(srcdir)/gethost.c
+ ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}
$(srcdir)/gethost.c
tc.defs.c: gethost host.defs
@rm -f [email protected]
Modified: head/contrib/tcsh/Makefile.std
==============================================================================
--- head/contrib/tcsh/Makefile.std Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/Makefile.std Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,5 +1,3 @@
-# $tcsh: Makefile.std,v 1.100 2015/08/24 20:09:04 kim Exp $
-# Makefile.std 4.3 6/11/83
#
# C Shell with process control; VM/UNIX VAX Makefile
# Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -317,11 +315,11 @@ TCOBJS= tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF}
tc.vers.${SUF} tc.who.${SUF}
PVSRCS= Makefile.std Makefile.vms Makefile.in Makefile.win32
-AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \
+AVSRCS= BUILDING Fixes MAKEDIFFS MAKESHAR NewThings README.md 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.ac configure config.h.in \
+ complete.tcsh vmsreadme.txt termcap.vms snames.h host.defs \
+ gethost.c tcsh.man2html configure.ac configure config.h.in \
aclocal.m4
VHSRCS=${PVSRCS} ${AVSRCS}
Modified: head/contrib/tcsh/Makefile.vms
==============================================================================
--- head/contrib/tcsh/Makefile.vms Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/Makefile.vms Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,5 +1,3 @@
-# $tcsh: Makefile.vms,v 1.40 2014/07/07 20:34:58 christos Exp $
-# Makefile.vms 4.3 6/11/83
#
# C Shell with process control; VM/UNIX VAX Makefile
# Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -295,11 +293,11 @@ TCOBJS= tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF}
tc.vers.${SUF} tc.who.${SUF}
PVSRCS= Makefile.std Makefile.vms Makefile.in Makefile.win32
-AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \
+AVSRCS= BUILDING Fixes MAKEDIFFS MAKESHAR NewThings README.md 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.ac aclocal.m4
+ complete.tcsh vmsreadme.txt termcap.vms snames.h host.defs \
+ gethost.c tcsh.man2html configure.ac aclocal.m4
VHSRCS=${PVSRCS} ${AVSRCS}
Modified: head/contrib/tcsh/Ported
==============================================================================
--- head/contrib/tcsh/Ported Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/Ported Tue Oct 8 20:59:31 2019 (r353325)
@@ -338,7 +338,7 @@ CFLAGS : normal
LIBES : -ltermcap
OS : bsd 4.3reno
CONFIG : bsdreno
-NOTES : ttyname() is buggy. calls closedir() twice. See README
+NOTES : ttyname() is buggy. calls closedir() twice. See BUILDING
ENVIRON : n/a
VERSION : 6.00.04
Copied: head/contrib/tcsh/README.md (from r353317, vendor/tcsh/dist/README.md)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/tcsh/README.md Tue Oct 8 20:59:31 2019 (r353325, copy
of r353317, vendor/tcsh/dist/README.md)
@@ -0,0 +1,26 @@
+# Tcsh
+
+*C shell with file name completion and command line editing*
+
+The Tcsh source code is available on GitHub as a read-only repo
+mirror at:
+
+> http://github.com/tcsh-org/tcsh
+
+Instructions for compiling Tcsh can be found in [BUILDING].
+
+PLEASE file any bug reports, fixes, and code for new features at:
+
+> https://bugs.astron.com/
+
+Comments, questions, etc. (even flames) are welcome via email to
+the Tcsh Bugs mailing list:
+
+> [email protected]
+> https://mailman.astron.com/
+
+[![Build Status][status]][travis]
+
+[BUILDING]: BUILDING
+[status]: https://travis-ci.org/tcsh-org/tcsh.svg?branch=master
+[travis]: https://travis-ci.org/tcsh-org/tcsh
Modified: head/contrib/tcsh/complete.tcsh
==============================================================================
--- head/contrib/tcsh/complete.tcsh Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/complete.tcsh Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,5 +1,4 @@
#
-# $tcsh: complete.tcsh,v 1.56 2015/07/03 16:52:47 christos Exp $
# example file using the new completion code
#
# Debian GNU/Linux
Modified: head/contrib/tcsh/config_f.h
==============================================================================
--- head/contrib/tcsh/config_f.h Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/config_f.h Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/config_f.h,v 3.52 2016/04/16 15:44:18
christos Exp $ */
/*
* config_f.h -- configure various defines for tcsh
*
@@ -176,20 +175,6 @@
* FILEC support for old style file completion
*/
#define FILEC
-
-/*
- * RCSID This defines if we want rcs strings in the binary or not
- *
- */
-#if !defined(lint) && !defined(SABER) && !defined(__CLCC__)
-# ifndef __GNUC__
-# define RCSID(id) static char *rcsid = (id);
-# else
-# define RCSID(id) static const char rcsid[] __attribute__((__used__)) = (id);
-# endif /* !__GNUC__ */
-#else
-# define RCSID(id) /* Nothing */
-#endif /* !lint && !SABER */
/* Consistency checks */
#ifdef WIDE_STRINGS
Modified: head/contrib/tcsh/configure
==============================================================================
--- head/contrib/tcsh/configure Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/configure Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tcsh 6.20.00.
+# Generated by GNU Autoconf 2.69 for tcsh 6.21.00.
#
-# Report bugs to <http://bugs.gw.com/>.
+# Report bugs to <https://bugs.astron.com/>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -267,10 +267,10 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell [email protected] and
-$0: http://bugs.gw.com/ about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
+$0: https://bugs.astron.com/ about your system, including
+$0: any error possibly output before this message. Then
+$0: install a modern shell, or manually run the script
+$0: under such a shell if you do have one."
fi
exit 1
fi
@@ -580,9 +580,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='tcsh'
PACKAGE_TARNAME='tcsh'
-PACKAGE_VERSION='6.20.00'
-PACKAGE_STRING='tcsh 6.20.00'
-PACKAGE_BUGREPORT='http://bugs.gw.com/'
+PACKAGE_VERSION='6.21.00'
+PACKAGE_STRING='tcsh 6.21.00'
+PACKAGE_BUGREPORT='https://bugs.astron.com/'
PACKAGE_URL=''
ac_unique_file="tc.vers.c"
@@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures tcsh 6.20.00 to adapt to many kinds of systems.
+\`configure' configures tcsh 6.21.00 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1315,7 +1315,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tcsh 6.20.00:";;
+ short | recursive ) echo "Configuration of tcsh 6.21.00:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,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/>.
+Report bugs to <https://bugs.astron.com/>.
_ACEOF
ac_status=$?
fi
@@ -1411,7 +1411,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tcsh configure 6.20.00
+tcsh configure 6.21.00
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1658,9 +1658,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf docume
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\""
>&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the
compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------- ##
-## Report this to http://bugs.gw.com/ ##
-## ---------------------------------- ##"
+( $as_echo "## --------------------------------------- ##
+## Report this to https://bugs.astron.com/ ##
+## --------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -2174,7 +2174,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tcsh $as_me 6.20.00, which was
+It was created by tcsh $as_me 6.21.00, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4284,7 +4284,7 @@ return tgetent ();
return 0;
}
_ACEOF
-for ac_lib in '' termlib termcap curses ncurses; do
+for ac_lib in '' termlib tinfo termcap curses ncurses; do
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -7350,7 +7350,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tcsh $as_me 6.20.00, which was
+This file was extended by tcsh $as_me 6.21.00, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7410,13 +7410,13 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <http://bugs.gw.com/>."
+Report bugs to <https://bugs.astron.com/>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-tcsh config.status 6.20.00
+tcsh config.status 6.21.00
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: head/contrib/tcsh/dotlock.c
==============================================================================
--- head/contrib/tcsh/dotlock.c Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/dotlock.c Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,4 +1,4 @@
-/* $NetBSD: dotlock.c,v 1.11 2009/10/21 01:07:46 snj Exp $ */
+/* NetBSD: dotlock.c,v 1.11 2009/10/21 01:07:46 snj Exp */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "sh.h"
-RCSID("$tcsh: dotlock.c,v 3.4 2015/11/03 21:04:13 christos Exp $")
#include <stdio.h>
#ifndef O_SYNC
Modified: head/contrib/tcsh/ed.chared.c
==============================================================================
--- head/contrib/tcsh/ed.chared.c Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/ed.chared.c Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.chared.c,v 3.103 2015/08/19 14:29:55
christos Exp $ */
/*
* ed.chared.c: Character editing functions.
*/
@@ -71,9 +70,6 @@
*/
#include "sh.h"
-
-RCSID("$tcsh: ed.chared.c,v 3.103 2015/08/19 14:29:55 christos Exp $")
-
#include "ed.h"
#include "tw.h"
#include "ed.defns.h"
@@ -1105,8 +1101,7 @@ e_inc_search(int dir)
if (GetNextChar(&ch) != 1)
return(e_send_eof(0));
- switch (ch > NT_NUM_KEYS
- ? F_INSERT : CurrentKeyMap[(unsigned char) ch]) {
+ switch (GetCmdChar(ch)) {
case F_INSERT:
case F_DIGIT:
case F_MAGIC_SPACE:
Modified: head/contrib/tcsh/ed.decls.h
==============================================================================
--- head/contrib/tcsh/ed.decls.h Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/ed.decls.h Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.decls.h,v 3.46 2015/08/19 14:29:55
christos Exp $ */
/*
* ed.decls.h: Editor external definitions
*/
@@ -250,6 +249,7 @@ extern CCRETVAL e_newline_down_hist (Char);
* ed.inputl.c
*/
extern int Inputl (void);
+extern int GetCmdChar (Char);
extern int GetNextChar (Char *);
extern void UngetNextChar (Char);
extern void PushMacro (Char *);
Modified: head/contrib/tcsh/ed.defns.c
==============================================================================
--- head/contrib/tcsh/ed.defns.c Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/ed.defns.c Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.defns.c,v 3.51 2016/02/14 15:44:18
christos Exp $ */
/*
* ed.defns.c: Editor function definitions and initialization
*/
@@ -31,9 +30,6 @@
* SUCH DAMAGE.
*/
#include "sh.h"
-
-RCSID("$tcsh: ed.defns.c,v 3.51 2016/02/14 15:44:18 christos Exp $")
-
#include "ed.h"
static void ed_InitMetaBindings (void);
@@ -265,26 +261,22 @@ PFCmd CcFuncTbl[] = { /* table of available
command
#define F_COMMAND_NORM 111
e_dabbrev_expand,
#define F_DABBREV_EXPAND 112
- e_copy_to_clipboard,
-#define F_COPY_CLIP 113
- e_paste_from_clipboard,
-#define F_PASTE_CLIP 114
e_dosify_next,
-#define F_DOSIFY_NEXT 115
+#define F_DOSIFY_NEXT 113
e_dosify_prev,
-#define F_DOSIFY_PREV 116
+#define F_DOSIFY_PREV 114
e_page_up,
-#define F_PAGE_UP 117
+#define F_PAGE_UP 115
e_page_down,
-#define F_PAGE_DOWN 118
+#define F_PAGE_DOWN 116
e_yank_pop,
-#define F_YANK_POP 119
+#define F_YANK_POP 117
e_newline_hold,
-#define F_NEWLINE_HOLD 120
+#define F_NEWLINE_HOLD 118
e_newline_down_hist,
-#define F_NEWLINE_DOWN_HIST 121
+#define F_NEWLINE_DOWN_HIST 119
0 /* DUMMY VALUE */
-#define F_NUM_FNS 122
+#define F_NUM_FNS 120
};
@@ -1752,18 +1744,6 @@ editinit(void)
f->func = F_YANK_POP;
f->desc = CSAVS(3, 115,
"Replace just-yanked text with yank from earlier kill");
-
- f++;
- f->name = "e_copy_to_clipboard";
- f->func = F_COPY_CLIP;
- f->desc = CSAVS(3, 116,
- "(WIN32 only) Copy cut buffer to system clipboard");
-
- f++;
- f->name = "e_paste_from_clipboard";
- f->func = F_PASTE_CLIP;
- f->desc = CSAVS(3, 117,
- "(WIN32 only) Paste clipboard buffer at cursor position");
f++;
f->name = "e_dosify_next";
Modified: head/contrib/tcsh/ed.h
==============================================================================
--- head/contrib/tcsh/ed.h Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/ed.h Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.h,v 3.50 2007/07/05 14:13:06 christos Exp
$ */
/*
* ed.h: Editor declarations and globals
*/
Modified: head/contrib/tcsh/ed.init.c
==============================================================================
--- head/contrib/tcsh/ed.init.c Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/ed.init.c Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.init.c,v 3.60 2006/08/24 20:56:31 christos
Exp $ */
/*
* ed.init.c: Editor initializations
*/
@@ -31,9 +30,6 @@
* SUCH DAMAGE.
*/
#include "sh.h"
-
-RCSID("$tcsh: ed.init.c,v 3.60 2006/08/24 20:56:31 christos Exp $")
-
#include "ed.h"
#include "tc.h"
#include "ed.defns.h"
Modified: head/contrib/tcsh/ed.inputl.c
==============================================================================
--- head/contrib/tcsh/ed.inputl.c Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/ed.inputl.c Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.inputl.c,v 3.73 2012/10/19 15:23:32
christos Exp $ */
/*
* ed.inputl.c: Input line handling.
*/
@@ -31,9 +30,6 @@
* SUCH DAMAGE.
*/
#include "sh.h"
-
-RCSID("$tcsh: ed.inputl.c,v 3.73 2012/10/19 15:23:32 christos Exp $")
-
#include "ed.h"
#include "ed.defns.h" /* for the function names */
#include "tw.h" /* for twenex stuff */
@@ -668,6 +664,17 @@ RunCommand(Char *str)
Refresh();
}
+int
+GetCmdChar(Char ch)
+{
+#ifndef WINNT_NATIVE // We use more than 256 for various extended keys
+ wint_t c = ch & CHAR;
+#else
+ wint_t c = ch;
+#endif
+ return c < NT_NUM_KEYS ? CurrentKeyMap[c] : F_INSERT;
+}
+
static int
GetNextCommand(KEYCMD *cmdnum, Char *ch)
{
@@ -696,17 +703,8 @@ GetNextCommand(KEYCMD *cmdnum, Char *ch)
MetaNext = 0;
*ch |= META;
}
- /* XXX: This needs to be fixed so that we don't just truncate
- * the character, we unquote it.
- */
- if (*ch < NT_NUM_KEYS)
- cmd = CurrentKeyMap[*ch];
- else
-#ifdef WINNT_NATIVE
- cmd = CurrentKeyMap[(unsigned char) *ch];
-#else
- cmd = F_INSERT;
-#endif
+
+ cmd = GetCmdChar(*ch);
if (cmd == F_XKEY) {
XmapVal val;
CStr cstr;
@@ -800,13 +798,18 @@ GetNextChar(Char *cp)
return -1;
}
}
- 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;
+ if (cbp == 0 /* && *cbuf < NT_NUM_KEYS */
+ && CurrentKeyMap[(unsigned char)*cbuf] == F_XKEY) {
+ *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;
}
Modified: head/contrib/tcsh/ed.refresh.c
==============================================================================
--- head/contrib/tcsh/ed.refresh.c Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/ed.refresh.c Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.refresh.c,v 3.51 2015/06/06 21:19:07
christos Exp $ */
/*
* ed.refresh.c: Lower level screen refreshing functions
*/
@@ -31,9 +30,6 @@
* SUCH DAMAGE.
*/
#include "sh.h"
-
-RCSID("$tcsh: ed.refresh.c,v 3.51 2015/06/06 21:19:07 christos Exp $")
-
#include "ed.h"
/* #define DEBUG_UPDATE */
/* #define DEBUG_REFRESH */
Modified: head/contrib/tcsh/ed.screen.c
==============================================================================
--- head/contrib/tcsh/ed.screen.c Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/ed.screen.c Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.screen.c,v 3.82 2016/11/24 15:04:14
christos Exp $ */
/*
* ed.screen.c: Editor/termcap-curses interface
*/
@@ -31,9 +30,6 @@
* SUCH DAMAGE.
*/
#include "sh.h"
-
-RCSID("$tcsh: ed.screen.c,v 3.82 2016/11/24 15:04:14 christos Exp $")
-
#include "ed.h"
#include "tc.h"
#include "ed.defns.h"
Modified: head/contrib/tcsh/ed.term.c
==============================================================================
--- head/contrib/tcsh/ed.term.c Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/ed.term.c Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.term.c,v 1.38 2011/02/25 23:58:34 christos
Exp $ */
/*
* ed.term.c: Low level terminal interface
*/
@@ -32,8 +31,6 @@
*/
#include "sh.h"
#ifndef WINNT_NATIVE
-
-RCSID("$tcsh: ed.term.c,v 1.38 2011/02/25 23:58:34 christos Exp $")
#include <assert.h>
#include "ed.h"
Modified: head/contrib/tcsh/ed.term.h
==============================================================================
--- head/contrib/tcsh/ed.term.h Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/ed.term.h Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.term.h,v 1.19 2015/03/25 19:53:16 christos
Exp $ */
/*
* ed.term.h: Local terminal header
*/
Modified: head/contrib/tcsh/ed.xmap.c
==============================================================================
--- head/contrib/tcsh/ed.xmap.c Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/ed.xmap.c Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.xmap.c,v 3.38 2015/06/06 21:19:07 christos
Exp $ */
/*
* ed.xmap.c: This module contains the procedures for maintaining
* the extended-key map.
@@ -87,9 +86,6 @@
* SUCH DAMAGE.
*/
#include "sh.h"
-
-RCSID("$tcsh: ed.xmap.c,v 3.38 2015/06/06 21:19:07 christos Exp $")
-
#include "ed.h"
#include "ed.defns.h"
Modified: head/contrib/tcsh/eight-bit.me
==============================================================================
--- head/contrib/tcsh/eight-bit.me Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/eight-bit.me Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-.\" $tcsh: eight-bit.me,v 3.2 2006/03/02 18:46:44 christos Exp $
How to use 8 bit characters
by
Johan Widen
Modified: head/contrib/tcsh/gethost.c
==============================================================================
--- head/contrib/tcsh/gethost.c Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/gethost.c Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/gethost.c,v 1.19 2014/03/09 00:11:54 christos
Exp $ */
/*
* gethost.c: Create version file from prototype
*/
@@ -31,8 +30,6 @@
* SUCH DAMAGE.
*/
#include "sh.h"
-
-RCSID("$tcsh: gethost.c,v 1.19 2014/03/09 00:11:54 christos Exp $")
#ifdef SCO
# define perror __perror
Modified: head/contrib/tcsh/glob.3
==============================================================================
--- head/contrib/tcsh/glob.3 Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/glob.3 Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,4 +1,4 @@
-.\" $NetBSD: glob.3,v 1.17 2001/03/16 21:09:05 christos Exp $
+.\" NetBSD: glob.3,v 1.17 2001/03/16 21:09:05 christos Exp
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
Modified: head/contrib/tcsh/glob.c
==============================================================================
--- head/contrib/tcsh/glob.c Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/glob.c Tue Oct 8 20:59:31 2019 (r353325)
@@ -693,72 +693,92 @@ globextend(const char *path, glob_t *pglob)
}
/*
- * pattern matching function for filenames. Each occurrence of the *
- * pattern causes a recursion level.
+ * pattern matching function for filenames.
*/
static int
match(const char *name, const Char *pat, const Char *patend, int m_not)
{
int ok, negate_range;
+ const Char *patNext;
+ const char *nameNext, *nameStart, *nameEnd;
Char c;
- while (pat < patend) {
- size_t lwk;
+ patNext = pat;
+ nameStart = nameNext = name;
+ nameEnd = NULL;
+
+ while (pat < patend || *name) {
+ size_t lwk, pwk;
__Char wc, wk;
c = *pat; /* Only for M_MASK bits */
- pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
+ if (*name == EOS)
+ nameEnd = name;
+
+ pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
lwk = one_mbtowc(&wk, name, MB_LEN_MAX);
switch (c & M_MASK) {
case M_ALL:
- while (pat < patend && (*pat & M_MASK) == M_ALL) /* eat
consecutive '*' */
- pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
- if (pat == patend)
- return (1);
- while (!match(name, pat, patend, m_not)) {
- if (*name == EOS)
- return (0);
- name += lwk;
- lwk = one_mbtowc(&wk, name, MB_LEN_MAX);
+ while ((*(pat + pwk) & M_MASK) == M_ALL) {
+ pat += pwk;
+ pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
}
- return (1);
+ patNext = pat;
+ nameNext = name + lwk;
+ pat += pwk;
+ continue;
case M_ONE:
if (*name == EOS)
- return (0);
+ break;
name += lwk;
- break;
+ pat += pwk;
+ continue;
case M_SET:
ok = 0;
if (*name == EOS)
- return (0);
+ break;
+ pat += pwk;
+ pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
name += lwk;
- if ((negate_range = ((*pat & M_MASK) == m_not)) != 0)
- ++pat;
+ if ((negate_range = ((*pat & M_MASK) == m_not)) != 0) {
+ pat += pwk;
+ pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
+ }
while ((*pat & M_MASK) != M_END) {
- pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
if ((*pat & M_MASK) == M_RNG) {
__Char wc2;
- pat++;
- pat += One_Char_mbtowc(&wc2, pat, MB_LEN_MAX);
+ pat += pwk;
+ pwk = 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 += pwk;
+ pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
}
- pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
+ pat += pwk;
+ pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
if (ok == negate_range)
- return (0);
- break;
+ break;
+ continue;
default:
if (*name == EOS || samecase(wk) != samecase(wc))
- return (0);
+ break;
name += lwk;
- break;
+ pat += pwk;
+ continue;
}
+ if (nameNext != nameStart
+ && (nameEnd == NULL || nameNext <= nameEnd)) {
+ pat = patNext;
+ name = nameNext;
+ continue;
+ }
+ return 0;
}
- return (*name == EOS);
+ return 1;
}
/* free allocated data belonging to a glob_t structure */
Modified: head/contrib/tcsh/glob.h
==============================================================================
--- head/contrib/tcsh/glob.h Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/glob.h Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,4 +1,4 @@
-/* $NetBSD: glob.h,v 1.13 2001/03/16 21:02:42 christos Exp $ */
+/* NetBSD: glob.h,v 1.13 2001/03/16 21:02:42 christos Exp */
/*
* Copyright (c) 1989, 1993
Modified: head/contrib/tcsh/host.defs
==============================================================================
--- head/contrib/tcsh/host.defs Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/host.defs Tue Oct 8 20:59:31 2019 (r353325)
@@ -1,5 +1,4 @@
newcode :
-/* $Header: /p/tcsh/cvsroot/tcsh/host.defs,v 1.61 2015/05/26 18:56:19 christos
Exp $ */
/*
* host.defs: Hosttype/Machtype etc.
*/
@@ -32,8 +31,6 @@ newcode :
* SUCH DAMAGE.
*/
#include "sh.h"
-
-RCSID("$tcsh: host.defs,v 1.61 2015/05/26 18:56:19 christos Exp $")
endcode :
Modified: head/contrib/tcsh/imake.config
==============================================================================
--- head/contrib/tcsh/imake.config Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/imake.config Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,6 +1,4 @@
/*
- * $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
*/
Modified: head/contrib/tcsh/ma.setp.c
==============================================================================
--- head/contrib/tcsh/ma.setp.c Tue Oct 8 20:26:51 2019 (r353324)
+++ head/contrib/tcsh/ma.setp.c Tue Oct 8 20:59:31 2019 (r353325)
@@ -82,7 +82,6 @@
**********************************************************************
*/
#include "sh.h"
-RCSID("$tcsh: ma.setp.c,v 1.19 2007/11/20 20:03:51 christos Exp $")
#ifdef MACH
Modified: head/contrib/tcsh/mi.termios.c
==============================================================================
--- head/contrib/tcsh/mi.termios.c Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/mi.termios.c Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,10 +1,8 @@
-/* $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("$tcsh: mi.termios.c,v 1.5 2006/03/02 18:46:44 christos Exp $")
#if defined(_MINIX) && !defined(_MINIX_VMD)
Modified: head/contrib/tcsh/mi.varargs.h
==============================================================================
--- head/contrib/tcsh/mi.varargs.h Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/mi.varargs.h Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-/* $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
*/
Modified: head/contrib/tcsh/nls/C/set1
==============================================================================
--- head/contrib/tcsh/nls/C/set1 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set1 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.7 2015/05/26 17:38:25 christos Exp $
$ Error messages
$set 1
1 Syntax Error
Modified: head/contrib/tcsh/nls/C/set10
==============================================================================
--- head/contrib/tcsh/nls/C/set10 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set10 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.3 2006/03/02 18:46:45 christos Exp $
$ ma.setp.c
$set 10
1 setpath: invalid command '%s'.\n
Modified: head/contrib/tcsh/nls/C/set11
==============================================================================
--- head/contrib/tcsh/nls/C/set11 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set11 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $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
Modified: head/contrib/tcsh/nls/C/set12
==============================================================================
--- head/contrib/tcsh/nls/C/set12 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set12 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $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
Modified: head/contrib/tcsh/nls/C/set13
==============================================================================
--- head/contrib/tcsh/nls/C/set13 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set13 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $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
Modified: head/contrib/tcsh/nls/C/set14
==============================================================================
--- head/contrib/tcsh/nls/C/set14 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set14 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.4 2006/03/02 18:46:45 christos Exp $
$ sh.file.c
$set 14
1 \nYikes!! Too many %s!!\n
Modified: head/contrib/tcsh/nls/C/set15
==============================================================================
--- head/contrib/tcsh/nls/C/set15 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set15 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $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
Modified: head/contrib/tcsh/nls/C/set16
==============================================================================
--- head/contrib/tcsh/nls/C/set16 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set16 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $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
Modified: head/contrib/tcsh/nls/C/set17
==============================================================================
--- head/contrib/tcsh/nls/C/set17 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set17 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $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
Modified: head/contrib/tcsh/nls/C/set18
==============================================================================
--- head/contrib/tcsh/nls/C/set18 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set18 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $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
Modified: head/contrib/tcsh/nls/C/set19
==============================================================================
--- head/contrib/tcsh/nls/C/set19 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set19 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.6 2011/02/25 23:58:07 christos Exp $
$ tc.alloc.c
$set 19
1 nbytes=%d: Out of memory\n
Modified: head/contrib/tcsh/nls/C/set2
==============================================================================
--- head/contrib/tcsh/nls/C/set2 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set2 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.5 2006/03/02 18:46:45 christos Exp $
$ Signal names
$set 2
1 Null signal
Modified: head/contrib/tcsh/nls/C/set20
==============================================================================
--- head/contrib/tcsh/nls/C/set20 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set20 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.4 2015/08/13 08:54:04 christos Exp $
$ tc.bind.c
$set 20
1 Invalid key name `%S'\n
Modified: head/contrib/tcsh/nls/C/set21
==============================================================================
--- head/contrib/tcsh/nls/C/set21 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set21 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $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
Modified: head/contrib/tcsh/nls/C/set22
==============================================================================
--- head/contrib/tcsh/nls/C/set22 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set22 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.3 2006/03/02 18:46:45 christos Exp $
$ tc.func.c
$set 22
1 %S: \t aliased to
Modified: head/contrib/tcsh/nls/C/set23
==============================================================================
--- head/contrib/tcsh/nls/C/set23 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set23 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.4 2006/03/02 18:46:45 christos Exp $
$ tc.os.c
$set 23
1 Bad cpu/site name
Modified: head/contrib/tcsh/nls/C/set24
==============================================================================
--- head/contrib/tcsh/nls/C/set24 Tue Oct 8 20:26:51 2019
(r353324)
+++ head/contrib/tcsh/nls/C/set24 Tue Oct 8 20:59:31 2019
(r353325)
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.3 2006/03/02 18:46:45 christos Exp $
$ tc.sched.c
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
