X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=f18ec8380f8a7b9697c9a129eb8833b5a1ca8a66;hb=46554671ebc1e554b09c0fbd5305541f4848c20a;hp=b946a9ab41267a81fc6382f81a368ddb393984f7;hpb=72d0da607a296094cdffd068f011ce28106097fe;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index b946a9a..f18ec83 100755
--- a/caff/caff
+++ b/caff/caff
@@ -56,14 +56,22 @@ sigs and sigs done by you.
 
 =over
 
-=item B<-e>, B<--export>, B<-E>, B<--no-export>
+=item B<-e>, B<--export-old>
 
-Export/do not export old signatures. Default is to ask the user for each old
+Export old signatures. Default is to ask the user for each old signature.
+
+=item B<-E>, B<--no-export-old>
+
+Do not export old signatures. Default is to ask the user for each old
 signature.
 
-=item B<-m>, B<--mail>, B<-M>, B<--no-mail>
+=item B<-m>, B<--mail>
+
+Send mail after signing. Default is to ask the user for each uid.
+
+=item B<-M>, B<--no-mail>
 
-Send/do not send mail after signing. Default is to ask the user for each uid.
+Do not send mail after signing. Default is to ask the user for each uid.
 
 =item B<-R>, B<--no-download>
 
@@ -669,10 +677,10 @@ if (!GetOptions (
 	'-V'              =>  \$params->{'version'},
 	'-u=s'            =>  \$params->{'local-user'},
 	'--local-user=s'  =>  \$params->{'local-user'},
-	'-e'              =>  \$params->{'export'},
-	'--export'        =>  \$params->{'export'},
-	'-E'              =>  \$params->{'no-export'},
-	'--no-export'     =>  \$params->{'no-export'},
+	'-e'              =>  \$params->{'export-old'},
+	'--export-old'    =>  \$params->{'export-old'},
+	'-E'              =>  \$params->{'no-export-old'},
+	'--no-export-old' =>  \$params->{'no-export-old'},
 	'-m'              =>  \$params->{'mail'},
 	'--mail'          =>  \$params->{'mail'},
 	'-M'              =>  \$params->{'no-mail'},
@@ -998,7 +1006,7 @@ for my $keyid (@keyids_ok) {
 
 		if ($signed_by_me) {
 			if ($NOW - $signed_by_me > $CONFIG{'export-sig-age'} ) {
-				my $write = ask("Signature on $this_uid_text is old.  Export?", 0, $params->{export}, $params->{'no-export'});
+				my $write = ask("Signature on $this_uid_text is old.  Export?", 0, $params->{'export-old'}, $params->{'no-export-old'});
 				next unless $write;
 			};
 			my $keydir = "$KEYSBASE/$DATE_STRING";