extern char **g_argv;
extern bool use_logfile;
+extern bool use_syslog;
/* Some functions the less gifted operating systems might lack... */
Detach from current terminal
*/
bool detach(void) {
+ logmode_t logmode;
+
#ifndef HAVE_MINGW
signal(SIGPIPE, SIG_IGN);
signal(SIGUSR1, SIG_IGN);
#endif
}
- openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
+ logmode = use_logfile?LOGMODE_FILE:LOGMODE_SYSLOG;
+ if(do_detach && !use_syslog)
+ logmode = LOGMODE_STDERR;
+ openlogger(identname, logmode);
logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
VERSION, __DATE__, __TIME__, debug_level);
return true;
}
-
-bool execute_script(const char *name, char **envp) {
-#ifdef HAVE_SYSTEM
- char *scriptname;
- char *command;
-
- xasprintf(&scriptname, "%s" SLASH "%s%s", confbase, name, scriptextension);
-
- /* First check if there is a script */
-
- if(access(scriptname, F_OK)) {
- free(scriptname);
- return true;
- }
-
- logger(DEBUG_STATUS, LOG_INFO, "Executing script %s", name);
-
-#ifdef HAVE_PUTENV
- /* Set environment */
-
- for(int i = 0; envp[i]; i++)
- putenv(envp[i]);
-#endif
-
- if(scriptinterpreter)
- xasprintf(&command, "%s \"%s\"", scriptinterpreter, scriptname);
- else
- xasprintf(&command, "\"%s\"", scriptname);
-
- int status = system(command);
-
- free(command);
- free(scriptname);
-
- /* Unset environment */
-
- for(int i = 0; envp[i]; i++) {
- char *e = strchr(envp[i], '=');
- if(e) {
- char p[e - envp[i] + 1];
- strncpy(p, envp[i], e - envp[i]);
- p[e - envp[i]] = '\0';
- putenv(p);
- }
- }
-
- if(status != -1) {
-#ifdef WEXITSTATUS
- if(WIFEXITED(status)) { /* Child exited by itself */
- if(WEXITSTATUS(status)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Script %s exited with non-zero status %d",
- name, WEXITSTATUS(status));
- return false;
- }
- } else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
- logger(DEBUG_ALWAYS, LOG_ERR, "Script %s was killed by signal %d (%s)",
- name, WTERMSIG(status), strsignal(WTERMSIG(status)));
- return false;
- } else { /* Something strange happened */
- logger(DEBUG_ALWAYS, LOG_ERR, "Script %s terminated abnormally", name);
- return false;
- }
-#endif
- } else {
- logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
- return false;
- }
-#endif
- return true;
-}