Added str_number().

[nssm.git] / service.cpp

diff --git a/service.cpp b/service.cpp
index 781f269..d402ab3 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -65,6 +65,22 @@ QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE
   return qsc;\r
 }\r
 \r
+int set_service_description(const TCHAR *service_name, SC_HANDLE service_handle, TCHAR *buffer) {\r
+  SERVICE_DESCRIPTION description;\r
+  ZeroMemory(&description, sizeof(description));\r
+  /*\r
+    lpDescription must be NULL if we aren't changing, the new description\r
+    or "".\r
+  */\r
+  if (buffer && buffer[0]) description.lpDescription = buffer;\r
+  else description.lpDescription = _T("");\r
+\r
+  if (ChangeServiceConfig2(service_handle, SERVICE_CONFIG_DESCRIPTION, &description)) return 0;\r
+\r
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_DESCRIPTION_FAILED, service_name, error_string(GetLastError()), 0);\r
+  return 1;\r
+}\r
+\r
 int get_service_description(const TCHAR *service_name, SC_HANDLE service_handle, unsigned long len, TCHAR *buffer) {\r
   if (! buffer) return 1;\r
 \r
@@ -142,6 +158,30 @@ int get_service_startup(const TCHAR *service_name, SC_HANDLE service_handle, con
   return 0;\r
 }\r
 \r
+int get_service_username(const TCHAR *service_name, const QUERY_SERVICE_CONFIG *qsc, TCHAR **username, size_t *usernamelen) {\r
+  if (! username) return 1;\r
+  if (! usernamelen) return 1;\r
+\r
+  *username = 0;\r
+  *usernamelen = 0;\r
+\r
+  if (! qsc) return 1;\r
+\r
+  if (str_equiv(qsc->lpServiceStartName, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;\r
+\r
+  size_t len = _tcslen(qsc->lpServiceStartName);\r
+  *username = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));\r
+  if (! *username) {\r
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("username"), _T("get_service_username()"));\r
+    return 2;\r
+  }\r
+\r
+  memmove(*username, qsc->lpServiceStartName, (len + 1) * sizeof(TCHAR));\r
+  *usernamelen = len;\r
+\r
+  return 0;\r
+}\r
+\r
 static int grant_logon_as_service(const TCHAR *username) {\r
   if (str_equiv(username, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;\r
 \r
@@ -424,21 +464,13 @@ int pre_edit_service(int argc, TCHAR **argv) {
     return 4;\r
   }\r
 \r
-  if (! str_equiv(qsc->lpServiceStartName, NSSM_LOCALSYSTEM_ACCOUNT)) {\r
-    size_t len = _tcslen(qsc->lpServiceStartName);\r
-    service->username = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));\r
-    if (service->username) {\r
-      memmove(service->username, qsc->lpServiceStartName, (len + 1) * sizeof(TCHAR));\r
-      service->usernamelen = (unsigned long) len;\r
-    }\r
-    else {\r
-      HeapFree(GetProcessHeap(), 0, qsc);\r
-      CloseHandle(service->handle);\r
-      CloseServiceHandle(services);\r
-      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("username"), _T("pre_edit_service()"));\r
-      return 5;\r
-    }\r
+  if (get_service_username(service->name, qsc, &service->username, &service->usernamelen)) {\r
+    HeapFree(GetProcessHeap(), 0, qsc);\r
+    CloseHandle(service->handle);\r
+    CloseServiceHandle(services);\r
+    return 5;\r
   }\r
+\r
   _sntprintf_s(service->displayname, _countof(service->displayname), _TRUNCATE, _T("%s"), qsc->lpDisplayName);\r
 \r
   /* Get the canonical service name. We open it case insensitively. */\r
@@ -573,13 +605,7 @@ int edit_service(nssm_service_t *service, bool editing) {
   }\r
 \r
   if (service->description[0] || editing) {\r
-    SERVICE_DESCRIPTION description;\r
-    ZeroMemory(&description, sizeof(description));\r
-    if (service->description[0]) description.lpDescription = service->description;\r
-    else description.lpDescription = 0;\r
-    if (! ChangeServiceConfig2(service->handle, SERVICE_CONFIG_DESCRIPTION, &description)) {\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_DESCRIPTION_FAILED, service->name, error_string(GetLastError()), 0);\r
-    }\r
+    set_service_description(service->name, service->handle, service->description);\r
   }\r
 \r
   SERVICE_DELAYED_AUTO_START_INFO delayed;\r