X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=cccfa2b55d161578d74dd117dd229447be78e88c;hb=aa519d5f870a1069107c04fca707f84ea5d204a6;hp=e3824ff87f4eb462d9b1f1800bc8a5de5532ce1f;hpb=4d0f8abd0f891348080589ffacd1b9f1fd3faf41;p=nssm.git

diff --git a/service.cpp b/service.cpp
index e3824ff..cccfa2b 100644
--- a/service.cpp
+++ b/service.cpp
@@ -65,6 +65,39 @@ QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE
   return qsc;
 }
 
+int get_service_description(const TCHAR *service_name, SC_HANDLE service_handle, unsigned long len, TCHAR *buffer) {
+  if (! buffer) return 1;
+
+  unsigned long bufsize;
+  QueryServiceConfig2(service_handle, SERVICE_CONFIG_DESCRIPTION, 0, 0, &bufsize);
+  unsigned long error = GetLastError();
+  if (error == ERROR_INSUFFICIENT_BUFFER) {
+    SERVICE_DESCRIPTION *description = (SERVICE_DESCRIPTION *) HeapAlloc(GetProcessHeap(), 0, bufsize);
+    if (! description) {
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("SERVICE_CONFIG_DESCRIPTION"), _T("get_service_description()"));
+      return 2;
+    }
+
+    if (QueryServiceConfig2(service_handle, SERVICE_CONFIG_DESCRIPTION, (unsigned char *) description, bufsize, &bufsize)) {
+      if (description->lpDescription) _sntprintf_s(buffer, len, _TRUNCATE, _T("%s"), description->lpDescription);
+      else ZeroMemory(buffer, len * sizeof(TCHAR));
+      HeapFree(GetProcessHeap(), 0, description);
+      return 0;
+    }
+    else {
+      HeapFree(GetProcessHeap(), 0, description);
+      print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_CONFIG_DESCRIPTION"), error_string(error));
+      return 3;
+    }
+  }
+  else {
+    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_CONFIG_DESCRIPTION"), error_string(error));
+    return 4;
+  }
+
+  return 0;
+}
+
 int get_service_startup(const TCHAR *service_name, SC_HANDLE service_handle, const QUERY_SERVICE_CONFIG *qsc, unsigned long *startup) {
   if (! qsc) return 1;
 
@@ -109,6 +142,30 @@ int get_service_startup(const TCHAR *service_name, SC_HANDLE service_handle, con
   return 0;
 }
 
+int get_service_username(const TCHAR *service_name, const QUERY_SERVICE_CONFIG *qsc, TCHAR **username, size_t *usernamelen) {
+  if (! username) return 1;
+  if (! usernamelen) return 1;
+
+  *username = 0;
+  *usernamelen = 0;
+
+  if (! qsc) return 1;
+
+  if (str_equiv(qsc->lpServiceStartName, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;
+
+  size_t len = _tcslen(qsc->lpServiceStartName);
+  *username = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));
+  if (! *username) {
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("username"), _T("get_service_username()"));
+    return 2;
+  }
+
+  memmove(*username, qsc->lpServiceStartName, (len + 1) * sizeof(TCHAR));
+  *usernamelen = len;
+
+  return 0;
+}
+
 static int grant_logon_as_service(const TCHAR *username) {
   if (str_equiv(username, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;
 
@@ -368,7 +425,6 @@ int pre_edit_service(int argc, TCHAR **argv) {
 
   /* Get system details. */
   unsigned long bufsize;
-  unsigned long error;
   QUERY_SERVICE_CONFIG *qsc = query_service_config(service->name, service->handle);
   if (! qsc) {
     CloseHandle(service->handle);
@@ -392,21 +448,13 @@ int pre_edit_service(int argc, TCHAR **argv) {
     return 4;
   }
 
-  if (! str_equiv(qsc->lpServiceStartName, NSSM_LOCALSYSTEM_ACCOUNT)) {
-    size_t len = _tcslen(qsc->lpServiceStartName);
-    service->username = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));
-    if (service->username) {
-      memmove(service->username, qsc->lpServiceStartName, (len + 1) * sizeof(TCHAR));
-      service->usernamelen = (unsigned long) len;
-    }
-    else {
-      HeapFree(GetProcessHeap(), 0, qsc);
-      CloseHandle(service->handle);
-      CloseServiceHandle(services);
-      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("username"), _T("pre_edit_service()"));
-      return 5;
-    }
+  if (get_service_username(service->name, qsc, &service->username, &service->usernamelen)) {
+    HeapFree(GetProcessHeap(), 0, qsc);
+    CloseHandle(service->handle);
+    CloseServiceHandle(services);
+    return 5;
   }
+
   _sntprintf_s(service->displayname, _countof(service->displayname), _TRUNCATE, _T("%s"), qsc->lpDisplayName);
 
   /* Get the canonical service name. We open it case insensitively. */
@@ -418,33 +466,9 @@ int pre_edit_service(int argc, TCHAR **argv) {
   HeapFree(GetProcessHeap(), 0, qsc);
 
   /* Get extended system details. */
-  QueryServiceConfig2(service->handle, SERVICE_CONFIG_DESCRIPTION, 0, 0, &bufsize);
-  error = GetLastError();
-  if (error == ERROR_INSUFFICIENT_BUFFER) {
-    SERVICE_DESCRIPTION *description = (SERVICE_DESCRIPTION *) HeapAlloc(GetProcessHeap(), 0, bufsize);
-    if (! description) {
-      CloseHandle(service->handle);
-      CloseServiceHandle(services);
-      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("SERVICE_CONFIG_DESCRIPTION"), _T("pre_edit_service()"));
-      return 6;
-    }
-
-    if (QueryServiceConfig2(service->handle, SERVICE_CONFIG_DESCRIPTION, (unsigned char *) description, bufsize, &bufsize)) {
-     if (description->lpDescription) _sntprintf_s(service->description, _countof(service->description), _TRUNCATE, _T("%s"), description->lpDescription);
-      HeapFree(GetProcessHeap(), 0, description);
-    }
-    else {
-      HeapFree(GetProcessHeap(), 0, description);
-      CloseHandle(service->handle);
-      CloseServiceHandle(services);
-      print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service->name, _T("SERVICE_CONFIG_DELAYED_AUTO_START_INFO"), error_string(error));
-      return 6;
-    }
-  }
-  else {
+  if (get_service_description(service->name, service->handle, _countof(service->description), service->description)) {
     CloseHandle(service->handle);
     CloseServiceHandle(services);
-    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service->name, _T("SERVICE_CONFIG_DELAYED_AUTO_START_INFO"), error_string(error));
     return 6;
   }