summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/csh/file.c8
-rw-r--r--bin/csh/func.c8
-rw-r--r--bin/csh/lex.c6
-rw-r--r--bin/csh/proc.c6
-rw-r--r--bin/csh/sem.c7
-rw-r--r--bin/csh/set.c14
-rw-r--r--bin/mv/mv.c6
7 files changed, 28 insertions, 27 deletions
diff --git a/bin/csh/file.c b/bin/csh/file.c
index 2c79e1ef2f7..a4319857ef0 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.6 1998/05/18 20:38:20 deraadt Exp $ */
+/* $OpenBSD: file.c,v 1.7 2001/12/01 19:10:39 deraadt 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.6 1998/05/18 20:38:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: file.c,v 1.7 2001/12/01 19:10:39 deraadt Exp $";
#endif
#endif /* not lint */
@@ -448,8 +448,8 @@ tsearch(word, command, max_word_length)
{
static Char **items = NULL;
register DIR *dir_fd;
- register numitems = 0, ignoring = TRUE, nignored = 0;
- register name_length, looking_for_lognames;
+ register int numitems = 0, ignoring = TRUE, nignored = 0;
+ register int name_length, looking_for_lognames;
Char tilded_dir[MAXPATHLEN], dir[MAXPATHLEN];
Char name[MAXNAMLEN + 1], extended_name[MAXNAMLEN + 1];
Char *entry;
diff --git a/bin/csh/func.c b/bin/csh/func.c
index d1ab8208097..38617cd6f95 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: func.c,v 1.11 2001/07/09 07:02:08 deraadt Exp $ */
+/* $OpenBSD: func.c,v 1.12 2001/12/01 19:10:39 deraadt 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.11 2001/07/09 07:02:08 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: func.c,v 1.12 2001/12/01 19:10:39 deraadt Exp $";
#endif
#endif /* not lint */
@@ -101,7 +101,7 @@ isbfunc(t)
* one past the end.
*/
for (bp1 = bfunc, bp2 = bfunc + nbfunc; bp1 < bp2;) {
- register i;
+ register int i;
bp = bp1 + ((bp2 - bp1) >> 1);
if ((i = *cp - *bp->bname) == 0 &&
@@ -612,7 +612,7 @@ srchx(cp)
register Char *cp;
{
register struct srch *sp, *sp1, *sp2;
- register i;
+ register int i;
/*
* Binary search Sp1 is the beginning of the current search range. Sp2 is
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index ae8bb8ddc7f..267dab2e126 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.3 1997/07/25 18:58:12 mickey Exp $ */
+/* $OpenBSD: lex.c,v 1.4 2001/12/01 19:10:39 deraadt 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.3 1997/07/25 18:58:12 mickey Exp $";
+static char rcsid[] = "$OpenBSD: lex.c,v 1.4 2001/12/01 19:10:39 deraadt Exp $";
#endif
#endif /* not lint */
@@ -1331,7 +1331,7 @@ readc(wanteof)
bool wanteof;
{
register int c;
- static sincereal;
+ static int sincereal;
aret = F_SEEK;
if ((c = peekread) != '\0') {
diff --git a/bin/csh/proc.c b/bin/csh/proc.c
index f2976d70408..e7b0bd57fc2 100644
--- a/bin/csh/proc.c
+++ b/bin/csh/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.12 2000/06/28 19:41:10 millert Exp $ */
+/* $OpenBSD: proc.c,v 1.13 2001/12/01 19:10:39 deraadt Exp $ */
/* $NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: proc.c,v 1.12 2000/06/28 19:41:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: proc.c,v 1.13 2001/12/01 19:10:39 deraadt Exp $";
#endif
#endif /* not lint */
@@ -671,7 +671,7 @@ pprint(pp, flag)
register struct process *pp;
bool flag;
{
- register status, reason;
+ register int status, reason;
struct process *tp;
int jobflags, pstatus;
bool hadnl = 1; /* did we just have a newline */
diff --git a/bin/csh/sem.c b/bin/csh/sem.c
index 857f03afe97..10da22d5e15 100644
--- a/bin/csh/sem.c
+++ b/bin/csh/sem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sem.c,v 1.8 2001/06/22 21:07:35 deraadt Exp $ */
+/* $OpenBSD: sem.c,v 1.9 2001/12/01 19:10:39 deraadt Exp $ */
/* $NetBSD: sem.c,v 1.9 1995/09/27 00:38:50 jtc Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: sem.c,v 1.8 2001/06/22 21:07:35 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sem.c,v 1.9 2001/12/01 19:10:39 deraadt Exp $";
#endif
#endif /* not lint */
@@ -208,7 +208,7 @@ execute(t, wanttty, pipein, pipeout)
* We have to fork for eval too.
*/
(bifunc && (t->t_dflg & (F_PIPEIN | F_PIPEOUT)) != 0 &&
- bifunc->bfunct == doeval))
+ bifunc->bfunct == doeval)) {
if (t->t_dtyp == NODE_PAREN ||
t->t_dflg & (F_REPEAT | F_AMPERSAND) || bifunc) {
forked++;
@@ -351,6 +351,7 @@ execute(t, wanttty, pipein, pipeout)
}
}
+ }
if (pid != 0) {
/*
* It would be better if we could wait for the whole job when we
diff --git a/bin/csh/set.c b/bin/csh/set.c
index 4ffb811b04b..509aacdd19d 100644
--- a/bin/csh/set.c
+++ b/bin/csh/set.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: set.c,v 1.4 1997/11/15 21:51:30 todd Exp $ */
+/* $OpenBSD: set.c,v 1.5 2001/12/01 19:10:39 deraadt Exp $ */
/* $NetBSD: set.c,v 1.8 1995/03/21 18:35:52 mycroft Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: set.c,v 1.4 1997/11/15 21:51:30 todd Exp $";
+static char rcsid[] = "$OpenBSD: set.c,v 1.5 2001/12/01 19:10:39 deraadt Exp $";
#endif
#endif /* not lint */
@@ -458,7 +458,7 @@ adrof1(name, v)
register Char *name;
register struct varent *v;
{
- register cmp;
+ register int cmp;
v = v->v_left;
while (v && ((cmp = *name - *v->v_name) ||
@@ -513,7 +513,7 @@ setq(name, vec, p)
register struct varent *p;
{
register struct varent *c;
- register f;
+ register int f;
f = 0; /* tree hangs off the header's left link */
while ((c = p->v_link[f]) != NULL) {
@@ -587,7 +587,7 @@ unsetv1(p)
register struct varent *p;
{
register struct varent *c, *pp;
- register f;
+ register int f;
/*
* Free associated memory first to avoid complications.
@@ -727,7 +727,7 @@ balance(p, f, d)
register struct varent *t; /* used by the rotate macros */
#endif
- register ff;
+ register int ff;
/*
* Ok, from here on, p is the node we're operating on; pp is it's parent; f
@@ -816,7 +816,7 @@ plist(p)
register struct varent *p;
{
register struct varent *c;
- register len;
+ register int len;
sigset_t sigset;
if (setintr) {
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 8db29894189..3724e3825ce 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mv.c,v 1.19 2001/09/06 13:29:08 mpech Exp $ */
+/* $OpenBSD: mv.c,v 1.20 2001/12/01 19:10:39 deraadt Exp $ */
/* $NetBSD: mv.c,v 1.9 1995/03/21 09:06:52 cgd Exp $ */
/*
@@ -47,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: mv.c,v 1.19 2001/09/06 13:29:08 mpech Exp $";
+static char rcsid[] = "$OpenBSD: mv.c,v 1.20 2001/12/01 19:10:39 deraadt Exp $";
#endif
#endif /* not lint */
@@ -281,7 +281,7 @@ fastcopy(from, to, sbp)
static u_int blen;
static char *bp;
register int nread, from_fd, to_fd;
- int badchown = 0, serrno;
+ int badchown = 0, serrno = 0;
if ((from_fd = open(from, O_RDONLY, 0)) < 0) {
warn("%s", from);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 05:23:42 +0000