summaryrefslogtreecommitdiffstats
path: root/usr.sbin/apm/apm.c
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2009-12-22 14:21:08 +0000
committerru <ru@FreeBSD.org>2009-12-22 14:21:08 +0000
commit2c27b3cca9f677862d6dbcb87b5d153887db5c09 (patch)
tree333baad8f5b9abc10e247edaf092245826c8c88a /usr.sbin/apm/apm.c
parentb1be6dab1b6ffe015d7aeb8a6d08021ebdf00fcf (diff)
downloadFreeBSD-src-2c27b3cca9f677862d6dbcb87b5d153887db5c09.zip
FreeBSD-src-2c27b3cca9f677862d6dbcb87b5d153887db5c09.tar.gz
apm(8) is no longer linked to zzz(8), catch up.
(Fixes "zzz" clash in the whatis(1) database.)
Diffstat (limited to 'usr.sbin/apm/apm.c')
-rw-r--r--usr.sbin/apm/apm.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 56432a4..a60f821 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -1,5 +1,5 @@
/*
- * apm / zzz APM BIOS utility for FreeBSD
+ * APM BIOS utility for FreeBSD
*
* Copyright (C) 1994-1996 by Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
*
@@ -43,10 +43,9 @@ int cmos_wall = 0; /* True when wall time is in cmos clock, else UTC */
static void
usage(void)
{
- fprintf(stderr, "%s\n%s\n",
+ fprintf(stderr,
"usage: apm [-ablstzZ] [-d enable ] [ -e enable ] "
- "[ -h enable ] [-r delta]",
- " zzz");
+ "[ -h enable ] [-r delta]\n");
exit(1);
}
@@ -397,11 +396,6 @@ main(int argc, char *argv[])
else
cmdname = argv[0];
- if (strcmp(cmdname, "zzz") == 0) {
- dosleep = 1;
- all_info = 0;
- goto finish_option;
- }
while ((c = getopt(argc, argv, "abe:h:lRr:stzd:Z")) != -1) {
switch (c) {
case 'a':
@@ -457,7 +451,6 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
}
-finish_option:
if (haltcpu != -1 || enable != -1 || display != -1 || delta || dosleep
|| standby) {
fd = open(APMDEV, O_RDWR);
OpenPOWER on IntegriCloud