diff options
| author | Werner Koch <wk@gnupg.org> | 2014-03-07 09:46:44 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-03-07 16:06:35 +0100 |
| commit | 3032fc3ad78ac9ed857570844547afed520d635a (patch) | |
| tree | 5aa245750d356cbdf6e7d51fb97b7c0fc8d4dc17 /g10/encrypt.c | |
| parent | w32: Include winsock2.h to silence warnings. (diff) | |
| download | gnupg2-3032fc3ad78ac9ed857570844547afed520d635a.tar.xz gnupg2-3032fc3ad78ac9ed857570844547afed520d635a.zip | |
Silence several warnings when building under Windows.
* agent/call-scd.c (start_scd): Replace int by assuan_fd_t.
(start_pinentry): Ditto.
* common/asshelp.c (start_new_gpg_agent): Replace int by assuan_fd_t.
* common/dotlock.c (GNUPG_MAJOR_VERSION): Include stringhelp.h for
prototypes on Windows and some other platforms.
* common/logging.c (fun_writer): Declare addrbuf only if needed.
* g10/decrypt.c (decrypt_message_fd) [W32]: Return not_implemented.
* g10/encrypt.c (encrypt_crypt) [W32]: Return error if used in server
mode.
* g10/dearmor.c (dearmor_file, enarmor_file): Replace GNUPG_INVALID_FD
by -1 as temporary hack for Windows.
* g10/export.c (do_export): Ditto.
* g10/revoke.c (gen_desig_revoke, gen_revoke): Ditto.
* g10/sign.c (sign_file, clearsign_file, sign_symencrypt_file): Ditto.
* g10/server.c (cmd_verify, gpg_server) [W32]: Return an error.
--
The gpg server mode is not actual working and thus we can avoid the
warnings by explicitly disabling the mode. We keep it working under
Unix, though.
Diffstat (limited to 'g10/encrypt.c')
| -rw-r--r-- | g10/encrypt.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index 671f8f6df..c8e796214 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -524,7 +524,17 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename, } /* Prepare iobufs. */ +#ifdef HAVE_W32_SYSTEM + if (filefd == -1) + inp = iobuf_open_fd_or_name (GNUPG_INVALID_FD, filename, "rb"); + else + { + inp = NULL; + gpg_err_set_errno (ENOSYS); + } +#else inp = iobuf_open_fd_or_name (filefd, filename, "rb"); +#endif if (inp) iobuf_ioctl (inp, IOBUF_IOCTL_NO_CACHE, 1, NULL); if (inp && is_secured_file (iobuf_get_fd (inp))) |