X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=766f73ba2578aa78aea607da0f9277c745fe1c1c;hb=4c009756eefa8c649e3d97673da7b2477d33cf37;hp=74fe047e287fb34d621b759ca483a5eb6f04c6f6;hpb=df8b0890255d7d1eeade3ba7754ef37c61d2fbad;p=nssm.git

diff --git a/registry.cpp b/registry.cpp
index 74fe047..766f73b 100644
--- a/registry.cpp
+++ b/registry.cpp
@@ -28,68 +28,79 @@ int create_messages() {
   return 0;
 }
 
-int create_parameters(nssm_service_t *service) {
-  /* Get registry */
-  TCHAR registry[KEY_LENGTH];
-  if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY, service->name) < 0) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("NSSM_REGISTRY"), _T("create_parameters()"), 0);
-    return 1;
-  }
-
+int create_parameters(nssm_service_t *service, bool editing) {
   /* Try to open the registry */
-  HKEY key;
-  if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &key, 0) != ERROR_SUCCESS) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);
-    return 2;
-  }
+  HKEY key = open_registry(service->name, KEY_WRITE);
+  if (! key) return 1;
 
   /* Try to create the parameters */
   if (set_expand_string(key, NSSM_REG_EXE, service->exe)) {
     RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);
     RegCloseKey(key);
-    return 3;
+    return 2;
   }
   if (set_expand_string(key, NSSM_REG_FLAGS, service->flags)) {
     RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);
     RegCloseKey(key);
-    return 4;
+    return 3;
   }
   if (set_expand_string(key, NSSM_REG_DIR, service->dir)) {
     RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);
     RegCloseKey(key);
-    return 5;
+    return 4;
   }
 
   /* Other non-default parameters. May fail. */
   unsigned long stop_method_skip = ~service->stop_method;
   if (stop_method_skip) set_number(key, NSSM_REG_STOP_METHOD_SKIP, stop_method_skip);
-  if (service->default_exit_action < NSSM_NUM_EXIT_ACTIONS) create_exit_action(service->name, exit_action_strings[service->default_exit_action]);
+  else if (editing) RegDeleteValue(key, NSSM_REG_STOP_METHOD_SKIP);
+  if (service->default_exit_action < NSSM_NUM_EXIT_ACTIONS) create_exit_action(service->name, exit_action_strings[service->default_exit_action], editing);
   if (service->throttle_delay != NSSM_RESET_THROTTLE_RESTART) set_number(key, NSSM_REG_THROTTLE, service->throttle_delay);
+  else if (editing) RegDeleteValue(key, NSSM_REG_THROTTLE);
   if (service->kill_console_delay != NSSM_KILL_CONSOLE_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_CONSOLE_GRACE_PERIOD, service->kill_console_delay);
+  else if (editing) RegDeleteValue(key, NSSM_REG_KILL_CONSOLE_GRACE_PERIOD);
   if (service->kill_window_delay != NSSM_KILL_WINDOW_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD, service->kill_window_delay);
+  else if (editing) RegDeleteValue(key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD);
   if (service->kill_threads_delay != NSSM_KILL_THREADS_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_THREADS_GRACE_PERIOD, service->kill_threads_delay);
-  if (service->stdin_path[0]) {
-    set_expand_string(key, NSSM_REG_STDIN, service->stdin_path);
+  else if (editing) RegDeleteValue(key, NSSM_REG_KILL_THREADS_GRACE_PERIOD);
+  if (service->stdin_path[0] || editing) {
+    if (service->stdin_path[0]) set_expand_string(key, NSSM_REG_STDIN, service->stdin_path);
+    else if (editing) RegDeleteValue(key, NSSM_REG_STDIN);
     if (service->stdin_sharing != NSSM_STDIN_SHARING) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_SHARING, service->stdin_sharing);
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_SHARING);
     if (service->stdin_disposition != NSSM_STDIN_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_DISPOSITION, service->stdin_disposition);
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_DISPOSITION);
     if (service->stdin_flags != NSSM_STDIN_FLAGS) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_FLAGS, service->stdin_flags);
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_FLAGS);
   }
