diff options
| author | Werner Koch <[email protected]> | 2017-11-15 10:01:10 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-11-15 10:01:10 +0000 |
| commit | 091c4af64543cf95d92e09664b5eb1b729782064 (patch) | |
| tree | 1abe5f5a75a39852e5e78f17efed1d4f86426afe /tools/gpgtar-extract.c | |
| parent | dirmngr: Check for WKD support at session end (diff) | |
| parent | doc: Add man page for gpgtar (diff) | |
| download | gnupg-091c4af64543cf95d92e09664b5eb1b729782064.tar.gz gnupg-091c4af64543cf95d92e09664b5eb1b729782064.zip | |
Merge branch 'STABLE-BRANCH-2-2'
--
Kept our AUTHORS and README
Diffstat (limited to 'tools/gpgtar-extract.c')
| -rw-r--r-- | tools/gpgtar-extract.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c index b0e17cb10..8613d193f 100644 --- a/tools/gpgtar-extract.c +++ b/tools/gpgtar-extract.c @@ -345,21 +345,21 @@ gpgtar_extract (const char *filename, int decrypt) dirname = xtrystrdup (opt.directory); else { - if (filename) + if (opt.filename) { - dirprefix = strrchr (filename, '/'); + dirprefix = strrchr (opt.filename, '/'); if (dirprefix) dirprefix++; else - dirprefix = filename; + dirprefix = opt.filename; } - else if (opt.filename) + else if (filename) { - dirprefix = strrchr (opt.filename, '/'); + dirprefix = strrchr (filename, '/'); if (dirprefix) dirprefix++; else - dirprefix = opt.filename; + dirprefix = filename; } if (!dirprefix || !*dirprefix) |