nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i3bar: fix usage description, make -b happen

This commit is contained in:
Simon Elsbrock 2013-03-28 20:11:05 +01:00 committed by Michael Stapelberg
parent 0a3d42c21e
commit 6b0efac483
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
i3bar/src/main.c
View File

@ -53,12 +53,12 @@ char *expand_path(char *path) {
} }
void print_usage(char *elf_name) { void print_usage(char *elf_name) {
printf("Usage: %s [-b bar_id] [-s sock_path] [-h] [-v]\n", elf_name); printf("Usage: %s -b bar_id [-s sock_path] [-h] [-v]\n", elf_name);
printf("\n"); printf("\n");
printf("--bar_id <bar_id>\tBar ID for which to get the configuration\n"); printf("-b, --bar_id <bar_id>\tBar ID for which to get the configuration\n");
printf("-s <sock_path>\tConnect to i3 via <sock_path>\n"); printf("-s, --socket <sock_path>\tConnect to i3 via <sock_path>\n");
printf("-h\t\tDisplay this help-message and exit\n"); printf("-h, --help Display this help-message and exit\n");
printf("-v\t\tDisplay version number and exit\n"); printf("-v, --version Display version number and exit\n");
printf("\n"); printf("\n");
printf(" PLEASE NOTE that i3bar will be automatically started by i3\n" printf(" PLEASE NOTE that i3bar will be automatically started by i3\n"
" as soon as there is a 'bar' configuration block in your\n" " as soon as there is a 'bar' configuration block in your\n"
@ -97,13 +97,13 @@ int main(int argc, char **argv) {
static struct option long_opt[] = { static struct option long_opt[] = {
{ "socket", required_argument, 0, 's' }, { "socket", required_argument, 0, 's' },
{ "bar_id", required_argument, 0, 0 }, { "bar_id", required_argument, 0, 'b' },
{ "help", no_argument, 0, 'h' }, { "help", no_argument, 0, 'h' },
{ "version", no_argument, 0, 'v' }, { "version", no_argument, 0, 'v' },
{ NULL, 0, 0, 0} { NULL, 0, 0, 0}
}; };
while ((opt = getopt_long(argc, argv, "s:hv", long_opt, &option_index)) != -1) { while ((opt = getopt_long(argc, argv, "b:s:hv", long_opt, &option_index)) != -1) {
switch (opt) { switch (opt) {
case 's': case 's':
socket_path = expand_path(optarg); socket_path = expand_path(optarg);
@ -112,11 +112,8 @@ int main(int argc, char **argv) {
printf("i3bar version " I3_VERSION " © 2010-2011 Axel Wagner and contributors\n"); printf("i3bar version " I3_VERSION " © 2010-2011 Axel Wagner and contributors\n");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
case 0: case 'b':
if (!strcmp(long_opt[option_index].name, "bar_id")) { config.bar_id = sstrdup(optarg);
FREE(config.bar_id);
config.bar_id = sstrdup(optarg);
}
break; break;
default: default:
print_usage(argv[0]); print_usage(argv[0]);