-  if (service->stdout_path[0]) {
-    set_expand_string(key, NSSM_REG_STDOUT, service->stdout_path);
+  if (service->stdout_path[0] || editing) {
+    if (service->stdout_path[0]) set_expand_string(key, NSSM_REG_STDOUT, service->stdout_path);
+    else if (editing) RegDeleteValue(key, NSSM_REG_STDOUT);
     if (service->stdout_sharing != NSSM_STDOUT_SHARING) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_SHARING, service->stdout_sharing);
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_SHARING);
     if (service->stdout_disposition != NSSM_STDOUT_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_DISPOSITION, service->stdout_disposition);
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_DISPOSITION);
     if (service->stdout_flags != NSSM_STDOUT_FLAGS) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_FLAGS, service->stdout_flags);
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_FLAGS);
   }
-  if (service->stderr_path[0]) {
-    set_expand_string(key, NSSM_REG_STDERR, service->stderr_path);
+  if (service->stderr_path[0] || editing) {
+    if (service->stderr_path[0]) set_expand_string(key, NSSM_REG_STDERR, service->stderr_path);
+    else if (editing) RegDeleteValue(key, NSSM_REG_STDERR);
     if (service->stderr_sharing != NSSM_STDERR_SHARING) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_SHARING, service->stderr_sharing);
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_SHARING);
     if (service->stderr_disposition != NSSM_STDERR_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_DISPOSITION, service->stderr_disposition);
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_DISPOSITION);
     if (service->stderr_flags != NSSM_STDERR_FLAGS) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_FLAGS, service->stderr_flags);
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_FLAGS);
   }
   if (service->rotate_files) set_number(key, NSSM_REG_ROTATE, 1);
+  else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE);
   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);
+  else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_BYTES_LOW);
   if (service->rotate_bytes_high) set_number(key, NSSM_REG_ROTATE_BYTES_HIGH, service->rotate_bytes_high);
+  else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_BYTES_HIGH);
 
   /* Environment */
   if (service->env) {
@@ -97,11 +108,13 @@ int create_parameters(nssm_service_t *service) {
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);
     }
   }
+  else if (editing) RegDeleteValue(key, NSSM_REG_ENV);
   if (service->env_extra) {
     if (RegSetValueEx(key, NSSM_REG_ENV_EXTRA, 0, REG_MULTI_SZ, (const unsigned char *) service->env_extra, (unsigned long) service->env_extralen * sizeof(TCHAR)) != ERROR_SUCCESS) {
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_ENV_EXTRA, error_string(GetLastError()), 0);
     }
   }
+  else if (editing) RegDeleteValue(key, NSSM_REG_ENV_EXTRA);
 
   /* Close registry. */
   RegCloseKey(key);
@@ -109,7 +122,7 @@ int create_parameters(nssm_service_t *service) {
   return 0;
 }
 
-int create_exit_action(TCHAR *service_name, const TCHAR *action_string) {
+int create_exit_action(TCHAR *service_name, const TCHAR *action_string, bool editing) {
   /* Get registry */
   TCHAR registry[KEY_LENGTH];
   if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY _T("\\%s"), service_name, NSSM_REG_EXIT) < 0) {
@@ -126,7 +139,7 @@ int create_exit_action(TCHAR *service_name, const TCHAR *action_string) {
   }
 
   /* Do nothing if the key already existed */
-  if (disposition == REG_OPENED_EXISTING_KEY) {
+  if (disposition == REG_OPENED_EXISTING_KEY && ! editing) {
     RegCloseKey(key);
     return 0;
   }
@@ -311,23 +324,46 @@ void override_milliseconds(TCHAR *service_name, HKEY key, TCHAR *value, unsigned
   if (! ok) *buffer = default_value;
 }
 
-int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
-  unsigned long ret;
-
+HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam) {
   /* Get registry */
   TCHAR registry[KEY_LENGTH];
-  if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY, service->name) < 0) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("NSSM_REGISTRY"), _T("get_parameters()"), 0);
-    return 1;
+  HKEY key;
+  int ret;
+
+  if (sub) ret = _sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY _T("\\%s"), service_name, sub);
+  else ret = _sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY, service_name);
+  if (ret < 0) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("NSSM_REGISTRY"), _T("open_registry()"), 0);
+    return 0;
   }
 
