Fixed NSSM_EVENT_DUPLICATEHANDLE_FAILED message.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index 443d2e5..158158d 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -17,7 +17,7 @@ int create_messages() {
   }\r
 \r
   /* Get path of this program */\r
-  TCHAR path[MAX_PATH];\r
+  TCHAR path[PATH_LENGTH];\r
   GetModuleFileName(0, path, _countof(path));\r
 \r
   /* Try to register the module but don't worry so much on failure */\r
@@ -111,6 +111,8 @@ int create_parameters(nssm_service_t *service, bool editing) {
   }\r
   if (service->rotate_files) set_number(key, NSSM_REG_ROTATE, 1);\r
   else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE);\r
+  if (service->rotate_stdout_online) set_number(key, NSSM_REG_ROTATE_ONLINE, 1);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_ONLINE);\r
   if (service->rotate_seconds) set_number(key, NSSM_REG_ROTATE_SECONDS, service->rotate_seconds);\r
   else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_SECONDS);\r
   if (service->rotate_bytes_low) set_number(key, NSSM_REG_ROTATE_BYTES_LOW, service->rotate_bytes_low);\r
@@ -279,10 +281,10 @@ int unformat_environment(TCHAR *env, unsigned long envlen, TCHAR **unformatted,
   return 0;\r
 }\r
 \r
-int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {\r
+int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool expand, bool sanitise, bool must_exist) {\r
   TCHAR *buffer = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, datalen);\r
   if (! buffer) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("expand_parameter()"), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_string()"), 0);\r
     return 1;\r
   }\r
 \r
@@ -307,6 +309,11 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   /* Paths aren't allowed to contain quotes. */\r
   if (sanitise) PathUnquoteSpaces(buffer);\r
 \r
+  /* Do we want to expand the string? */\r
+  if (! expand) {\r
+    if (type == REG_EXPAND_SZ) type = REG_SZ;\r
+  }\r
+\r
   /* Technically we shouldn't expand environment strings from REG_SZ values */\r
   if (type != REG_EXPAND_SZ) {\r
     memmove(data, buffer, buflen);\r
@@ -325,6 +332,14 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   return 0;\r
 }\r
 \r
+int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {\r
+  return get_string(key, value, data, datalen, false, sanitise, true);\r
+}\r
+\r
+int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {\r
+  return get_string(key, value, data, datalen, true, sanitise, must_exist);\r
+}\r
+\r
 int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {\r
   return expand_parameter(key, value, data, datalen, sanitise, true);\r
 }\r
@@ -334,12 +349,23 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   Returns: 0 if it was set.\r
            1 on error.\r
 */\r
-int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {\r
-  if (RegSetValueEx(key, value, 0, REG_EXPAND_SZ, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;\r
+int set_string(HKEY key, TCHAR *value, TCHAR *string, bool expand) {\r
+  unsigned long type = expand ? REG_EXPAND_SZ : REG_SZ;\r
+  if (RegSetValueEx(key, value, 0, type, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;\r
   log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, value, error_string(GetLastError()), 0);\r
   return 1;\r
 }\r
 \r
+int set_string(HKEY key, TCHAR *value, TCHAR *string) {\r
+  return set_string(key, value, string, false);\r
+  return 1;\r
+}\r
+\r
+int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {\r
+  return set_string(key, value, string, true);\r
+  return 1;\r
+}\r
+\r
 /*\r
   Set an unsigned long in the registry.\r
   Returns: 0 if it was set.\r
@@ -573,12 +599,17 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
     else service->rotate_files = false;\r
   }\r
   else service->rotate_files = false;\r
+  if (get_number(key, NSSM_REG_ROTATE_ONLINE, &rotate_files, false) == 1) {\r
+    if (rotate_files) service->rotate_stdout_online = service->rotate_stderr_online = true;\r
+    else service->rotate_stdout_online = service->rotate_stderr_online = false;\r
+  }\r
+  else service->rotate_stdout_online = service->rotate_stderr_online = false;\r
   if (get_number(key, NSSM_REG_ROTATE_SECONDS, &service->rotate_seconds, false) != 1) service->rotate_seconds = 0;\r
   if (get_number(key, NSSM_REG_ROTATE_BYTES_LOW, &service->rotate_bytes_low, false) != 1) service->rotate_bytes_low = 0;\r
   if (get_number(key, NSSM_REG_ROTATE_BYTES_HIGH, &service->rotate_bytes_high, false) != 1) service->rotate_bytes_high = 0;\r
 \r
   /* Change to startup directory in case stdout/stderr are relative paths. */\r
-  TCHAR cwd[MAX_PATH];\r
+  TCHAR cwd[PATH_LENGTH];\r
   GetCurrentDirectory(_countof(cwd), cwd);\r
   SetCurrentDirectory(service->dir);\r
 \r