From: myon-guest Date: Tue, 16 Aug 2005 15:07:52 +0000 (+0000) Subject: * gpg-key2ps: X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=a17369aaa3f8783c7ea3ee7425e14f7c8534df18;p=pgp-tools.git * gpg-key2ps: + use Getopt::Long, general code cleanup. + gpg-key2ps "my name" works now. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@190 b513b33f-fedd-0310-b452-c3deb5f4c849 --- diff --git a/debian/changelog b/debian/changelog index 3bb40f8..9153bd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ signing-party (0.4.2-1) UNRELEASED; urgency=low + be more verbose when user tries to sign obsolete v3 crap. + install README.*. * gpglist: added new script, thanks to Uli Martens. + * gpg-key2ps: + + use Getopt::Long, general code cleanup. + + gpg-key2ps "my name" works now. * debian/control: move libpaper-utils to Recommends, remove redundant perl dependency. diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps index ca6244f..c8e58fa 100755 --- a/gpg-key2ps/gpg-key2ps +++ b/gpg-key2ps/gpg-key2ps @@ -1,44 +1,82 @@ #!/usr/bin/perl -w # # gpg-key2ps: convert a PGP/GnuPG key into paper slips. -# Copyright (C) 2001-2005 Simon Richter and Thijs Kinkhorst +# Copyright (C) 2001-2005 Simon Richter +# Copyright (C) 2005 Thijs Kinkhorst +# Copyright (C) 2005 Christoph Berg # Licenced under the GNU General Public License, # version 2 or later. # # $Id$ use strict; -use Getopt::Std; +use Getopt::Long; my $version = '$Rev$'; $version =~ s/\$Rev:\s*(\d+)\s*\$/$1/; -my $usage = "Usage: $0 [-p papersize] [-r revoked-style] keyid-or-name\n"; -my $keyids = ""; -my $revokestyle="hide"; +my $revokestyle = "hide"; +my $creationdate = scalar(localtime); -if ( $#ARGV < 0 ) { - print $usage; - exit 1; +sub version($) { + my $fd = shift; + print $fd "gpg-key2ps $version - (c) 2001-2005 Simon Richter, Thijs Kinkhorst, Christoph Berg\n"; +} + +sub usage($$) { + my ($fd, $exitcode) = @_; + version ($fd); + print $fd < \$opts->{help}, + '--help' => \$opts->{help}, + '-v' => \$opts->{version}, + '--version' => \$opts->{version}, + '-p=s' => \$opts->{papersize}, + '--paper-size=s' => \$opts->{papersize}, + '-r=s' => \$opts->{revokestyle}, + '--revoked-style=s' => \$opts->{revokestyle}, +)) { + usage(\*STDERR, 1); +} + +if ($opts->{help}) { + usage (\*STDOUT, 0); +} + +if ($opts->{version}) { + version (\*STDOUT); + exit 0; +} + +if ( $opts->{revokestyle} ) { $revokestyle = $opts->{revokestyle}; } +if ( $opts->{papersize} ) { $ENV{'PAPERSIZE'} = $opts->{papersize}; } if ( $revokestyle !~ /^(grey|hide|note|show|strike)$/ ) { - print STDERR "Unknown style \"$revokestyle\". Please use one of\n"; - print STDERR " grey - Print text in grey\n"; - print STDERR " hide - Don't show revoked uids\n"; - print STDERR " note - Add \"(revoked)\"\n"; - print STDERR " show - List revoked uids normally\n"; - print STDERR " strike - Strike through lines\n"; - exit 1; + print STDERR "Unknown revoked-style \"$revokestyle\".\n"; + usage (\*STDERR, 1); } -# determine default papersize through the paperconf tool +usage(\*STDERR, 1) unless scalar @ARGV >= 1; + +# determine the paper size through the paperconf tool my $w; my $h; if ( -x "/usr/bin/paperconf" ) { $w=`paperconf -w`; @@ -51,26 +89,18 @@ if ( -x "/usr/bin/paperconf" ) { $h=842; } -# check if key exists -# can't check that accurately through the 'open' call below -# so have to run gpg twice). Please supply a better way. -if ( system( "gpg --fingerprint $keyids >/dev/null" ) != 0 ) { - print STDERR "Key not found. Try 'gpg --list-keys'\n"; - exit 1; -} - # open a gpg process we'll be reading from below -open(GPG, "gpg --fingerprint --with-colons $keyids |"); +map { s/'/'\\''/g; } @ARGV; # quote single quotes +open(GPG, "gpg --fingerprint --with-colons '". (join "' '", @ARGV) ."' |"); +sub start_postscript { # start the PostScript output print <) { # we don't use these if ( /^(tru|uat):/ ) { next; } # every primary uid causes an extra line because of the separator - if ( /^pub:/ ) { $numlines++; } + if ( /^pub:/ ) { + start_postscript() unless $started; + $started = 1; + $numlines++; + } # primary uid s/^pub:[^:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:([^:]*):[^:]*:[^:]*:.*/ ($5) ($4) ($3) $2 ($1) pub/; # fingerprint, format it nicely with spaces @@ -183,8 +219,7 @@ while() { $fpr =~ s/(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})(\w{2})/$1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16/g; $_ = " ($fpr) fpr\n"; } - # user id's - s/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) uid/; + # user ids s/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) uid/; # revoked user id s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) revuid/; @@ -196,13 +231,16 @@ while() { } close(GPG); +unless ($started) { + print STDERR "No public key found.\n"; + exit 1; +} + # output the remaining postscript print < - generates a PS file from a GnuPG keyring =head1 SYNOPSIS -B [-r I] [-p I] II<[> I I<...>I<]>>I<]> +B [B<-r> I] [B<-p> I] I [ I<...> ] =head1 DESCRIPTION @@ -256,24 +294,31 @@ The PS data is written to stdout. =over -=item -p I +=item B<-p> B<--paper-size> I Select the output paper size. Default is to look into /etc/papersize or A4 if libpaper isn't installed. -=item -r I +=item B<-r> B<--revoked-style> I Select how to mark revoked UIDs. Five styles are available: -B (don't show at all), -B (show normally), -B (display in 50% grey), -B (add a note), and -B (strike through). + B don't show at all (default), + B show normally, + B display in 50% grey, + B add "[revoked]", and + B strike through. =item I -Keyid's to print. Multiple can be separated by spaces. +Keyids to print. Multiple can be separated by spaces. + +=item B<-h> B<--help> +Print usage and exit. + +=item B<-v> B<--version> + +Print version and exit. =back @@ -290,3 +335,5 @@ http://pgp-tools.alioth.debian.org/ (c) 2005 Thijs Kinkhorst +(c) 2005 Christoph Berg +