shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

lvmpolld: add long option variants for all short ones

Browse Source
This commit is contained in:
Ondrej Kozina 2015-05-15 19:18:32 +02:00
parent b91e1ea95e
commit d34de2d912
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
daemons/lvmpolld/lvmpolld-core.c
View File

@ -65,17 +65,17 @@ static const char *_strerror_r(int errnum, struct lvmpolld_thread_data *data)
static void _usage(const char *prog, FILE *file) static void _usage(const char *prog, FILE *file)
{ {
fprintf(file, "Usage:\n" fprintf(file, "Usage:\n"
"%s [-V] [-h] [-f] [-l {all|wire|debug}] [-s path]\n" "%s [-V] [-h] [-f] [-l {all|wire|debug}] [-s path] [-B path] [-p path] [-t secs]\n"
"%s --dump [-s path]\n" "%s --dump [-s path]\n"
" -V Show version info\n" " -V|--version Show version info\n"
" -h Show this help information\n" " -h|--help Show this help information\n"
" -f Don't fork, run in the foreground\n" " -f|--foreground Don't fork, run in the foreground\n"
" --dump Dump full lvmpolld state\n" " --dump Dump full lvmpolld state\n"
" -l Logging message level (-l {all|wire|debug})\n" " -l|--log Logging message level (-l {all|wire|debug})\n"
" -p Set path to the pidfile\n" " -p|--pidfile Set path to the pidfile\n"
" -s Set path to the communication socket\n" " -s|--socket Set path to the communication socket\n"
" -B Path to lvm2 binary\n" " -B|--binary Path to lvm2 binary\n"
" -t Time to wait in seconds before shutdown on idle (missing or 0 = inifinite)\n\n", prog, prog); " -t|--timeout Time to wait in seconds before shutdown on idle (missing or 0 = inifinite)\n\n", prog, prog);
} }
static int _init(struct daemon_state *s) static int _init(struct daemon_state *s)
@ -882,8 +882,13 @@ static struct option long_options[] = {
{"dump", no_argument, &action_idx, ACTION_DUMP }, /* or an option_index ? */ {"dump", no_argument, &action_idx, ACTION_DUMP }, /* or an option_index ? */
/* other options */ /* other options */
{"binary", required_argument, 0, 'B' },
{"foreground", no_argument, 0, 'f' },
{"help", no_argument, 0, 'h' }, {"help", no_argument, 0, 'h' },
{"log", required_argument, 0, 'l' },
{"pidfile", required_argument, 0, 'p' },
{"socket", required_argument, 0, 's' }, {"socket", required_argument, 0, 's' },
{"timeout", required_argument, 0, 't' },
{"version", no_argument, 0, 'V' }, {"version", no_argument, 0, 'V' },
{0, 0, 0, 0 } {0, 0, 0, 0 }
}; };
@ -928,21 +933,21 @@ int main(int argc, char *argv[])
ls.lvm_binary = optarg; ls.lvm_binary = optarg;
server = 1; server = 1;
break; break;
case 'V': case 'V': /* --version */
printf("lvmpolld version: " LVM_VERSION "\n"); printf("lvmpolld version: " LVM_VERSION "\n");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
case 'f': case 'f': /* --foreground */
s.foreground = 1; s.foreground = 1;
server = 1; server = 1;
break; break;
case 'h': case 'h': /* --help */
_usage(argv[0], stdout); _usage(argv[0], stdout);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
case 'l': case 'l': /* --log */
ls.log_config = optarg; ls.log_config = optarg;
server = 1; server = 1;
break; break;
case 'p': case 'p': /* --pidfile */
s.pidfile = optarg; s.pidfile = optarg;
server = 1; server = 1;
break; break;