summaryrefslogtreecommitdiff
path: root/sbin/init/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'sbin/init/init.c')
-rw-r--r--sbin/init/init.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 7ea3af3ecb3..fb599f083b8 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.10 1997/06/25 18:18:58 kstailey Exp $ */
+/* $OpenBSD: init.c,v 1.11 1997/09/14 10:37:45 deraadt Exp $ */
/* $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $ */
/*-
@@ -47,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)init.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.10 1997/06/25 18:18:58 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.11 1997/09/14 10:37:45 deraadt Exp $";
#endif
#endif /* not lint */
@@ -298,7 +298,7 @@ handle(va_alist)
sa.sa_handler = handler;
sigfillset(&mask_everything);
- while (sig = va_arg(ap, int)) {
+ while ((sig = va_arg(ap, int))) {
sa.sa_mask = mask_everything;
/* XXX SA_RESTART? */
sa.sa_flags = sig == SIGCHLD ? SA_NOCLDSTOP : 0;
@@ -329,7 +329,7 @@ delset(va_alist)
va_start(ap, maskp);
#endif
- while (sig = va_arg(ap, int))
+ while ((sig = va_arg(ap, int)))
sigdelset(maskp, sig);
va_end(ap);
}
@@ -900,7 +900,7 @@ construct_argv(command)
if ((argv[argc++] = strtok(command, separators)) == 0)
return 0;
- while (argv[argc++] = strtok(NULL, separators))
+ while ((argv[argc++] = strtok(NULL, separators)))
continue;
return argv;
}
@@ -1032,8 +1032,8 @@ read_ttys()
* Allocate a session entry for each active port.
* Note that sp starts at 0.
*/
- while (typ = getttyent())
- if (snext = new_session(sp, ++session_index, typ))
+ while ((typ = getttyent()))
+ if ((snext = new_session(sp, ++session_index, typ)))
sp = snext;
endttyent();
@@ -1187,11 +1187,11 @@ collect_child(pid)
sp->se_process = 0;
if (sp->se_flags & SE_SHUTDOWN) {
- if (sprev = sp->se_prev)
+ if ((sprev = sp->se_prev))
sprev->se_next = sp->se_next;
else
sessions = sp->se_next;
- if (snext = sp->se_next)
+ if ((snext = sp->se_next))
snext->se_prev = sp->se_prev;
free_session(sp);
return;
@@ -1291,7 +1291,7 @@ clean_ttys()
sp->se_flags &= ~SE_PRESENT;
devlen = sizeof(_PATH_DEV) - 1;
- while (typ = getttyent()) {
+ while ((typ = getttyent())) {
++session_index;
for (sprev = 0, sp = sessions; sp; sprev = sp, sp = sp->se_next)