Fix -p option.

This commit is contained in:
Ondrej Zajicek 2009-11-26 23:23:29 +01:00
parent bf47fe4b2e
commit a6250a7d10
2 changed files with 5 additions and 3 deletions

View file

@ -132,7 +132,8 @@ options. The most important ones are:
log debugging information to given file instead of stderr. log debugging information to given file instead of stderr.
<tag>-p</tag> <tag>-p</tag>
just parse the config file and exit. just parse the config file and exit. Return value is zero if the config file is valid,
nonzero if there are some errors.
<tag>-s <m/name of communication socket/</tag> <tag>-s <m/name of communication socket/</tag>
use given filename for a socket for communications with the client, default is <it/prefix/<file>/var/run/bird.ctl</file>. use given filename for a socket for communications with the client, default is <it/prefix/<file>/var/run/bird.ctl</file>.

View file

@ -370,7 +370,7 @@ static char *opt_list = "c:dD:ps:";
static void static void
usage(void) usage(void)
{ {
fprintf(stderr, "Usage: bird [-c <config-file>] [-d] [-D <debug-file>] [-s <control-socket>]\n"); fprintf(stderr, "Usage: bird [-c <config-file>] [-d] [-D <debug-file>] [-p] [-s <control-socket>]\n");
exit(1); exit(1);
} }
@ -434,7 +434,8 @@ main(int argc, char **argv)
log_init_debug(""); log_init_debug("");
log_init(debug_flag, 1); log_init(debug_flag, 1);
test_old_bird(path_control_socket); if (!parse_and_exit)
test_old_bird(path_control_socket);
DBG("Initializing.\n"); DBG("Initializing.\n");
resource_init(); resource_init();