 @@ -117,48 +117,61 @@ static struct option long_options[]=
     /* debug */
     { "debug", required_argument, NULL, OPS_DEBUG },
     { 0,0,0,0},
     };
 static void print_usage(const char* usagemsg, char* progname)
+    {
     fprintf(stderr, "\nUsage: ");
     fprintf(stderr, usagemsg, basename(progname));
+    }
 /* wrapper to get a pass phrase from the user */
 static void
 get_pass_phrase(char *phrase, size_t size)
+{
 	char	*p;
 	if ((p = getpass("openpgp pass phrase: ")) == NULL) {
 		exit(EXIT_ERROR);
+	}
 	(void) snprintf(phrase, size, "%s", p);
+}
 int main(int argc, char **argv)
+    {
     int optindex=0;
     int ch=0;
     int cmd=0;
     int armour=0;
     int fd=0;
     pname=argv[0];
     char opt_keyring[MAXBUF+1]="";
     char opt_userid[MAXBUF+1]="";
     char opt_passphrase[MAXBUF+1]="";
     char opt_filename[MAXBUF+1]="";
     char opt_homedir[MAXBUF+1]="";
     int got_homedir=0;
     int got_keyring=0;
     int got_userid=0;
     int got_passphrase=0;
     int got_filename=0;
     int got_numbits=0;
     int numbits=DEFAULT_NUMBITS;
     int ex;
     char outputfilename[MAXBUF+1]="";
     ops_keyring_t* myring=NULL;
     char myring_name[MAXBUF+1]="";
     ops_keyring_t* pubring=NULL;
     char pubring_name[MAXBUF+1]="";
     ops_keyring_t* secring=NULL;
     char secring_name[MAXBUF+1]="";
     const ops_keydata_t* keydata=NULL;
     char *suffix=NULL;
     char *dir=NULL;
     char default_homedir[MAXBUF+1]="";
     ops_boolean_t overwrite=ops_true;
     ops_keydata_t* mykeydata=NULL;
 @@ -231,26 +244,29 @@ int main(int argc, char **argv)
             cmd=LIST_PACKETS;
             break;
             // option
         case KEYRING:
             assert(optarg);
             snprintf(opt_keyring,MAXBUF,"%s",optarg);
             got_keyring=1;
             break;
         case USERID:
             assert(optarg);
 	    if (ops_get_debug_level(__FILE__)) {
 		(void) fprintf(stderr, "user_id is '%s'\n", optarg);
+	    }
             snprintf(opt_userid,MAXBUF,"%s",optarg);
             got_userid=1;
             break;
         case PASSPHRASE:
             assert(optarg);
             snprintf(opt_passphrase,MAXBUF,"%s",optarg);
             got_passphrase=1;
             break;
         case FILENAME:
             assert(optarg);
             snprintf(opt_filename,MAXBUF,"%s",optarg);
 @@ -335,41 +351,33 @@ int main(int argc, char **argv)
     case LIST_KEYS:
 	ops_keyring_list((got_keyring) ? myring : pubring);
         break;
         //case LIST_PACKETS:
     case FIND_KEY:
         if (!got_userid)
+            {
             print_usage(usage_find_key,pname);
             exit(EXIT_ERROR);
+            }
-        //        fprintf(stderr,"userid: %s\n", opt_userid);
+	if (ops_get_debug_level(__FILE__)) {
-        //keydata=ops_keydata_new();
+		(void) fprintf(stderr,"userid: %s\n", opt_userid);
         if (!got_keyring)
-            keydata=ops_keyring_find_key_by_userid(pubring, opt_userid);
+        keydata = ops_keyring_find_key_by_userid((got_keyring) ?
-        else
+				myring : pubring, opt_userid);
-            keydata=ops_keyring_find_key_by_userid(myring, opt_userid);
+	exit((keydata) ? EXIT_FAILURE : EXIT_SUCCESS);
         //        ops_keyring_free(&keyring);
         if (keydata)
             exit(EXIT_FAILURE);
         else
             exit(EXIT_SUCCESS);
         break;
     case EXPORT_KEY:
         if (!got_keyring || !got_userid)
+            {
             print_usage(usage_export_key,pname);
             exit(EXIT_ERROR);
+            }
         if (got_keyring)
             keydata=ops_keyring_find_key_by_userid(myring, opt_userid);
         else
             keydata=ops_keyring_find_key_by_userid(pubring, opt_userid);
 @@ -496,26 +504,32 @@ int main(int argc, char **argv)
+            {
             print_usage(usage_sign, pname);
             exit(EXIT_ERROR);
+            }
         // get key with which to sign
         keydata=ops_keyring_find_key_by_userid(secring,opt_userid);
         if (!keydata)
+            {
             fprintf(stderr,"Userid '%s' not found in keyring\n",
                     opt_userid);
             exit(EXIT_ERROR);
+            }
 	/* get the passphrase */
 	if (opt_passphrase[0] == 0x0) {
 		get_pass_phrase(opt_passphrase, sizeof(opt_passphrase));
+	}
         // now decrypt key
         skey=ops_decrypt_secret_key_from_data(keydata,opt_passphrase);
         assert(skey);
         // sign file
         overwrite=ops_true;
         ops_sign_file(opt_filename, NULL, skey, armour, overwrite);
         break;
     case CLEARSIGN:
         if (!got_filename || !got_userid)
+            {
             print_usage(usage_clearsign, pname);
 @@ -539,33 +553,36 @@ int main(int argc, char **argv)
         break;
     case VERIFY:
         if (!got_filename)
+            {
             print_usage(usage_verify, pname);
             exit(EXIT_ERROR);
+            }
         validate_result=ops_mallocz(sizeof (ops_validate_result_t));
         if (ops_validate_file(validate_result, opt_filename, armour, pubring)==ops_true)
+            {
-            fprintf(stdout, "Verify OK\n");
+            printf("Good signature for \"%s\"\n", opt_filename);
 	    ex = EXIT_SUCCESS;
+            }
         else
+            {
-            fprintf(stdout, "Verify FAIL: %d invalid signatures, %d unknown signatures\n", validate_result->invalid_count, validate_result->unknown_signer_count);
+            printf("\"%s\": verification failure: %d invalid signatures, %d unknown signatures\n", opt_filename, validate_result->invalid_count, validate_result->unknown_signer_count);
 	    ex = EXIT_FAILURE;
+            }
         ops_validate_result_free(validate_result);
 	exit(ex);
         break;
     case LIST_PACKETS:
         if (!got_filename)
+            {
             print_usage(usage_list_packets, pname);
             exit(EXIT_ERROR);
+            }
         ops_list_packets(opt_filename, armour, pubring, callback_cmd_get_passphrase_from_cmdline);
         break;
     default:
         print_usage(usage,pname);