summaryrefslogtreecommitdiff
path: root/bin/csh
diff options
context:
space:
mode:
Diffstat (limited to 'bin/csh')
-rw-r--r--bin/csh/USD.doc/csh.116
-rw-r--r--bin/csh/const.c12
-rw-r--r--bin/csh/csh.c16
-rw-r--r--bin/csh/dir.c6
-rw-r--r--bin/csh/dol.c10
-rw-r--r--bin/csh/exec.c6
-rw-r--r--bin/csh/file.c6
-rw-r--r--bin/csh/func.c8
-rw-r--r--bin/csh/glob.c12
-rw-r--r--bin/csh/lex.c6
-rw-r--r--bin/csh/parse.c18
-rw-r--r--bin/csh/str.c12
12 files changed, 64 insertions, 64 deletions
diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1
index 9d687d3456b..c0a924ae746 100644
--- a/bin/csh/USD.doc/csh.1
+++ b/bin/csh/USD.doc/csh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.1,v 1.4 1999/05/12 21:58:32 aaron Exp $
+.\" $OpenBSD: csh.1,v 1.5 2002/06/09 05:47:27 todd Exp $
.\" $NetBSD: csh.1,v 1.3 1995/03/21 09:03:33 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -121,7 +121,7 @@ for it in the glossary.
Acknowledgements
.PP
Numerous people have provided good input about previous versions
-of
+of
.I csh
and aided in its debugging and in the debugging of its documentation.
I would especially like to thank Michael Ubell
@@ -211,7 +211,7 @@ is to be read ``control-\fIx\fR'' and represents the striking of the \fIx\fR
key while the control key is held down.)
The mail program
then echoed the characters `EOT' and transmitted our message.
-The characters `% ' were printed before and after the mail command
+The characters `% ' were printed before and after the mail command
by the shell to indicate that input was needed.
.PP
After typing the `% ' prompt the shell was reading command input from
@@ -294,7 +294,7 @@ rather than having a large number of hard to remember options.
.NH 2
Output to files
.PP
-Commands that normally read input or write output on the terminal
+Commands that normally read input or write output on the terminal
can also be executed with this input and/or output done to
a file.
.PP
@@ -681,7 +681,7 @@ beginning are treated specially.
Neither `*' or `?' or the `[' `]' mechanism will match it.
This prevents accidental matching of the filenames `.' and `..'
in the working directory which have special meaning to the system,
-as well as other files such as
+as well as other files such as
.I \&.cshrc
which are not normally
visible.
@@ -734,7 +734,7 @@ as it is used less frequently.
Quotation
.PP
We have already seen a number of metacharacters used by the shell.
-These metacharacters pose a problem in that we cannot use them directly
+These metacharacters pose a problem in that we cannot use them directly
as parts of words.
Thus the command
.DS
@@ -744,7 +744,7 @@ will not echo the character `*'.
It will either echo an sorted list of filenames in the
current
.I "working directory,"
-or print the message `No match' if there are
+or print the message `No match' if there are
no files in the working directory.
.PP
The recommended mechanism for placing characters which are neither numbers,
@@ -828,7 +828,7 @@ The shell also terminates when it gets an end-of-file printing `logout';
\s-2UNIX\s0 then logs you off the system.
Since this means that typing too many ^D's can accidentally log us off,
the shell has a mechanism for preventing this.
-This
+This
.I ignoreeof
option will be discussed in section 2.2.
.PP
diff --git a/bin/csh/const.c b/bin/csh/const.c
index 58699d54191..3ceac4a89b1 100644
--- a/bin/csh/const.c
+++ b/bin/csh/const.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: const.c,v 1.3 1997/07/23 14:36:48 kstailey Exp $ */
+/* $OpenBSD: const.c,v 1.4 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: const.c,v 1.6 1995/03/21 09:02:31 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)const.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: const.c,v 1.3 1997/07/23 14:36:48 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: const.c,v 1.4 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -77,7 +77,7 @@ Char STRcent2[] = { '%', '%', '\0' };
Char STRcenthash[] = { '%', '#', '\0' };
Char STRcentplus[] = { '%', '+', '\0' };
Char STRcentminus[] = { '%', '-', '\0' };
-Char STRchase_symlinks[] = { 'c', 'h', 'a', 's', 'e', '_', 's', 'y', 'm', 'l',
+Char STRchase_symlinks[] = { 'c', 'h', 'a', 's', 'e', '_', 's', 'y', 'm', 'l',
'i', 'n', 'k', 's', '\0' };
Char STRchild[] = { 'c', 'h', 'i', 'l', 'd', '\0' };
Char STRcolon[] = { ':', '\0' };
@@ -95,7 +95,7 @@ Char STRfignore[] = { 'f', 'i', 'g', 'n', 'o', 'r', 'e', '\0' };
Char STRfilec[] = { 'f', 'i', 'l', 'e', 'c', '\0' };
#endif /* FILEC */
Char STRhistchars[] = { 'h', 'i', 's', 't', 'c', 'h', 'a', 'r', 's', '\0' };
-Char STRtildothist[] = { '~', '/', '.', 'h', 'i', 's', 't', 'o', 'r',
+Char STRtildothist[] = { '~', '/', '.', 'h', 'i', 's', 't', 'o', 'r',
'y', '\0' };
Char STRhistfile[] = { 'h', 'i', 's', 't', 'f', 'i', 'l', 'e', '\0' };
Char STRhistory[] = { 'h', 'i', 's', 't', 'o', 'r', 'y', '\0' };
@@ -114,7 +114,7 @@ Char STRml[] = { '-', 'l', '\0' };
Char STRmn[] = { '-', 'n', '\0' };
Char STRmquestion[] = { '?' | QUOTE, ' ', '\0' };
Char STRnice[] = { 'n', 'i', 'c', 'e', '\0' };
-Char STRnoambiguous[] = { 'n', 'o', 'a', 'm', 'b', 'i', 'g', 'u', 'o', 'u',
+Char STRnoambiguous[] = { 'n', 'o', 'a', 'm', 'b', 'i', 'g', 'u', 'o', 'u',
's', '\0' };
Char STRnobeep[] = { 'n', 'o', 'b', 'e', 'e', 'p', '\0' };
Char STRnoclobber[] = { 'n', 'o', 'c', 'l', 'o', 'b', 'b', 'e', 'r', '\0' };
@@ -126,7 +126,7 @@ Char STRnotify[] = { 'n', 'o', 't', 'i', 'f', 'y', '\0' };
Char STRor[] = { '|', '\0' };
Char STRor2[] = { '|', '|', '\0' };
Char STRpath[] = { 'p', 'a', 't', 'h', '\0' };
-Char STRprintexitvalue[] = { 'p', 'r', 'i', 'n', 't', 'e', 'x', 'i', 't', 'v',
+Char STRprintexitvalue[] = { 'p', 'r', 'i', 'n', 't', 'e', 'x', 'i', 't', 'v',
'a', 'l', 'u', 'e', '\0' };
Char STRprompt[] = { 'p', 'r', 'o', 'm', 'p', 't', '\0' };
Char STRprompt2[] = { 'p', 'r', 'o', 'm', 'p', 't', '2', '\0' };
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 1f3f230f8e1..d0149a8f48f 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: csh.c,v 1.17 2002/06/09 05:03:59 deraadt Exp $ */
+/* $OpenBSD: csh.c,v 1.18 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */
/*-
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
#else
-static char rcsid[] = "$OpenBSD: csh.c,v 1.17 2002/06/09 05:03:59 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: csh.c,v 1.18 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -817,7 +817,7 @@ rechist()
}
if ((fp = open(short2str(hfile), O_WRONLY | O_CREAT | O_TRUNC,
- 0600)) == -1)
+ 0600)) == -1)
return;
oldidfds = didfds;
@@ -883,14 +883,14 @@ int sig;
/*
* We kill the last foreground process group. It then becomes
- * responsible to propagate the SIGHUP to its progeny.
+ * responsible to propagate the SIGHUP to its progeny.
*/
{
struct process *pp, *np;
for (pp = proclist.p_next; pp; pp = pp->p_next) {
np = pp;
- /*
+ /*
* Find if this job is in the foreground. It could be that
* the process leader has exited and the foreground flag
* is cleared for it.
@@ -898,7 +898,7 @@ int sig;
do
/*
* If a process is in the foreground; we try to kill
- * it's process group. If we succeed, then the
+ * it's process group. If we succeed, then the
* whole job is gone. Otherwise we keep going...
* But avoid sending HUP to the shell again.
*/
@@ -1288,9 +1288,9 @@ vis_fputc(ch, fp)
{
char uenc[5]; /* 4 + NUL */
- if (ch & QUOTE)
+ if (ch & QUOTE)
return fputc(ch & TRIM, fp);
- /*
+ /*
* XXX: When we are in AsciiOnly we want all characters >= 0200 to
* be encoded, but currently there is no way in vis to do that.
*/
diff --git a/bin/csh/dir.c b/bin/csh/dir.c
index 1f940916827..0a31e9eef72 100644
--- a/bin/csh/dir.c
+++ b/bin/csh/dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dir.c,v 1.6 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: dir.c,v 1.7 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: dir.c,v 1.6 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: dir.c,v 1.7 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -222,7 +222,7 @@ printdirs()
}
if (!(dirflag & DIR_LONG) && hp != NULL && !eq(hp, STRslash) &&
(len = Strlen(hp), Strncmp(hp, dp->di_name, len) == 0) &&
- (dp->di_name[len] == '\0' || dp->di_name[len] == '/'))
+ (dp->di_name[len] == '\0' || dp->di_name[len] == '/'))
len = Strlen(s = (dp->di_name + len)) + 2;
else
len = Strlen(s = dp->di_name) + 1;
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index 316cf4b7467..00567ea7c39 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dol.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: dol.c,v 1.10 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: dol.c,v 1.9 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: dol.c,v 1.10 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -426,7 +426,7 @@ Dgetdol()
if (dimen || bitset)
stderror(ERR_SYNTAX);
if (backpid != 0) {
- if (dolbang)
+ if (dolbang)
xfree((ptr_t) dolbang);
setDolp(dolbang = putn(backpid));
}
@@ -645,13 +645,13 @@ fixDolMod()
dolwcnt = 10000;
c = DgetC(0);
}
- if ((c == 'g' && dolmcnt != 10000) ||
+ if ((c == 'g' && dolmcnt != 10000) ||
(c == 'a' && dolwcnt != 10000)) {
if (c == 'g')
dolmcnt = 10000;
else
dolwcnt = 10000;
- c = DgetC(0);
+ c = DgetC(0);
}
if (c == 's') { /* [eichin:19910926.0755EST] */
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index 02022d968ac..f7da9108d48 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: exec.c,v 1.10 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95";
#else
-static char rcsid[] = "$OpenBSD: exec.c,v 1.9 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: exec.c,v 1.10 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -702,7 +702,7 @@ tellmewhat(lexp, str)
if (str == NULL) {
if (aliased)
prlex(cshout, lexp);
- (void) fprintf(cshout, "%s: shell built-in command.\n",
+ (void) fprintf(cshout, "%s: shell built-in command.\n",
vis_str(sp->word));
}
else
diff --git a/bin/csh/file.c b/bin/csh/file.c
index 303dac5cfaf..ba8df9a1bc0 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: file.c,v 1.10 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94";
#else
-static char rcsid[] = "$OpenBSD: file.c,v 1.9 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: file.c,v 1.10 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -528,7 +528,7 @@ again: /* search for matches */
return (numitems);
}
else { /* LIST */
- qsort((ptr_t) items, numitems, sizeof(items[0]),
+ qsort((ptr_t) items, numitems, sizeof(items[0]),
(int (*)(const void *, const void *)) sortscmp);
print_by_column(looking_for_lognames ? NULL : tilded_dir,
items, numitems);
diff --git a/bin/csh/func.c b/bin/csh/func.c
index 625bb099fa3..c76c8bcc6c7 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: func.c,v 1.14 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: func.c,v 1.15 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: func.c,v 1.14 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: func.c,v 1.15 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -873,12 +873,12 @@ wfree()
if (wp->w_end.type != I_SEEK && wp->w_start.type == wp->w_end.type &&
wp->w_start.type == o.type) {
if (wp->w_end.type == F_SEEK) {
- if (o.f_seek >= wp->w_start.f_seek &&
+ if (o.f_seek >= wp->w_start.f_seek &&
(wp->w_end.f_seek == 0 || o.f_seek < wp->w_end.f_seek))
break;
}
else {
- if (o.a_seek >= wp->w_start.a_seek &&
+ if (o.a_seek >= wp->w_start.a_seek &&
(wp->w_end.a_seek == 0 || o.a_seek < wp->w_end.a_seek))
break;
}
diff --git a/bin/csh/glob.c b/bin/csh/glob.c
index 24bb3e2b5a2..d012450b43f 100644
--- a/bin/csh/glob.c
+++ b/bin/csh/glob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glob.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: glob.c,v 1.8 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.7 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: glob.c,v 1.8 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -575,7 +575,7 @@ tglob(t)
*/
if (c == '`') {
gflag |= G_CSH;
- while (*p && *p != '`')
+ while (*p && *p != '`')
if (*p++ == '\\') {
if (*p) /* Quoted chars */
p++;
@@ -807,7 +807,7 @@ pword()
pnleft = MAXPATHLEN - 4;
}
-int
+int
Gmatch(string, pattern)
Char *string, *pattern;
{
@@ -830,7 +830,7 @@ Gmatch(string, pattern)
blkfree(blk);
return(gres == gpol);
-}
+}
static int
pmatch(string, pattern)
@@ -871,7 +871,7 @@ pmatch(string, pattern)
(*(pattern-2) & TRIM) <= stringc);
pattern++;
}
- else
+ else
match = (stringc == (rangec & TRIM));
}
if (rangec == 0)
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index c9b141c409b..84fbf766ee3 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.6 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: lex.c,v 1.7 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: lex.c,v 1.6 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: lex.c,v 1.7 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -878,7 +878,7 @@ dosub(sc, en, global)
wdp = hp;
while (--i >= 0) {
- register struct wordent *new =
+ register struct wordent *new =
(struct wordent *) xcalloc(1, sizeof *wdp);
new->word = 0;
diff --git a/bin/csh/parse.c b/bin/csh/parse.c
index 7cd949554e1..e73a134d160 100644
--- a/bin/csh/parse.c
+++ b/bin/csh/parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: parse.c,v 1.6 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: parse.c,v 1.6 1995/03/21 09:03:10 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: parse.c,v 1.5 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.6 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -53,19 +53,19 @@ static char rcsid[] = "$OpenBSD: parse.c,v 1.5 2002/02/19 19:39:35 millert Exp $
static void asyntax(struct wordent *, struct wordent *);
static void asyn0(struct wordent *, struct wordent *);
static void asyn3(struct wordent *, struct wordent *);
-static struct wordent
+static struct wordent
*freenod(struct wordent *, struct wordent *);
-static struct command
+static struct command
*syn0(struct wordent *, struct wordent *, int);
-static struct command
+static struct command
*syn1(struct wordent *, struct wordent *, int);
-static struct command
+static struct command
*syn1a(struct wordent *, struct wordent *, int);
-static struct command
+static struct command
*syn1b(struct wordent *, struct wordent *, int);
-static struct command
+static struct command
*syn2(struct wordent *, struct wordent *, int);
-static struct command
+static struct command
*syn3(struct wordent *, struct wordent *, int);
#define ALEFT 21 /* max of 20 alias expansions */
diff --git a/bin/csh/str.c b/bin/csh/str.c
index d00a4fe2e67..7bbc8bf5ca3 100644
--- a/bin/csh/str.c
+++ b/bin/csh/str.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: str.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: str.c,v 1.6 2002/06/09 05:47:27 todd Exp $ */
/* $NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: str.c,v 1.5 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: str.c,v 1.6 2002/06/09 05:47:27 todd Exp $";
#endif
#endif /* not lint */
@@ -450,21 +450,21 @@ vis_str(cp)
if (cp == NULL)
return (NULL);
-
+
for (dp = cp; *dp++;)
continue;
n = ((dp - cp) << 2) + 1; /* 4 times + NULL */
if (dstsize < n) {
- sdst = (char *) (dstsize ?
+ sdst = (char *) (dstsize ?
xrealloc(sdst, (size_t) n * sizeof(char)) :
xmalloc((size_t) n * sizeof(char)));
dstsize = n;
}
- /*
+ /*
* XXX: When we are in AsciiOnly we want all characters >= 0200 to
* be encoded, but currently there is no way in vis to do that.
*/
(void) strvis(sdst, short2str(cp), VIS_NOSLASH);
return (sdst);
}
-
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:25:57 +0000