diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-11-16 16:45:12 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-11-16 16:45:12 +0000 |
| commit | 90a6dd053bc78263832427a00d5964e55aaae91e (patch) | |
| tree | 935f3c515d4dc23af38fa3e7d8971d6601899f03 /usr.bin/calendar/calendar.c | |
| parent | 4a7a489ddf912969ba3e886f62103b5815f5b682 (diff) | |
knf & cleanup; mickey ok
Diffstat (limited to 'usr.bin/calendar/calendar.c')
| -rw-r--r-- | usr.bin/calendar/calendar.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index e2ed6ff02d8..71a7ed21332 100644 --- a/usr.bin/calendar/calendar.c +++ b/usr.bin/calendar/calendar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: calendar.c,v 1.24 2005/08/09 12:32:58 mickey Exp $ */ +/* $OpenBSD: calendar.c,v 1.25 2005/11/16 16:45:11 deraadt Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -39,7 +39,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; #else -static const char rcsid[] = "$OpenBSD: calendar.c,v 1.24 2005/08/09 12:32:58 mickey Exp $"; +static const char rcsid[] = "$OpenBSD: calendar.c,v 1.25 2005/11/16 16:45:11 deraadt Exp $"; #endif #endif /* not lint */ @@ -232,7 +232,8 @@ main(int argc, char *argv[]) warnx("uid %u did not finish in time", pw->pw_uid); } if (time(NULL) - t >= SECSPERDAY) - errx(2, "'calendar -a' took more than a day; stopped at uid %u", + errx(2, "'calendar -a' took more than a day; " + "stopped at uid %u", pw->pw_uid); } for (;;) { @@ -242,10 +243,9 @@ main(int argc, char *argv[]) runningkids--; } if (runningkids) - warnx( -"%d child processes still running when 'calendar -a' finished", runningkids); - } - else if ((caldir = getenv("CALENDAR_DIR")) != NULL) { + warnx("%d child processes still running when " + "'calendar -a' finished", runningkids); + } else if ((caldir = getenv("CALENDAR_DIR")) != NULL) { if(!chdir(caldir)) cal(); } else |