Drop support for localisation.
Localised messages don't make much sense for a daemon, and there is only the Dutch translation which costs time to maintain.
This commit is contained in:
Guus Sliepen
parent
a227843b73
commit
4c85542894
40 changed files with 486 additions and 2276 deletions
|
|
@ -48,7 +48,7 @@ sigset_t emptysigset;
|
|||
static int saved_debug_level = -1;
|
||||
|
||||
static void memory_full(int size) {
|
||||
logger(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size);
|
||||
logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ bool install_service(void) {
|
|||
|
||||
manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
|
||||
if(!manager) {
|
||||
logger(LOG_ERR, _("Could not open service manager: %s"), winerror(GetLastError()));
|
||||
logger(LOG_ERR, "Could not open service manager: %s", winerror(GetLastError()));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -103,18 +103,18 @@ bool install_service(void) {
|
|||
command, NULL, NULL, NULL, NULL, NULL);
|
||||
|
||||
if(!service) {
|
||||
logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError()));
|
||||
logger(LOG_ERR, "Could not create %s service: %s", identname, winerror(GetLastError()));
|
||||
return false;
|
||||
}
|
||||
|
||||
ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
|
||||
|
||||
logger(LOG_INFO, _("%s service installed"), identname);
|
||||
logger(LOG_INFO, "%s service installed", identname);
|
||||
|
||||
if(!StartService(service, 0, NULL))
|
||||
logger(LOG_WARNING, _("Could not start %s service: %s"), identname, winerror(GetLastError()));
|
||||
logger(LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));
|
||||
else
|
||||
logger(LOG_INFO, _("%s service started"), identname);
|
||||
logger(LOG_INFO, "%s service started", identname);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -122,28 +122,28 @@ bool install_service(void) {
|
|||
bool remove_service(void) {
|
||||
manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
|
||||
if(!manager) {
|
||||
logger(LOG_ERR, _("Could not open service manager: %s"), winerror(GetLastError()));
|
||||
logger(LOG_ERR, "Could not open service manager: %s", winerror(GetLastError()));
|
||||
return false;
|
||||
}
|
||||
|
||||
service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
|
||||
|
||||
if(!service) {
|
||||
logger(LOG_ERR, _("Could not open %s service: %s"), identname, winerror(GetLastError()));
|
||||
logger(LOG_ERR, "Could not open %s service: %s", identname, winerror(GetLastError()));
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!ControlService(service, SERVICE_CONTROL_STOP, &status))
|
||||
logger(LOG_ERR, _("Could not stop %s service: %s"), identname, winerror(GetLastError()));
|
||||
logger(LOG_ERR, "Could not stop %s service: %s", identname, winerror(GetLastError()));
|
||||
else
|
||||
logger(LOG_INFO, _("%s service stopped"), identname);
|
||||
logger(LOG_INFO, "%s service stopped", identname);
|
||||
|
||||
if(!DeleteService(service)) {
|
||||
logger(LOG_ERR, _("Could not remove %s service: %s"), identname, winerror(GetLastError()));
|
||||
logger(LOG_ERR, "Could not remove %s service: %s", identname, winerror(GetLastError()));
|
||||
return false;
|
||||
}
|
||||
|
||||
logger(LOG_INFO, _("%s service removed"), identname);
|
||||
logger(LOG_INFO, "%s service removed", identname);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -154,13 +154,13 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
|
|||
SetServiceStatus(statushandle, &status);
|
||||
return NO_ERROR;
|
||||
case SERVICE_CONTROL_STOP:
|
||||
logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_STOP");
|
||||
logger(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_STOP");
|
||||
break;
|
||||
case SERVICE_CONTROL_SHUTDOWN:
|
||||
logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_SHUTDOWN");
|
||||
logger(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
|
||||
break;
|
||||
default:
|
||||
logger(LOG_WARNING, _("Got unexpected request %d"), request);
|
||||
logger(LOG_WARNING, "Got unexpected request %d", request);
|
||||
return ERROR_CALL_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
|
|
@ -193,7 +193,7 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
|
|||
statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL);
|
||||
|
||||
if (!statushandle) {
|
||||
logger(LOG_ERR, _("System call `%s' failed: %s"), "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
|
||||
logger(LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
|
||||
err = 1;
|
||||
} else {
|
||||
status.dwWaitHint = 30000;
|
||||
|
|
@ -226,7 +226,7 @@ bool init_service(void) {
|
|||
return false;
|
||||
}
|
||||
else
|
||||
logger(LOG_ERR, _("System call `%s' failed: %s"), "StartServiceCtrlDispatcher", winerror(GetLastError()));
|
||||
logger(LOG_ERR, "System call `%s' failed: %s", "StartServiceCtrlDispatcher", winerror(GetLastError()));
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
@ -244,16 +244,16 @@ static bool write_pidfile(void) {
|
|||
|
||||
if(pid) {
|
||||
if(netname)
|
||||
fprintf(stderr, _("A tincd is already running for net `%s' with pid %ld.\n"),
|
||||
fprintf(stderr, "A tincd is already running for net `%s' with pid %ld.\n",
|
||||
netname, (long)pid);
|
||||
else
|
||||
fprintf(stderr, _("A tincd is already running with pid %ld.\n"), (long)pid);
|
||||
fprintf(stderr, "A tincd is already running with pid %ld.\n", (long)pid);
|
||||
return false;
|
||||
}
|
||||
|
||||
/* if it's locked, write-protected, or whatever */
|
||||
if(!write_pid(pidfilename)) {
|
||||
fprintf(stderr, _("Could write pid file %s: %s\n"), pidfilename, strerror(errno));
|
||||
fprintf(stderr, "Could write pid file %s: %s\n", pidfilename, strerror(errno));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -272,10 +272,10 @@ bool kill_other(int signal) {
|
|||
|
||||
if(!pid) {
|
||||
if(netname)
|
||||
fprintf(stderr, _("No other tincd is running for net `%s'.\n"),
|
||||
fprintf(stderr, "No other tincd is running for net `%s'.\n",
|
||||
netname);
|
||||
else
|
||||
fprintf(stderr, _("No other tincd is running.\n"));
|
||||
fprintf(stderr, "No other tincd is running.\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -284,12 +284,12 @@ bool kill_other(int signal) {
|
|||
/* ESRCH is returned when no process with that pid is found */
|
||||
if(kill(pid, signal) && errno == ESRCH) {
|
||||
if(netname)
|
||||
fprintf(stderr, _("The tincd for net `%s' is no longer running. "),
|
||||
fprintf(stderr, "The tincd for net `%s' is no longer running. ",
|
||||
netname);
|
||||
else
|
||||
fprintf(stderr, _("The tincd is no longer running. "));
|
||||
fprintf(stderr, "The tincd is no longer running. ");
|
||||
|
||||
fprintf(stderr, _("Removing stale lock file.\n"));
|
||||
fprintf(stderr, "Removing stale lock file.\n");
|
||||
remove_pid(pidfilename);
|
||||
}
|
||||
|
||||
|
|
@ -319,7 +319,7 @@ bool detach(void) {
|
|||
if(do_detach) {
|
||||
#ifndef HAVE_MINGW
|
||||
if(daemon(0, 0)) {
|
||||
fprintf(stderr, _("Couldn't detach from terminal: %s"),
|
||||
fprintf(stderr, "Couldn't detach from terminal: %s",
|
||||
strerror(errno));
|
||||
return false;
|
||||
}
|
||||
|
|
@ -327,7 +327,7 @@ bool detach(void) {
|
|||
/* Now UPDATE the pid in the pidfile, because we changed it... */
|
||||
|
||||
if(!write_pid(pidfilename)) {
|
||||
fprintf(stderr, _("Could not write pid file %s: %s\n"), pidfilename, strerror(errno));
|
||||
fprintf(stderr, "Could not write pid file %s: %s\n", pidfilename, strerror(errno));
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
|
|
@ -338,7 +338,7 @@ bool detach(void) {
|
|||
|
||||
openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
|
||||
|
||||
logger(LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d"),
|
||||
logger(LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
|
||||
VERSION, __DATE__, __TIME__, debug_level);
|
||||
|
||||
xalloc_fail_func = memory_full;
|
||||
|
|
@ -371,7 +371,7 @@ bool execute_script(const char *name, char **envp) {
|
|||
}
|
||||
#endif
|
||||
|
||||
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
|
||||
ifdebug(STATUS) logger(LOG_INFO, "Executing script %s", name);
|
||||
|
||||
#ifdef HAVE_PUTENV
|
||||
/* Set environment */
|
||||
|
|
@ -401,20 +401,20 @@ bool execute_script(const char *name, char **envp) {
|
|||
if(status != -1) {
|
||||
if(WIFEXITED(status)) { /* Child exited by itself */
|
||||
if(WEXITSTATUS(status)) {
|
||||
logger(LOG_ERR, _("Script %s exited with non-zero status %d"),
|
||||
logger(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(LOG_ERR, _("Script %s was killed by signal %d (%s)"),
|
||||
logger(LOG_ERR, "Script %s was killed by signal %d (%s)",
|
||||
name, WTERMSIG(status), strsignal(WTERMSIG(status)));
|
||||
return false;
|
||||
} else { /* Something strange happened */
|
||||
logger(LOG_ERR, _("Script %s terminated abnormally"), name);
|
||||
logger(LOG_ERR, "Script %s terminated abnormally", name);
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
logger(LOG_ERR, _("System call `%s' failed: %s"), "system", strerror(errno));
|
||||
logger(LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -429,7 +429,7 @@ bool execute_script(const char *name, char **envp) {
|
|||
|
||||
#ifndef HAVE_MINGW
|
||||
static RETSIGTYPE sigterm_handler(int a) {
|
||||
logger(LOG_NOTICE, _("Got %s signal"), "TERM");
|
||||
logger(LOG_NOTICE, "Got %s signal", "TERM");
|
||||
if(running)
|
||||
running = false;
|
||||
else
|
||||
|
|
@ -437,7 +437,7 @@ static RETSIGTYPE sigterm_handler(int a) {
|
|||
}
|
||||
|
||||
static RETSIGTYPE sigquit_handler(int a) {
|
||||
logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
|
||||
logger(LOG_NOTICE, "Got %s signal", "QUIT");
|
||||
if(running)
|
||||
running = false;
|
||||
else
|
||||
|
|
@ -445,17 +445,17 @@ static RETSIGTYPE sigquit_handler(int a) {
|
|||
}
|
||||
|
||||
static RETSIGTYPE fatal_signal_square(int a) {
|
||||
logger(LOG_ERR, _("Got another fatal signal %d (%s): not restarting."), a,
|
||||
logger(LOG_ERR, "Got another fatal signal %d (%s): not restarting.", a,
|
||||
strsignal(a));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static RETSIGTYPE fatal_signal_handler(int a) {
|
||||
struct sigaction act;
|
||||
logger(LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a));
|
||||
logger(LOG_ERR, "Got fatal signal %d (%s)", a, strsignal(a));
|
||||
|
||||
if(do_detach) {
|
||||
logger(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
|
||||
logger(LOG_NOTICE, "Trying to re-execute in 5 seconds...");
|
||||
|
||||
act.sa_handler = fatal_signal_square;
|
||||
act.sa_mask = emptysigset;
|
||||
|
|
@ -467,27 +467,27 @@ static RETSIGTYPE fatal_signal_handler(int a) {
|
|||
remove_pid(pidfilename);
|
||||
execvp(g_argv[0], g_argv);
|
||||
} else {
|
||||
logger(LOG_NOTICE, _("Not restarting."));
|
||||
logger(LOG_NOTICE, "Not restarting.");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
static RETSIGTYPE sighup_handler(int a) {
|
||||
logger(LOG_NOTICE, _("Got %s signal"), "HUP");
|
||||
logger(LOG_NOTICE, "Got %s signal", "HUP");
|
||||
sighup = true;
|
||||
}
|
||||
|
||||
static RETSIGTYPE sigint_handler(int a) {
|
||||
logger(LOG_NOTICE, _("Got %s signal"), "INT");
|
||||
logger(LOG_NOTICE, "Got %s signal", "INT");
|
||||
|
||||
if(saved_debug_level != -1) {
|
||||
logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
|
||||
logger(LOG_NOTICE, "Reverting to old debug level (%d)",
|
||||
saved_debug_level);
|
||||
debug_level = saved_debug_level;
|
||||
saved_debug_level = -1;
|
||||
} else {
|
||||
logger(LOG_NOTICE,
|
||||
_("Temporarily setting debug level to 5. Kill me with SIGINT again to go back to level %d."),
|
||||
"Temporarily setting debug level to 5. Kill me with SIGINT again to go back to level %d.",
|
||||
debug_level);
|
||||
saved_debug_level = debug_level;
|
||||
debug_level = 5;
|
||||
|
|
@ -495,7 +495,7 @@ static RETSIGTYPE sigint_handler(int a) {
|
|||
}
|
||||
|
||||
static RETSIGTYPE sigalrm_handler(int a) {
|
||||
logger(LOG_NOTICE, _("Got %s signal"), "ALRM");
|
||||
logger(LOG_NOTICE, "Got %s signal", "ALRM");
|
||||
sigalrm = true;
|
||||
}
|
||||
|
||||
|
|
@ -515,11 +515,11 @@ static RETSIGTYPE sigwinch_handler(int a) {
|
|||
}
|
||||
|
||||
static RETSIGTYPE unexpected_signal_handler(int a) {
|
||||
logger(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
|
||||
logger(LOG_WARNING, "Got unexpected signal %d (%s)", a, strsignal(a));
|
||||
}
|
||||
|
||||
static RETSIGTYPE ignore_signal_handler(int a) {
|
||||
ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
|
||||
ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Ignored signal %d (%s)", a, strsignal(a));
|
||||
}
|
||||
|
||||
static struct {
|
||||
|
|
@ -572,7 +572,7 @@ void setup_signals(void) {
|
|||
for(i = 0; sighandlers[i].signal; i++) {
|
||||
act.sa_handler = sighandlers[i].handler;
|
||||
if(sigaction(sighandlers[i].signal, &act, NULL) < 0)
|
||||
fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"),
|
||||
fprintf(stderr, "Installing signal handler for signal %d (%s) failed: %s\n",
|
||||
sighandlers[i].signal, strsignal(sighandlers[i].signal),
|
||||
strerror(errno));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue