merge upstream, add version to github release title.

.gitignore

@@ -18,4 +18,5 @@ tcsh-*.tar.gz
 tests/package.m4
 tests/testsuite
 *.suo
+*~
 .vs/

.travis.yml

@@ -1,14 +1,34 @@
+branches:
+  only:
+  - master
+  - coverity_scan
 language: c
 compiler:
 - gcc
 - clang
 addons:
   apt:
     packages:
-    - automake
-    - libtinfo-dev
+    - libncurses-dev
     - make
-script:
-- ./configure
-- make -j4
-- make check
+  coverity_scan:
+    project:
+      name: tcsh-org/tcsh
+      version: 6.22
+      description: C shell with file name completion and command line editing
+    notification_email: [email protected]
+    build_command_prepend: ./configure
+    build_command: make
+    # https://scan.coverity.com/faq#frequency
+    branch_pattern: coverity_scan
+jobs:
+  exclude:
+  - os: osx
+    compiler: gcc
+os:
+- linux
+- osx
+script: >-
+  if [ "${COVERITY_SCAN_BRANCH}" != 1 ] ;
+  then ./configure && make && make test ;
+  fi

BUILDING

@@ -103,7 +103,8 @@ To install tcsh:
 11) 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...
+    look at complete.tcsh for useful completions, dot.login for a sample
+    ~/.login file, and dot.tcshrc for a sample ~/.tcshrc file...
 
 12) Enjoy.
 

Fixes

@@ -1,3 +1,18 @@
+  8. Prevent recursive entry for writing history (Brett Frankenberger)
+  7. alxwded@github, keep track of the :g and :a modifiers per modifier they
+     affect.
+  6. alzwded@github, fix infinite loop with :gas variable modifier
+  5. PR/88: Add a Q: modifier that preserves empty arguments leaving :q
+     alone.
+  4. V6.22.02 - 20191204
+  3. Fix version in configure.ac
+  2. V6.22.01 - 20191201
+  1. undo PR/88: Preserve empty arguments in :q, since it breaks
+	$ set x=""
+	$ alias test "echo "\""$x:q"\"" is working."
+	$ alias test
+	echo "
+
   6. V6.22.00 - 20191128
   5. PR/113: Sobomax: avoid infinite loops for -c commands when stdout is
      not a tty.

Imakefile

@@ -492,14 +492,15 @@ SHSRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c \
 	sh.char.c sh.exp.c sh.file.c sh.func.c \
 	sh.glob.c sh.hist.c sh.init.c sh.lex.c \
 	sh.misc.c sh.parse.c sh.print.c sh.proc.c \
-	sh.sem.c sh.set.c sh.time.c glob.c \
+	sh.sem.c sh.set.c sh.time.c dotlock.c dotlock.h glob.c \
 	sh.char.h sh.dir.h sh.proc.h sh.h \
 	sh.decls.h glob.h ${SYSSRCS}
 SHOBJS=	sh.${SUF} sh.dir.${SUF} sh.dol.${SUF} sh.err.${SUF} sh.exec.${SUF} \
 	sh.char.${SUF} sh.exp.${SUF} sh.file.${SUF} sh.func.${SUF} \
 	sh.glob.${SUF} sh.hist.${SUF} sh.init.${SUF} sh.lex.${SUF} \
 	sh.misc.${SUF} sh.parse.${SUF} sh.print.${SUF} sh.proc.${SUF} \
-	sh.sem.${SUF} sh.set.${SUF} sh.time.${SUF} glob.${SUF} ${SYSOBJS}
+	sh.sem.${SUF} sh.set.${SUF} sh.time.${SUF} dotlock.${SUF} glob.${SUF} \
+	${SYSOBJS}
 
 TWSRCS= tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \
 	tw.comp.c tw.color.c
@@ -512,9 +513,10 @@ EDOBJS=	ed.chared.${SUF} ed.refresh.${SUF} ed.screen.${SUF} ed.init.${SUF} \
 	ed.inputl.${SUF} ed.defns.${SUF} ed.xmap.${SUF} ed.term.${SUF}
 
 TCSRCS= tc.alloc.c tc.bind.c tc.const.c tc.decls.h tc.disc.c \
-	tc.func.c tc.os.c tc.os.h tc.printf.c tc.prompt.c \
-	tc.sched.c tc.sig.c tc.sig.h tc.str.c sh.types.h tc.vers.c tc.wait.h \
-	tc.who.c tc.h 
+	tc.func.c tc.nls.c tc.nls.h tc.os.c tc.os.h tc.printf.c tc.prompt.c \
+	tc.disc.${SUF} tc.func.${SUF} tc.nls.${SUF} tc.os.${SUF} \
+	tc.printf.${SUF} tc.sched.c tc.sig.c tc.sig.h tc.str.c sh.types.h \
+	tc.vers.c tc.wait.h tc.who.c tc.h 
 TCOBJS=	tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF} tc.defs.${SUF} \
 	tc.disc.${SUF} tc.func.${SUF} tc.os.${SUF} tc.printf.${SUF} \
 	tc.prompt.${SUF} tc.sched.${SUF} tc.sig.${SUF} tc.str.${SUF} \
@@ -524,7 +526,7 @@ 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
+	Makefile.in configure.ac Makefile.win32 aclocal.m4 dot.login dot.tcshrc
 CONFSRCS=config/[a-z]*
 
 

