From fea6f55d8d0c78105004ca5239cf4b3a2c5f90b6 Mon Sep 17 00:00:00 2001 From: mycroft Date: Tue, 20 Jan 1998 23:13:31 +0000 Subject: [PATCH] Recognize `-' only if it is the only argument after the time. --- sbin/shutdown/shutdown.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index f7a37d741585..7076da6bbcb5 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -1,4 +1,4 @@ -/* $NetBSD: shutdown.c,v 1.20 1998/01/20 23:05:15 mycroft Exp $ */ +/* $NetBSD: shutdown.c,v 1.21 1998/01/20 23:13:31 mycroft Exp $ */ /* * Copyright (c) 1988, 1990, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1990, 1993\n\ #if 0 static char sccsid[] = "@(#)shutdown.c 8.4 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: shutdown.c,v 1.20 1998/01/20 23:05:15 mycroft Exp $"); +__RCSID("$NetBSD: shutdown.c,v 1.21 1998/01/20 23:13:31 mycroft Exp $"); #endif #endif /* not lint */ @@ -162,8 +162,8 @@ main(argc, argv) getoffset(*argv++); - if (*argv) - if (strcmp(*argv, "-")) { + if (argv[0]) + if (strcmp(argv[0], "-") || argv[1]) { for (p = mbuf, len = sizeof(mbuf); *argv; ++argv) { arglen = strlen(*argv); if ((len -= arglen) <= 2) @@ -518,8 +518,8 @@ void usage() { (void)fprintf(stderr, - "usage: shutdown [-dfhknr] [[[[[cc]yy]mm]dd]hh]mm [message | -]\n"); + "usage: shutdown [-dfhknr] [[[[[cc]yy]mm]dd]hh]mm [- | message ...]\n"); (void)fprintf(stderr, - " shutdown [-dfhknr] +time [message | -]\n"); + " shutdown [-dfhknr] +time [- | message ...]\n"); exit(1); }