Ignore SIGPIPE in keyd

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index 0732a11156eae085c991428fa7f4bd75641be89c..0cc9edd89e1bb20da6966646f6837035ea06b5c0 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -1,9 +1,7 @@
 /*
  * keyindex.c - Routines to list an OpenPGP key.
  *
- * Jonathan McDowell <noodles@earth.li>
- *
- * Copyright 2002-2005 Project Purple
+ * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>
  */
 
 #include <inttypes.h>
@@ -21,6 +19,7 @@
 #include "keyindex.h"
 #include "keystructs.h"
 #include "log.h"
+#include "onak-conf.h"
 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
@@ -30,7 +29,7 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
 
        while (sigs != NULL) {
                sigid = sig_keyid(sigs->packet);
-               uid = keyid2uid(sigid);
+               uid = config.dbbackend->keyid2uid(sigid);
                if (sigs->packet->data[0] == 4 &&
                                sigs->packet->data[1] == 0x30) {
                        /* It's a Type 4 sig revocation */
@@ -40,21 +39,22 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
                }
                if (html && uid != NULL) {
                        printf("%s         <a href=\"lookup?op=get&"
-                               "search=%016llX\">%08llX</a>             "
-                               "<a href=\"lookup?op=vindex&search=0x%016llX\">"
-                               "%s</a>\n",
+                               "search=%016" PRIX64 "\">%08" PRIX64
+                               "</a>             "
+                               "<a href=\"lookup?op=vindex&search=0x%016"
+                               PRIX64 "\">%s</a>\n",
                                sig,
                                sigid,
                                sigid & 0xFFFFFFFF,
                                sigid,
                                txt2html(uid));
                } else if (html && uid == NULL) {
-                       printf("%s         %08llX             "
+                       printf("%s         %08" PRIX64 "             "
                                "[User id not found]\n",
                                sig,
                                sigid & 0xFFFFFFFF);
                } else {
-                       printf("%s         %08llX"
+                       printf("%s         %08" PRIX64
                                "             %s\n",
                                sig,
                                sigid & 0xFFFFFFFF,
@@ -87,9 +87,11 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
                } else if (uids->packet->tag == 17) {
                        printf("                                ");
                        if (html) {
-                               printf("<img src=\"lookup?op=photo&search=0x%llX&idx=%d\" alt=\"[photo id]\">\n",
-                                               keyid,
-                                               imgindx);
+                               printf("<img src=\"lookup?op=photo&search="
+                                       "0x%016" PRIX64 "&idx=%d\" alt=\""
+                                       "[photo id]\">\n",
+                                       keyid,
+                                       imgindx);
                                imgindx++;
                        } else {
                                printf("[photo id]\n");
@@ -199,6 +201,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
        struct tm                               *created = NULL;
        time_t                                   created_time = 0;
        int                                      type = 0;
+       char                                     typech;
        int                                      length = 0;
        char                                     buf[1024];
        uint64_t                                 keyid;
@@ -233,22 +236,39 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                
                keyid = get_keyid(keys);
 
+               switch (type) {
+               case 1:
+                       typech = 'R';
+                       break;
+               case 16:
+                       typech = 'g';
+                       break;
+               case 17:
+                       typech = 'D';
+                       break;
+               case 20:
+                       typech = 'G';
+                       break;
+               default:
+                       typech = '?';
+                       break;
+               }
+
                if (html) {
                        printf("pub  %5d%c/<a href=\"lookup?op=get&"
-                               "search=%016llX\">%08llX</a> %04d/%02d/%02d ",
+                               "search=%016" PRIX64 "\">%08" PRIX64
+                               "</a> %04d/%02d/%02d ",
                                length,
-                               (type == 1) ? 'R' : ((type == 16) ? 'g' : 
-                                       ((type == 17) ? 'D' : '?')),
+                               typech,
                                keyid,
                                keyid & 0xFFFFFFFF,
                                created->tm_year + 1900,
                                created->tm_mon + 1,
                                created->tm_mday);
                } else {
-                       printf("pub  %5d%c/%08llX %04d/%02d/%02d ",
+                       printf("pub  %5d%c/%08" PRIX64 " %04d/%02d/%02d ",
                                length,
-                               (type == 1) ? 'R' : ((type == 16) ? 'g' : 
-                                       ((type == 17) ? 'D' : '?')),
+                               typech,
                                keyid & 0xFFFFFFFF,
                                created->tm_year + 1900,
                                created->tm_mon + 1,
@@ -262,14 +282,13 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                                curuid->packet->data);
                        if (html) {
                                printf("<a href=\"lookup?op=vindex&"
-                                       "search=0x%016llX\">",
+                                       "search=0x%016" PRIX64 "\">",
                                        keyid);
                        }
                        printf("%s%s%s\n", 
                                (html) ? txt2html(buf) : buf,
                                (html) ? "</a>" : "",
-                               (keys->revocations == NULL) ? "" :
-                                       " *** REVOKED ***");
+                               (keys->revoked) ? " *** REVOKED ***" : "");
                        if (fingerprint) {
                                display_fingerprint(keys);
                        }
@@ -279,8 +298,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                        curuid = curuid->next;
                } else {
                        printf("%s\n", 
-                               (keys->revocations == NULL) ? "" :
-                                       "*** REVOKED ***");
+                               (keys->revoked) ? "*** REVOKED ***": "");
                        if (fingerprint) {
                                display_fingerprint(keys);
                        }
@@ -317,6 +335,7 @@ int mrkey_index(struct openpgp_publickey *keys)
        int                                      i = 0;
        size_t                                   fplength = 0;
        unsigned char                            fp[20];
+       int                                      c;
 
        while (keys != NULL) {
                created_time = (keys->publickey->data[1] << 24) +
@@ -329,7 +348,7 @@ int mrkey_index(struct openpgp_publickey *keys)
                switch (keys->publickey->data[0]) {
                case 2:
                case 3:
-                       printf("%016llX", get_keyid(keys));
+                       printf("%016" PRIX64, get_keyid(keys));
                        type = keys->publickey->data[7];
                        length = (keys->publickey->data[8] << 8) +
                                        keys->publickey->data[9];
@@ -354,15 +373,26 @@ int mrkey_index(struct openpgp_publickey *keys)
                        type,
                        length,
                        created_time,
-                       (keys->revocations == NULL) ? "" : "r");
+                       (keys->revoked) ? "r" : "");
        
                for (curuid = keys->uids; curuid != NULL;
                         curuid = curuid->next) {
                
                        if (curuid->packet->tag == 13) {
-                               printf("uid:%.*s\n",
-                                       (int) curuid->packet->length,
-                                       curuid->packet->data);
+                               printf("uid:");
+                               for (i = 0; i < (int) curuid->packet->length;
+                                               i++) {
+                                       c = curuid->packet->data[i];
+                                       if (c == '%') {
+                                               putchar('%');
+                                               putchar(c);
+                                       } else if (c == ':' || c > 127) {
+                                               printf("%%%X", c);
+                                       } else {
+                                               putchar(c);
+                                       }
+                               }
+                               printf("\n");
                        }
                }
                keys = keys->next;