d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged from Lite2 (one bcopy -> memmove, one significant change:

Browse Source 
don't unlink _PATH_NOLOGIN for the -k case even if shutdown terminates
abnormally.  NetBSD already has this change).
This commit is contained in:
Bruce Evans 1998-12-11 11:21:47 +00:00
parent 689419f325
commit 39b831af10
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=41684
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbin/shutdown/shutdown.c
View File

@ -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);
}