projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify translation
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
547c51a
..
babdf43
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: process.c,v 1.1.2.6
1 2003/08/02 20:50:38
guus Exp $
+ $Id: process.c,v 1.1.2.6
3 2003/08/03 21:45:13
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-165,6
+165,11
@@
DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
return ERROR_CALL_NOT_IMPLEMENTED;
}
return ERROR_CALL_NOT_IMPLEMENTED;
}
+ if(!running) {
+ status.dwCurrentState = SERVICE_STOP_PENDING;
+ SetServiceStatus(statushandle, &status);
+ }
+
return NO_ERROR;
}
return NO_ERROR;
}
@@
-175,7
+180,6
@@
VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
status.dwServiceType = SERVICE_WIN32;
status.dwServiceType = SERVICE_WIN32;
- status.dwCurrentState = SERVICE_RUNNING;
status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
status.dwWin32ExitCode = 0;
status.dwServiceSpecificExitCode = 0;
status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
status.dwWin32ExitCode = 0;
status.dwServiceSpecificExitCode = 0;
@@
-188,13
+192,16
@@
VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
logger(LOG_ERR, _("System call `%s' failed: %s"), "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
err = 1;
} else {
logger(LOG_ERR, _("System call `%s' failed: %s"), "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
err = 1;
} else {
+ status.dwCurrentState = SERVICE_START_PENDING;
+ SetServiceStatus(statushandle, &status);
+
+ status.dwCurrentState = SERVICE_RUNNING;
SetServiceStatus(statushandle, &status);
err = main2(argc, argv);
status.dwCurrentState = SERVICE_STOPPED;
SetServiceStatus(statushandle, &status);
err = main2(argc, argv);
status.dwCurrentState = SERVICE_STOPPED;
- status.dwWin32ExitCode = err;
-
+ //status.dwWin32ExitCode = err;
SetServiceStatus(statushandle, &status);
}
SetServiceStatus(statushandle, &status);
}
@@
-447,13
+454,13
@@
bool execute_script(const char *name, char **envp)
#ifndef HAVE_MINGW
static RETSIGTYPE sigterm_handler(int a)
{
#ifndef HAVE_MINGW
static RETSIGTYPE sigterm_handler(int a)
{
- logger(LOG_NOTICE, _("Got
TERM signal")
);
+ logger(LOG_NOTICE, _("Got
%s signal"), "TERM"
);
running = false;
}
static RETSIGTYPE sigquit_handler(int a)
{
running = false;
}
static RETSIGTYPE sigquit_handler(int a)
{
- logger(LOG_NOTICE, _("Got
QUIT signal")
);
+ logger(LOG_NOTICE, _("Got
%s signal"), "QUIT"
);
running = false;
}
running = false;
}
@@
-491,12
+498,14
@@
static RETSIGTYPE fatal_signal_handler(int a)
static RETSIGTYPE sighup_handler(int a)
{
static RETSIGTYPE sighup_handler(int a)
{
- logger(LOG_NOTICE, _("Got
HUP signal")
);
+ logger(LOG_NOTICE, _("Got
%s signal"), "HUP"
);
sighup = true;
}
static RETSIGTYPE sigint_handler(int a)
{
sighup = true;
}
static RETSIGTYPE sigint_handler(int a)
{
+ logger(LOG_NOTICE, _("Got %s signal"), "INT");
+
if(saved_debug_level != -1) {
logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
saved_debug_level);
if(saved_debug_level != -1) {
logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
saved_debug_level);
@@
-513,7
+522,7
@@
static RETSIGTYPE sigint_handler(int a)
static RETSIGTYPE sigalrm_handler(int a)
{
static RETSIGTYPE sigalrm_handler(int a)
{
- logger(LOG_NOTICE, _("Got
ALRM signal")
);
+ logger(LOG_NOTICE, _("Got
%s signal"), "ALRM"
);
sigalrm = true;
}
sigalrm = true;
}