Date: Sat, 15 Apr 2017 11:13:11 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r316957 - in stable/11: bin/csh contrib/tcsh contrib/tcsh/config contrib/tcsh/nls contrib/tcsh/nls/C contrib/tcsh/nls/et contrib/tcsh/nls/finnish contrib/tcsh/nls/french contrib/tcsh/nl... Message-ID: <201704151113.v3FBDBWp085762@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Sat Apr 15 11:13:11 2017 New Revision: 316957 URL: https://svnweb.freebsd.org/changeset/base/316957 Log: MFC r315948: Update tcsh to 6.20.00 MFC r315952: Update tcsh to vendor git b605cb561d Vendor changes: 1. PR/471: Daiki Ueno: Delay interpreting arginp until we've processed our startup files (which can change the NLS environment). 2. Fix type of read in prompt confirmation (eg. rmstar) (David Kaspar). 3. Fix out of bounds read (Brooks Davis) (reproduce by starting tcsh and hitting tab at the prompt). 4. Don't play pointer tricks that are undefined in modern c (Brooks Davis). Added: stable/11/contrib/tcsh/dotlock.c - copied unchanged from r315948, head/contrib/tcsh/dotlock.c stable/11/contrib/tcsh/dotlock.h - copied unchanged from r315948, head/contrib/tcsh/dotlock.h stable/11/contrib/tcsh/tcsh.man.new - copied unchanged from r315948, head/contrib/tcsh/tcsh.man.new Deleted: stable/11/contrib/tcsh/configure.in Modified: stable/11/bin/csh/Makefile stable/11/contrib/tcsh/Fixes (contents, props changed) stable/11/contrib/tcsh/Imakefile (contents, props changed) stable/11/contrib/tcsh/Makefile.in (contents, props changed) stable/11/contrib/tcsh/Makefile.std (contents, props changed) stable/11/contrib/tcsh/Makefile.vms (contents, props changed) stable/11/contrib/tcsh/README (contents, props changed) stable/11/contrib/tcsh/complete.tcsh (contents, props changed) stable/11/contrib/tcsh/config.guess (contents, props changed) stable/11/contrib/tcsh/config.h.in (contents, props changed) stable/11/contrib/tcsh/config.sub (contents, props changed) stable/11/contrib/tcsh/config/bsd4.4 (contents, props changed) stable/11/contrib/tcsh/config_f.h (contents, props changed) stable/11/contrib/tcsh/configure (contents, props changed) stable/11/contrib/tcsh/ed.chared.c (contents, props changed) stable/11/contrib/tcsh/ed.decls.h (contents, props changed) stable/11/contrib/tcsh/ed.defns.c (contents, props changed) stable/11/contrib/tcsh/ed.inputl.c (contents, props changed) stable/11/contrib/tcsh/ed.refresh.c (contents, props changed) stable/11/contrib/tcsh/ed.screen.c (contents, props changed) stable/11/contrib/tcsh/ed.term.h (contents, props changed) stable/11/contrib/tcsh/ed.xmap.c (contents, props changed) stable/11/contrib/tcsh/gethost.c (contents, props changed) stable/11/contrib/tcsh/glob.c (contents, props changed) stable/11/contrib/tcsh/host.defs (contents, props changed) stable/11/contrib/tcsh/nls/C/set1 (contents, props changed) stable/11/contrib/tcsh/nls/C/set20 (contents, props changed) stable/11/contrib/tcsh/nls/C/set9 (contents, props changed) stable/11/contrib/tcsh/nls/Makefile.in stable/11/contrib/tcsh/nls/catgen stable/11/contrib/tcsh/nls/et/set1 (contents, props changed) stable/11/contrib/tcsh/nls/et/set20 (contents, props changed) stable/11/contrib/tcsh/nls/et/set9 (contents, props changed) stable/11/contrib/tcsh/nls/finnish/set1 (contents, props changed) stable/11/contrib/tcsh/nls/finnish/set20 (contents, props changed) stable/11/contrib/tcsh/nls/finnish/set3 (contents, props changed) stable/11/contrib/tcsh/nls/finnish/set9 (contents, props changed) stable/11/contrib/tcsh/nls/french/set1 (contents, props changed) stable/11/contrib/tcsh/nls/french/set20 (contents, props changed) stable/11/contrib/tcsh/nls/french/set9 (contents, props changed) stable/11/contrib/tcsh/nls/german/set1 (contents, props changed) stable/11/contrib/tcsh/nls/german/set20 (contents, props changed) stable/11/contrib/tcsh/nls/german/set9 (contents, props changed) stable/11/contrib/tcsh/nls/greek/set1 (contents, props changed) stable/11/contrib/tcsh/nls/greek/set20 (contents, props changed) stable/11/contrib/tcsh/nls/greek/set9 (contents, props changed) stable/11/contrib/tcsh/nls/italian/set1 (contents, props changed) stable/11/contrib/tcsh/nls/italian/set20 (contents, props changed) stable/11/contrib/tcsh/nls/italian/set9 (contents, props changed) stable/11/contrib/tcsh/nls/ja/set1 (contents, props changed) stable/11/contrib/tcsh/nls/russian/set1 (contents, props changed) stable/11/contrib/tcsh/nls/russian/set20 (contents, props changed) stable/11/contrib/tcsh/nls/russian/set9 (contents, props changed) stable/11/contrib/tcsh/nls/spanish/set1 (contents, props changed) stable/11/contrib/tcsh/nls/spanish/set20 (contents, props changed) stable/11/contrib/tcsh/nls/spanish/set9 (contents, props changed) stable/11/contrib/tcsh/nls/ukrainian/set1 (contents, props changed) stable/11/contrib/tcsh/nls/ukrainian/set20 (contents, props changed) stable/11/contrib/tcsh/nls/ukrainian/set9 (contents, props changed) stable/11/contrib/tcsh/patchlevel.h (contents, props changed) stable/11/contrib/tcsh/sh.c (contents, props changed) stable/11/contrib/tcsh/sh.char.h (contents, props changed) stable/11/contrib/tcsh/sh.decls.h (contents, props changed) stable/11/contrib/tcsh/sh.dir.c (contents, props changed) stable/11/contrib/tcsh/sh.dol.c (contents, props changed) stable/11/contrib/tcsh/sh.err.c (contents, props changed) stable/11/contrib/tcsh/sh.exec.c (contents, props changed) stable/11/contrib/tcsh/sh.exp.c (contents, props changed) stable/11/contrib/tcsh/sh.file.c (contents, props changed) stable/11/contrib/tcsh/sh.func.c (contents, props changed) stable/11/contrib/tcsh/sh.glob.c (contents, props changed) stable/11/contrib/tcsh/sh.h (contents, props changed) stable/11/contrib/tcsh/sh.hist.c (contents, props changed) stable/11/contrib/tcsh/sh.init.c (contents, props changed) stable/11/contrib/tcsh/sh.lex.c (contents, props changed) stable/11/contrib/tcsh/sh.misc.c (contents, props changed) stable/11/contrib/tcsh/sh.print.c (contents, props changed) stable/11/contrib/tcsh/sh.proc.c (contents, props changed) stable/11/contrib/tcsh/sh.proc.h (contents, props changed) stable/11/contrib/tcsh/sh.sem.c (contents, props changed) stable/11/contrib/tcsh/sh.set.c (contents, props changed) stable/11/contrib/tcsh/sh.time.c (contents, props changed) stable/11/contrib/tcsh/tc.alloc.c (contents, props changed) stable/11/contrib/tcsh/tc.bind.c (contents, props changed) stable/11/contrib/tcsh/tc.const.c (contents, props changed) stable/11/contrib/tcsh/tc.decls.h (contents, props changed) stable/11/contrib/tcsh/tc.func.c (contents, props changed) stable/11/contrib/tcsh/tc.nls.c (contents, props changed) stable/11/contrib/tcsh/tc.nls.h (contents, props changed) stable/11/contrib/tcsh/tc.os.c (contents, props changed) stable/11/contrib/tcsh/tc.printf.c (contents, props changed) stable/11/contrib/tcsh/tc.prompt.c (contents, props changed) stable/11/contrib/tcsh/tc.str.c (contents, props changed) stable/11/contrib/tcsh/tc.who.c (contents, props changed) stable/11/contrib/tcsh/tcsh.man (contents, props changed) stable/11/contrib/tcsh/tw.color.c (contents, props changed) stable/11/contrib/tcsh/tw.comp.c (contents, props changed) stable/11/contrib/tcsh/tw.decls.h (contents, props changed) stable/11/contrib/tcsh/tw.init.c (contents, props changed) stable/11/contrib/tcsh/tw.parse.c (contents, props changed) Directory Properties: stable/11/contrib/tcsh/FAQ (props changed) stable/11/contrib/tcsh/MAKEDIFFS (props changed) stable/11/contrib/tcsh/MAKESHAR (props changed) stable/11/contrib/tcsh/NewThings (props changed) stable/11/contrib/tcsh/Ported (props changed) stable/11/contrib/tcsh/README.imake (props changed) stable/11/contrib/tcsh/WishList (props changed) stable/11/contrib/tcsh/Y2K (props changed) stable/11/contrib/tcsh/csh-mode.el (props changed) stable/11/contrib/tcsh/ed.h (props changed) stable/11/contrib/tcsh/ed.init.c (props changed) stable/11/contrib/tcsh/ed.term.c (props changed) stable/11/contrib/tcsh/eight-bit.me (props changed) stable/11/contrib/tcsh/glob.3 (props changed) stable/11/contrib/tcsh/glob.h (props changed) stable/11/contrib/tcsh/imake.config (props changed) stable/11/contrib/tcsh/install-sh (props changed) stable/11/contrib/tcsh/ma.setp.c (props changed) stable/11/contrib/tcsh/mi.termios.c (props changed) stable/11/contrib/tcsh/mi.varargs.h (props changed) stable/11/contrib/tcsh/mi.wait.h (props changed) stable/11/contrib/tcsh/nls/C/charset (props changed) stable/11/contrib/tcsh/nls/C/set10 (props changed) stable/11/contrib/tcsh/nls/C/set11 (props changed) stable/11/contrib/tcsh/nls/C/set12 (props changed) stable/11/contrib/tcsh/nls/C/set13 (props changed) stable/11/contrib/tcsh/nls/C/set14 (props changed) stable/11/contrib/tcsh/nls/C/set15 (props changed) stable/11/contrib/tcsh/nls/C/set16 (props changed) stable/11/contrib/tcsh/nls/C/set17 (props changed) stable/11/contrib/tcsh/nls/C/set18 (props changed) stable/11/contrib/tcsh/nls/C/set19 (props changed) stable/11/contrib/tcsh/nls/C/set2 (props changed) stable/11/contrib/tcsh/nls/C/set21 (props changed) stable/11/contrib/tcsh/nls/C/set22 (props changed) stable/11/contrib/tcsh/nls/C/set23 (props changed) stable/11/contrib/tcsh/nls/C/set24 (props changed) stable/11/contrib/tcsh/nls/C/set25 (props changed) stable/11/contrib/tcsh/nls/C/set26 (props changed) stable/11/contrib/tcsh/nls/C/set27 (props changed) stable/11/contrib/tcsh/nls/C/set29 (props changed) stable/11/contrib/tcsh/nls/C/set3 (props changed) stable/11/contrib/tcsh/nls/C/set30 (props changed) stable/11/contrib/tcsh/nls/C/set31 (props changed) stable/11/contrib/tcsh/nls/C/set4 (props changed) stable/11/contrib/tcsh/nls/C/set5 (props changed) stable/11/contrib/tcsh/nls/C/set6 (props changed) stable/11/contrib/tcsh/nls/C/set7 (props changed) stable/11/contrib/tcsh/nls/C/set8 (props changed) stable/11/contrib/tcsh/nls/et/charset (props changed) stable/11/contrib/tcsh/nls/et/set10 (props changed) stable/11/contrib/tcsh/nls/et/set11 (props changed) stable/11/contrib/tcsh/nls/et/set12 (props changed) stable/11/contrib/tcsh/nls/et/set13 (props changed) stable/11/contrib/tcsh/nls/et/set14 (props changed) stable/11/contrib/tcsh/nls/et/set15 (props changed) stable/11/contrib/tcsh/nls/et/set16 (props changed) stable/11/contrib/tcsh/nls/et/set17 (props changed) stable/11/contrib/tcsh/nls/et/set18 (props changed) stable/11/contrib/tcsh/nls/et/set19 (props changed) stable/11/contrib/tcsh/nls/et/set2 (props changed) stable/11/contrib/tcsh/nls/et/set21 (props changed) stable/11/contrib/tcsh/nls/et/set22 (props changed) stable/11/contrib/tcsh/nls/et/set23 (props changed) stable/11/contrib/tcsh/nls/et/set24 (props changed) stable/11/contrib/tcsh/nls/et/set25 (props changed) stable/11/contrib/tcsh/nls/et/set26 (props changed) stable/11/contrib/tcsh/nls/et/set27 (props changed) stable/11/contrib/tcsh/nls/et/set29 (props changed) stable/11/contrib/tcsh/nls/et/set3 (props changed) stable/11/contrib/tcsh/nls/et/set30 (props changed) stable/11/contrib/tcsh/nls/et/set31 (props changed) stable/11/contrib/tcsh/nls/et/set4 (props changed) stable/11/contrib/tcsh/nls/et/set5 (props changed) stable/11/contrib/tcsh/nls/et/set6 (props changed) stable/11/contrib/tcsh/nls/et/set7 (props changed) stable/11/contrib/tcsh/nls/et/set8 (props changed) stable/11/contrib/tcsh/nls/finnish/charset (props changed) stable/11/contrib/tcsh/nls/finnish/set10 (props changed) stable/11/contrib/tcsh/nls/finnish/set11 (props changed) stable/11/contrib/tcsh/nls/finnish/set12 (props changed) stable/11/contrib/tcsh/nls/finnish/set13 (props changed) stable/11/contrib/tcsh/nls/finnish/set14 (props changed) stable/11/contrib/tcsh/nls/finnish/set15 (props changed) stable/11/contrib/tcsh/nls/finnish/set16 (props changed) stable/11/contrib/tcsh/nls/finnish/set17 (props changed) stable/11/contrib/tcsh/nls/finnish/set18 (props changed) stable/11/contrib/tcsh/nls/finnish/set19 (props changed) stable/11/contrib/tcsh/nls/finnish/set2 (props changed) stable/11/contrib/tcsh/nls/finnish/set21 (props changed) stable/11/contrib/tcsh/nls/finnish/set22 (props changed) stable/11/contrib/tcsh/nls/finnish/set23 (props changed) stable/11/contrib/tcsh/nls/finnish/set24 (props changed) stable/11/contrib/tcsh/nls/finnish/set25 (props changed) stable/11/contrib/tcsh/nls/finnish/set26 (props changed) stable/11/contrib/tcsh/nls/finnish/set27 (props changed) stable/11/contrib/tcsh/nls/finnish/set29 (props changed) stable/11/contrib/tcsh/nls/finnish/set30 (props changed) stable/11/contrib/tcsh/nls/finnish/set31 (props changed) stable/11/contrib/tcsh/nls/finnish/set4 (props changed) stable/11/contrib/tcsh/nls/finnish/set5 (props changed) stable/11/contrib/tcsh/nls/finnish/set6 (props changed) stable/11/contrib/tcsh/nls/finnish/set7 (props changed) stable/11/contrib/tcsh/nls/finnish/set8 (props changed) stable/11/contrib/tcsh/nls/french/charset (props changed) stable/11/contrib/tcsh/nls/french/set10 (props changed) stable/11/contrib/tcsh/nls/french/set11 (props changed) stable/11/contrib/tcsh/nls/french/set12 (props changed) stable/11/contrib/tcsh/nls/french/set13 (props changed) stable/11/contrib/tcsh/nls/french/set14 (props changed) stable/11/contrib/tcsh/nls/french/set15 (props changed) stable/11/contrib/tcsh/nls/french/set16 (props changed) stable/11/contrib/tcsh/nls/french/set17 (props changed) stable/11/contrib/tcsh/nls/french/set18 (props changed) stable/11/contrib/tcsh/nls/french/set19 (props changed) stable/11/contrib/tcsh/nls/french/set2 (props changed) stable/11/contrib/tcsh/nls/french/set21 (props changed) stable/11/contrib/tcsh/nls/french/set22 (props changed) stable/11/contrib/tcsh/nls/french/set23 (props changed) stable/11/contrib/tcsh/nls/french/set24 (props changed) stable/11/contrib/tcsh/nls/french/set25 (props changed) stable/11/contrib/tcsh/nls/french/set26 (props changed) stable/11/contrib/tcsh/nls/french/set27 (props changed) stable/11/contrib/tcsh/nls/french/set29 (props changed) stable/11/contrib/tcsh/nls/french/set3 (props changed) stable/11/contrib/tcsh/nls/french/set30 (props changed) stable/11/contrib/tcsh/nls/french/set31 (props changed) stable/11/contrib/tcsh/nls/french/set4 (props changed) stable/11/contrib/tcsh/nls/french/set5 (props changed) stable/11/contrib/tcsh/nls/french/set6 (props changed) stable/11/contrib/tcsh/nls/french/set7 (props changed) stable/11/contrib/tcsh/nls/french/set8 (props changed) stable/11/contrib/tcsh/nls/german/charset (props changed) stable/11/contrib/tcsh/nls/german/set10 (props changed) stable/11/contrib/tcsh/nls/german/set11 (props changed) stable/11/contrib/tcsh/nls/german/set12 (props changed) stable/11/contrib/tcsh/nls/german/set13 (props changed) stable/11/contrib/tcsh/nls/german/set14 (props changed) stable/11/contrib/tcsh/nls/german/set15 (props changed) stable/11/contrib/tcsh/nls/german/set16 (props changed) stable/11/contrib/tcsh/nls/german/set17 (props changed) stable/11/contrib/tcsh/nls/german/set18 (props changed) stable/11/contrib/tcsh/nls/german/set19 (props changed) stable/11/contrib/tcsh/nls/german/set2 (props changed) stable/11/contrib/tcsh/nls/german/set21 (props changed) stable/11/contrib/tcsh/nls/german/set22 (props changed) stable/11/contrib/tcsh/nls/german/set23 (props changed) stable/11/contrib/tcsh/nls/german/set24 (props changed) stable/11/contrib/tcsh/nls/german/set25 (props changed) stable/11/contrib/tcsh/nls/german/set26 (props changed) stable/11/contrib/tcsh/nls/german/set27 (props changed) stable/11/contrib/tcsh/nls/german/set29 (props changed) stable/11/contrib/tcsh/nls/german/set3 (props changed) stable/11/contrib/tcsh/nls/german/set30 (props changed) stable/11/contrib/tcsh/nls/german/set31 (props changed) stable/11/contrib/tcsh/nls/german/set4 (props changed) stable/11/contrib/tcsh/nls/german/set5 (props changed) stable/11/contrib/tcsh/nls/german/set6 (props changed) stable/11/contrib/tcsh/nls/german/set7 (props changed) stable/11/contrib/tcsh/nls/german/set8 (props changed) stable/11/contrib/tcsh/nls/greek/charset (props changed) stable/11/contrib/tcsh/nls/greek/set10 (props changed) stable/11/contrib/tcsh/nls/greek/set11 (props changed) stable/11/contrib/tcsh/nls/greek/set12 (props changed) stable/11/contrib/tcsh/nls/greek/set13 (props changed) stable/11/contrib/tcsh/nls/greek/set14 (props changed) stable/11/contrib/tcsh/nls/greek/set15 (props changed) stable/11/contrib/tcsh/nls/greek/set16 (props changed) stable/11/contrib/tcsh/nls/greek/set17 (props changed) stable/11/contrib/tcsh/nls/greek/set18 (props changed) stable/11/contrib/tcsh/nls/greek/set19 (props changed) stable/11/contrib/tcsh/nls/greek/set2 (props changed) stable/11/contrib/tcsh/nls/greek/set21 (props changed) stable/11/contrib/tcsh/nls/greek/set22 (props changed) stable/11/contrib/tcsh/nls/greek/set23 (props changed) stable/11/contrib/tcsh/nls/greek/set24 (props changed) stable/11/contrib/tcsh/nls/greek/set25 (props changed) stable/11/contrib/tcsh/nls/greek/set26 (props changed) stable/11/contrib/tcsh/nls/greek/set27 (props changed) stable/11/contrib/tcsh/nls/greek/set29 (props changed) stable/11/contrib/tcsh/nls/greek/set3 (props changed) stable/11/contrib/tcsh/nls/greek/set30 (props changed) stable/11/contrib/tcsh/nls/greek/set31 (props changed) stable/11/contrib/tcsh/nls/greek/set4 (props changed) stable/11/contrib/tcsh/nls/greek/set5 (props changed) stable/11/contrib/tcsh/nls/greek/set6 (props changed) stable/11/contrib/tcsh/nls/greek/set7 (props changed) stable/11/contrib/tcsh/nls/greek/set8 (props changed) stable/11/contrib/tcsh/nls/italian/charset (props changed) stable/11/contrib/tcsh/nls/italian/set10 (props changed) stable/11/contrib/tcsh/nls/italian/set11 (props changed) stable/11/contrib/tcsh/nls/italian/set12 (props changed) stable/11/contrib/tcsh/nls/italian/set13 (props changed) stable/11/contrib/tcsh/nls/italian/set14 (props changed) stable/11/contrib/tcsh/nls/italian/set15 (props changed) stable/11/contrib/tcsh/nls/italian/set16 (props changed) stable/11/contrib/tcsh/nls/italian/set17 (props changed) stable/11/contrib/tcsh/nls/italian/set18 (props changed) stable/11/contrib/tcsh/nls/italian/set19 (props changed) stable/11/contrib/tcsh/nls/italian/set2 (props changed) stable/11/contrib/tcsh/nls/italian/set21 (props changed) stable/11/contrib/tcsh/nls/italian/set22 (props changed) stable/11/contrib/tcsh/nls/italian/set23 (props changed) stable/11/contrib/tcsh/nls/italian/set24 (props changed) stable/11/contrib/tcsh/nls/italian/set25 (props changed) stable/11/contrib/tcsh/nls/italian/set26 (props changed) stable/11/contrib/tcsh/nls/italian/set27 (props changed) stable/11/contrib/tcsh/nls/italian/set29 (props changed) stable/11/contrib/tcsh/nls/italian/set3 (props changed) stable/11/contrib/tcsh/nls/italian/set30 (props changed) stable/11/contrib/tcsh/nls/italian/set31 (props changed) stable/11/contrib/tcsh/nls/italian/set4 (props changed) stable/11/contrib/tcsh/nls/italian/set5 (props changed) stable/11/contrib/tcsh/nls/italian/set6 (props changed) stable/11/contrib/tcsh/nls/italian/set7 (props changed) stable/11/contrib/tcsh/nls/italian/set8 (props changed) stable/11/contrib/tcsh/nls/ja/charset (props changed) stable/11/contrib/tcsh/nls/ja/set10 (props changed) stable/11/contrib/tcsh/nls/ja/set11 (props changed) stable/11/contrib/tcsh/nls/ja/set12 (props changed) stable/11/contrib/tcsh/nls/ja/set13 (props changed) stable/11/contrib/tcsh/nls/ja/set15 (props changed) stable/11/contrib/tcsh/nls/ja/set16 (props changed) stable/11/contrib/tcsh/nls/ja/set17 (props changed) stable/11/contrib/tcsh/nls/ja/set18 (props changed) stable/11/contrib/tcsh/nls/ja/set2 (props changed) stable/11/contrib/tcsh/nls/ja/set21 (props changed) stable/11/contrib/tcsh/nls/ja/set24 (props changed) stable/11/contrib/tcsh/nls/ja/set29 (props changed) stable/11/contrib/tcsh/nls/ja/set3 (props changed) stable/11/contrib/tcsh/nls/ja/set30 (props changed) stable/11/contrib/tcsh/nls/ja/set4 (props changed) stable/11/contrib/tcsh/nls/ja/set5 (props changed) stable/11/contrib/tcsh/nls/ja/set6 (props changed) stable/11/contrib/tcsh/nls/ja/set7 (props changed) stable/11/contrib/tcsh/nls/ja/set8 (props changed) stable/11/contrib/tcsh/nls/russian/charset (props changed) stable/11/contrib/tcsh/nls/russian/set10 (props changed) stable/11/contrib/tcsh/nls/russian/set11 (props changed) stable/11/contrib/tcsh/nls/russian/set12 (props changed) stable/11/contrib/tcsh/nls/russian/set13 (props changed) stable/11/contrib/tcsh/nls/russian/set14 (props changed) stable/11/contrib/tcsh/nls/russian/set15 (props changed) stable/11/contrib/tcsh/nls/russian/set16 (props changed) stable/11/contrib/tcsh/nls/russian/set17 (props changed) stable/11/contrib/tcsh/nls/russian/set18 (props changed) stable/11/contrib/tcsh/nls/russian/set19 (props changed) stable/11/contrib/tcsh/nls/russian/set2 (props changed) stable/11/contrib/tcsh/nls/russian/set21 (props changed) stable/11/contrib/tcsh/nls/russian/set22 (props changed) stable/11/contrib/tcsh/nls/russian/set23 (props changed) stable/11/contrib/tcsh/nls/russian/set24 (props changed) stable/11/contrib/tcsh/nls/russian/set25 (props changed) stable/11/contrib/tcsh/nls/russian/set26 (props changed) stable/11/contrib/tcsh/nls/russian/set27 (props changed) stable/11/contrib/tcsh/nls/russian/set29 (props changed) stable/11/contrib/tcsh/nls/russian/set3 (props changed) stable/11/contrib/tcsh/nls/russian/set30 (props changed) stable/11/contrib/tcsh/nls/russian/set31 (props changed) stable/11/contrib/tcsh/nls/russian/set4 (props changed) stable/11/contrib/tcsh/nls/russian/set5 (props changed) stable/11/contrib/tcsh/nls/russian/set6 (props changed) stable/11/contrib/tcsh/nls/russian/set7 (props changed) stable/11/contrib/tcsh/nls/russian/set8 (props changed) stable/11/contrib/tcsh/nls/spanish/charset (props changed) stable/11/contrib/tcsh/nls/spanish/set10 (props changed) stable/11/contrib/tcsh/nls/spanish/set11 (props changed) stable/11/contrib/tcsh/nls/spanish/set12 (props changed) stable/11/contrib/tcsh/nls/spanish/set13 (props changed) stable/11/contrib/tcsh/nls/spanish/set14 (props changed) stable/11/contrib/tcsh/nls/spanish/set15 (props changed) stable/11/contrib/tcsh/nls/spanish/set16 (props changed) stable/11/contrib/tcsh/nls/spanish/set17 (props changed) stable/11/contrib/tcsh/nls/spanish/set18 (props changed) stable/11/contrib/tcsh/nls/spanish/set19 (props changed) stable/11/contrib/tcsh/nls/spanish/set2 (props changed) stable/11/contrib/tcsh/nls/spanish/set21 (props changed) stable/11/contrib/tcsh/nls/spanish/set22 (props changed) stable/11/contrib/tcsh/nls/spanish/set23 (props changed) stable/11/contrib/tcsh/nls/spanish/set24 (props changed) stable/11/contrib/tcsh/nls/spanish/set25 (props changed) stable/11/contrib/tcsh/nls/spanish/set26 (props changed) stable/11/contrib/tcsh/nls/spanish/set27 (props changed) stable/11/contrib/tcsh/nls/spanish/set29 (props changed) stable/11/contrib/tcsh/nls/spanish/set3 (props changed) stable/11/contrib/tcsh/nls/spanish/set30 (props changed) stable/11/contrib/tcsh/nls/spanish/set31 (props changed) stable/11/contrib/tcsh/nls/spanish/set4 (props changed) stable/11/contrib/tcsh/nls/spanish/set5 (props changed) stable/11/contrib/tcsh/nls/spanish/set6 (props changed) stable/11/contrib/tcsh/nls/spanish/set7 (props changed) stable/11/contrib/tcsh/nls/spanish/set8 (props changed) stable/11/contrib/tcsh/nls/ukrainian/charset (props changed) stable/11/contrib/tcsh/nls/ukrainian/set10 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set11 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set12 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set13 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set14 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set15 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set16 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set17 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set18 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set19 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set2 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set21 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set22 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set23 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set24 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set25 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set26 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set27 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set29 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set3 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set30 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set31 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set4 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set5 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set6 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set7 (props changed) stable/11/contrib/tcsh/nls/ukrainian/set8 (props changed) stable/11/contrib/tcsh/pathnames.h (props changed) stable/11/contrib/tcsh/sh.char.c (props changed) stable/11/contrib/tcsh/sh.dir.h (props changed) stable/11/contrib/tcsh/sh.parse.c (props changed) stable/11/contrib/tcsh/sh.types.h (props changed) stable/11/contrib/tcsh/snames.h (props changed) stable/11/contrib/tcsh/src.desc (props changed) stable/11/contrib/tcsh/tc.disc.c (props changed) stable/11/contrib/tcsh/tc.h (props changed) stable/11/contrib/tcsh/tc.os.h (props changed) stable/11/contrib/tcsh/tc.sched.c (props changed) stable/11/contrib/tcsh/tc.sig.c (props changed) stable/11/contrib/tcsh/tc.sig.h (props changed) stable/11/contrib/tcsh/tc.vers.c (props changed) stable/11/contrib/tcsh/tc.wait.h (props changed) stable/11/contrib/tcsh/tcsh.man2html (props changed) stable/11/contrib/tcsh/termcap.vms (props changed) stable/11/contrib/tcsh/tw.h (props changed) stable/11/contrib/tcsh/tw.help.c (props changed) stable/11/contrib/tcsh/tw.spell.c (props changed) stable/11/contrib/tcsh/vms.termcap.c (props changed) Modified: stable/11/bin/csh/Makefile ============================================================================== --- stable/11/bin/csh/Makefile Sat Apr 15 09:56:42 2017 (r316956) +++ stable/11/bin/csh/Makefile Sat Apr 15 11:13:11 2017 (r316957) @@ -33,6 +33,7 @@ SRCS+= tc.alloc.c tc.bind.c tc.const.c t tc.func.c tc.nls.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 +SRCS+= dotlock.c dotlock.h GENHDRS= ed.defns.h sh.err.h tc.const.h tc.defs.c SRCS+= ${GENHDRS} Modified: stable/11/contrib/tcsh/Fixes ============================================================================== --- stable/11/contrib/tcsh/Fixes Sat Apr 15 09:56:42 2017 (r316956) +++ stable/11/contrib/tcsh/Fixes Sat Apr 15 11:13:11 2017 (r316957) @@ -1,3 +1,96 @@ + 22. Fix type of read in prompt confirmation (eg. rmstar) (David Kaspar) + 20. V6.20.00 - 20161124 + 19. Don't resize the screen if it did not change size. + 18. V6.19.01 - 20161025 + 17. restore file description when cleaning up after eval: + repeat 99 time + 16. PR/572: Fix $SHLVL issue when exec'ing subshells. + 15. PR/403: Fix backquote expansion for multi-byte character sets. + 14. Fix drawing issu with multi-line prompt (Kensuke Iwahashi/David Kaspar) + 13. always send prusage to stdout. + 12. PR/526: Fix double \\ printing from previous fix in history expansion. + 11. Android updates from Corinna Vinschen + 10. PR/526: Quote backslashes properly so they can be preserved in `` + expansions + 9. Fix memory leak for paraml + 8. Add notempty and ask values for the noclobber setting (Martin Tournoij) + 7. more correct $wordchars for vimode (Luke Mewburn) + 6. expose VImode in $vimode (Luke Mewburn) + 5. display what the compiled in editor is in bindkey -d (Luke Mewburn) + 4. run-fg-editor improvements and documentation (Luke Mewburn) + 3. Fix parsing of 'if (cond)then' (Fridolin Pokorny) + 2. PR/437: Fix handling of invalid unicode characters. + 1. PR/451: Fix error messages containing %c to be always '%c' + + 41. V6.19.00 - 20150521 + 40. V6.18.05 - 20150510 + 39. fix reseting when interrupted inside an eval "eval sleep 10^C" + (paulo.cesar.pereira.de.andrade) + 38. rename handle_intr -> handle_interrupt as originally intended. + 37. fix input tests that need stdin on a tty + 36. V6.18.04 - 20150504 + 35. revert fix echo "\1", it is incorrect. + 34. revert fix to PR/437, breaks short strings. + 33. V6.18.03 - 20150503 + 32. PR/437: Nakajima Akira: Fix segmentation fault reading input files + 31. PR/291: Print job status messages to stderr. + 30. Fridolin Pokorny NUL in `` does not mean EOF. + 29. Pavel Raiskup fix hang with: + while (1) + ( date & ; wait ) + end + 28. Add cdtohome special variable (Martin Tournoij) + 27. Fix root prompt char for windows (Corinna Vinschen) + 26. For "next" completion matches only consider exact matches of the previous + word (Jamie Landeg-Jones) + 25. Fix echo "\1" for echo_style=both where the first character was + not processed properly (Gary Duzan) + 24. V6.18.02 - 20140618 + 23. fix ls-F /non printing exit value twice. + 22. rename configure.in to configure.ac, add aclocal.m4 to CVS + 21. set foo="aabaabaa"; echo $foo:as/a// should produce bb + 20. Add locked merge history support (Marcin Konarski) + 19. Support more resource limits from various BSD's + 18. Cache history count to speed up thing + 17. PR/240: minix support + 16. revert fix for 15. Causes extra quoting, for example (foo is a program + that prints its arguments): + $ ./foo 'abc' * + '\a\b\c' + 15. fix globbing for ``, stripping backslashes. Example: + cat << _EOF > huh + echo 'hello\;world' + _EOF + echo `./huh 0` + echo `./huh $?` + 14. fix for `` that causes hang. Example: + cat << _EOF > huh + #!/bin/sh + echo "[$@]" + echo "I am running" + echo "I am running ($$)" >> huh.out + _EOF + cat << _EOF > huh.tcsh + #!/bin/tcsh -f + + ./huh \ + `#comment blah blah blah` \ + parameter a \ + `#comment blah blah blah` \ + parameter b \ + `#comment blah blah blah` \ + parameter c + echo ok + _EOF + 13. remove AsciiOnly fix now that the real issue has been fixed (Roman Kollar) + 12. define utmp file for aix (Laurence Darby) + 11. fix if history in loops + 10. make ls-F print to stderr and set the exit code + 9. make rmstar interruptible on linux + 8. Get rid of pret_t and make the printf functions return the number of + characters printed as the system ones do. + 7. Parse a FreeBSD compat $LSCOLORS. What to do when both LSCOLORS and + LS_COLORS are set. I am not documenting this until we decide. 6. V6.18.01 - 20120214 5. fix interruptible wait again 4. ignore bogus compiler overflow message Modified: stable/11/contrib/tcsh/Imakefile ============================================================================== --- stable/11/contrib/tcsh/Imakefile Sat Apr 15 09:56:42 2017 (r316956) +++ stable/11/contrib/tcsh/Imakefile Sat Apr 15 11:13:11 2017 (r316957) @@ -1,5 +1,5 @@ XCOMM -XCOMM $tcsh: Imakefile,v 1.87 2010/01/28 19:01:05 christos Exp $ +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 @@ -526,8 +526,8 @@ MISCF = Makefile.std Fixes MAKEDIFFS MAK 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.in \ - Makefile.win32 + snames.h host.defs gethost.c tcsh.man2html Makefile.in configure.ac \ + Makefile.win32 aclocal.m4 CONFSRCS=config/[a-z]* Modified: stable/11/contrib/tcsh/Makefile.in ============================================================================== --- stable/11/contrib/tcsh/Makefile.in Sat Apr 15 09:56:42 2017 (r316956) +++ stable/11/contrib/tcsh/Makefile.in Sat Apr 15 11:13:11 2017 (r316957) @@ -1,4 +1,4 @@ -# $tcsh: Makefile.in,v 3.49 2011/02/05 17:35:31 christos Exp $ +# $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 @@ -315,8 +315,8 @@ CPP = @CPP@ # on the suns does not know how to make dynamically linked binaries. # This is set by autoconf. CC = @CC@ -#CC= gcc -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Werror -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wsign-compare -Wcast-qual -Wreturn-type -Wswitch -Wshadow -Wwrite-strings -Wextra -# -ansi -pedantic +#CC= gcc -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Werror -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wsign-compare -Wcast-qual -Wreturn-type -Wswitch -Wshadow -Wwrite-strings -Wextra -Wcast-qual -Wwrite-strings -Wold-style-definition -Wuninitialized -Wpointer-sign +# -Wconversion -Wformat=2 -ansi -pedantic #CC= gcc -Wall -pipe -B/bin/ # Generate code for Intel 486 (linux) #CC= gcc -m486 -pipe -Wall @@ -377,14 +377,14 @@ ASSRCS= sh.c sh.dir.c sh.dol.c sh.err.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 sh.char.h sh.dir.h sh.proc.h sh.h \ tw.color.c -PSSRCS= sh.decls.h glob.c glob.h mi.termios.c mi.wait.h mi.varargs.h ma.setp.c \ +PSSRCS= sh.decls.h glob.c glob.h dotlock.c dotlock.h mi.termios.c mi.wait.h mi.varargs.h ma.setp.c \ vms.termcap.c SHSRCS= ${ASSRCS} ${PSSRCS} SHOBJS= sh.${SUF} sh.dir.${SUF} sh.dol.${SUF} sh.err.${SUF} sh.exec.${SUF} \ sh.char.${SUF} sh.exp.${SUF} sh.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} \ + sh.sem.${SUF} sh.set.${SUF} sh.time.${SUF} glob.${SUF} dotlock.${SUF} \ mi.termios.${SUF} ma.setp.${SUF} vms.termcap.${SUF} TWSRCS= tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \ @@ -411,12 +411,12 @@ AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThin 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 \ - tests/testsuite.at + 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 \ - tests/mb-utf8.at tests/noexec.at tests/syntax.at tests/subst.at \ - tests/variables.at tests/sh.dol.at + tests/mb-utf8.at tests/noexec.at tests/parenthesis.at tests/syntax.at \ + tests/subst.at tests/variables.at tests/sh.dol.at VHSRCS=${PVSRCS} ${AVSRCS} @@ -533,11 +533,11 @@ tc.const.h: tc.const.c sh.char.h config. ${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 >> $@.tmp + LC_COLLATE=C 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 +$(srcdir)/tests/package.m4: $(srcdir)/configure.ac { \ echo '# Signature of the current package.'; \ echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ @@ -594,12 +594,12 @@ vgrind: @vgrind -t -x -h Index index >/crp/bill/csh/index.t install-strip: install + -strip ${DESTBIN}/tcsh$(EXEEXT) install: tcsh$(EXEEXT) install.catalogs install.man -mkdir -p ${DESTBIN} -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) - -strip ${DESTBIN}/tcsh$(EXEEXT) chmod 755 ${DESTBIN}/tcsh$(EXEEXT) install.catalogs: @@ -623,25 +623,6 @@ install.man: tcsh.man # nroff -man tcsh.man | compress > ${DESTMAN}/tcsh.${MANSECT}.Z # chmod 444 ${DESTMAN}/tcsh.${MANSECT}.Z -install.cygwin: install - -gzip ${DESTMAN}/tcsh.${MANSECT} - -mkdir -p ${DESTDIR}${prefix}/share/doc/tcsh - cp ${srcdir}/FAQ ${srcdir}/Fixes ${DESTDIR}${prefix}/share/doc/tcsh - cp ${srcdir}/NewThings ${srcdir}/README ${DESTDIR}${prefix}/share/doc/tcsh - cp ${srcdir}/WishList ${srcdir}/Y2K ${DESTDIR}${prefix}/share/doc/tcsh - perl ${srcdir}/tcsh.man2html ${srcdir}/tcsh.man - cp -rp tcsh.html ${DESTDIR}${prefix}/share/doc/tcsh - -mkdir -p ${DESTDIR}/etc/defaults/etc/profile.d - -mkdir -p ${DESTDIR}/etc/profile.d - -mkdir -p ${DESTDIR}/etc/postinstall - -mkdir -p ${DESTDIR}/etc/preremove - cp -p ${srcdir}/cygwin/csh.cshrc ${DESTDIR}/etc/defaults/etc - cp -p ${srcdir}/cygwin/csh.login ${DESTDIR}/etc/defaults/etc - cp -p ${srcdir}/cygwin/bindkey.tcsh ${DESTDIR}/etc/defaults/etc/profile.d - cp -p ${srcdir}/complete.tcsh ${DESTDIR}/etc/defaults/etc/profile.d - cp -p ${srcdir}/cygwin/postinstall.sh ${DESTDIR}/etc/postinstall/tcsh.sh - cp -p ${srcdir}/cygwin/preremove.sh ${DESTDIR}/etc/preremove/tcsh.sh - clean: clean.catalogs ${RM} -f a.out strings x.c xs.c tcsh$(EXEEXT) tcsh.a _MAKE_LOG gethost ${RM} -f *.${SUF} *.i *.s @@ -748,11 +729,11 @@ ftp: tcsh-${VERSION}.tar.Z tcsh.tahoe-${ autoconfigure: $(srcdir)/configure $(srcdir)/config.h.in -$(srcdir)/configure: $(srcdir)/configure.in +$(srcdir)/configure: $(srcdir)/configure.ac cd $(srcdir) && autoconf $(srcdir)/config.h.in: $(srcdir)/stamp-h.in -$(srcdir)/stamp-h.in: $(srcdir)/configure.in +$(srcdir)/stamp-h.in: $(srcdir)/configure.ac cd $(srcdir) && autoheader @echo timestamp > $(srcdir)/stamp-h.in @@ -787,6 +768,9 @@ ${TWOBJS} ${TWINC}: ${TWH} # glob.h glob.${SUF} sh.glob.${SUF}: glob.h +# dotlock.h +dotlock.${SUF}: dotlock.h + # ed.defns.h EDDINC=tc.bind.${SUF} tc.func.${SUF} tc.os.${SUF} ${EDOBJS} ${EDDINC}: ed.defns.h Modified: stable/11/contrib/tcsh/Makefile.std ============================================================================== --- stable/11/contrib/tcsh/Makefile.std Sat Apr 15 09:56:42 2017 (r316956) +++ stable/11/contrib/tcsh/Makefile.std Sat Apr 15 11:13:11 2017 (r316957) @@ -1,4 +1,4 @@ -# $tcsh: Makefile.std,v 1.97 2006/03/02 18:46:44 christos Exp $ +# $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 @@ -287,14 +287,14 @@ ASSRCS= sh.c sh.dir.c sh.dol.c sh.err.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 sh.char.h sh.dir.h sh.proc.h sh.h -PSSRCS= sh.decls.h glob.c glob.h mi.termios.c mi.wait.h mi.varargs.h ma.setp.c \ +PSSRCS= sh.decls.h glob.c glob.h dotlock.c dotlock.h mi.termios.c mi.wait.h mi.varargs.h ma.setp.c \ vms.termcap.c SHSRCS= ${ASSRCS} ${PSSRCS} SHOBJS= sh.${SUF} sh.dir.${SUF} sh.dol.${SUF} sh.err.${SUF} sh.exec.${SUF} \ sh.char.${SUF} sh.exp.${SUF} sh.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} \ + sh.sem.${SUF} sh.set.${SUF} sh.time.${SUF} glob.${SUF} dotlock.${SUF} \ mi.termios.${SUF} ma.setp.${SUF} vms.termcap.${SUF} TWSRCS= tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \ @@ -321,7 +321,8 @@ AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThin 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.ac configure config.h.in \ + aclocal.m4 VHSRCS=${PVSRCS} ${AVSRCS} @@ -424,7 +425,7 @@ tc.const.h: tc.const.c sh.char.h config. ${CPP} $(INCLUDES) ${DFLAGS} ${EXTRAFLAGS} -D_h_tc_const\ $(srcdir)/tc.const.c | grep 'Char STR' | \ sed -e 's/Char \([a-zA-Z0-9_]*\) *\[ *\].*/extern Char \1[];/' | \ - sort >> $@ + LC_COLLATE=C sort >> $@ @echo '#endif /* _h_tc_const */' >> $@ csh.prof: ${OBJS} sh.prof.${SUF} mcrt0.${SUF} @@ -584,11 +585,11 @@ ftp: tcsh-${VERSION}.tar.Z tcsh.tahoe-${ autoconfigure: $(srcdir)/configure $(srcdir)/config.h.in -$(srcdir)/configure: $(srcdir)/configure.in +$(srcdir)/configure: $(srcdir)/configure.ac cd $(srcdir) && autoconf $(srcdir)/config.h.in: $(srcdir)/stamp-h.in -$(srcdir)/stamp-h.in: $(srcdir)/configure.in +$(srcdir)/stamp-h.in: $(srcdir)/configure.ac cd $(srcdir) && autoheader @echo timestamp > $(srcdir)/stamp-h.in @@ -620,6 +621,9 @@ ${TWOBJS} ${TWINC}: ${TWH} # glob.h glob.${SUF} sh.glob.${SUF}: glob.h +# dotlock.h +dotlock.${SUF}: dotlock.h + # ed.defns.h EDDINC=tc.bind.${SUF} tc.func.${SUF} tc.os.${SUF} ${EDOBJS} ${EDDINC}: ed.defns.h Modified: stable/11/contrib/tcsh/Makefile.vms ============================================================================== --- stable/11/contrib/tcsh/Makefile.vms Sat Apr 15 09:56:42 2017 (r316956) +++ stable/11/contrib/tcsh/Makefile.vms Sat Apr 15 11:13:11 2017 (r316957) @@ -1,4 +1,4 @@ -# $tcsh: Makefile.vms,v 1.39 2006/03/02 18:46:44 christos Exp $ +# $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 @@ -299,7 +299,7 @@ AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThin 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 + host.defs gethost.c tcsh.man2html configure.ac aclocal.m4 VHSRCS=${PVSRCS} ${AVSRCS} Modified: stable/11/contrib/tcsh/README ============================================================================== --- stable/11/contrib/tcsh/README Sat Apr 15 09:56:42 2017 (r316956) +++ stable/11/contrib/tcsh/README Sat Apr 15 11:13:11 2017 (r316957) @@ -1,4 +1,4 @@ -This is tcsh version 6.18.01. Tcsh is a version of the Berkeley +This is tcsh version 6.20.00. 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. Modified: stable/11/contrib/tcsh/complete.tcsh ============================================================================== --- stable/11/contrib/tcsh/complete.tcsh Sat Apr 15 09:56:42 2017 (r316956) +++ stable/11/contrib/tcsh/complete.tcsh Sat Apr 15 11:13:11 2017 (r316957) @@ -1,5 +1,5 @@ # -# $tcsh: complete.tcsh,v 1.52 2010/05/07 17:54:13 christos Exp $ +# $tcsh: complete.tcsh,v 1.56 2015/07/03 16:52:47 christos Exp $ # example file using the new completion code # # Debian GNU/Linux @@ -20,1209 +20,1262 @@ # Cleanup by Martin A. Godisch <martin@godisch.de>. onintr - -if (! $?prompt) goto end +if ( ! $?prompt ) goto end -if ($?tcsh) then - if ($tcsh != 1) then - set rev=$tcsh:r - set rel=$rev:e - set pat=$tcsh:e - set rev=$rev:r +if ( $?tcsh ) then + if ( $tcsh != 1 ) then + set rev=$tcsh:r:r + set rel=$tcsh:r:e + if ( $rev > 6 || ( $rev > 5 && $rel > 1 ) ) then + set _has_complete=1 endif - if ($rev > 5 && $rel > 1) then - set _complete=1 - endif - unset rev rel pat + endif + unset rev rel endif -if ($?_complete) then - set noglob - if ( ! $?hosts ) set hosts - foreach f ("$HOME/.hosts" /usr/local/etc/csh.hosts "$HOME/.rhosts" /etc/hosts.equiv) - if ( -r "$f" ) then - set hosts = ($hosts `grep -v "+" "$f" | grep -E -v "^#" | tr -s " " " " | cut -f 1`) - endif - end - if ( -r "$HOME/.netrc" ) then - set f=`awk '/machine/ { print $2 }' < "$HOME/.netrc"` >& /dev/null - set hosts=($hosts $f) - endif - if ( -r "$HOME/.ssh/known_hosts" ) then - set f=`cat "$HOME/.ssh/known_hosts" | cut -f 1 -d \ ` >& /dev/null - set f=`cat "$HOME/.ssh/known_hosts" | cut -f 1 -d \ | sed -e 's/,/ /g'` >& /dev/null - set hosts=($hosts $f) - endif - unset f - if ( ! $?hosts ) then - set hosts=(hyperion.ee.cornell.edu phaeton.ee.cornell.edu \ - guillemin.ee.cornell.edu vangogh.cs.berkeley.edu \ - ftp.uu.net prep.ai.mit.edu export.lcs.mit.edu \ - labrea.stanford.edu sumex-aim.stanford.edu \ - tut.cis.ohio-state.edu) - endif +if ( ! $?_has_complete ) goto end - complete ywho n/*/\$hosts/ # argument from list in $hosts - complete rsh p/1/\$hosts/ c/-/"(l n)"/ n/-l/u/ N/-l/c/ n/-/c/ p/2/c/ p/*/f/ - complete ssh p/1/\$hosts/ c/-/"(l n)"/ n/-l/u/ N/-l/c/ n/-/c/ p/2/c/ p/*/f/ - complete xrsh p/1/\$hosts/ c/-/"(l 8 e)"/ n/-l/u/ N/-l/c/ n/-/c/ p/2/c/ p/*/f/ - complete rlogin p/1/\$hosts/ c/-/"(l 8 e)"/ n/-l/u/ - complete telnet p/1/\$hosts/ p/2/x:'<port>'/ n/*/n/ - - complete cd p/1/d/ # Directories only - complete chdir p/1/d/ - complete pushd p/1/d/ - complete popd p/1/d/ - complete pu p/1/d/ - complete po p/1/d/ - complete complete p/1/X/ # Completions only - complete uncomplete n/*/X/ - complete exec p/1/c/ # Commands only - complete trace p/1/c/ - complete strace p/1/c/ - complete which n/*/c/ - complete where n/*/c/ - complete skill p/1/c/ - complete dde p/1/c/ - complete adb c/-I/d/ n/-/c/ N/-/"(core)"/ p/1/c/ p/2/"(core)"/ - complete sdb p/1/c/ - complete dbx c/-I/d/ n/-/c/ N/-/"(core)"/ p/1/c/ p/2/"(core)"/ - complete xdb p/1/c/ - complete gdb n/-d/d/ n/*/c/ - complete ups p/1/c/ - complete set 'c/*=/f/' 'p/1/s/=' 'n/=/f/' - complete unset n/*/s/ - complete alias p/1/a/ # only aliases are valid - complete unalias n/*/a/ - complete xdvi n/*/f:*.dvi/ # Only files that match *.dvi - complete dvips n/*/f:*.dvi/ - if ($?traditional_complete) then - complete tex n/*/f:*.tex/ # Only files that match *.tex - else - complete tex n/*/f:*.{tex,texi}/ # Files that match *.tex and *.texi - endif - complete latex n/*/f:*.{tex,ltx}/ - complete su c/--/"(login fast preserve-environment command shell \ - help version)"/ c/-/"(f l m p c s -)"/ \ - n/{-c,--command}/c/ \ - n@{-s,--shell}@'`cat /etc/shells`'@ n/*/u/ - complete cc c/-[IL]/d/ \ - c@-l@'`\ls -1 /usr/lib/lib*.a | sed s%^.\*/lib%%\;s%\\.a\$%%`'@ \ - c/-/"(o l c g L I D U)"/ n/*/f:*.[coasi]/ - complete acc c/-[IL]/d/ \ - c@-l@'`\ls -1 /usr/lang/SC1.0/lib*.a | sed s%^.\*/lib%%\;s%\\.a\$%%`'@ \ - c/-/"(o l c g L I D U)"/ n/*/f:*.[coasi]/ - complete gcc c/-[IL]/d/ \ - c/-f/"(caller-saves cse-follow-jumps delayed-branch \ - elide-constructors expensive-optimizations \ - float-store force-addr force-mem inline \ - inline-functions keep-inline-functions \ - memoize-lookups no-default-inline \ - no-defer-pop no-function-cse omit-frame-pointer \ - rerun-cse-after-loop schedule-insns \ - schedule-insns2 strength-reduce \ - thread-jumps unroll-all-loops \ - unroll-loops syntax-only all-virtual \ - cond-mismatch dollars-in-identifiers \ - enum-int-equiv no-asm no-builtin \ - no-strict-prototype signed-bitfields \ - signed-char this-is-variable unsigned-bitfields \ - unsigned-char writable-strings call-saved-reg \ - call-used-reg fixed-reg no-common \ - no-gnu-binutils nonnull-objects \ - pcc-struct-return pic PIC shared-data \ - short-enums short-double volatile)"/ \ - c/-W/"(all aggregate-return cast-align cast-qual \ - comment conversion enum-clash error format \ - id-clash-len implicit missing-prototypes \ - no-parentheses pointer-arith return-type shadow \ - strict-prototypes switch uninitialized unused \ - write-strings)"/ \ - c/-m/"(68000 68020 68881 bitfield fpa nobitfield rtd \ - short c68000 c68020 soft-float g gnu unix fpu \ - no-epilogue)"/ \ - c/-d/"(D M N)"/ \ - c/-/"(f W vspec v vpath ansi traditional \ - traditional-cpp trigraphs pedantic x o l c g L \ - I D U O O2 C E H B b V M MD MM i dynamic \ - nodtdlib static nostdinc undef)"/ \ - c/-l/f:*.a/ \ - n/*/f:*.{c,C,cc,o,a,s,i}/ - complete g++ n/*/f:*.{C,cc,o,s,i}/ - complete CC n/*/f:*.{C,cc,cpp,o,s,i}/ - complete rm c/--/"(directory force interactive verbose \ - recursive help version)"/ c/-/"(d f i v r R -)"/ \ - n/*/f:^*.{c,cc,C,h,in}/ # Protect precious files - complete vi n/*/f:^*.[oa]/ - complete bindkey N/-a/b/ N/-c/c/ n/-[ascr]/'x:<key-sequence>'/ \ - n/-[svedlr]/n/ c/-[vedl]/n/ c/-/"(a s k c v e d l r)"/\ - n/-k/"(left right up down)"/ p/2-/b/ \ - p/1/'x:<key-sequence or option>'/ - - complete find n/-fstype/"(nfs 4.2)"/ n/-name/f/ \ - n/-type/"(c b d f p l s)"/ n/-user/u/ n/-group/g/ \ - n/-exec/c/ n/-ok/c/ n/-cpio/f/ n/-ncpio/f/ n/-newer/f/ \ - c/-/"(fstype name perm prune type user nouser \ - group nogroup size inum atime mtime ctime exec \ - ok print ls cpio ncpio newer xdev depth \ - daystart follow maxdepth mindepth noleaf version \ - anewer cnewer amin cmin mmin true false uid gid \ - ilname iname ipath iregex links lname empty path \ - regex used xtype fprint fprint0 fprintf \ - print0 printf not a and o or)"/ \ - n/*/d/ - - complete -%* c/%/j/ # fill in the jobs builtin - complete {fg,bg,stop} c/%/j/ p/1/"(%)"// - - complete limit c/-/"(h)"/ n/*/l/ - complete unlimit c/-/"(h)"/ n/*/l/ - - complete -co* p/0/"(compress)"/ # make compress completion - # not ambiguous - if ($?traditional_complete) then - complete zcat n/*/f:*.Z/ - else - # "zcat" may be linked to "compress" or "gzip" - if (-X zcat) then - zcat --version >& /dev/null - if ($status != 0) then - complete zcat n/*/f:*.Z/ - else - complete zcat c/--/"(force help license quiet version)"/ \ - c/-/"(f h L q V -)"/ n/*/f:*.{gz,Z,z,zip}/ - endif - endif - endif +if ( ! $?noglob ) set noglob _unset_noglob - complete finger c/*@/\$hosts/ n/*/u/@ - complete ping p/1/\$hosts/ - complete traceroute p/1/\$hosts/ - - complete {talk,ntalk,phone} p/1/'`users | tr " " "\012" | uniq`'/ \ - n/*/\`who\ \|\ grep\ \$:1\ \|\ awk\ \'\{\ print\ \$2\ \}\'\`/ - - complete ftp c/-/"(d i g n v)"/ n/-/\$hosts/ p/1/\$hosts/ n/*/n/ - - # this one is simple... - #complete rcp c/*:/f/ C@[./\$~]*@f@ n/*/\$hosts/: - # From Michael Schroeder <mlschroe@immd4.informatik.uni-erlangen.de> - # This one will rsh to the file to fetch the list of files! - complete rcp 'c%*@*:%`set q=$:-0;set q="$q:s/@/ /";set q="$q:s/:/ /";set q=($q " ");rsh $q[2] -l $q[1] ls -dp $q[3]\*`%' 'c%*:%`set q=$:-0;set q="$q:s/:/ /";set q=($q " ");rsh $q[1] ls -dp $q[2]\*`%' 'c%*@%$hosts%:' 'C@[./$~]*@f@' 'n/*/$hosts/:' - - complete dd c/--/"(help version)"/ c/[io]f=/f/ \ - c/conv=*,/"(ascii ebcdic ibm block unblock \ - lcase notrunc ucase swab noerror sync)"/,\ - c/conv=/"(ascii ebcdic ibm block unblock \ - lcase notrunc ucase swab noerror sync)"/,\ - c/*=/x:'<number>'/ \ - n/*/"(if of conv ibs obs bs cbs files skip file seek count)"/= - - complete nslookup p/1/x:'<host>'/ p/2/\$hosts/ - - complete ar c/[dmpqrtx]/"(c l o u v a b i)"/ p/1/"(d m p q r t x)"// \ - p/2/f:*.a/ p/*/f:*.o/ - - # these should be merged with the MH completion hacks below - jgotts - complete {refile,sprev,snext,scan,pick,rmm,inc,folder,show} \ - "c@+@F:$HOME/Mail/@" - - # these and interrupt handling from Jaap Vermeulen <jaap@sequent.com> - complete {rexec,rxexec,rxterm,rmterm} \ - 'p/1/$hosts/' 'c/-/(l L E)/' 'n/-l/u/' 'n/-L/f/' \ - 'n/-E/e/' 'n/*/c/' - complete kill 'c/-/S/' 'c/%/j/' \ - 'n/*/`ps -u $LOGNAME | awk '"'"'{print $1}'"'"'`/' - - # these from Marc Horowitz <marc@cam.ov.com> - complete attach 'n/-mountpoint/d/' 'n/-m/d/' 'n/-type/(afs nfs rvd ufs)/' \ - 'n/-t/(afs nfs rvd ufs)/' 'n/-user/u/' 'n/-U/u/' \ - 'c/-/(verbose quiet force printpath lookup debug map \ - nomap remap zephyr nozephyr readonly write \ - mountpoint noexplicit explicit type mountoptions \ - nosetuid setuid override skipfsck lock user host)/' \ - 'n/-e/f/' 'n/*/()/' - complete hesinfo 'p/1/u/' \ - 'p/2/(passwd group uid grplist pcap pobox cluster \ - filsys sloc service)/' - - # these from E. Jay Berkenbilt <ejb@ERA.COM> - # = isn't always followed by a filename or a path anymore - jgotts - if ($?traditional_complete) then - complete ./configure \ - 'c/--*=/f/' 'c/--{cache-file,prefix,exec-prefix,\ - bindir,sbindir,libexecdir,datadir,\ - sysconfdir,sharedstatedir,localstatedir,\ - libdir,includedir,oldincludedir,infodir,\ - mandir,srcdir}/(=)//' \ - 'c/--/(cache-file verbose prefix exec-prefix bindir \ - sbindir libexecdir datadir sysconfdir \ - sharedstatedir localstatedir libdir \ - includedir oldincludedir infodir mandir \ - srcdir)//' - else - complete ./configure \ - 'c@--{prefix,exec-prefix,bindir,sbindir,libexecdir,datadir,sysconfdir,sharedstatedir,localstatedir,infodir,mandir,srcdir,x-includes,x-libraries}=*@x:<directory e.g. /usr/local>'@ \ - 'c/--cachefile=*/x:<filename>/' \ - 'c/--{enable,disable,with}-*/x:<feature>//' \ - 'c/--*=/x:<directory>//' \ - 'c/--/(prefix= exec-prefix= bindir= \ - sbindir= libexecdir= datadir= sysconfdir= \ - sharedstatedir= localstatedir= infodir= \ - mandir= srcdir= x-includes= x-libraries= cachefile= \ - enable- disable- with- \ - help no-create quiet silent version verbose )//' - endif - complete gs 'c/-sDEVICE=/(x11 cdjmono cdj550 epson eps9high epsonc \ - dfaxhigh dfaxlow laserjet ljet4 sparc pbm \ - pbmraw pgm pgmraw ppm ppmraw bit)/' \ - 'c/-sOutputFile=/f/' 'c/-s/(DEVICE OutputFile)/=' \ - 'c/-d/(NODISPLAY NOPLATFONTS NOPAUSE)/' 'n/*/f/' - complete perl 'n/-S/c/' - complete printenv 'n/*/e/' - complete sccs p/1/"(admin cdc check clean comb deledit delget \ - delta diffs edit enter fix get help info \ - print prs prt rmdel sccsdiff tell unedit \ - unget val what)"/ - complete setenv 'p/1/e/' 'c/*:/f/' - - # these and method of setting hosts from Kimmo Suominen <kim@tac.nyc.ny.us> - if ( -f "$HOME/.mh_profile" && -x "`which folders`" ) then - - if ( ! $?FOLDERS ) setenv FOLDERS "`folders -fast -recurse`" - if ( ! $?MHA ) setenv MHA "`ali | sed -e '/^ /d' -e 's/:.*//'`" - - set folders = ( $FOLDERS ) - set mha = ( $MHA ) - - complete ali \ - 'c/-/(alias nolist list nonormalize normalize nouser user help)/' \ - 'n,-alias,f,' - - complete anno \ - 'c/-/(component noinplace inplace nodate date text help)/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete burst \ - 'c/-/(noinplace inplace noquiet quiet noverbose verbose help)/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete comp \ - 'c/-/(draftfolder draftmessage nodraftfolder editor noedit file form nouse use whatnowproc nowhatnowproc help)/' \ - 'c,+,$folders,' \ - 'n,-whatnowproc,c,' \ - 'n,-file,f,'\ - 'n,-form,f,'\ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete dist \ - 'c/-/(noannotate annotate draftfolder draftmessage nodraftfolder editor noedit form noinplace inplace whatnowproc nowhatnowproc help)/' \ - 'c,+,$folders,' \ - 'n,-whatnowproc,c,' \ - 'n,-form,f,'\ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete folder \ - 'c/-/(all nofast fast noheader header nopack pack noverbose verbose norecurse recurse nototal total noprint print nolist list push pop help)/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete folders \ - 'c/-/(all nofast fast noheader header nopack pack noverbose verbose norecurse recurse nototal total noprint print nolist list push pop help)/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete forw \ - 'c/-/(noannotate annotate draftfolder draftmessage nodraftfolder editor noedit filter form noformat format noinplace inplace digest issue volume whatnowproc nowhatnowproc help)/' \ - 'c,+,$folders,' \ - 'n,-whatnowproc,c,' \ - 'n,-filter,f,'\ - 'n,-form,f,'\ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete inc \ - 'c/-/(audit file noaudit nochangecur changecur file form format nosilent silent notruncate truncate width help)/' \ - 'c,+,$folders,' \ - 'n,-audit,f,'\ - 'n,-form,f,' - - complete mark \ - 'c/-/(add delete list sequence nopublic public nozero zero help)/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete mhmail \ - 'c/-/(body cc from subject help)/' \ - 'n,-cc,$mha,' \ - 'n,-from,$mha,' \ - 'n/*/$mha/' - - complete mhpath \ - 'c/-/(help)/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete msgchk \ - 'c/-/(nodate date nonotify notify help)/' - - complete msh \ - 'c/-/(prompt noscan scan notopcur topcur help)/' - - complete next \ - 'c/-/(draft form moreproc nomoreproc length width showproc noshowproc header noheader help)/' \ - 'c,+,$folders,' \ - 'n,-moreproc,c,' \ - 'n,-showproc,c,' \ - 'n,-form,f,' - - complete packf \ - 'c/-/(file help)/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete pick \ - 'c/-/(and or not lbrace rbrace cc date from search subject to othercomponent after before datefield sequence nopublic public nozero zero nolist list help)/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete prev \ - 'c/-/(draft form moreproc nomoreproc length width showproc noshowproc header noheader help)/' \ - 'c,+,$folders,' \ - 'n,-moreproc,c,' \ - 'n,-showproc,c,' \ - 'n,-form,f,' - - complete prompter \ - 'c/-/(erase kill noprepend prepend norapid rapid nodoteof doteof help)/' - - complete refile \ - 'c/-/(draft nolink link nopreserve preserve src file help)/' \ - 'c,+,$folders,' \ - 'n,-file,f,'\ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete rmf \ - 'c/-/(nointeractive interactive help)/' \ - 'c,+,$folders,' - - complete rmm \ - 'c/-/(help)/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete scan \ - 'c/-/(noclear clear form format noheader header width noreverse reverse file help)/' \ - 'c,+,$folders,' \ - 'n,-form,f,'\ - 'n,-file,f,'\ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete send \ - 'c/-/(alias draft draftfolder draftmessage nodraftfolder filter nofilter noformat format noforward forward nomsgid msgid nopush push noverbose verbose nowatch watch width help)/' \ - 'n,-alias,f,'\ - 'n,-filter,f,' - - complete show \ - 'c/-/(draft form moreproc nomoreproc length width showproc noshowproc header noheader help)/' \ - 'c,+,$folders,' \ - 'n,-moreproc,c,' \ - 'n,-showproc,c,' \ - 'n,-form,f,'\ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete sortm \ - 'c/-/(datefield textfield notextfield limit nolimit noverbose verbose help)/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete vmh \ - 'c/-/(prompt vmhproc novmhproc help)/' \ - 'n,-vmhproc,c,' - - complete whatnow \ - 'c/-/(draftfolder draftmessage nodraftfolder editor noedit prompt help)/' - - complete whom \ - 'c/-/(alias nocheck check draft draftfolder draftmessage nodraftfolder help)/' \ - 'n,-alias,f,' - - complete plum \ - 'c/-/()/' \ - 'c,+,$folders,' \ - 'n,*,`(mark | sed "s/:.*//";echo next cur prev first last)|tr " " "\12" | sort -u`,' - - complete mail \ - 'c/-/()/' \ - 'n/*/$mha/' +# Old TCSH versions don't define OSTYPE. +# Use a close approximation instead. - endif +if ( ! $?OSTYPE ) then + setenv OSTYPE `echo "$HOSTTYPE" | sed -e 's/^(i[3456]86|(amd|x86_)64)-//'` +endif - #from Dan Nicolaescu <dann@ics.uci.edu> - if ( $?MODULESHOME ) then - alias Compl_module 'find ${MODULEPATH:as/:/ /} -name .version -o -name .modulea\* -prune -o -print | sed `echo "-e s@${MODULEPATH:as%:%/\*@@g -e s@%}/\*@@g"`' - complete module 'p%1%(add load unload switch display avail use unuse update purge list clear help initadd initrm initswitch initlist initclear)%' \ - 'n%{unl*,sw*,inits*}%`echo "$LOADEDMODULES:as/:/ /"`%' \ - 'n%{lo*,di*,he*,inita*,initr*}%`eval Compl_module`%' \ - 'N%{sw*,initsw*}%`eval Compl_module`%' 'C%-%(-append)%' 'n%{use,unu*,av*}%d%' 'n%-append%d%' \ - 'C%[^-]*%`eval Compl_module`%' - endif +if ( ! $?hosts ) set hosts + +foreach f ( "$HOME/."{,r,ssh/known_}hosts* \ + /usr/local/etc/csh.hosts /etc/hosts.equiv ) + if ( -r "$f" ) then + set hosts=($hosts `sed \ + -e 's/#.*//' \ + -e '/^[+-]@/d' \ + -e 's/^[-+]//' \ + -e 's/[[:space:]].*//' \ + -e 's/,/\n/g' "$f" \ + | sed -e '/^[.:[:xdigit:][:space:]]*$/d'`) + endif +end +unset f + +if ( -r "$HOME/.netrc" ) then + set hosts=($hosts `awk '$1 == "machine" { print $2 }' "$HOME/.netrc"`) +endif + +set hosts=(`echo $hosts | tr ' ' '\012' | sort -u`) + +if ( ! $#hosts ) then + # This is just a hint for the user. + set hosts=(ftp.funet.fi ftp.gnu.org ftp.uu.net) +endif + +complete ywho n/*/\$hosts/ # argument from list in $hosts +complete rsh p/1/\$hosts/ c/-/"(l n)"/ n/-l/u/ N/-l/c/ n/-/c/ p/2/c/ p/*/f/ +complete ssh p/1/\$hosts/ c/-/"(l n)"/ n/-l/u/ N/-l/c/ n/-/c/ p/2/c/ p/*/f/ +complete xrsh p/1/\$hosts/ c/-/"(l 8 e)"/ n/-l/u/ N/-l/c/ n/-/c/ p/2/c/ p/*/f/ +complete rlogin p/1/\$hosts/ c/-/"(l 8 e)"/ n/-l/u/ +complete telnet p/1/\$hosts/ p/2/x:'<port>'/ n/*/n/ + +complete cd p/1/d/ # Directories only +complete chdir p/1/d/ +complete pushd p/1/d/ +complete popd p/1/d/ +complete pu p/1/d/ +complete po p/1/d/ +complete complete p/1/X/ # Completions only +complete uncomplete n/*/X/ +complete exec p/1/c/ # Commands only +complete trace p/1/c/ +complete strace p/1/c/ +complete which n/*/c/ +complete where n/*/c/ +complete skill p/1/c/ +complete dde p/1/c/ +complete adb c/-I/d/ n/-/c/ N/-/"(core)"/ p/1/c/ p/2/"(core)"/ +complete sdb p/1/c/ +complete dbx c/-I/d/ n/-/c/ N/-/"(core)"/ p/1/c/ p/2/"(core)"/ +complete xdb p/1/c/ +complete gdb n/-d/d/ n/*/c/ +complete ups p/1/c/ +complete set 'c/*=/f/' 'p/1/s/=' 'n/=/f/' +complete unset n/*/s/ +complete alias p/1/a/ # only aliases are valid +complete unalias n/*/a/ +complete xdvi n/*/f:*.dvi/ +complete dvips n/*/f:*.dvi/ +complete tex n/*/f:*.{tex,texi}/ +complete latex n/*/f:*.{tex,ltx}/ + +complete su \ + c/--/"(login fast preserve-environment command shell help version)"/ \ + c/-/"(f l m p c s -)"/ \ + n/{-c,--command}/c/ \ + n@{-s,--shell}@'`cat /etc/shells`'@ \ + n/*/u/ +complete cc \ + c/-[IL]/d/ \ + c@-l@'`\ls -1 /usr/lib/lib*.a | sed s%^.\*/lib%%\;s%\\.a\$%%`'@ \ + c/-/"(o l c g L I D U)"/ n/*/f:*.[coasi]/ +complete acc \ + c/-[IL]/d/ \ + c@-l@'`\ls -1 /usr/lang/SC1.0/lib*.a | sed s%^.\*/lib%%\;s%\\.a\$%%`'@ \ + c/-/"(o l c g L I D U)"/ n/*/f:*.[coasi]/ +complete gcc \ + c/-[IL]/d/ \ + c/-f/"(caller-saves cse-follow-jumps delayed-branch elide-constructors \ + expensive-optimizations float-store force-addr force-mem inline \ + inline-functions keep-inline-functions memoize-lookups \ + no-default-inline no-defer-pop no-function-cse omit-frame-pointer \ + rerun-cse-after-loop schedule-insns schedule-insns2 strength-reduce \ + thread-jumps unroll-all-loops unroll-loops syntax-only all-virtual \ + cond-mismatch dollars-in-identifiers enum-int-equiv no-asm no-builtin \ + no-strict-prototype signed-bitfields signed-char this-is-variable \ + unsigned-bitfields unsigned-char writable-strings call-saved-reg \ + call-used-reg fixed-reg no-common no-gnu-binutils nonnull-objects \ + pcc-struct-return pic PIC shared-data short-enums short-double \ + volatile)"/ \ + c/-W/"(all aggregate-return cast-align cast-qual comment conversion \ + enum-clash error format id-clash-len implicit missing-prototypes \ + no-parentheses pointer-arith return-type shadow strict-prototypes \ + switch uninitialized unused write-strings)"/ \ + c/-m/"(68000 68020 68881 bitfield fpa nobitfield rtd short c68000 c68020 \ + soft-float g gnu unix fpu no-epilogue)"/ \ + c/-d/"(D M N)"/ \ + c/-/"(f W vspec v vpath ansi traditional traditional-cpp trigraphs pedantic \ + x o l c g L I D U O O2 C E H B b V M MD MM i dynamic nodtdlib static \ + nostdinc undef)"/ \ + c/-l/f:*.a/ \ + n/*/f:*.{c,C,cc,o,a,s,i}/ +complete g++ n/*/f:*.{C,cc,o,s,i}/ +complete CC n/*/f:*.{C,cc,cpp,o,s,i}/ +complete rm \ + c/--/"(directory force interactive verbose recursive help version)"/ \ + c/-/"(d f i v r R -)"/ \ + n/*/f:^*.{c,cc,C,h,in}/ + # Protect precious files +complete vi n/*/f:^*.[oa]/ +complete bindkey \ + N/-a/b/ N/-c/c/ n/-[ascr]/'x:<key-sequence>'/ \ + n/-[svedlr]/n/ c/-[vedl]/n/ c/-/"(a s k c v e d l r)"/ \ + n/-k/"(left right up down)"/ p/2-/b/ \ + p/1/'x:<key-sequence or option>'/ + +complete find \ + n/-fstype/"(nfs 4.2)"/ \ + n/-name/f/ \ + n/-type/"(c b d f p l s)"/ \ + n/-user/u/ \ + n/-group/g/ \ + n/-exec/c/ \ + n/-ok/c/ \ + n/-cpio/f/ \ + n/-ncpio/f/ \ + n/-newer/f/ \ + c/-/"(fstype name perm prune type user nouser group nogroup size inum \ + atime mtime ctime exec ok print ls cpio ncpio newer xdev depth \ + daystart follow maxdepth mindepth noleaf version anewer cnewer \ + amin cmin mmin true false uid gid ilname iname ipath iregex links \ + lname empty path regex used xtype fprint fprint0 fprintf print0 \ + printf not a and o or)"/ \ + n/*/d/ + +complete -%* c/%/j/ # fill in the jobs builtin +complete {fg,bg,stop} c/%/j/ p/1/"(%)"// + +complete limit c/-/"(h)"/ n/*/l/ +complete unlimit c/-/"(h)"/ n/*/l/ + +#complete -co* p/0/"(compress)"/ # make compress completion +# # not ambiguous + +# "zcat" may be linked to "compress" or "gzip" +if (-X zcat) then + zcat --version >& /dev/null + if ($status != 0) then + complete zcat n/*/f:*.Z/ + else + complete zcat c/--/"(force help license quiet version)"/ \ + c/-/"(f h L q V -)"/ \ + n/*/f:*.{gz,Z,z,zip}/ + endif +endif + +complete finger c/*@/\$hosts/ n/*/u/@ +complete ping p/1/\$hosts/ +complete traceroute p/1/\$hosts/ + +complete {talk,ntalk,phone} \ + p/1/'`users | tr " " "\012" | uniq`'/ \ + n/*/\`who\ \|\ grep\ \$:1\ \|\ awk\ \'\{\ print\ \$2\ \}\'\`/ + +complete ftp c/-/"(d i g n v)"/ n/-/\$hosts/ p/1/\$hosts/ n/*/n/ + +# this one is simple... +#complete rcp c/*:/f/ C@[./\$~]*@f@ n/*/\$hosts/: +# From Michael Schroeder <mlschroe@immd4.informatik.uni-erlangen.de> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704151113.v3FBDBWp085762>