Commit 6dafe04e authored by Geoff Simmons's avatar Geoff Simmons

added -h option and a correct usage message

parent 81de90f2
...@@ -420,12 +420,14 @@ read_default_config(void) { ...@@ -420,12 +420,14 @@ read_default_config(void) {
} }
static void static void
usage(void) usage(int status)
{ {
fprintf(stderr, fprintf(stderr,
"usage: varnishevent [-aDVg] [-G configfile] [-P pidfile] " "usage: varnishevent [-adDhvV] [-f configfile] [-F format]\n"
"[-w outputfile]\n"); " [-g grouping] [-L txlimit] [-n name] \n"
exit(1); " [-N vsmfile] [-P pidfile] [-q query] \n"
" [-r binlog] [-T txtimeout] [-w outputfile]\n");
exit(status);
} }
int int
...@@ -446,7 +448,7 @@ main(int argc, char *argv[]) ...@@ -446,7 +448,7 @@ main(int argc, char *argv[])
CONF_Init(); CONF_Init();
read_default_config(); read_default_config();
while ((c = getopt(argc, argv, "adDvVP:w:F:g:f:q:r:n:N:L:T:")) != -1) { while ((c = getopt(argc, argv, "adDhvVP:w:F:g:f:q:r:n:N:L:T:")) != -1) {
switch (c) { switch (c) {
case 'a': case 'a':
a_flag = 1; a_flag = 1;
...@@ -506,23 +508,25 @@ main(int argc, char *argv[]) ...@@ -506,23 +508,25 @@ main(int argc, char *argv[])
case 'T': case 'T':
if ((errnum = VSL_Arg(vsl, c, optarg)) < 0) { if ((errnum = VSL_Arg(vsl, c, optarg)) < 0) {
fprintf(stderr, "%s\n", VSL_Error(vsl)); fprintf(stderr, "%s\n", VSL_Error(vsl));
usage(); usage(EXIT_FAILURE);
} }
/* XXX: VSL_Arg doesn't check this */ /* XXX: VSL_Arg doesn't check this */
if (c == 'L' && atoi(optarg) == 0) { if (c == 'L' && atoi(optarg) == 0) {
fprintf(stderr, "-L: Range error\n"); fprintf(stderr, "-L: Range error\n");
usage(); usage(EXIT_FAILURE);
} }
AN(errnum); AN(errnum);
break; break;
case 'h':
usage(EXIT_SUCCESS);
default: default:
usage(); usage(EXIT_FAILURE);
} }
} }
if (n_arg && N_arg) { if (n_arg && N_arg) {
fprintf(stderr, "Cannot have both -n and -N options\n"); fprintf(stderr, "Cannot have both -n and -N options\n");
usage(); usage(EXIT_FAILURE);
} }
if (! EMPTY(cli_config_filename)) { if (! EMPTY(cli_config_filename)) {
...@@ -537,7 +541,7 @@ main(int argc, char *argv[]) ...@@ -537,7 +541,7 @@ main(int argc, char *argv[])
if (!EMPTY(config.varnish_bindump) && (n_arg || N_arg)) { if (!EMPTY(config.varnish_bindump) && (n_arg || N_arg)) {
fprintf(stderr, "Cannot specify -r/varnish.bindump together with -n " fprintf(stderr, "Cannot specify -r/varnish.bindump together with -n "
" or -N\n"); " or -N\n");
usage(); usage(EXIT_FAILURE);
} }
if (P_arg && (pfh = VPF_Open(P_arg, 0644, NULL)) == NULL) { if (P_arg && (pfh = VPF_Open(P_arg, 0644, NULL)) == NULL) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment