aboutsummaryrefslogtreecommitdiff
path: root/sbin/shutdown
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1998-12-11 11:21:47 +0000
committerBruce Evans <bde@FreeBSD.org>1998-12-11 11:21:47 +0000
commit39b831af104ffae667d42e13ecb8252215465f67 (patch)
treec2a8261ddc7163e95043f3357fc037886b488db0 /sbin/shutdown
parent689419f325e0290b1c459fe320aa0ce92bfa22c1 (diff)
downloadsrc-39b831af104ffae667d42e13ecb8252215465f67.tar.gz
src-39b831af104ffae667d42e13ecb8252215465f67.zip
Merged from Lite2 (one bcopy -> memmove, one significant change:
don't unlink _PATH_NOLOGIN for the -k case even if shutdown terminates abnormally. NetBSD already has this change).
Notes
Notes: svn path=/head/; revision=41684
Diffstat (limited to 'sbin/shutdown')
-rw-r--r--sbin/shutdown/shutdown.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 6c7d51ec3872..680925fc970a 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -39,10 +39,10 @@ static const char copyright[] =
#ifndef lint
#if 0
-static char sccsid[] = "@(#)shutdown.c 8.2 (Berkeley) 2/16/94";
+static char sccsid[] = "@(#)shutdown.c 8.4 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$Id: shutdown.c,v 1.14 1998/12/10 23:54:02 msmith Exp $";
+ "$Id: shutdown.c,v 1.15 1998/12/11 11:04:19 bde Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -164,7 +164,7 @@ main(argc, argv)
break;
if (p != mbuf)
*p++ = ' ';
- bcopy(*argv, p, arglen);
+ memmove(p, *argv, arglen);
p += arglen;
}
*p = '\n';
@@ -480,7 +480,8 @@ void
finish(signo)
int signo;
{
- (void)unlink(_PATH_NOLOGIN);
+ if (!killflg)
+ (void)unlink(_PATH_NOLOGIN);
exit(0);
}