summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-12-21 03:59:07 +0100
committerLennart Poettering <lennart@poettering.net>2013-12-21 03:59:07 +0100
commitba7689164c0f81ad23861b486514c86ec908ffee (patch)
tree9a550e1df36efada6911bdb8530b0cf0aacf2e14
parent3547329642fef7468548320131ab992517957e81 (diff)
bus: change bus-proxyd command line parsing to be more similar to other tools
-rw-r--r--src/bus-proxyd/bus-proxyd.c31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 015f40a65c..ce2a20bb89 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -41,19 +41,19 @@
#include "build.h"
#ifdef ENABLE_KDBUS
-const char *arg_bus_path = "kernel:path=/dev/kdbus/0-system/bus;unix:path=/run/dbus/system_bus_socket";
+const char *arg_address = "kernel:path=/dev/kdbus/0-system/bus;unix:path=/run/dbus/system_bus_socket";
#else
-const char *arg_bus_path = "unix:path=/run/dbus/system_bus_socket";
+const char *arg_address = "unix:path=/run/dbus/system_bus_socket";
#endif
static int help(void) {
printf("%s [OPTIONS...]\n\n"
- "Connection STDIO or a socket to a given bus address.\n\n"
+ "Connect STDIO or a socket to a given bus address.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
- " -p --bus-path=PATH Bus address to forward to (default: %s)\n",
- program_invocation_short_name, arg_bus_path);
+ " --address=ADDRESS Connect to bus specified by address\n",
+ program_invocation_short_name);
return 0;
}
@@ -62,12 +62,14 @@ static int parse_argv(int argc, char *argv[]) {
enum {
ARG_VERSION = 0x100,
+ ARG_ADDRESS,
};
static const struct option options[] = {
- { "help", no_argument, NULL, 'h' },
- { "bus-path", required_argument, NULL, 'p' },
- { NULL, 0, NULL, 0 }
+ { "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, ARG_VERSION },
+ { "address", required_argument, NULL, ARG_ADDRESS },
+ { NULL, 0, NULL, 0 }
};
int c;
@@ -88,16 +90,15 @@ static int parse_argv(int argc, char *argv[]) {
puts(SYSTEMD_FEATURES);
return 0;
+ case ARG_ADDRESS:
+ arg_address = optarg;
+ break;
+
case '?':
return -EINVAL;
- case 'p':
- arg_bus_path = optarg;
- break;
-
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
}
@@ -140,7 +141,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
- r = sd_bus_set_address(a, arg_bus_path);
+ r = sd_bus_set_address(a, arg_address);
if (r < 0) {
log_error("Failed to set address to connect to: %s", strerror(-r));
goto finish;