diff options
| author | Werner Koch <wk@gnupg.org> | 2018-05-13 13:29:40 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-05-13 13:29:40 +0200 |
| commit | 7b7576637ddfb6e426e77a86b05af6d828e585d5 (patch) | |
| tree | 21919eed435194f8db1dac8150b581a731a66e26 /common | |
| parent | doc: Include release info from 2.2.6 (diff) | |
| parent | doc: Fix URL in NEWS. (diff) | |
| download | gnupg2-7b7576637ddfb6e426e77a86b05af6d828e585d5.tar.xz gnupg2-7b7576637ddfb6e426e77a86b05af6d828e585d5.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Resolved Conflicts:
NEWS - removed
configure.ac - removed
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/exechelp-w32.c | 2 | ||||
| -rw-r--r-- | common/miscellaneous.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c index fddcbb65c..86b1d6869 100644 --- a/common/exechelp-w32.c +++ b/common/exechelp-w32.c @@ -556,7 +556,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[], memset (&si, 0, sizeof si); si.cb = sizeof (si); si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; - si.wShowWindow = DEBUG_W32_SPAWN? SW_SHOW : SW_MINIMIZE; + si.wShowWindow = DEBUG_W32_SPAWN? SW_SHOW : SW_HIDE; si.hStdInput = inpipe[0] == INVALID_HANDLE_VALUE? nullhd[0] : inpipe[0]; si.hStdOutput = outpipe[1] == INVALID_HANDLE_VALUE? nullhd[1] : outpipe[1]; si.hStdError = errpipe[1] == INVALID_HANDLE_VALUE? nullhd[2] : errpipe[1]; diff --git a/common/miscellaneous.c b/common/miscellaneous.c index 7997a1a83..0b374e6c8 100644 --- a/common/miscellaneous.c +++ b/common/miscellaneous.c @@ -401,6 +401,7 @@ is_file_compressed (const char *s, int *ret_rc) *ret_rc = gpg_error_from_syserror (); return 0; } + iobuf_ioctl (a, IOBUF_IOCTL_NO_CACHE, 1, NULL); if ( iobuf_get_filelength( a, &overflow ) < 6 && !overflow) { *ret_rc = 0; |