gpg-key2ps: assume gpg output to be in utf-8, instead of depending on the

[pgp-tools.git] / gpg-key2ps / gpg-key2ps

diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps
index e73d9a6d17d3e21d89ae45b9cbe325338ed0991e..9351707776d6546ecf2c96e48e5e4aa2abaf30b8 100755 (executable)
--- a/gpg-key2ps/gpg-key2ps
+++ b/gpg-key2ps/gpg-key2ps
@@ -253,7 +253,7 @@ while(<GPG>) {
        }
        # user ids
        s/\\x([0-9a-f][0-9a-f])/ chr(hex($1)) /gie;
-       $_ = `echo "$_" | iconv -ct latin1`;
+       $_ = `echo "$_" | iconv -c -f utf-8 -t latin1`;
        s/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/     ($1) uid/;
        # revoked user id
        if (s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) revuid/) {