Re: duplicated/bad output from apm(8)

In message: <20040630.144717.47470993.imp_at_bsdimp.com>
            "M. Warner Losh" <imp_at_bsdimp.com> writes:
: In message: <20040630195649.GB9228_at_elvis.mu.org>
:             Maxime Henrion <mux_at_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
: : > _at__at_ -226,7 +226,6 _at__at_
: : > 				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