David Bremner committed some fixes.

[nssm.git] / nssm.cpp

diff --git a/nssm.cpp b/nssm.cpp
index 7eef69d..647ea40 100644 (file)
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -4,6 +4,9 @@ extern unsigned long tls_index;
 extern bool is_admin;\r
 extern imports_t imports;\r
 \r
+static TCHAR unquoted_imagepath[PATH_LENGTH];\r
+static TCHAR imagepath[PATH_LENGTH];\r
+\r
 /* Are two strings case-insensitively equivalent? */\r
 int str_equiv(const TCHAR *a, const TCHAR *b) {\r
   size_t len = _tcslen(a);\r
@@ -62,16 +65,10 @@ static int elevate(int argc, TCHAR **argv, unsigned long message) {
   ZeroMemory(&sei, sizeof(sei));\r
   sei.cbSize = sizeof(sei);\r
   sei.lpVerb = _T("runas");\r
-  sei.lpFile = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, PATH_LENGTH);\r
-  if (! sei.lpFile) {\r
-    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("GetModuleFileName()"), _T("elevate()"));\r
-    return 111;\r
-  }\r
-  GetModuleFileName(0, (TCHAR *) sei.lpFile, PATH_LENGTH);\r
+  sei.lpFile = (TCHAR *) nssm_imagepath();\r
 \r
   TCHAR *args = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, EXE_LENGTH * sizeof(TCHAR));\r
   if (! args) {\r
-    HeapFree(GetProcessHeap(), 0, (void *) sei.lpFile);\r
     print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("GetCommandLine()"), _T("elevate()"));\r
     return 111;\r
   }\r
@@ -88,7 +85,6 @@ static int elevate(int argc, TCHAR **argv, unsigned long message) {
   unsigned long exitcode = 0;\r
   if (! ShellExecuteEx(&sei)) exitcode = 100;\r
 \r
-  HeapFree(GetProcessHeap(), 0, (void *) sei.lpFile);\r
   HeapFree(GetProcessHeap(), 0, (void *) args);\r
   return exitcode;\r
 }\r
@@ -100,6 +96,14 @@ int num_cpus() {
   return (int) i;\r
 }\r
 \r
+const TCHAR *nssm_unquoted_imagepath() {\r
+  return unquoted_imagepath;\r
+}\r
+\r
+const TCHAR *nssm_imagepath() {\r
+  return imagepath;\r
+}\r
+\r
 int _tmain(int argc, TCHAR **argv) {\r
   check_console();\r
 \r
@@ -118,6 +122,11 @@ int _tmain(int argc, TCHAR **argv) {
   /* Set up function pointers. */\r
   if (get_imports()) exit(111);\r
 \r
+  /* Remember our path for later. */\r
+  GetModuleFileName(0, unquoted_imagepath, _countof(unquoted_imagepath));\r
+  GetModuleFileName(0, imagepath, _countof(imagepath));\r
+  PathQuoteSpaces(imagepath);\r
+\r
   /* Elevate */\r
   if (argc > 1) {\r
     /*\r
@@ -137,6 +146,7 @@ int _tmain(int argc, TCHAR **argv) {
     if (str_equiv(argv[1], _T("rotate"))) exit(control_service(NSSM_SERVICE_CONTROL_ROTATE, argc - 2, argv + 2));\r
     if (str_equiv(argv[1], _T("install"))) {\r
       if (! is_admin) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL));\r
+      create_messages();\r
       exit(pre_install_service(argc - 2, argv + 2));\r
     }\r
     if (str_equiv(argv[1], _T("edit")) || str_equiv(argv[1], _T("get")) || str_equiv(argv[1], _T("set")) || str_equiv(argv[1], _T("reset")) || str_equiv(argv[1], _T("unset"))) {\r
@@ -146,6 +156,7 @@ int _tmain(int argc, TCHAR **argv) {
       for (int i = 0; i < argc; i++) SecureZeroMemory(argv[i], _tcslen(argv[i]) * sizeof(TCHAR));\r
       exit(ret);\r
     }\r
+    if (str_equiv(argv[1], _T("list"))) exit(list_nssm_services());\r
     if (str_equiv(argv[1], _T("remove"))) {\r
       if (! is_admin) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_REMOVE));\r
       exit(pre_remove_service(argc - 2, argv + 2));\r