X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.cpp;h=e29ead6531ab653f835ed445cc95daa405d6724b;hb=cca8d28295ce27b7c996b47badc6a1e3a6a34e65;hp=0ce86640c74346122a8345577448fee54695f71f;hpb=e42e6900a5dad50b952d92c57344fdea2e13646e;p=nssm.git

diff --git a/nssm.cpp b/nssm.cpp
index 0ce8664..e29ead6 100644
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -4,18 +4,43 @@ extern unsigned long tls_index;
 extern bool is_admin;
 extern imports_t imports;
 
-/* String function */
-int str_equiv(const char *a, const char *b) {
-  int i;
-  for (i = 0; ; i++) {
-    if (tolower(b[i]) != tolower(a[i])) return 0;
-    if (! a[i]) return 1;
-  }
+/* Are two strings case-insensitively equivalent? */
+int str_equiv(const TCHAR *a, const TCHAR *b) {
+  size_t len = _tcslen(a);
+  if (_tcslen(b) != len) return 0;
+  if (_tcsnicmp(a, b, len)) return 0;
+  return 1;
+}
+
+/* Convert a string to a number. */
+int str_number(const TCHAR *string, unsigned long *number, TCHAR **bogus) {
+  if (! string) return 1;
+
+  *number = _tcstoul(string, bogus, 0);
+  if (**bogus) return 2;
+
+  return 0;
+}
+
+int str_number(const TCHAR *string, unsigned long *number) {
+  TCHAR *bogus;
+  return str_number(string, number, &bogus);
+}
+
+/* Remove basename of a path. */
+void strip_basename(TCHAR *buffer) {
+  size_t len = _tcslen(buffer);
+  size_t i;
+  for (i = len; i && buffer[i] != _T('\\') && buffer[i] != _T('/'); i--);
+  /* X:\ is OK. */
+  if (i && buffer[i - 1] == _T(':')) i++;
+  buffer[i] = _T('\0');
 }
 
 /* How to use me correctly */
 int usage(int ret) {
-  print_message(stderr, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_DATE);
+  if (GetConsoleWindow()) print_message(stderr, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_CONFIGURATION, NSSM_DATE);
+  else popup_message(0, MB_OK, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_CONFIGURATION, NSSM_DATE);
   return(ret);
 }
 
@@ -30,21 +55,66 @@ void check_admin() {
   FreeSid(AdministratorsGroup);
 }
 
-int main(int argc, char **argv) {
+int num_cpus() {
+  DWORD_PTR i, affinity, system_affinity;
+  if (! GetProcessAffinityMask(GetCurrentProcess(), &affinity, &system_affinity)) return 64;
+  for (i = 0; system_affinity & (1LL << i); i++);
+  return (int) i;
+}
+
+int _tmain(int argc, TCHAR **argv) {
+  check_console();
+
+#ifdef UNICODE
+  /*
+    Ensure we write in UTF-16 mode, so that non-ASCII characters don't get
+    mangled.  If we were compiled in ANSI mode it won't work.
+   */
+  _setmode(_fileno(stdout), _O_U16TEXT);
+  _setmode(_fileno(stderr), _O_U16TEXT);
+#endif
+
   /* Remember if we are admin */
   check_admin();
 
+  /* Set up function pointers. */
+  if (get_imports()) exit(111);
+
   /* Elevate */
   if (argc > 1) {
-    /* Valid commands are install or remove */
-    if (str_equiv(argv[1], "install")) {
+    /*
+      Valid commands are:
+      start, stop, pause, continue, install, edit, get, set, reset, unset, remove
+    */
+    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);
       }
       exit(pre_install_service(argc - 2, argv + 2));
     }
-    if (str_equiv(argv[1], "remove")) {
+    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);
+      /* 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);
@@ -69,10 +139,7 @@ int main(int argc, char **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)) {