X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.cpp;h=3df55bcc523e00d84ba4f2d7351bd10ed38759d8;hb=caaaa1208f29647987173f7d9bc1aa75b58757b7;hp=6456c9735c4066a8f7fed4222def6077714a8b36;hpb=b0a6672810ee06052dc3dcf268274d06f0e82a50;p=nssm.git

diff --git a/nssm.cpp b/nssm.cpp
index 6456c97..3df55bc 100644
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -4,6 +4,10 @@ extern unsigned long tls_index;
 extern bool is_admin;
 extern imports_t imports;
 
+static TCHAR unquoted_imagepath[PATH_LENGTH];
+static TCHAR imagepath[PATH_LENGTH];
+static TCHAR imageargv0[PATH_LENGTH];
+
 /* Are two strings case-insensitively equivalent? */
 int str_equiv(const TCHAR *a, const TCHAR *b) {
   size_t len = _tcslen(a);
@@ -55,6 +59,37 @@ void check_admin() {
   FreeSid(AdministratorsGroup);
 }
 
+static int elevate(int argc, TCHAR **argv, unsigned long message) {
+  print_message(stderr, message);
+
+  SHELLEXECUTEINFO sei;
+  ZeroMemory(&sei, sizeof(sei));
+  sei.cbSize = sizeof(sei);
+  sei.lpVerb = _T("runas");
+  sei.lpFile = (TCHAR *) nssm_imagepath();
+
+  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;
+  }
+
+  /* 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() {
   DWORD_PTR i, affinity, system_affinity;
   if (! GetProcessAffinityMask(GetCurrentProcess(), &affinity, &system_affinity)) return 64;
@@ -62,6 +97,18 @@ int num_cpus() {
   return (int) i;
 }
 
+const TCHAR *nssm_unquoted_imagepath() {
+  return unquoted_imagepath;
+}
+
+const TCHAR *nssm_imagepath() {
+  return imagepath;
+}
+
+const TCHAR *nssm_exe() {
+  return imageargv0;
+}
+
 int _tmain(int argc, TCHAR **argv) {
   check_console();
 
@@ -77,6 +124,16 @@ 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. */
+  _sntprintf_s(imageargv0, _countof(imageargv0), _TRUNCATE, _T("%s"), argv[0]);
+  PathQuoteSpaces(imageargv0);
+  GetModuleFileName(0, unquoted_imagepath, _countof(unquoted_imagepath));
+  GetModuleFileName(0, imagepath, _countof(imagepath));
+  PathQuoteSpaces(imagepath);
+
   /* Elevate */
   if (argc > 1) {
     /*
@@ -95,27 +152,20 @@ int _tmain(int argc, TCHAR **argv) {
     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));
+      create_messages();
       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("list"))) exit(list_nssm_services());
     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));
     }
   }
@@ -136,10 +186,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)) {