X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=c794ed186a4509904d99ccf45b7033e3cf2b67c9;hb=e3b93d0c37ae200fa0375e4be6f435008050b385;hp=caa0fb1f812d7ec94e82b930e249e54f7554d059;hpb=7fdd3f6c44421a7c4872ecea56e550c19489c949;p=nssm.git diff --git a/registry.cpp b/registry.cpp index caa0fb1..c794ed1 100644 --- a/registry.cpp +++ b/registry.cpp @@ -17,7 +17,7 @@ int create_messages() { } /* Get path of this program */ - TCHAR path[MAX_PATH]; + TCHAR path[PATH_LENGTH]; GetModuleFileName(0, path, _countof(path)); /* Try to register the module but don't worry so much on failure */ @@ -111,6 +111,8 @@ int create_parameters(nssm_service_t *service, bool editing) { } if (service->rotate_files) set_number(key, NSSM_REG_ROTATE, 1); else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE); + if (service->rotate_stdout_online) set_number(key, NSSM_REG_ROTATE_ONLINE, 1); + else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_ONLINE); if (service->rotate_seconds) set_number(key, NSSM_REG_ROTATE_SECONDS, service->rotate_seconds); else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_SECONDS); if (service->rotate_bytes_low) set_number(key, NSSM_REG_ROTATE_BYTES_LOW, service->rotate_bytes_low); @@ -220,69 +222,11 @@ int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, un return 0; } -/* Replace NULL with CRLF. Leave NULL NULL as the end marker. */ -int format_environment(TCHAR *env, unsigned long envlen, TCHAR **formatted, unsigned long *newlen) { - unsigned long i, j; - *newlen = envlen; - if (! *newlen) { - *formatted = 0; - return 0; - } - - for (i = 0; i < envlen; i++) if (! env[i] && env[i + 1]) ++*newlen; - - *formatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR)); - if (! *formatted) { - *newlen = 0; - return 1; - } - - for (i = 0, j = 0; i < envlen; i++) { - (*formatted)[j] = env[i]; - if (! env[i]) { - if (env[i + 1]) { - (*formatted)[j] = _T('\r'); - (*formatted)[++j] = _T('\n'); - } - } - j++; - } - - return 0; -} - -/* Strip CR and replace LF with NULL. */ -int unformat_environment(TCHAR *env, unsigned long envlen, TCHAR **unformatted, unsigned long *newlen) { - unsigned long i, j; - *newlen = 0; - - if (! envlen) { - *unformatted = 0; - return 0; - } - - for (i = 0; i < envlen; i++) if (env[i] != _T('\r')) ++*newlen; - /* Must end with two NULLs. */ - *newlen += 2; - - *unformatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR)); - if (! *unformatted) return 1; - - for (i = 0, j = 0; i < envlen; i++) { - if (env[i] == _T('\r')) continue; - if (env[i] == _T('\n')) (*unformatted)[j] = _T('\0'); - else (*unformatted)[j] = env[i]; - j++; - } - - return 0; -} - -int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) { +int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool expand, bool sanitise, bool must_exist) { TCHAR *buffer = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, datalen); if (! buffer) { - log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("expand_parameter()"), 0); + log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_string()"), 0); return 1; } @@ -307,6 +251,11 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, /* Paths aren't allowed to contain quotes. */ if (sanitise) PathUnquoteSpaces(buffer); + /* Do we want to expand the string? */ + if (! expand) { + if (type == REG_EXPAND_SZ) type = REG_SZ; + } + /* Technically we shouldn't expand environment strings from REG_SZ values */ if (type != REG_EXPAND_SZ) { memmove(data, buffer, buflen); @@ -325,6 +274,14 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, return 0; } +int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) { + return get_string(key, value, data, datalen, false, sanitise, true); +} + +int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) { + return get_string(key, value, data, datalen, true, sanitise, must_exist); +} + int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) { return expand_parameter(key, value, data, datalen, sanitise, true); } @@ -334,12 +291,23 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, Returns: 0 if it was set. 1 on error. */ -int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) { - if (RegSetValueEx(key, value, 0, REG_EXPAND_SZ, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0; +int set_string(HKEY key, TCHAR *value, TCHAR *string, bool expand) { + unsigned long type = expand ? REG_EXPAND_SZ : REG_SZ; + if (RegSetValueEx(key, value, 0, type, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0; log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, value, error_string(GetLastError()), 0); return 1; } +int set_string(HKEY key, TCHAR *value, TCHAR *string) { + return set_string(key, value, string, false); + return 1; +} + +int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) { + return set_string(key, value, string, true); + return 1; +} + /* Set an unsigned long in the registry. Returns: 0 if it was set. @@ -500,38 +468,63 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) { if (si) { if (service->env_extra) { - /* Append these to any other environment variables set. */ + TCHAR *env; + unsigned long envlen; + + /* Copy our environment for the application. */ + if (! service->env) { + TCHAR *rawenv = GetEnvironmentStrings(); + env = rawenv; + if (env) { + /* + The environment block starts with variables of the form + =C:=C:\Windows\System32 which we ignore. + */ + while (*env == _T('=')) { + for ( ; *env; env++); + env++; + } + envlen = 0; + if (*env) { + while (true) { + for ( ; env[envlen]; envlen++); + if (! env[++envlen]) break; + } + envlen++; + + service->envlen = envlen * sizeof(TCHAR); + service->env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, service->envlen); + memmove(service->env, env, service->envlen); + FreeEnvironmentStrings(rawenv); + } + } + } + + /* Append extra variables to configured variables. */ if (service->env) { - /* Append extra variables to configured variables. */ - unsigned long envlen = service->envlen + service->env_extralen - 1; - TCHAR *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen); + envlen = service->envlen + service->env_extralen - sizeof(TCHAR)/*?*/; + env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen); if (env) { memmove(env, service->env, service->envlen - sizeof(TCHAR)); - /* envlen is in bytes. */ + /* envlen is in bytes but env[i] is in characters. */ memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen); HeapFree(GetProcessHeap(), 0, service->env); + HeapFree(GetProcessHeap(), 0, service->env_extra); service->env = env; service->envlen = envlen; } else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0); } else { - /* Append extra variables to our environment. */ - TCHAR *env, *s; - size_t envlen, len; - - env = service->env_extra; - len = 0; - while (*env) { - envlen = _tcslen(env) + 1; - for (s = env; *s && *s != _T('='); s++); - if (*s == _T('=')) *s++ = _T('\0'); - if (! SetEnvironmentVariable(env, s)) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETENVIRONMENTVARIABLE_FAILED, env, s, error_string(GetLastError()), 0); - env += envlen; - } + /* Huh? No environment at all? */ + service->env = service->env_extra; + service->envlen = service->env_extralen; } } + + service->env_extra = 0; + service->env_extralen = 0; } /* Try to get priority - may fail. */ @@ -548,12 +541,17 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) { else service->rotate_files = false; } else service->rotate_files = false; + if (get_number(key, NSSM_REG_ROTATE_ONLINE, &rotate_files, false) == 1) { + if (rotate_files) service->rotate_stdout_online = service->rotate_stderr_online = true; + else service->rotate_stdout_online = service->rotate_stderr_online = false; + } + else service->rotate_stdout_online = service->rotate_stderr_online = false; if (get_number(key, NSSM_REG_ROTATE_SECONDS, &service->rotate_seconds, false) != 1) service->rotate_seconds = 0; if (get_number(key, NSSM_REG_ROTATE_BYTES_LOW, &service->rotate_bytes_low, false) != 1) service->rotate_bytes_low = 0; if (get_number(key, NSSM_REG_ROTATE_BYTES_HIGH, &service->rotate_bytes_high, false) != 1) service->rotate_bytes_high = 0; /* Change to startup directory in case stdout/stderr are relative paths. */ - TCHAR cwd[MAX_PATH]; + TCHAR cwd[PATH_LENGTH]; GetCurrentDirectory(_countof(cwd), cwd); SetCurrentDirectory(service->dir);