Allow compiling as a Unicode application.

[nssm.git] / nssm.cpp

diff --git a/nssm.cpp b/nssm.cpp
index 1ee38bd..86a1827 100644 (file)
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -2,14 +2,24 @@
 \r
 extern unsigned long tls_index;\r
 extern bool is_admin;\r
+extern imports_t imports;\r
 \r
-/* String function */\r
-int str_equiv(const char *a, const char *b) {\r
-  int i;\r
-  for (i = 0; ; i++) {\r
-    if (tolower(b[i]) != tolower(a[i])) return 0;\r
-    if (! a[i]) return 1;\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
+  if (_tcslen(b) != len) return 0;\r
+  if (_tcsnicmp(a, b, len)) return 0;\r
+  return 1;\r
+}\r
+\r
+/* Remove basename of a path. */\r
+void strip_basename(TCHAR *buffer) {\r
+  size_t len = _tcslen(buffer);\r
+  size_t i;\r
+  for (i = len; i && buffer[i] != _T('\\') && buffer[i] != _T('/'); i--);\r
+  /* X:\ is OK. */\r
+  if (i && buffer[i - 1] == _T(':')) i++;\r
+  buffer[i] = _T('\0');\r
 }\r
 \r
 /* How to use me correctly */\r
@@ -29,21 +39,21 @@ void check_admin() {
   FreeSid(AdministratorsGroup);\r
 }\r
 \r
-int main(int argc, char **argv) {\r
+int _tmain(int argc, TCHAR **argv) {\r
   /* Remember if we are admin */\r
   check_admin();\r
 \r
   /* Elevate */\r
   if (argc > 1) {\r
     /* Valid commands are install or remove */\r
-    if (str_equiv(argv[1], "install")) {\r
+    if (str_equiv(argv[1], _T("install"))) {\r
       if (! is_admin) {\r
         print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL);\r
         exit(100);\r
       }\r
       exit(pre_install_service(argc - 2, argv + 2));\r
     }\r
-    if (str_equiv(argv[1], "remove")) {\r
+    if (str_equiv(argv[1], _T("remove"))) {\r
       if (! is_admin) {\r
         print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_REMOVE);\r
         exit(100);\r
@@ -69,6 +79,9 @@ int main(int argc, char **argv) {
     This will save time when running with no arguments from a command prompt.\r
   */\r
   if (_fileno(stdin) < 0) {\r
+    /* Set up function pointers. */\r
+    if (get_imports()) exit(111);\r
+\r
     /* Start service magic */\r
     SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };\r
     if (! StartServiceCtrlDispatcher(table)) {\r
@@ -76,6 +89,7 @@ int main(int argc, char **argv) {
       /* User probably ran nssm with no argument */\r
       if (error == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) exit(usage(1));\r
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(error), 0);\r
+      free_imports();\r
       exit(100);\r
     }\r
   }\r