summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-02-25 16:07:11 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-02-25 16:07:11 +0000
commitc4e0c3284e4a4db9ae01e770073457f6da37c790 (patch)
tree70f63b38ba8966eadf282b9be139c22e07ac18c2
parent39c674fc7651fcced3abd44b7890e535611557c6 (diff)
spacing
-rw-r--r--bin/csh/csh.c16
-rw-r--r--bin/csh/dol.c10
-rw-r--r--bin/csh/exec.c8
-rw-r--r--bin/csh/lex.c8
-rw-r--r--bin/csh/time.c6
5 files changed, 24 insertions, 24 deletions
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 2d880d987e2..04cf2d66372 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: csh.c,v 1.21 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: csh.c,v 1.22 2005/02/25 16:07:10 deraadt Exp $ */
/* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */
/*-
@@ -40,7 +40,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.21 2003/06/11 21:09:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: csh.c,v 1.22 2005/02/25 16:07:10 deraadt Exp $";
#endif
#endif /* not lint */
@@ -797,17 +797,17 @@ rechist(void)
return;
}
else
- return;
+ return;
- if ((hfile = value(STRhistfile)) == STRNULL) {
- Strlcpy(buf, value(STRhome), sizeof buf/sizeof(Char));
+ if ((hfile = value(STRhistfile)) == STRNULL) {
+ Strlcpy(buf, value(STRhome), sizeof buf/sizeof(Char));
hfile = buf;
(void) Strlcat(buf, STRsldthist, sizeof buf/sizeof(Char));
- }
+ }
- if ((fp = open(short2str(hfile), O_WRONLY | O_CREAT | O_TRUNC,
+ if ((fp = open(short2str(hfile), O_WRONLY | O_CREAT | O_TRUNC,
0600)) == -1)
- return;
+ return;
oldidfds = didfds;
didfds = 0;
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index fd915043bb9..aca71c79bf7 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dol.c,v 1.14 2003/12/01 18:25:15 millert Exp $ */
+/* $OpenBSD: dol.c,v 1.15 2005/02/25 16:07:10 deraadt Exp $ */
/* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */
/*-
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: dol.c,v 1.14 2003/12/01 18:25:15 millert Exp $";
+static char rcsid[] = "$OpenBSD: dol.c,v 1.15 2005/02/25 16:07:10 deraadt Exp $";
#endif
#endif /* not lint */
@@ -649,12 +649,12 @@ fixDolMod(void)
int delim = DgetC(0);
dolmod[dolnmod++] = c;
dolmod[dolnmod++] = delim;
-
+
if (!delim || letter(delim)
|| Isdigit(delim) || any(" \t\n", delim)) {
seterror(ERR_BADSUBST);
break;
- }
+ }
while ((c = DgetC(0)) != (-1)) {
dolmod[dolnmod++] = c;
if(c == delim) delimcnt--;
@@ -697,7 +697,7 @@ setDolp(Char *cp)
Char *lhsub, *rhsub, *np;
size_t lhlen = 0, rhlen = 0;
int didmod = 0;
-
+
delim = dolmod[++i];
if (!delim || letter(delim)
|| Isdigit(delim) || any(" \t\n", delim)) {
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index dd1232f3531..b517813b140 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.c,v 1.13 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: exec.c,v 1.14 2005/02/25 16:07:10 deraadt Exp $ */
/* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */
/*-
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95";
#else
-static char rcsid[] = "$OpenBSD: exec.c,v 1.13 2003/06/11 21:09:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: exec.c,v 1.14 2005/02/25 16:07:10 deraadt Exp $";
#endif
#endif /* not lint */
@@ -99,7 +99,7 @@ static Char *justabs[] = {STRNULL, 0};
static void pexerr(void);
static void texec(Char *, Char **);
static int hashname(Char *);
-static int tellmewhat(struct wordent *, Char *, int len);
+static int tellmewhat(struct wordent *, Char *, int len);
static int executable(Char *, Char *, bool);
static int iscommand(Char *);
@@ -724,7 +724,7 @@ tellmewhat(struct wordent *lexp, Char *str, int len)
found = 1;
}
else {
- if (str == NULL) {
+ if (str == NULL) {
if (aliased)
prlex(cshout, lexp);
(void) fprintf(csherr,
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index 2305e9e705a..271bf35a867 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.12 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: lex.c,v 1.13 2005/02/25 16:07:10 deraadt Exp $ */
/* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */
/*-
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: lex.c,v 1.12 2003/06/11 21:09:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lex.c,v 1.13 2005/02/25 16:07:10 deraadt Exp $";
#endif
#endif /* not lint */
@@ -565,12 +565,12 @@ getdol(void)
int delimcnt = 2;
int delim = getC(0);
*np++ = delim;
-
+
if (!delim || letter(delim)
|| Isdigit(delim) || any(" \t\n", delim)) {
seterror(ERR_BADSUBST);
break;
- }
+ }
while ((c = getC(0)) != (-1)) {
*np++ = c;
if(c == delim) delimcnt--;
diff --git a/bin/csh/time.c b/bin/csh/time.c
index ba5ae145c87..33a04a3ba8d 100644
--- a/bin/csh/time.c
+++ b/bin/csh/time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: time.c,v 1.10 2003/06/11 21:09:51 deraadt Exp $ */
+/* $OpenBSD: time.c,v 1.11 2005/02/25 16:07:10 deraadt Exp $ */
/* $NetBSD: time.c,v 1.7 1995/03/21 13:55:25 mycroft Exp $ */
/*-
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: time.c,v 1.10 2003/06/11 21:09:51 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: time.c,v 1.11 2005/02/25 16:07:10 deraadt Exp $";
#endif
#endif /* not lint */
@@ -171,7 +171,7 @@ prusage(struct rusage *r0, struct rusage *r1, struct timeval *e,
break;
case 'X': /* (average) shared text size */
- (void) fprintf(cshout, "%ld", t == 0 ? 0L :
+ (void) fprintf(cshout, "%ld", t == 0 ? 0L :
(r1->ru_ixrss - r0->ru_ixrss) / t);
break;