X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.cpp;h=0b586f36cb427fdacc1d1f6dd631c79cd082bbb4;hb=e26682667e15433cad518e622c3c061840b487dd;hp=37f3aea34e9f608c794a5215285873e422326e5d;hpb=f1d6394333ce0f90c423d74a9860620942f2bb6f;p=nssm.git

diff --git a/nssm.cpp b/nssm.cpp
index 37f3aea..0b586f3 100644
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -4,6 +4,9 @@ extern unsigned long tls_index;
 extern bool is_admin;
 extern imports_t imports;
 
+static TCHAR unquoted_imagepath[PATH_LENGTH];
+static TCHAR imagepath[PATH_LENGTH];
+
 /* Are two strings case-insensitively equivalent? */
 int str_equiv(const TCHAR *a, const TCHAR *b) {
   size_t len = _tcslen(a);
@@ -55,24 +58,35 @@ void check_admin() {
   FreeSid(AdministratorsGroup);
 }
 
-/* See if we were launched from a console window. */
-static void check_console() {
-  /* If we're running in a service context there will be no console window. */
-  HWND console = GetConsoleWindow();
-  if (! console) return;
+static int elevate(int argc, TCHAR **argv, unsigned long message) {
+  print_message(stderr, message);
 
-  unsigned long pid;
-  if (! GetWindowThreadProcessId(console, &pid)) return;
+  SHELLEXECUTEINFO sei;
+  ZeroMemory(&sei, sizeof(sei));
+  sei.cbSize = sizeof(sei);
+  sei.lpVerb = _T("runas");
+  sei.lpFile = (TCHAR *) nssm_imagepath();
 
-  /*
-    If the process associated with the console window handle is the same as
-    this process, we were not launched from an existing console.  The user
-    probably double-clicked our executable.
-  */
-  if (GetCurrentProcessId() != pid) return;
+  TCHAR *args = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, EXE_LENGTH * sizeof(TCHAR));
+  if (! args) {
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("GetCommandLine()"), _T("elevate()"));
+    return 111;
+  }
 
-  /* We close our new console so that subsequent messages appear in a popup. */
-  FreeConsole();
+  /* Get command line, which includes the path to NSSM, and skip that part. */
+  _sntprintf_s(args, EXE_LENGTH, _TRUNCATE, _T("%s"), GetCommandLine());
+  size_t s = _tcslen(argv[0]) + 1;
+  if (args[0] == _T('"')) s += 2;
+  while (isspace(args[s])) s++;
+
+  sei.lpParameters = args + s;
+  sei.nShow = SW_SHOW;
+
+  unsigned long exitcode = 0;
+  if (! ShellExecuteEx(&sei)) exitcode = 100;
+
+  HeapFree(GetProcessHeap(), 0, (void *) args);
+  return exitcode;
 }
 
 int num_cpus() {
@@ -82,6 +96,14 @@ int num_cpus() {
   return (int) i;
 }
 
+const TCHAR *nssm_unquoted_imagepath() {
+  return unquoted_imagepath;
+}
+
+const TCHAR *nssm_imagepath() {
+  return imagepath;
+}
+
 int _tmain(int argc, TCHAR **argv) {
   check_console();
 
@@ -97,6 +119,14 @@ int _tmain(int argc, TCHAR **argv) {
   /* Remember if we are admin */
   check_admin();
 
+  /* Set up function pointers. */
+  if (get_imports()) exit(111);
+
+  /* Remember our path for later. */
+  GetModuleFileName(0, unquoted_imagepath, _countof(unquoted_imagepath));
+  GetModuleFileName(0, imagepath, _countof(imagepath));
+  PathQuoteSpaces(imagepath);
+
   /* Elevate */
   if (argc > 1) {
     /*
@@ -105,32 +135,28 @@ int _tmain(int argc, TCHAR **argv) {
     */
     if (str_equiv(argv[1], _T("start"))) exit(control_service(NSSM_SERVICE_CONTROL_START, argc - 2, argv + 2));
     if (str_equiv(argv[1], _T("stop"))) exit(control_service(SERVICE_CONTROL_STOP, argc - 2, argv + 2));
+    if (str_equiv(argv[1], _T("restart"))) {
+      int ret = control_service(SERVICE_CONTROL_STOP, argc - 2, argv + 2);
+      if (ret) exit(ret);
+      exit(control_service(NSSM_SERVICE_CONTROL_START, argc - 2, argv + 2));
+    }
     if (str_equiv(argv[1], _T("pause"))) exit(control_service(SERVICE_CONTROL_PAUSE, argc - 2, argv + 2));
     if (str_equiv(argv[1], _T("continue"))) exit(control_service(SERVICE_CONTROL_CONTINUE, argc - 2, argv + 2));
     if (str_equiv(argv[1], _T("status"))) exit(control_service(SERVICE_CONTROL_INTERROGATE, argc - 2, argv + 2));
     if (str_equiv(argv[1], _T("rotate"))) exit(control_service(NSSM_SERVICE_CONTROL_ROTATE, argc - 2, argv + 2));
     if (str_equiv(argv[1], _T("install"))) {
-      if (! is_admin) {
-        print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL);
-        exit(100);
-      }
+      if (! is_admin) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL));
       exit(pre_install_service(argc - 2, argv + 2));
     }
     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"))) {
-      if (! is_admin) {
-        print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_EDIT);
-        exit(100);
-      }
       int ret = pre_edit_service(argc - 1, argv + 1);
+      if (ret == 3 && ! is_admin && argc == 3) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_EDIT));
       /* There might be a password here. */
       for (int i = 0; i < argc; i++) SecureZeroMemory(argv[i], _tcslen(argv[i]) * sizeof(TCHAR));
       exit(ret);
     }
     if (str_equiv(argv[1], _T("remove"))) {
-      if (! is_admin) {
-        print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_REMOVE);
-        exit(100);
-      }
+      if (! is_admin) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_REMOVE));
       exit(pre_remove_service(argc - 2, argv + 2));
     }
   }
@@ -151,10 +177,7 @@ int _tmain(int argc, TCHAR **argv) {
     actually running as a service.
     This will save time when running with no arguments from a command prompt.
   */
-  if (_fileno(stdin) < 0) {
-    /* Set up function pointers. */
-    if (get_imports()) exit(111);
-
+  if (! GetStdHandle(STD_INPUT_HANDLE)) {
     /* Start service magic */
     SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };
     if (! StartServiceCtrlDispatcher(table)) {