diff options
author | Werner Koch <[email protected]> | 2016-11-29 15:18:24 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2016-11-29 15:54:36 +0000 |
commit | 60b4982836a00ef6b2a97d16f735b3f6b74dce62 (patch) | |
tree | 95b51ae8ed413646ebdc601d8344fd85e34965dd /g10/gpgv.c | |
parent | g10: Fix memory leak. (diff) | |
download | gnupg-60b4982836a00ef6b2a97d16f735b3f6b74dce62.tar.gz gnupg-60b4982836a00ef6b2a97d16f735b3f6b74dce62.zip |
gpg,sm: Merge the two versions of check_special_filename.
* sm/gpgsm.c (check_special_filename): Move to ..
* common/sysutils.c (check_special_filename): here. Add arg
NOTRANSLATE.
(allow_special_filenames): New local var.
(enable_special_filenames): New public functions.
* sm/gpgsm.c (allow_special_filenames): Remove var.
(main): Call enable_special_filenames instead of setting the var.
(open_read, open_es_fread, open_es_fwrite): Call
check_special_filename with 0 for NOTRANSLATE.
* common/iobuf.c (special_names_enabled): Remove var.
(iobuf_enable_special_filenames): Remove func.
(check_special_filename): Remove func.
(iobuf_is_pipe_filename): Call new version of the function with
NOTRANSLATE set.
(do_open): Ditto.
* g10/gpg.c (main): Call enable_special_filenames instead of
iobuf_enable_special_filenames.
* g10/gpgv.c (main): Ditto.
--
Note that we keep the iobuf.c:translate_file_handle because it is a
bit different (for whatever reasons) than the translate function from
sysutils.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/gpgv.c')
-rw-r--r-- | g10/gpgv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c index 0ecf232e2..bd16b3907 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -204,7 +204,7 @@ main( int argc, char **argv ) break; case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break; case oEnableSpecialFilenames: - iobuf_enable_special_filenames (1); + enable_special_filenames (); break; default : pargs.err = ARGPARSE_PRINT_ERROR; break; } |