X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/576754568dc383e78065e88e05eeb2d078524f9c..6afb1be70692774239e25ff9fb1083bedc714031:/keyindex.c?ds=inline

diff --git a/keyindex.c b/keyindex.c
index 6593224..1f13851 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: keyindex.c,v 1.11 2003/06/08 19:04:32 noodles Exp $
+ * $Id: keyindex.c,v 1.14 2004/05/26 17:48:02 noodles Exp $
  */
 
 #include <assert.h>
@@ -72,10 +72,10 @@ int list_uids(struct openpgp_signedpacket_list *uids, bool verbose, bool html)
 			snprintf(buf, 1023, "%.*s",
 				(int) uids->packet->length,
 				uids->packet->data);
-			printf("uid                             %s\n",
+			printf("                                %s\n",
 				(html) ? txt2html(buf) : buf);
 		} else if (uids->packet->tag == 17) {
-			printf("uid                             "
+			printf("                                "
 				"[photo id]\n");
 		}
 		if (verbose) {
@@ -227,7 +227,10 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 			snprintf(buf, 1023, "%.*s",
 				(int) curuid->packet->length,
 				curuid->packet->data);
-			printf("%s\n", (html) ? txt2html(buf) : buf);
+			printf("%s%s\n", 
+				(html) ? txt2html(buf) : buf,
+				(keys->revocations == NULL) ? "" :
+					" *** REVOKED ***");
 			if (fingerprint) {
 				display_fingerprint(keys);
 			}
@@ -236,14 +239,18 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
 			}
 			curuid = curuid->next;
 		} else {
-			putchar('\n');
+			printf("%s\n", 
+				(keys->revocations == NULL) ? "" :
+					"*** REVOKED ***");
 			if (fingerprint) {
 				display_fingerprint(keys);
 			}
 		}
 
 		list_uids(curuid, verbose, html);
-		list_subkeys(keys->subkeys, verbose, html);
+		if (verbose) {
+			list_subkeys(keys->subkeys, verbose, html);
+		}
 
 		keys = keys->next;
 	}
@@ -272,8 +279,6 @@ int mrkey_index(struct openpgp_publickey *keys)
 	size_t					 fplength = 0;
 	unsigned char				 fp[20];
 
-
-
 	while (keys != NULL) {
 		created_time = (keys->publickey->data[1] << 24) +
 					(keys->publickey->data[2] << 16) +
@@ -291,7 +296,7 @@ int mrkey_index(struct openpgp_publickey *keys)
 					keys->publickey->data[9];
 			break;
 		case 4:
-			get_fingerprint(keys->publickey, fp, &fplength);
+			(void) get_fingerprint(keys->publickey, fp, &fplength);
 
 			for (i = 0; i < fplength; i++) {
 				printf("%02X", fp[i]);
@@ -306,10 +311,11 @@ int mrkey_index(struct openpgp_publickey *keys)
 				keys->publickey->data[0]);
 		}
 
-		printf(":%d:%d:%ld::\n",
+		printf(":%d:%d:%ld::%s\n",
 			type,
 			length,
-			created_time);
+			created_time,
+			(keys->revocations == NULL) ? "" : "r");
 	
 		for (curuid = keys->uids; curuid != NULL;
 			 curuid = curuid->next) {