cscvs to tla changeset 29

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

index d820b528fe30b5b1011e7246a334fec67679223a..bb12e059beb861d69afde4beea10ee4a65b3b715 100644 (file)
--- a/add.c
+++ b/add.c
@@ -12,37 +12,20 @@
  #include <string.h>
  
  #include "armor.h"
+#include "charfuncs.h"
  #include "getcgi.h"
  #include "keydb.h"
  #include "keystructs.h"
+#include "onak-conf.h"
  #include "parsekey.h"
  #include "merge.h"
  
-struct cgi_get_ctx {
-       char *buffer;
-       int offset;
-};
-
-
-int cgi_getchar(void *ctx, size_t count, unsigned char *c)
-{
-       struct cgi_get_ctx *buf = NULL;
-
-       buf = (struct cgi_get_ctx *) ctx;
-
-       while (count-- > 0 && *c != 0) {
-               *c = buf->buffer[buf->offset++];
-       }
-
-       return (*c == 0);
-}
-
  int main(int argc, char *argv[])
  {
         struct openpgp_packet_list *packets = NULL;
         struct openpgp_publickey *keys = NULL;
         char **params = NULL;
-       struct cgi_get_ctx ctx;
+       struct buffer_ctx ctx;
         int i;
  
         memset(&ctx, 0, sizeof(ctx));
@@ -51,27 +34,37 @@ int main(int argc, char *argv[])
         for (i = 0; params != NULL && params[i] != NULL; i += 2) {
                 if (!strcmp(params[i], "keytext")) {
                         ctx.buffer = params[i+1];
+                       ctx.size = strlen(ctx.buffer);
+               } else {
+                       free(params[i+1]);
                 }
+               params[i+1] = NULL;
+               free(params[i]);
+               params[i] = NULL;
+       }
+       if (params != NULL) {
+               free(params);
+               params = NULL;
         }
  
-       puts("Content-Type: text/html\n");
-       puts("<html><title>onak : Add</title><body>");
+       start_html("onak : Add");
         if (ctx.buffer == NULL) {
                 puts("Error: No keytext to add supplied.");
         } else {
-               dearmor_openpgp_stream(cgi_getchar,
+               dearmor_openpgp_stream(buffer_fetchchar,
                                         &ctx,
                                         &packets);
                 if (packets != NULL) {
                         parse_keys(packets, &keys);
+                       readconfig();
                         initdb();
                         printf("Got %d new keys.\n",
-                                       update_keys(&keys));
+                                       update_keys(&keys, false));
                         cleanupdb();
                 } else {
                         puts("No OpenPGP packets found in input.");
                 }
         }
-       puts("</body></html>");
+       end_html();
         return (EXIT_SUCCESS);
  }