diff options
| author | Werner Koch <wk@gnupg.org> | 2017-01-06 18:45:14 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-01-06 18:47:53 +0100 |
| commit | 8d774904c8066d8c0f19cfffe2d568979bb8c470 (patch) | |
| tree | fa71b0e160b7f30cf2d342a7bc4a1a166f1fc6ef /agent | |
| parent | doc: Document summary values of TOFU_STATS (diff) | |
| download | gnupg2-8d774904c8066d8c0f19cfffe2d568979bb8c470.tar.xz gnupg2-8d774904c8066d8c0f19cfffe2d568979bb8c470.zip | |
agent,w32: Fix annoying output to DebugView.
* agent/gpg-agent.c (startup_fd_list): Do not define for W32.
(main) [W32]: Do not call get_all_open_fds.
--
GnuPG-bug-id: 2267
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/gpg-agent.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index f4ed6c5c4..724b55a30 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -303,8 +303,10 @@ static int putty_support; #endif /*HAVE_W32_SYSTEM*/ /* The list of open file descriptors at startup. Note that this list - has been allocated using the standard malloc. */ + * has been allocated using the standard malloc. */ +#ifndef HAVE_W32_SYSTEM static int *startup_fd_list; +#endif /* The signal mask at startup and a flag telling whether it is valid. */ #ifdef HAVE_SIGPROCMASK @@ -949,8 +951,10 @@ main (int argc, char **argv ) /* Before we do anything else we save the list of currently open file descriptors and the signal mask. This info is required to - do the exec call properly. */ + do the exec call properly. We don't need it on Windows. */ +#ifndef HAVE_W32_SYSTEM startup_fd_list = get_all_open_fds (); +#endif /*!HAVE_W32_SYSTEM*/ #ifdef HAVE_SIGPROCMASK if (!sigprocmask (SIG_UNBLOCK, NULL, &startup_signal_mask)) startup_signal_mask_valid = 1; |