From 85b66f4b34daef6618e01f81ba3e799b9cbbf082 Mon Sep 17 00:00:00 2001 From: obrien Date: Sat, 10 Jun 2000 20:14:21 +0000 Subject: Offical fixes to the history and I18N bugs ache found. --- contrib/tcsh/Copyright | 32 ++++++++++++++++++ contrib/tcsh/complete.tcsh | 14 ++++---- contrib/tcsh/host.defs | 9 +++-- contrib/tcsh/sh.func.c | 9 +++-- contrib/tcsh/tc.prompt.c | 4 +-- contrib/tcsh/tc.who.c | 16 +++++---- contrib/tcsh/tcsh.man | 82 +++++++++++++++++++++++++++++++++------------- contrib/tcsh/tcsh.man2html | 17 +++++----- 8 files changed, 131 insertions(+), 52 deletions(-) create mode 100644 contrib/tcsh/Copyright (limited to 'contrib/tcsh') diff --git a/contrib/tcsh/Copyright b/contrib/tcsh/Copyright new file mode 100644 index 0000000..6ba10c4 --- /dev/null +++ b/contrib/tcsh/Copyright @@ -0,0 +1,32 @@ +/*- + * Copyright (c) 1980, 1991 The Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ diff --git a/contrib/tcsh/complete.tcsh b/contrib/tcsh/complete.tcsh index f8e0ab9..2a1715f 100644 --- a/contrib/tcsh/complete.tcsh +++ b/contrib/tcsh/complete.tcsh @@ -1,5 +1,5 @@ # -# $Id: complete.tcsh,v 1.32 1999/06/09 19:09:12 christos Exp $ +# $Id: complete.tcsh,v 1.33 2000/06/10 18:54:34 kim Exp $ # example file using the new completion code # @@ -408,14 +408,12 @@ if ($?complete) then #from Dan Nicolaescu if ( $?MODULESHOME ) then - - alias Compl_module ' set q = "$MODULEPATH:as/:/ /" ; find $q -name .version -o -name .modulea\* -prune -o -print | sed `echo "-e s@"$MODULEPATH:as%:%/\*@@g -e s@%"/\*@@g"`' - + 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%unload%`echo "$LOADEDMODULES:as/:/ /"`%' \ - 'n%{lo*,sw*,di*,he*,inita*,initr*,inits*}%`eval Compl_module`%' \ - 'N%{sw*,initsw*}%`eval Compl_module`%' 'C%-%(-append)%' 'n%{use,unu*,av*}%d%' 'n%-append%d%' \ - 'C%[^-]*%`eval Compl_module`%' + '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 # these from Tom Warzeka diff --git a/contrib/tcsh/host.defs b/contrib/tcsh/host.defs index 6f25601..f5297d7 100644 --- a/contrib/tcsh/host.defs +++ b/contrib/tcsh/host.defs @@ -1,5 +1,5 @@ newcode : -/* $Header: /src/pub/tcsh/host.defs,v 1.25 1999/04/20 07:48:41 christos Exp $ */ +/* $Header: /src/pub/tcsh/host.defs,v 1.26 2000/06/10 18:48:09 kim Exp $ */ /* * host.defs: Hosttype/Machtype etc. */ @@ -37,7 +37,7 @@ newcode : */ #include "sh.h" -RCSID("$Id: host.defs,v 1.25 1999/04/20 07:48:41 christos Exp $") +RCSID("$Id: host.defs,v 1.26 2000/06/10 18:48:09 kim Exp $") endcode : @@ -184,6 +184,11 @@ getmachine() endcode : +newdef : defined(HOSTTYPE) +hosttype: : HOSTTYPE +enddef : + + newdef : defined(__PARAGON__) comment : Intel Paragon running OSF/1 vendor : : "intel" diff --git a/contrib/tcsh/sh.func.c b/contrib/tcsh/sh.func.c index 2138bce..fb8c898 100644 --- a/contrib/tcsh/sh.func.c +++ b/contrib/tcsh/sh.func.c @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/sh.func.c,v 3.86 2000/01/14 22:57:27 christos Exp $ */ +/* $Header: /src/pub/tcsh/sh.func.c,v 3.87 2000/06/09 19:43:43 kim Exp $ */ /* * sh.func.c: csh builtin functions */ @@ -36,7 +36,7 @@ */ #include "sh.h" -RCSID("$Id: sh.func.c,v 3.86 2000/01/14 22:57:27 christos Exp $") +RCSID("$Id: sh.func.c,v 3.87 2000/06/09 19:43:43 kim Exp $") #include "ed.h" #include "tw.h" @@ -2019,10 +2019,13 @@ limtail(cp, str) Char *cp; char *str; { + char *sp; + + sp = str; while (*cp && *cp == *str) cp++, str++; if (*cp) - stderror(ERR_BADSCALE, str); + stderror(ERR_BADSCALE, sp); } diff --git a/contrib/tcsh/tc.prompt.c b/contrib/tcsh/tc.prompt.c index c1a2da6..aebb3ca 100644 --- a/contrib/tcsh/tc.prompt.c +++ b/contrib/tcsh/tc.prompt.c @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/tc.prompt.c,v 3.38 2000/04/18 19:40:46 christos Exp $ */ +/* $Header: /src/pub/tcsh/tc.prompt.c,v 3.39 2000/06/10 19:20:01 kim Exp $ */ /* * tc.prompt.c: Prompt printing stuff */ @@ -36,7 +36,7 @@ */ #include "sh.h" -RCSID("$Id: tc.prompt.c,v 3.38 2000/04/18 19:40:46 christos Exp $") +RCSID("$Id: tc.prompt.c,v 3.39 2000/06/10 19:20:01 kim Exp $") #include "ed.h" #include "tw.h" diff --git a/contrib/tcsh/tc.who.c b/contrib/tcsh/tc.who.c index fe80702..91b2c03 100644 --- a/contrib/tcsh/tc.who.c +++ b/contrib/tcsh/tc.who.c @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/tc.who.c,v 3.28 1998/04/08 13:59:13 christos Exp $ */ +/* $Header: /src/pub/tcsh/tc.who.c,v 3.29 2000/06/09 18:33:25 kim Exp $ */ /* * tc.who.c: Watch logins and logouts... */ @@ -36,7 +36,7 @@ */ #include "sh.h" -RCSID("$Id: tc.who.c,v 3.28 1998/04/08 13:59:13 christos Exp $") +RCSID("$Id: tc.who.c,v 3.29 2000/06/09 18:33:25 kim Exp $") #include "tc.h" @@ -236,8 +236,10 @@ watch_login(force) * Don't open utmp all the time, stat it first... */ if (stat(_PATH_UTMP, &sta)) { - xprintf(CGETS(26, 1, "cannot stat %s. Please \"unset watch\".\n"), - _PATH_UTMP); + if (!force) + xprintf(CGETS(26, 1, + "cannot stat %s. Please \"unset watch\".\n"), + _PATH_UTMP); # ifdef BSDSIGS (void) sigsetmask(omask); # else @@ -255,8 +257,10 @@ watch_login(force) } stlast = sta.st_mtime; if ((utmpfd = open(_PATH_UTMP, O_RDONLY)) < 0) { - xprintf(CGETS(26, 2, "%s cannot be opened. Please \"unset watch\".\n"), - _PATH_UTMP); + if (!force) + xprintf(CGETS(26, 2, + "%s cannot be opened. Please \"unset watch\".\n"), + _PATH_UTMP); # ifdef BSDSIGS (void) sigsetmask(omask); # else diff --git a/contrib/tcsh/tcsh.man b/contrib/tcsh/tcsh.man index ad7f0fb..81f6be5 100644 --- a/contrib/tcsh/tcsh.man +++ b/contrib/tcsh/tcsh.man @@ -3567,16 +3567,15 @@ If set to `enhance', completion 1) ignores case and 2) considers periods, hyphens and underscores (`.', `\-' and `_') to be word separators and hyphens and underscores to be equivalent. .TP 8 -.B continue_args \fR(+) +.B continue \fR(+) If set to a list of commands, the shell will continue the listed commands, instead of starting a new one. .TP 8 .B continue_args \fR(+) Same as continue, but the shell will execute: .RS +8 -.nf - echo `pwd` $argv > ~/._pause; % -.fi +.IP "" 4 +echo `pwd` $argv > ~/._pause; % .RE .TP 8 .B correct \fR(+) @@ -3630,7 +3629,7 @@ is set to number 0,1,2 and 3. Each number has the following meaning: 2 ... used for the second byte of a multi-byte character. .br 3 ... used for both the first byte and second byte of a multi-byte character. -.\" SHK: I tried my best to get the following to be gramatically correct. +.\" SHK: I tried my best to get the following to be grammatically correct. .\" However, I still don't understand what's going on here. In the \" following example, there are three bytes, but the text seems to refer to \" each nybble as a character. What's going on here? It this 3-byte code @@ -3856,6 +3855,10 @@ If set, restrictions are placed on output redirection to insure that files are not accidentally destroyed and that `>>' redirections refer to existing files, as described in the \fBInput/output\fR section. .TP 8 +.B noding +If set, disable the printing of `DING!' in the \fBprompt\fR time +specifiers at the change of hour. +.TP 8 .B noglob If set, \fBFilename substitution\fR and \fBDirectory stack substitution\fR (q.v.) are inhibited. This is most useful in shell scripts which do not deal @@ -4039,6 +4042,10 @@ superuser shell. For example, .br tut [37] \fB[2:54pm]\fR [/usr/accts/sys] you rang? _ .PP +If `%t', `%@', `%T', `%p', or `%P' is used, and \fBnoding\fR is not set, +then print `DING!' on the change of hour (i.e, `:00' minutes) instead of +the actual time. +.PP Set by default to `%# ' in interactive shells. .RE .TP 8 @@ -4537,22 +4544,52 @@ file format; a colon-separated list of expressions of the form variables with their associated defaults are: .PP .RS +8 -.nf -no 0 Normal (non-filename) text -fi 0 Regular file -di 01;34 Directory -ln 01;36 Symbolic link -pi 33 Named pipe (FIFO) -so 01;35 Socket -bd 01;33 Block device -cd 01;32 Character device -ex 01;32 Executable file -mi (none) Missing file (defaults to fi) -or (none) Orphaned symbolic link (defaults to ln) -lc ^[[ Left code -rc m Right code -ec (none) End code (replaces lc+no+rc) -.fi +.RS +4 +.PD 0 +.TP 12 +no 0 +Normal (non-filename) text +.TP 12 +fi 0 +Regular file +.TP 12 +di 01;34 +Directory +.TP 12 +ln 01;36 +Symbolic link +.TP 12 +pi 33 +Named pipe (FIFO) +.TP 12 +so 01;35 +Socket +.TP 12 +bd 01;33 +Block device +.TP 12 +cd 01;32 +Character device +.TP 12 +ex 01;32 +Executable file +.TP 12 +mi (none) +Missing file (defaults to fi) +.TP 12 +or (none) +Orphaned symbolic link (defaults to ln) +.TP 12 +lc ^[[ +Left code +.TP 12 +rc m +Right code +.TP 12 +ec (none) +End code (replaces lc+no+rc) +.PD +.RE .PP You need to include only the variables you want to change from the default. @@ -4647,6 +4684,7 @@ for cyan background .TP 4 47 for white (or gray) background +.PD .RE .PP Not all commands will work on all systems or display devices. @@ -4747,7 +4785,7 @@ ConvexOS, Stellix and Intel use \fI/etc/logout\fR and NeXTs use \fI/etc/logout.std\fR. A/UX, AMIX, Cray and IRIX have no equivalent in \fIcsh\fR(1), but read this file in \fItcsh\fR anyway. -Solaris 2.x does not have it either, but \fItcsh\fR reads \fI/etc/.cshrc\fR. (+) +Solaris 2.x does not have it either, but \fItcsh\fR reads \fI/etc/.logout\fR. (+) .TP 16 .I ~/.logout Read by login shells at logout after \fI/etc/csh.logout\fR or its equivalent. diff --git a/contrib/tcsh/tcsh.man2html b/contrib/tcsh/tcsh.man2html index 839bcb4..fd711f6 100644 --- a/contrib/tcsh/tcsh.man2html +++ b/contrib/tcsh/tcsh.man2html @@ -1,5 +1,5 @@ -#!/usr/local/bin/perl -# $Id: tcsh.man2html,v 1.10 1997/10/29 17:27:04 christos Exp $ +#!/bin/sh # -*- perl -*- +# $Id: tcsh.man2html,v 1.11 2000/04/17 23:35:54 kim Exp $ # tcsh.man2html, Dave Schweisguth # @@ -22,8 +22,8 @@ # Emulate #!/usr/local/bin/perl on systems without #! -eval '(exit $?0)' && eval 'exec /usr/local/bin/perl -S $0 ${1+"$@"}' -& eval 'exec /usr/local/bin/perl -S $0 $argv:q' if 0; +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' +& eval 'exec perl -S $0 $argv:q' if 0; ### Constants @@ -368,7 +368,7 @@ print <nroff manpage (175K) from which this HTML version was generated, the Perl script which did the conversion -and the +and the complete source code for tcsh.
tcsh is maintained by @@ -538,7 +538,6 @@ sub printsectionbody { } # Line break - s/^\.br.*/
/; # More nroff special characters @@ -821,12 +820,12 @@ only the word "help". Up END -#!/usr/local/bin/perl +#!/bin/sh # Emulate #!/usr/local/bin/perl on systems without #! -eval '(exit $?0)' && eval 'exec /usr/local/bin/perl -S $0 ${1+"$@"}' -& eval 'exec /usr/local/bin/perl -S $0 $argv:q' if 0; +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' +& eval 'exec perl -S $0 $argv:q' if 0; # Setup -- cgit v1.1