From owner-svn-src-head@FreeBSD.ORG Tue Dec 22 14:21:09 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19F2E106568D; Tue, 22 Dec 2009 14:21:09 +0000 (UTC) (envelope-from ru@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 08EFD8FC0C; Tue, 22 Dec 2009 14:21:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBMEL801066441; Tue, 22 Dec 2009 14:21:08 GMT (envelope-from ru@svn.freebsd.org) Received: (from ru@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBMEL82q066438; Tue, 22 Dec 2009 14:21:08 GMT (envelope-from ru@svn.freebsd.org) Message-Id: <200912221421.nBMEL82q066438@svn.freebsd.org> From: Ruslan Ermilov Date: Tue, 22 Dec 2009 14:21:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200840 - head/usr.sbin/apm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2009 14:21:09 -0000 Author: ru Date: Tue Dec 22 14:21:08 2009 New Revision: 200840 URL: http://svn.freebsd.org/changeset/base/200840 Log: apm(8) is no longer linked to zzz(8), catch up. (Fixes "zzz" clash in the whatis(1) database.) Modified: head/usr.sbin/apm/apm.8 head/usr.sbin/apm/apm.c Modified: head/usr.sbin/apm/apm.8 ============================================================================== --- head/usr.sbin/apm/apm.8 Tue Dec 22 14:13:13 2009 (r200839) +++ head/usr.sbin/apm/apm.8 Tue Dec 22 14:21:08 2009 (r200840) @@ -7,15 +7,15 @@ .\" these terms are retained. Under no circumstances is the author .\" responsible for the proper functioning of this software, nor does .\" the author assume any responsibility for damages incurred with its +.\" use. .\" .\" $FreeBSD$ .\" -.\" use. -.Dd November 1, 1994 +.Dd December 22, 2009 .Dt APM 8 i386 .Os .Sh NAME -.Nm apm , zzz +.Nm apm .Nd control the APM BIOS and display its information .Sh SYNOPSIS .Nm @@ -24,27 +24,14 @@ .Op Fl e Ar enable .Op Fl h Ar enable .Op Fl r Ar delta -.Pp -.Nm zzz .Sh DESCRIPTION The .Nm utility controls the Intel / Microsoft APM (Advanced Power Management) BIOS and displays the current status of APM on laptop PCs. -The -.Nm zzz -utility suspends the system by controlling APM. .Pp -The following options are available for -.Nm -(no options are available for -.Nm zzz ) . -If no options are specified, -.Nm -displays information and current status of APM in verbose mode. -If multiple display options are given, the values are displayed one -per line in the order given here. +The options are as follows: .Bl -tag -width indent .It Fl a Display the current AC-line status as an integer value. @@ -126,9 +113,15 @@ output of tells what your laptop claims to support. .It Fl z Suspend the system. -It is equivalent to -.Nm zzz . +It is used by +.Xr zzz 8 . .El +.Pp +If no options are specified, +.Nm +displays information and current status of APM in verbose mode. +If multiple display options are given, the values are displayed one +per line in the order given here. .Sh NOTES .Xr apmconf 8 has been merged in @@ -137,7 +130,8 @@ and thus .Nm replaces all of its functionality. .Sh SEE ALSO -.Xr apm 4 +.Xr apm 4 , +.Xr zzz 8 .Sh AUTHORS .An Tatsumi Hosokawa Aq hosokawa@jp.FreeBSD.org .Sh BUGS Modified: head/usr.sbin/apm/apm.c ============================================================================== --- head/usr.sbin/apm/apm.c Tue Dec 22 14:13:13 2009 (r200839) +++ head/usr.sbin/apm/apm.c Tue Dec 22 14:21:08 2009 (r200840) @@ -1,5 +1,5 @@ /* - * apm / zzz APM BIOS utility for FreeBSD + * APM BIOS utility for FreeBSD * * Copyright (C) 1994-1996 by Tatsumi Hosokawa * @@ -43,10 +43,9 @@ int cmos_wall = 0; /* True when wall tim 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);