diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-05-31 08:39:40 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-06-01 01:10:43 +0300 |
| commit | ed9dc5e5432f58826265013b1c5f085fae0bfa37 (patch) | |
| tree | 1af0ce6719ff730f0ca9ef127d5e2b919a819cb2 /src | |
| parent | 6f50408dc4495054b50a14859ea6b053cbec703e (diff) | |
| download | direvent-ed9dc5e5432f58826265013b1c5f085fae0bfa37.tar.gz direvent-ed9dc5e5432f58826265013b1c5f085fae0bfa37.tar.bz2 | |
Minor fixes
* src/cmdline.opt (help_hook): Change wording.
* src/config.c (config_help): Fix a typo.
* src/dircond.c (signal_setup): Include SIGCHLD
(main): Reset grecs_log_to_stderr.
* src/progman.c (run_handler): SIGCHLD is handled
by signal_setup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmdline.opt | 6 | ||||
| -rw-r--r-- | src/config.c | 2 | ||||
| -rw-r--r-- | src/dircond.c | 8 | ||||
| -rw-r--r-- | src/progman.c | 1 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/cmdline.opt b/src/cmdline.opt index ea2c352..59bbe8e 100644 --- a/src/cmdline.opt +++ b/src/cmdline.opt @@ -61,9 +61,9 @@ static void help_hook(FILE *fp) { fprintf(fp, - "Optional CONFIG argument supplies the configuration file " - "to use instead\n" - "of %s.\n\n", DEFAULT_CONFFILE); + "The optional CONFIG argument supplies the name of the " + "configuration file\n" + "to use instead of %s.\n\n", DEFAULT_CONFFILE); fprintf(fp, "This dircond uses %s interface.\n\n", INTERFACE); } diff --git a/src/config.c b/src/config.c index f3eb119..58ad7be 100644 --- a/src/config.c +++ b/src/config.c @@ -601,7 +601,7 @@ void config_help() { static char docstring[] = - "Configuration file structure for wydawca.\n" + "Configuration file structure for dircond.\n" "For more information, use `info dircond configuration'."; grecs_print_docstring(docstring, 0, stdout); grecs_print_statement_array(dircond_kw, 1, 0, stdout); diff --git a/src/dircond.c b/src/dircond.c index 2324160..3ed2054 100644 --- a/src/dircond.c +++ b/src/dircond.c @@ -256,6 +256,7 @@ signal_setup(void (*sf) (int)) signal(SIGALRM, sf); signal(SIGUSR1, sf); signal(SIGUSR2, sf); + signal(SIGCHLD, sf); } void @@ -463,9 +464,11 @@ main(int argc, char **argv) facility = LOG_DAEMON; } - if (facility > 0) + if (facility > 0) { openlog(tag, LOG_PID, facility); - + grecs_log_to_stderr = 0; + } + diag(LOG_INFO, "%s %s started", program_name, VERSION); /* Write pidfile */ @@ -477,7 +480,6 @@ main(int argc, char **argv) setuser(user); signal_setup(sigmain); - signal(SIGCHLD, sigmain); /* Main loop */ do { diff --git a/src/progman.c b/src/progman.c index 08f67fc..680aa73 100644 --- a/src/progman.c +++ b/src/progman.c @@ -466,7 +466,6 @@ run_handler(struct handler *hp, event_mask *event, close_fds(fdset); alarm(0); signal_setup(SIG_DFL); - signal(SIGCHLD, SIG_DFL); runcmd(hp->prog, hp->env, event, file); } |