X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=077c1e8b2c39b017fd2e25fe9c6449d7d5bb2270;hb=8aa782adfab4d63e4115fead833c864fe43d4cbc;hp=dffd7aa000b7f907790da095f0cb0c436f9812bc;hpb=fce252d07bdf443e3b283c26a940d3b0f26fd440;p=nssm.git

diff --git a/service.cpp b/service.cpp
index dffd7aa..077c1e8 100644
--- a/service.cpp
+++ b/service.cpp
@@ -5,8 +5,7 @@ bool use_critical_section;
 
 extern imports_t imports;
 
-static enum { NSSM_EXIT_RESTART, NSSM_EXIT_IGNORE, NSSM_EXIT_REALLY, NSSM_EXIT_UNCLEAN } exit_actions;
-static const char *exit_action_strings[] = { "Restart", "Ignore", "Exit", "Suicide", 0 };
+const char *exit_action_strings[] = { "Restart", "Ignore", "Exit", "Suicide", 0 };
 
 static inline int throttle_milliseconds(unsigned long throttle) {
   /* pow() operates on doubles. */
@@ -44,6 +43,7 @@ nssm_service_t *alloc_nssm_service() {
 void cleanup_nssm_service(nssm_service_t *service) {
   if (! service) return;
   if (service->env) HeapFree(GetProcessHeap(), 0, service->env);
+  if (service->env_extra) HeapFree(GetProcessHeap(), 0, service->env_extra);
   if (service->handle) CloseServiceHandle(service->handle);
   if (service->process_handle) CloseHandle(service->process_handle);
   if (service->wait_handle) UnregisterWait(service->process_handle);
@@ -69,7 +69,7 @@ int pre_install_service(int argc, char **argv) {
   /* Arguments are optional */
   size_t flagslen = 0;
   size_t s = 0;
-  size_t i;
+  int i;
   for (i = 2; i < argc; i++) flagslen += strlen(argv[i]) + 1;
   if (! flagslen) flagslen = 1;
 
@@ -87,10 +87,8 @@ int pre_install_service(int argc, char **argv) {
   }
 
   /* Work out directory name */
-  size_t len = strlen(service->exe);
-  for (i = len; i && service->exe[i] != '\\' && service->exe[i] != '/'; i--);
-  memmove(service->dir, service->exe, i);
-  service->dir[i] = '\0';
+  memmove(service->dir, service->exe, sizeof(service->dir));
+  strip_basename(service->dir);
 
   int ret = install_service(service);
   cleanup_nssm_service(service);