Allow configuring output file truncation.

[nssm.git] / gui.cpp

diff --git a/gui.cpp b/gui.cpp
index 4bcb144..7cc5bc4 100644 (file)
--- a/gui.cpp
+++ b/gui.cpp
@@ -4,15 +4,6 @@ static enum { NSSM_TAB_APPLICATION, NSSM_TAB_SHUTDOWN, NSSM_TAB_EXIT, NSSM_TAB_I
 static HWND tablist[NSSM_NUM_TABS];\r
 static int selected_tab;\r
 \r
-static void strip_basename(char *buffer) {\r
-  size_t len = strlen(buffer);\r
-  size_t i;\r
-  for (i = len; i && buffer[i] != '\\' && buffer[i] != '/'; i--);\r
-  /* X:\ is OK. */\r
-  if (i && buffer[i-1] == ':') i++;\r
-  buffer[i] = '\0';\r
-}\r
-\r
 int nssm_gui(int resource, char *name) {\r
   /* Create window */\r
   HWND dlg = CreateDialog(0, MAKEINTRESOURCE(resource), 0, install_dlg);\r
@@ -143,6 +134,21 @@ int install(HWND window) {
     check_io("stdin", service->stdin_path, sizeof(service->stdin_path), IDC_STDIN);\r
     check_io("stdout", service->stdout_path, sizeof(service->stdout_path), IDC_STDOUT);\r
     check_io("stderr", service->stderr_path, sizeof(service->stderr_path), IDC_STDERR);\r
+    /* I/O defaults. */\r
+    service->stdin_sharing = NSSM_STDIN_SHARING;\r
+    service->stdin_disposition = NSSM_STDIN_DISPOSITION;\r
+    service->stdin_flags = NSSM_STDIN_FLAGS;\r
+    service->stdout_sharing = NSSM_STDOUT_SHARING;\r
+    service->stdout_disposition = NSSM_STDOUT_DISPOSITION;\r
+    service->stdout_flags = NSSM_STDOUT_FLAGS;\r
+    service->stderr_sharing = NSSM_STDERR_SHARING;\r
+    service->stderr_disposition = NSSM_STDERR_DISPOSITION;\r
+    service->stderr_flags = NSSM_STDERR_FLAGS;\r
+    /* Override stdout and/or stderr. */\r
+    if (SendDlgItemMessage(tablist[NSSM_TAB_IO], IDC_TRUNCATE, BM_GETCHECK, 0, 0) & BST_CHECKED) {\r
+      if (service->stdout_path[0]) service->stdout_disposition = CREATE_ALWAYS;\r
+      if (service->stderr_path[0]) service->stderr_disposition = CREATE_ALWAYS;\r
+    }\r
 \r
     /* Get environment. */\r
     unsigned long envlen = (unsigned long) SendMessage(GetDlgItem(tablist[NSSM_TAB_ENVIRONMENT], IDC_ENVIRONMENT), WM_GETTEXTLENGTH, 0, 0);\r
@@ -166,7 +172,7 @@ int install(HWND window) {
       unsigned long i, j;\r
       for (i = 0; i < envlen; i++) if (env[i] != '\r') newlen++;\r
       /* Must end with two NULLs. */\r
-      newlen++;\r
+      newlen += 2;\r
 \r
       char *newenv = (char *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, newlen);\r
       if (! newenv) {\r
@@ -444,6 +450,8 @@ INT_PTR CALLBACK install_dlg(HWND window, UINT message, WPARAM w, LPARAM l) {
   switch (message) {\r
     /* Creating the dialogue */\r
     case WM_INITDIALOG:\r
+      SetFocus(GetDlgItem(window, IDC_NAME));\r
+\r
       HWND tabs;\r
       HWND combo;\r
       tabs = GetDlgItem(window, IDC_TAB1);\r