-  /* Try to open the registry */
-  HKEY key;
-  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, KEY_READ, &key) != ERROR_SUCCESS) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);
-    return 2;
+  if (sam & KEY_WRITE) {
+    if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, sam, 0, &key, 0) != ERROR_SUCCESS) {
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);
+      return 0;
+    }
+  }
+  else {
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, sam, &key) != ERROR_SUCCESS) {
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);
+      return 0;
+    }
   }
 
+  return key;
+}
+
+HKEY open_registry(const TCHAR *service_name, REGSAM sam) {
+  return open_registry(service_name, 0, sam);
+}
+
+int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
+  unsigned long ret;
+
+  /* Try to open the registry */
+  HKEY key = open_registry(service->name, KEY_READ);
+  if (! key) return 1;
+
   /* Try to get executable file - MUST succeed */
   if (expand_parameter(key, NSSM_REG_EXE, service->exe, sizeof(service->exe), false)) {
     RegCloseKey(key);
@@ -452,30 +488,47 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   override_milliseconds(service->name, key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD, &service->kill_window_delay, NSSM_KILL_WINDOW_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_WINDOW_GRACE_PERIOD);
   override_milliseconds(service->name, key, NSSM_REG_KILL_THREADS_GRACE_PERIOD, &service->kill_threads_delay, NSSM_KILL_THREADS_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_THREADS_GRACE_PERIOD);
 
+  /* Try to get default exit action. */
+  bool default_action;
+  service->default_exit_action = NSSM_EXIT_RESTART;
+  TCHAR action_string[ACTION_LEN];
+  if (! get_exit_action(service->name, 0, action_string, &default_action)) {
+    for (int i = 0; exit_action_strings[i]; i++) {
+      if (! _tcsnicmp((const TCHAR *) action_string, exit_action_strings[i], ACTION_LEN)) {
+        service->default_exit_action = i;
+        break;
+      }
+    }
+  }
+
   /* Close registry */
   RegCloseKey(key);
 
   return 0;
 }
 
-int get_exit_action(TCHAR *service_name, unsigned long *ret, TCHAR *action, bool *default_action) {
+/*
+  Sets the string for the exit action corresponding to the exit code.
+
+  ret is a pointer to an unsigned long containing the exit code.
+  If ret is NULL, we retrieve the default exit action unconditionally.
+
+  action is a buffer which receives the string.
+
+  default_action is a pointer to a bool which is set to false if there
+  was an explicit string for the given exit code, or true if we are
+  returning the default action.
+
+  Returns: 0 on success.
+           1 on error.
+*/
+int get_exit_action(const TCHAR *service_name, unsigned long *ret, TCHAR *action, bool *default_action) {
   /* Are we returning the default action or a status-specific one? */
   *default_action = ! ret;
 
-  /* Get registry */
-  TCHAR registry[KEY_LENGTH];
-  if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY _T("\\%s"), service_name, NSSM_REG_EXIT) < 0) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("NSSM_REG_EXIT"), _T("get_exit_action()"), 0);
-    return 1;
-  }
-
   /* Try to open the registry */
-  HKEY key;
-  long error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, KEY_READ, &key);
-  if (error != ERROR_SUCCESS && error != ERROR_FILE_NOT_FOUND) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);
-    return 2;
-  }
+  HKEY key = open_registry(service_name, NSSM_REG_EXIT, KEY_READ);
+  if (! key) return 1;
 
   unsigned long type = REG_SZ;
   unsigned long action_len = ACTION_LEN;