Makefile.ADMIN

@@ -9,15 +9,15 @@
 
 LYNX=	lynx -dump -nolist
 TRIM=	expand | sed -e 's/^  *$$//' | cat -s
-WEB=	http://www.tcsh.org/page?
+WEB=	https://www.tcsh.org
 
-PAGES=	FAQ WishList
+PAGES=	FAQ
 
 all: ${PAGES}
 
-.for i in FAQ WishList
+.for i in ${PAGES}
 $i: force
-	${LYNX} ${WEB}$i | ${TRIM} > ${.TARGET}
+	${LYNX} ${WEB}/${i:tl}/ | ${TRIM} > ${.TARGET}
 .endfor
 
 .DUMMY: force

Makefile.in

@@ -410,7 +410,7 @@ AVSRCS= BUILDING Fixes MAKEDIFFS MAKESHAR NewThings README.md FAQ \
 	pathnames.h tcsh.man Ported src.desc Imakefile imake.config \
 	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
+	tests/testsuite.at aclocal.m4 dot.login dot.tcshrc
 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/parenthesis.at tests/syntax.at \
@@ -735,7 +735,7 @@ $(srcdir)/stamp-h.in: $(srcdir)/configure.ac
 	cd $(srcdir) && autoheader
 	@echo timestamp > $(srcdir)/stamp-h.in
 
-check: atconfig $(srcdir)/tests/testsuite
+check test: atconfig $(srcdir)/tests/testsuite
 	$(SHELL) $(srcdir)/tests/testsuite
 
 #

Makefile.std

@@ -320,7 +320,7 @@ AVSRCS= BUILDING Fixes MAKEDIFFS MAKESHAR NewThings README.md FAQ \
 	pathnames.h tcsh.man Ported src.desc Imakefile imake.config \
 	complete.tcsh vmsreadme.txt termcap.vms snames.h host.defs \
 	gethost.c tcsh.man2html configure.ac configure config.h.in \
-	aclocal.m4
+	aclocal.m4 dot.login dot.tcshrc
 
 VHSRCS=${PVSRCS} ${AVSRCS}
 

Makefile.vms

@@ -297,7 +297,7 @@ 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 \
 	complete.tcsh vmsreadme.txt termcap.vms snames.h host.defs \
-	gethost.c tcsh.man2html configure.ac aclocal.m4
+	gethost.c tcsh.man2html configure.ac aclocal.m4 dot.login dot.tcshrc
 
 VHSRCS=${PVSRCS} ${AVSRCS}
 

README.md

@@ -5,7 +5,7 @@
 The Tcsh source code is available on GitHub as a read-only repo
 mirror at:
 
-> http://github.com/tcsh-org/tcsh
+> https://github.com/tcsh-org/tcsh
 
 Instructions for compiling Tcsh can be found in [BUILDING].
 
@@ -20,7 +20,10 @@ the tcsh mailing list:
 > https://mailman.astron.com/mailman/listinfo/tcsh
 
 [![Build Status][status]][travis]
+[![Coverity Scan][badge]][coverity]
 
 [BUILDING]: BUILDING
-[status]: https://travis-ci.org/tcsh-org/tcsh.svg?branch=master
-[travis]: https://travis-ci.org/tcsh-org/tcsh
+[badge]: https://scan.coverity.com/projects/20307/badge.svg
+[coverity]: https://scan.coverity.com/projects/tcsh-org-tcsh
+[status]: https://travis-ci.com/tcsh-org/tcsh.svg?branch=master
+[travis]: https://travis-ci.com/tcsh-org/tcsh

RELEASE-PROCEDURE

@@ -1,5 +1,7 @@
 HOW TO RELEASE TCSH
 
+See TOOLS.md for pre-requisites.
+
 1)  Update version number and date
     - patchlevel.h
     - Fixes (make a new entry at the top)
@@ -35,12 +37,4 @@ HOW TO RELEASE TCSH
       click on "Add and Edit Version"
     - Set the "Date Order" to 2030-01-01 (i.e. far in the future)
     - Click on "Update Version"
-8)  Update the version on http://www.tcsh.org/MostRecentRelease
-9)  Update the online manual page http://www.tcsh.org/tcsh.man/top.html
-    - Login to the webhost (huru)
-    - cd ~/src/tcsh && git pull
-    - cd ~/.www/sites/tcsh.org/man \
-	&& cp -p ~/src/tcsh/tcsh.man \
-	&& make clean \
-	&& make
-10) Mail an announcement to [email protected]
+9)  Mail an announcement to [email protected]

TOOLS.md

@@ -0,0 +1,19 @@
+# Developer Tools
+
+You need the following tools to fully work on tcsh development.
+
+- `autoconf`
+- `gettext` (for `AM_ICONV` in `share/aclocal/intl.m4`)
+
+## Debian
+
+The `autoconf` scripts on Debian add a `--runstatedir` option
+to `configured` that we don't have in the `tcsh` repository,
+due to running `autoreconf` on NetBSD.
+
+Install `gettext` to get `AM_ICONV`. The `gettext-base` package
+does not include the needed files in `/usr/share/aclocal`.
+
+## NetBSD
+
+Install `pkgsrc/devel/gettext-m4` to get `AM_ICONV`.