}\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
else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_BYTES_LOW);\r
if (service->rotate_bytes_high) set_number(key, NSSM_REG_ROTATE_BYTES_HIGH, service->rotate_bytes_high);\r
else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_BYTES_HIGH);\r
+ if (service->no_console) set_number(key, NSSM_REG_NO_CONSOLE, 1);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_NO_CONSOLE);\r
\r
/* Environment */\r
if (service->env) {\r
return 0;\r
}\r
\r
-int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {\r
+int get_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {\r
unsigned long type = REG_MULTI_SZ;\r
\r
/* Dummy test to find buffer size */\r
*env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, *envlen);\r
if (! *env) {\r
*envlen = 0;\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("set_environment()"), 0);\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_environment()"), 0);\r
return 3;\r
}\r
\r
return 0;\r
}\r
\r
-/* Replace NULL with CRLF. Leave NULL NULL as the end marker. */\r
-int format_environment(TCHAR *env, unsigned long envlen, TCHAR **formatted, unsigned long *newlen) {\r
- unsigned long i, j;\r
- *newlen = envlen;\r
\r
- if (! *newlen) {\r
- *formatted = 0;\r
- return 0;\r
- }\r
-\r
- for (i = 0; i < envlen; i++) if (! env[i] && env[i + 1]) ++*newlen;\r
-\r
- *formatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));\r
- if (! *formatted) {\r
- *newlen = 0;\r
- return 1;\r
- }\r
-\r
- for (i = 0, j = 0; i < envlen; i++) {\r
- (*formatted)[j] = env[i];\r
- if (! env[i]) {\r
- if (env[i + 1]) {\r
- (*formatted)[j] = _T('\r');\r
- (*formatted)[++j] = _T('\n');\r
- }\r
- }\r
- j++;\r
- }\r
-\r
- return 0;\r
-}\r
-\r
-/* Strip CR and replace LF with NULL. */\r
-int unformat_environment(TCHAR *env, unsigned long envlen, TCHAR **unformatted, unsigned long *newlen) {\r
- unsigned long i, j;\r
- *newlen = 0;\r
-\r
- if (! envlen) {\r
- *unformatted = 0;\r
- return 0;\r
- }\r
-\r
- for (i = 0; i < envlen; i++) if (env[i] != _T('\r')) ++*newlen;\r
- /* Must end with two NULLs. */\r
- *newlen += 2;\r
-\r
- *unformatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));\r
- if (! *unformatted) return 1;\r
-\r
- for (i = 0, j = 0; i < envlen; i++) {\r
- if (env[i] == _T('\r')) continue;\r
- if (env[i] == _T('\n')) (*unformatted)[j] = _T('\0');\r
- else (*unformatted)[j] = env[i];\r
- j++;\r
- }\r
-\r
- 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
/* 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
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
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
}\r
\r
/* Try to get environment variables - may fail */\r
- set_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);\r
+ get_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);\r
/* Environment variables to add to existing rather than replace - may fail. */\r
- set_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);\r
-\r
- if (si) {\r
- if (service->env_extra) {\r
- TCHAR *env;\r
- unsigned long envlen;\r
-\r
- /* Copy our environment for the application. */\r
- if (! service->env) {\r
- TCHAR *rawenv = GetEnvironmentStrings();\r
- env = rawenv;\r
- if (env) {\r
- /*\r
- The environment block starts with variables of the form\r
- =C:=C:\Windows\System32 which we ignore.\r
- */\r
- while (*env == _T('=')) {\r
- for ( ; *env; env++);\r
- env++;\r
- }\r
- envlen = 0;\r
- if (*env) {\r
- while (true) {\r
- for ( ; env[envlen]; envlen++);\r
- if (! env[++envlen]) break;\r
- }\r
- envlen++;\r
-\r
- service->envlen = envlen * sizeof(TCHAR);\r
- service->env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, service->envlen);\r
- memmove(service->env, env, service->envlen);\r
- FreeEnvironmentStrings(rawenv);\r
- }\r
- }\r
- }\r
-\r
- /* Append extra variables to configured variables. */\r
- if (service->env) {\r
- envlen = service->envlen + service->env_extralen - sizeof(TCHAR)/*?*/;\r
- env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
- if (env) {\r
- memmove(env, service->env, service->envlen - sizeof(TCHAR));\r
- /* envlen is in bytes but env[i] is in characters. */\r
- memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);\r
-\r
- HeapFree(GetProcessHeap(), 0, service->env);\r
- HeapFree(GetProcessHeap(), 0, service->env_extra);\r
- service->env = env;\r
- service->envlen = envlen;\r
- }\r
- else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0);\r
- }\r
- else {\r
- /* Huh? No environment at all? */\r
- service->env = service->env_extra;\r
- service->envlen = service->env_extralen;\r
- }\r
- }\r
-\r
- service->env_extra = 0;\r
- service->env_extralen = 0;\r
- }\r
+ get_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);\r
\r
/* Try to get priority - may fail. */\r
unsigned long priority;\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
+ /* Try to get force new console setting - may fail. */\r
+ if (get_number(key, NSSM_REG_NO_CONSOLE, &service->no_console, false) != 1) service->no_console = 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
git://git.iain.cx/iain / nssm.git / blobdiff