caff: Fix horrible &function calls used because of broken prototypes

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index b6d658742719b04c484da3b2273717fadb5f4bdc..99710ced34221c131e99cf06ab6a27432db72440 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -305,7 +305,7 @@ http://pgp-tools.alioth.debian.org/
 
 =head1 SEE ALSO
 
-gpg(1), pgp-clean(1), /usr/share/doc/signing-party/caff/caffrc.sample.
+gpg(1), pgp-clean(1), /usr/share/doc/signing-party/caff/
 
 =cut
 
@@ -325,6 +325,7 @@ use GnuPG::Interface;
 my %CONFIG;
 my $REVISION = '$Rev$';
 my ($REVISION_NUMER) = $REVISION =~ /(\d+)/;
+$REVISION_NUMER = 'unknown' unless defined $REVISION_NUMER;
 my $VERSION = "0.0.0.$REVISION_NUMER";
 
 # Global variables
@@ -916,8 +917,7 @@ sub delete_signatures($$$$$$) {
 # @return an array containing the local user keys\n
 #         (undef) if no valid key has been found
 #
-sub get_local_user_keys()
-{
+sub get_local_user_keys() {
        my @local_user = ();
        my @key_list;
        
@@ -972,28 +972,21 @@ sub get_local_user_keys()
 #         1 if the key could not be exported.\n
 #         2 if the key could not be imported.
 #
-sub import_key_from_user_gnupghome()
-{
+sub import_key_from_user_gnupghome($$) {
     my $err;
     my ($asciikey, $dst_gpghome) = @_;
 
     trace("Exporting key $asciikey from your normal GnuPGHOME.");
     my $key = export_key(undef, $asciikey);
-    if (defined $key && $key ne '')
-    {
+    if (defined $key && $key ne '') {
         trace("Importing key $asciikey into $GNUPGHOME.");
-        if (import_key($GNUPGHOME, $key))
-        {
+        if (import_key($GNUPGHOME, $key)) {
             $err = 0;
-        }
-        else
-        {
+        } else {
             warn("Could not import $asciikey into caff's gnupghome.");
             $err = 2;
         }
-    }
-    else
-    {
+    } else {
         $err = 1;
     }
 
@@ -1009,8 +1002,7 @@ sub import_key_from_user_gnupghome()
 # @return 0 if successful\n
 #         1 if an error occured.
 #
-sub import_key_files()
-{
+sub import_key_files($$) {
     my $err;
     my ($keyfile, $dst_gpghome) = @_;
 
@@ -1026,13 +1018,10 @@ sub import_key_files()
     info("Importing keys from file $keyfile");
     waitpid $pid, 0;
 
-    if ($status !~ /^\[GNUPG:\] IMPORT_OK/m)
-    {
+    if ($status !~ /^\[GNUPG:\] IMPORT_OK/m) {
         warn $stderr;
         $err = 1;
-    }
-    else
-    {
+    } else {
         $err = 0;
     }
 
@@ -1047,15 +1036,12 @@ sub import_key_files()
 # and in the key files specified by the user if not all of the keys have been
 # found.
 #
-sub import_keys_to_sign()
-{
+sub import_keys_to_sign() {
     # Check if we can find the gpg key from our normal gnupghome, and then
     # try to import it into our working gnupghome directory
     my $imported_keys = 0;
-    foreach my $keyid (@KEYIDS)
-    {
-        if (!&import_key_from_user_gnupghome($keyid, $GNUPGHOME))
-        {
+    foreach my $keyid (@KEYIDS) {
+        if (!import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
             info("Key $keyid imported from your normal GnuPGHOME.");
             $imported_keys++;
         }
@@ -1066,9 +1052,8 @@ sub import_keys_to_sign()
     return 1 if ($imported_keys == scalar (@KEYIDS));
 
     # Import user specified key files
-    foreach my $keyfile (@{$CONFIG{'key-files'}})
-    {
-        &import_key_files($keyfile, $GNUPGHOME);
+    foreach my $keyfile (@{$CONFIG{'key-files'}}) {
+        import_key_files($keyfile, $GNUPGHOME);
     }
 
     return 0;
@@ -1145,11 +1130,9 @@ for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argume
 #################
 # import own keys
 #################
-for my $keyid (@{$CONFIG{'keyid'}})
-{
+for my $keyid (@{$CONFIG{'keyid'}}) {
     info("Importing key $keyid from your normal GnuPGHome.");
-    if (&import_key_from_user_gnupghome($keyid, $GNUPGHOME))
-    {
+    if (import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
         mywarn("Key $keyid not found.");
     }
 }
@@ -1232,9 +1215,8 @@ if ($CONFIG{'ask-sign'} && ! $CONFIG{'no-sign'}) {
        $CONFIG{'no-sign'} = ! ask("Continue with signing?", 1);
 }
        
-unless ($CONFIG{'no-sign'})
-{
-       my @local_user = &get_local_user_keys();
+unless ($CONFIG{'no-sign'}) {
+       my @local_user = get_local_user_keys();
 
        info("Sign the following keys according to your policy, then exit gpg with 'save' after signing each key");
        for my $keyid (@keyids_ok) {