diff options
author | Werner Koch <wk@gnupg.org> | 2020-11-11 15:22:51 +0100 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2020-11-11 15:23:22 +0100 |
commit | d574213ce21c495d9432eeb5956e8857826876c6 (patch) | |
tree | e5ca4539906ac55975683f6163853f1bd6b5c2c0 /g10/plaintext.c | |
parent | gpg: Fix the previous commit. (diff) | |
download | gnupg2-d574213ce21c495d9432eeb5956e8857826876c6.tar.xz gnupg2-d574213ce21c495d9432eeb5956e8857826876c6.zip |
w32: Replace some fopen by es_fopen.
* agent/protect-tool.c (read_file): Replace fopen by es_fopen.
* dirmngr/dirmngr-client.c (read_pem_certificate): Ditto.
(read_certificate): Ditto.
* g10/keydb.c (rt_from_file): Ditto.
* kbx/kbxutil.c (read_file): Ditto.
* g10/plaintext.c (get_output_file) [__riscos__]: Remove code.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/plaintext.c')
-rw-r--r-- | g10/plaintext.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/g10/plaintext.c b/g10/plaintext.c index f9e0a4296..3e169d93f 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -146,7 +146,6 @@ get_output_file (const byte *embedded_name, int embedded_namelen, } } -#ifndef __riscos__ if (opt.outfp && is_secured_file (es_fileno (opt.outfp))) { err = gpg_error (GPG_ERR_EPERM); @@ -168,44 +167,6 @@ get_output_file (const byte *embedded_name, int embedded_namelen, log_error (_("error creating '%s': %s\n"), fname, gpg_strerror (err)); goto leave; } -#else /* __riscos__ */ - /* If no output filename was given, i.e. we constructed it, convert - all '.' in fname to '/' but not vice versa as we don't create - directories! */ - if (!opt.outfile) - for (c = 0; fname[c]; ++c) - if (fname[c] == '.') - fname[c] = '/'; - - if (fp || nooutput) - ; - else - { - /* Note: riscos stuff is not expected to work anymore. If we - want to port it again to riscos we should do most of the suff - in estream. FIXME: Consider to remove all riscos special - cases. */ - fp = fopen (fname, "wb"); - if (!fp) - { - log_error (_("error creating '%s': %s\n"), fname, gpg_strerror (err)); - err = GPG_ERR_CREATE_FILE; - if (errno == 106) - log_info ("Do output file and input file have the same name?\n"); - goto leave; - } - - /* If there's a ,xxx extension in the embedded filename, - use that, else check whether the user input (in fname) - has a ,xxx appended, then use that in preference */ - if ((c = riscos_get_filetype_from_string (embedded_name, - embedded_namelen)) != -1) - filetype = c; - if ((c = riscos_get_filetype_from_string (fname, strlen (fname))) != -1) - filetype = c; - riscos_set_filetype_by_number (fname, filetype); - } -#endif /* __riscos__ */ leave: if (err) |