From owner-freebsd-current@FreeBSD.ORG  Wed Jun 30 20:58:27 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id A29CC16A4CE; Wed, 30 Jun 2004 20:58:27 +0000 (GMT)
Received: from harmony.village.org (rover.village.org [168.103.84.182])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4980043D2D; Wed, 30 Jun 2004 20:58:27 +0000 (GMT)
	(envelope-from imp@bsdimp.com)
Received: from localhost (warner@rover2.village.org [10.0.0.1])
	by harmony.village.org (8.12.11/8.12.11) with ESMTP id i5UKw059088842;
	Wed, 30 Jun 2004 14:58:00 -0600 (MDT)
	(envelope-from imp@bsdimp.com)
Date: Wed, 30 Jun 2004 14:58:29 -0600 (MDT)
Message-Id: <20040630.145829.63340647.imp@bsdimp.com>
To: mux@freebsd.org
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <20040630.144717.47470993.imp@bsdimp.com>
References: <cone.1088624984.490789.732.1001@phobos.totalterror.net>
	<20040630195649.GB9228@elvis.mu.org>
	<20040630.144717.47470993.imp@bsdimp.com>
X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
cc: nike_d@cytexbg.com
cc: current@freebsd.org
Subject: Re: duplicated/bad output from apm(8)
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Jun 2004 20:58:27 -0000

In message: <20040630.144717.47470993.imp@bsdimp.com>
            "M. Warner Losh" <imp@bsdimp.com> writes:
: In message: <20040630195649.GB9228@elvis.mu.org>
:             Maxime Henrion <mux@FreeBSD.org> writes:
: : Niki Denev wrote:
: : > It seems that one of the last few commits 
: : > to 'usr.sbin/apm/apm.c' introduced 
: : > an extra printf for the battery status output.
: : > And the output is like this :
: : > 
: : >  Number of batteries: 1
: : >  Battery 0:
: : >          Battery status:         Battery Status: charging
: : >  ^^^^^^^^^^^^^^^^^^^^^^^
: : >  This is extra
: : > 
: : > here is the patch that i used to fix
: : > the output for me and my precious X31 :)
: : > 
: : > ---------------------------------------------------------------------------- 
: : > --- usr.sbin/apm/apm.c.orig	Wed Jun 30 22:26:28 2004
: : > +++ usr.sbin/apm/apm.c	Wed Jun 30 22:35:12 2004
: : > @@ -226,7 +226,6 @@
: : > 				if (ioctl(fd, APMIO_GETPWSTATUS, &aps) == -1)
: : > 					continue;
: : > 				printf("Battery %d:\n", i);
: : > -				printf("\tBattery status: ");
: : > 				if (aps.ap_batt_flag <= 255 &&
: : > 				    (aps.ap_batt_flag & 
: : > 				    APM_BATT_NOT_PRESENT)) {
: : > 					printf("not present\n");
: : 
: : Indeed.  I just committed your patch, thanks!
: 
: But it wasn't surpurflous.

Ah, I see.  My tree had changed enough to confuse me.

Warner