@@ -73,7 +73,7 @@ get_console_input_win32(const char *prompt, const bool echo, char *input, const
input[0] = '\0';
in = GetStdHandle(STD_INPUT_HANDLE);
- err = get_orig_stderr();
+ err = GetStdHandle(STD_ERROR_HANDLE);
if (in == INVALID_HANDLE_VALUE
|| err == INVALID_HANDLE_VALUE
@@ -490,25 +490,6 @@ close_syslog(void)
#endif
}
-#ifdef _WIN32
-
-static HANDLE orig_stderr;
-
-HANDLE
-get_orig_stderr(void)
-{
- if (orig_stderr)
- {
- return orig_stderr;
- }
- else
- {
- return GetStdHandle(STD_ERROR_HANDLE);
- }
-}
-
-#endif
-
void
redirect_stdout_stderr(const char *file, bool append)
{
@@ -549,18 +530,6 @@ redirect_stdout_stderr(const char *file, bool append)
}
}
- /* save original stderr for password prompts */
- orig_stderr = GetStdHandle(STD_ERROR_HANDLE);
-
-#if 0 /* seems not be necessary with stdout/stderr redirection below*/
- /* set up for redirection */
- if (!SetStdHandle(STD_OUTPUT_HANDLE, log_handle)
- || !SetStdHandle(STD_ERROR_HANDLE, log_handle))
- {
- msg(M_ERR, "Error: cannot redirect stdout/stderr to --log file: %s", file);
- }
-#endif
-
/* direct stdout/stderr to point to log_handle */
log_fd = _open_osfhandle((intptr_t)log_handle, _O_TEXT);
if (log_fd == -1)
@@ -255,12 +255,6 @@ void close_syslog(void);
/* log file output */
void redirect_stdout_stderr(const char *file, bool append);
-#ifdef _WIN32
-/* get original stderr handle, even if redirected by --log/--log-append */
-HANDLE get_orig_stderr(void);
-
-#endif
-
/* exit program */
void openvpn_exit(const int status);