diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-11-22 23:49:10 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-11-22 23:49:10 +0100 |
| commit | 26777aa1c659b229f07205291241e45e64712a72 (patch) | |
| tree | 9f145eef2fe8ffb957ab89ee2f6d0ea9dc7dbd2e /util-linux/acpid.c | |
| parent | 29ca1591335b2a73522c2c3ef43daff63c71e8dc (diff) | |
| download | busybox-w32-26777aa1c659b229f07205291241e45e64712a72.tar.gz busybox-w32-26777aa1c659b229f07205291241e45e64712a72.tar.bz2 busybox-w32-26777aa1c659b229f07205291241e45e64712a72.zip | |
fixes for bugs discovered by randomconfig builds and tests
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/acpid.c')
| -rw-r--r-- | util-linux/acpid.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/util-linux/acpid.c b/util-linux/acpid.c index 0b227a8ae..ce4c98ebe 100644 --- a/util-linux/acpid.c +++ b/util-linux/acpid.c | |||
| @@ -16,9 +16,9 @@ enum { | |||
| 16 | OPT_e = (1 << 2), | 16 | OPT_e = (1 << 2), |
| 17 | OPT_f = (1 << 3), | 17 | OPT_f = (1 << 3), |
| 18 | OPT_l = (1 << 4), | 18 | OPT_l = (1 << 4), |
| 19 | OPT_p = (1 << 5) * ENABLE_FEATURE_PIDFILE, | 19 | OPT_a = (1 << 5), |
| 20 | OPT_a = (1 << 6), | 20 | OPT_M = (1 << 6), |
| 21 | OPT_M = (1 << 7), | 21 | OPT_p = (1 << 7) * ENABLE_FEATURE_PIDFILE, |
| 22 | }; | 22 | }; |
| 23 | 23 | ||
| 24 | struct acpi_event { | 24 | struct acpi_event { |
| @@ -199,8 +199,9 @@ int acpid_main(int argc UNUSED_PARAM, char **argv) | |||
| 199 | INIT_G(); | 199 | INIT_G(); |
| 200 | 200 | ||
| 201 | opt_complementary = "df:e--e"; | 201 | opt_complementary = "df:e--e"; |
| 202 | opts = getopt32(argv, "c:de:fl:p:a:M:" IF_FEATURE_ACPID_COMPAT("g:m:s:S:v"), | 202 | opts = getopt32(argv, "c:de:fl:a:M:" IF_FEATURE_PIDFILE("p:") IF_FEATURE_ACPID_COMPAT("g:m:s:S:v"), |
| 203 | &opt_dir, &opt_input, &opt_logfile, &opt_pidfile, &opt_action, &opt_map | 203 | &opt_dir, &opt_input, &opt_logfile, &opt_action, &opt_map |
| 204 | IF_FEATURE_PIDFILE(, &opt_pidfile) | ||
| 204 | IF_FEATURE_ACPID_COMPAT(, NULL, NULL, NULL, NULL) | 205 | IF_FEATURE_ACPID_COMPAT(, NULL, NULL, NULL, NULL) |
| 205 | ); | 206 | ); |
| 206 | 207 | ||