X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.cpp;h=1f9e0ed1376cfb0cd22b0917a183de6e92c3d8d6;hb=62f28c55d444d846579159133dbe091809a2c08b;hp=9fde560f32b1054e4865a81bec552f35ce4f2f00;hpb=800ca0c4f150de75c38c87a59d18878b0341f16b;p=nssm.git diff --git a/nssm.cpp b/nssm.cpp index 9fde560..1f9e0ed 100644 --- a/nssm.cpp +++ b/nssm.cpp @@ -9,6 +9,7 @@ static TCHAR imagepath[PATH_LENGTH]; static TCHAR imageargv0[PATH_LENGTH]; void nssm_exit(int status) { + free_imports(); unsetup_utf8(); exit(status); } @@ -255,6 +256,7 @@ int _tmain(int argc, TCHAR **argv) { if (str_equiv(argv[1], _T("pause"))) nssm_exit(control_service(SERVICE_CONTROL_PAUSE, argc - 2, argv + 2)); if (str_equiv(argv[1], _T("continue"))) nssm_exit(control_service(SERVICE_CONTROL_CONTINUE, argc - 2, argv + 2)); if (str_equiv(argv[1], _T("status"))) nssm_exit(control_service(SERVICE_CONTROL_INTERROGATE, argc - 2, argv + 2)); + if (str_equiv(argv[1], _T("statuscode"))) nssm_exit(control_service(SERVICE_CONTROL_INTERROGATE, argc - 2, argv + 2, true)); if (str_equiv(argv[1], _T("rotate"))) nssm_exit(control_service(NSSM_SERVICE_CONTROL_ROTATE, argc - 2, argv + 2)); if (str_equiv(argv[1], _T("install"))) { if (! is_admin) nssm_exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL)); @@ -300,7 +302,6 @@ int _tmain(int argc, TCHAR **argv) { /* User probably ran nssm with no argument */ if (error == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) nssm_exit(usage(1)); log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(error), 0); - free_imports(); nssm_exit(100); } }