To avoid conflict with acpiclient (http://sourceforge.net/projects/acpiclient/), which also provides an executable binary named acpi, the acpi binary included with wmacpi is being renamed to wmacpi-cli.
Based on the patch from Debian: http://sources.debian.net/src/wmacpi/2.2~rc5%2Bds-1/debian/patches/rename_acpi_to_wmacpi-cli.patch/ --- wmacpi/Makefile | 8 ++-- wmacpi/acpi.1 | 1 - wmacpi/acpi.c | 129 ---------------------------------------------------- wmacpi/wmacpi-cli.1 | 1 + wmacpi/wmacpi-cli.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++ wmacpi/wmacpi.1 | 11 ++--- 6 files changed, 139 insertions(+), 140 deletions(-) delete mode 100644 wmacpi/acpi.1 delete mode 100644 wmacpi/acpi.c create mode 100644 wmacpi/wmacpi-cli.1 create mode 100644 wmacpi/wmacpi-cli.c diff --git a/wmacpi/Makefile b/wmacpi/Makefile index 7afeac8..acfde2d 100644 --- a/wmacpi/Makefile +++ b/wmacpi/Makefile @@ -22,8 +22,8 @@ targets := wmacpi doc_targets := wmacpi.1 ifdef BUILD_CLI -targets += acpi -doc_targets += acpi.1 +targets += wmacpi-cli +doc_targets += wmacpi-cli.1 endif PREFIX := /usr/local @@ -42,11 +42,11 @@ wmacpi: $(WMOBJ) # for the Debian package, we want to make building the command line tools # optional. So, we hide all the necessary stuff here . . . ifdef BUILD_CLI -CLSRC := acpi.c libacpi.c +CLSRC := wmacpi-cli.c libacpi.c CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC))) -include $(CLOBJ:.o=.d) -acpi: $(CLOBJ) +wmacpi-cli: $(CLOBJ) $(CC) $(LDFLAGS) -o $@ $^ endif diff --git a/wmacpi/acpi.1 b/wmacpi/acpi.1 deleted file mode 100644 index c286484..0000000 --- a/wmacpi/acpi.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/wmacpi.1 diff --git a/wmacpi/acpi.c b/wmacpi/acpi.c deleted file mode 100644 index 4ecb1c0..0000000 --- a/wmacpi/acpi.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * acpi-ng: command line acpi battery status tool. - * - * Written by Simon Fowler <[email protected]>, 2003-06-20. - * Copyright 2003-06-20 Dreamcraft Pty Ltd. - * - * This file is distributed under the GNU General Public License, - * version 2. Please see the COPYING file for details. - */ - -/* - * 2003-06-20. - * I'm getting sick of not having a convenient way to query battery - * status on the command line, so I'm hacking up this - a quick little - * command line tool to display current battery status, using the same - * libacpi code as wmacpi-ng. - */ - -#define _GNU_SOURCE - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <getopt.h> -#include <unistd.h> - -#include "libacpi.h" - -#define ACPI_VER "2.2rc5" - -global_t *globals; - -void usage(char *name) -{ - printf("%s: query battery status on ACPI enabled systems.\n" - "Usage:\n" - "%s [-h] [-a samples]\n" - " h - display this help information\n" - " a - average remaining time over some number of samples\n" - " much more accurate than using a single sample\n" - " V - increase verbosity\n" - " v - print version information\n", - name, name); -} - -void print_version(void) -{ - printf("acpi version %s\n", ACPI_VER); - printf(" Using libacpi version %s\n", LIBACPI_VER); -} - -int main(int argc, char *argv[]) -{ - int i, j, ch; - int sleep_time = 0; - int samples = 1; - battery_t *binfo; - adapter_t *ap; - - while((ch = getopt(argc, argv, "hvVa:")) != EOF) { - switch(ch) { - case 'h': - usage(argv[0]); - return 0; - case 'V': - verbosity++; - break; - case 'v': - print_version(); - return 0; - case 'a': - if(optarg != NULL) { - samples = atoi(optarg); - if(samples > 1000 || samples <= 0) { - fprintf(stderr, "Please specify a reasonable number of samples\n"); - exit(1); - } - } - pinfo("samples: %d\n", samples); - sleep_time = 1000000/samples; - break; - default: - usage(argv[0]); - return 1; - } - } - - globals = (global_t *) malloc(sizeof(global_t)); - - power_init(globals); - /* we want to acquire samples over some period of time, so . . . */ - for(i = 0; i < samples + 2; i++) { - for(j = 0; j < globals->battery_count; j++) - acquire_batt_info(globals, j); - acquire_global_info(globals); - usleep(sleep_time); - } - - ap = &globals->adapter; - if(ap->power == AC) { - printf("On AC Power"); - for(i = 0; i < globals->battery_count; i++) { - binfo = &batteries[i]; - if(binfo->present && (binfo->charge_state == CHARGE)) { - printf("; Battery %s charging", binfo->name); - printf(", currently at %2d%%", binfo->percentage); - if(binfo->charge_time >= 0) - printf(", %2d:%02d remaining", - binfo->charge_time/60, - binfo->charge_time%60); - } - } - printf("\n"); - } else if(ap->power == BATT) { - printf("On Battery"); - for(i = 0; i < globals->battery_count; i++) { - binfo = &batteries[i]; - if(binfo->present && (binfo->percentage >= 0)) - printf(", Battery %s at %d%%", binfo->name, - binfo->percentage); - } - if(globals->rtime >= 0) - printf("; %d:%02d remaining", globals->rtime/60, - globals->rtime%60); - printf("\n"); - } - return 0; -} - diff --git a/wmacpi/wmacpi-cli.1 b/wmacpi/wmacpi-cli.1 new file mode 100644 index 0000000..c286484 --- /dev/null +++ b/wmacpi/wmacpi-cli.1 @@ -0,0 +1 @@ +.so man1/wmacpi.1 diff --git a/wmacpi/wmacpi-cli.c b/wmacpi/wmacpi-cli.c new file mode 100644 index 0000000..3fa6fa2 --- /dev/null +++ b/wmacpi/wmacpi-cli.c @@ -0,0 +1,129 @@ +/* + * acpi-ng: command line acpi battery status tool. + * + * Written by Simon Fowler <[email protected]>, 2003-06-20. + * Copyright 2003-06-20 Dreamcraft Pty Ltd. + * + * This file is distributed under the GNU General Public License, + * version 2. Please see the COPYING file for details. + */ + +/* + * 2003-06-20. + * I'm getting sick of not having a convenient way to query battery + * status on the command line, so I'm hacking up this - a quick little + * command line tool to display current battery status, using the same + * libacpi code as wmacpi-ng. + */ + +#define _GNU_SOURCE + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <getopt.h> +#include <unistd.h> + +#include "libacpi.h" + +#define ACPI_VER "2.2rc5" + +global_t *globals; + +void usage(char *name) +{ + printf("%s: query battery status on ACPI enabled systems.\n" + "Usage:\n" + "%s [-h] [-a samples]\n" + " h - display this help information\n" + " a - average remaining time over some number of samples\n" + " much more accurate than using a single sample\n" + " V - increase verbosity\n" + " v - print version information\n", + name, name); +} + +void print_version(void) +{ + printf("wmacpi-cli version %s\n", ACPI_VER); + printf(" Using libacpi version %s\n", LIBACPI_VER); +} + +int main(int argc, char *argv[]) +{ + int i, j, ch; + int sleep_time = 0; + int samples = 1; + battery_t *binfo; + adapter_t *ap; + + while((ch = getopt(argc, argv, "hvVa:")) != EOF) { + switch(ch) { + case 'h': + usage(argv[0]); + return 0; + case 'V': + verbosity++; + break; + case 'v': + print_version(); + return 0; + case 'a': + if(optarg != NULL) { + samples = atoi(optarg); + if(samples > 1000 || samples <= 0) { + fprintf(stderr, "Please specify a reasonable number of samples\n"); + exit(1); + } + } + pinfo("samples: %d\n", samples); + sleep_time = 1000000/samples; + break; + default: + usage(argv[0]); + return 1; + } + } + + globals = (global_t *) malloc(sizeof(global_t)); + + power_init(globals); + /* we want to acquire samples over some period of time, so . . . */ + for(i = 0; i < samples + 2; i++) { + for(j = 0; j < globals->battery_count; j++) + acquire_batt_info(globals, j); + acquire_global_info(globals); + usleep(sleep_time); + } + + ap = &globals->adapter; + if(ap->power == AC) { + printf("On AC Power"); + for(i = 0; i < globals->battery_count; i++) { + binfo = &batteries[i]; + if(binfo->present && (binfo->charge_state == CHARGE)) { + printf("; Battery %s charging", binfo->name); + printf(", currently at %2d%%", binfo->percentage); + if(binfo->charge_time >= 0) + printf(", %2d:%02d remaining", + binfo->charge_time/60, + binfo->charge_time%60); + } + } + printf("\n"); + } else if(ap->power == BATT) { + printf("On Battery"); + for(i = 0; i < globals->battery_count; i++) { + binfo = &batteries[i]; + if(binfo->present && (binfo->percentage >= 0)) + printf(", Battery %s at %d%%", binfo->name, + binfo->percentage); + } + if(globals->rtime >= 0) + printf("; %d:%02d remaining", globals->rtime/60, + globals->rtime%60); + printf("\n"); + } + return 0; +} + diff --git a/wmacpi/wmacpi.1 b/wmacpi/wmacpi.1 index 93cf646..26c18ed 100644 --- a/wmacpi/wmacpi.1 +++ b/wmacpi/wmacpi.1 @@ -2,7 +2,7 @@ .SH NAME wmacpi \- Battery status monitor for systems supporting ACPI .SH NAME -acpi \- Query battery status for systems supporting ACPI +wmacpi-cli \- Query battery status for systems supporting ACPI .SH SYNOPSIS .B wmacpi [ @@ -39,7 +39,7 @@ samples ] .RI -h ] .PP -.B acpi +.B wmacpi-cli [ .RI -a samples ] @@ -77,7 +77,7 @@ and a scrolling message with some hopefully useful information. Clicking on the window cycles through the batteries that the ACPI system knows about. .PP -.B acpi +.B wmacpi-cli queries the battery status from the command line. It prints the power status, the percentage remaining for each battery found, and the time remaining if the system is on battery, or the time remaining for each @@ -115,8 +115,7 @@ rate. .TP .B \-x, --cmdline Run wmacpi in command line mode - this operates identically to -.B acpi -.. +.B wmacpi-cli\&. .TP .B \-a, --samples=samples Average the time remaining over num samples. This greatly improves the @@ -136,7 +135,7 @@ Disable scrolling message. .B \-h, --help Display help. .TP -.B acpi +.B wmacpi-cli .TP .B \-a num Average the time remaining over num samples. This greatly improves the -- 1.9.1 -- To unsubscribe, send mail to [email protected].
