cscvs to tla changeset 18

[onak.git] / gpgwww.c
diff --git a/gpgwww.c b/gpgwww.c

index 5f7da460e45626a1fb2106c0084bc875d9aa5837..75022b86e83b5d74d1312c4fc161fc3968e91d92 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -14,79 +14,9 @@
  #include "getcgi.h"
  #include "hash.h"
  #include "keydb.h"
  #include "getcgi.h"
  #include "hash.h"
  #include "keydb.h"
-#include "onak_conf.h"
+#include "onak-conf.h"
  #include "stats.h"
  
  #include "stats.h"
  
-void dofindpath(uint64_t have, uint64_t want, bool html)
-{
-       struct stats_key *keyinfoa, *keyinfob, *curkey;
-       int rec;
-       char *uid;
-
-       /*
-        * Make sure the keys we have and want are in the cache.
-        */
-       hash_getkeysigs(have);
-       hash_getkeysigs(want);
-
-       if ((keyinfoa = findinhash(have)) == NULL) {
-               printf("Couldn't find key 0x%llX.\n", have);
-               return;
-       }
-       if ((keyinfob = findinhash(want)) == NULL) {
-               printf("Couldn't find key 0x%llX.\n", want);
-               return;
-       }
-       
-       /*
-        * Fill the tree info up.
-        */
-       initcolour(true);
-       rec = findpath(keyinfoa, keyinfob);
-       keyinfob->parent = 0;
-
-       printf("%d nodes examined. %ld elements in the hash\n", rec,
-                       hashelements());
-       if (keyinfoa->colour == 0) {
-               printf("Can't find a link from 0x%llX to 0x%llX\n",
-                               have,
-                               want);
-       } else {
-               printf("%d steps from 0x%llX to 0x%llX\n",
-                               keyinfoa->colour, have, want);
-               curkey = keyinfoa;
-               while (curkey != NULL && curkey->keyid != 0) {
-                       uid = keyid2uid(curkey->keyid);
-                       if (html && uid == NULL) {
-                               printf("<a href=\"lookup?op=get&search=%llX\">"
-                                       "0x%llX</a> ([User id not found])%s)%s\n",
-                                       curkey->keyid,
-                                       curkey->keyid,
-                                       (curkey->keyid == want) ? "" :
-                                        " signs");
-                       } else if (html && uid != NULL) {
-                               printf("<a href=\"lookup?op=get&search=%llX\">"
-                                       "0x%llX</a> (<a href=\"lookup?op=vindex"
-                                       "&search=0x%llX\">%s</a>)%s\n",
-                                       curkey->keyid,
-                                       curkey->keyid,
-                                       curkey->keyid,
-                                       txt2html(keyid2uid(curkey->keyid)),
-                                       (curkey->keyid == want) ? "" :
-                                        " signs");
-                       } else {
-                               printf("0x%llX (%s)%s\n",
-                                       curkey->keyid,
-                                       (uid == NULL) ? "[User id not found]" :
-                                               uid,
-                                       (curkey->keyid == want) ? "" :
-                                        " signs");
-                       }
-                       curkey = findinhash(curkey->parent);
-               }
-       }
-}
-
  void parsecgistuff(char **cgiparams, uint64_t *from, uint64_t *to)
  {
         int i = 0;
  void parsecgistuff(char **cgiparams, uint64_t *from, uint64_t *to)
  {
         int i = 0;
@@ -113,13 +43,7 @@ int main(int argc, char *argv[])
  
         cgiparams = getcgivars(argc, argv);
  
  
         cgiparams = getcgivars(argc, argv);
  
-       puts("Content-Type: text/html\n");
-       puts("<HTML>");
-       puts("<HEAD>");
-       puts("<TITLE>Experimental PGP key path finder results</TITLE>");
-       puts("</HEAD>");
-       puts("<BODY>");
-       puts("</BODY>");
+       start_html("Experimental PGP key path finder results");
  
         parsecgistuff(cgiparams, &from, &to);
  
  
         parsecgistuff(cgiparams, &from, &to);
  
@@ -130,16 +54,15 @@ int main(int argc, char *argv[])
         }
  
         printf("<P>Looking for path from 0x%llX to 0x%llX</P>\n", from, to);
         }
  
         printf("<P>Looking for path from 0x%llX to 0x%llX</P>\n", from, to);
-       puts("<PRE>");
         initdb();
         inithash();
         dofindpath(from, to, true);
         initdb();
         inithash();
         dofindpath(from, to, true);
+       destroyhash();
         cleanupdb();
         cleanupdb();
-       puts("</PRE>");
  
         puts("<HR>");
         puts("Produced by gpgwww " VERSION ", part of onak. <A HREF=\"mailto:noodles-onak@earth.li\">Jonathan McDowell</A>");
  
         puts("<HR>");
         puts("Produced by gpgwww " VERSION ", part of onak. <A HREF=\"mailto:noodles-onak@earth.li\">Jonathan McDowell</A>");
-       puts("</HTML>");
+       end_html();
  
         return EXIT_SUCCESS;
  }
  
         return EXIT_SUCCESS;
  }