X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/36eef8ab7ec7c90e97f2371d7ca8c80d52fd3e27..5ba02c41963a4c4077a873a3c686a61cb84d56b7:/onak.c?ds=sidebyside

diff --git a/onak.c b/onak.c
index 07e01a5..0fdb7e4 100644
--- a/onak.c
+++ b/onak.c
@@ -6,6 +6,8 @@
  * Jonathan McDowell <noodles@earth.li>
  * 
  * Copyright 2002 Project Purple
+ *
+ * $Id: onak.c,v 1.19 2004/03/23 12:33:47 noodles Exp $
  */
 
 #include <stdio.h>
@@ -14,37 +16,17 @@
 #include <unistd.h>
 
 #include "armor.h"
+#include "charfuncs.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"
+#include "log.h"
 #include "mem.h"
 #include "merge.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 
-int stdin_getchar(void *ctx, size_t count, unsigned char *c)
-{
-	int ic;
-
-	do {
-		ic = getchar();
-		*c = ic;
-		c++;
-	} while ((ic != EOF) && (--count > 0));
-	return (ic == EOF);
-}
-
-int stdout_putchar(void *ctx, size_t count, unsigned char *c)
-{
-	int i;
-
-	for (i = 0; i < count; i++) {
-		putchar(c[i]);
-	}
-	return 0;
-}
-
 void find_keys(char *search, uint64_t keyid, bool ishex,
 		bool fingerprint, bool exact, bool verbose)
 {
@@ -77,6 +59,8 @@ void usage(void) {
 	puts("\tadd    - read armored OpenPGP keys from stdin and add to the"
 		" keyserver");
 	puts("\tdelete - delete a given key from the keyserver");
+	puts("\tdump   - dump all the keys from the keyserver to a file or"
+		" files\n\t         starting keydump*");
 	puts("\tget    - retrieves the key requested from the keyserver");
 	puts("\tindex  - search for a key and list it");
 	puts("\tvindex - search for a key and list it and its signatures");
@@ -87,6 +71,7 @@ int main(int argc, char *argv[])
 	struct openpgp_packet_list	*packets = NULL;
 	struct openpgp_packet_list	*list_end = NULL;
 	struct openpgp_publickey	*keys = NULL;
+	char				*configfile = NULL;
 	int				 rc = EXIT_SUCCESS;
 	int				 result = 0;
 	char				*search = NULL;
@@ -99,11 +84,14 @@ int main(int argc, char *argv[])
 	bool				 fingerprint = false;
 	int				 optchar;
 
-	while ((optchar = getopt(argc, argv, "bfuv")) != -1 ) {
+	while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) {
 		switch (optchar) {
 		case 'b': 
 			binary = true;
 			break;
+		case 'c':
+			configfile = strdup(optarg);
+			break;
 		case 'f': 
 			fingerprint = true;
 			break;
@@ -112,22 +100,26 @@ int main(int argc, char *argv[])
 			break;
 		case 'v': 
 			verbose = true;
+			setlogthreshold(LOGTHING_INFO);
 			break;
 		}
 	}
 
-	readconfig();
+	readconfig(configfile);
+	initlogthing("onak", config.logfile);
 
 	if ((argc - optind) < 1) {
 		usage();
+	} else if (!strcmp("dump", argv[optind])) {
+		initdb(true);
+		dumpdb("keydump");
+		cleanupdb();
 	} else if (!strcmp("add", argv[optind])) {
 		if (binary) {
 			result = read_openpgp_stream(stdin_getchar, NULL,
-				 &packets);
-			if (verbose) {
-				fprintf(stderr,
-					"read_openpgp_stream: %d\n", result);
-			}
+				 &packets, 0);
+			logthing(LOGTHING_INFO,
+					"read_openpgp_stream: %d", result);
 		} else {
 			dearmor_openpgp_stream(stdin_getchar, NULL, &packets);
 		}
@@ -135,14 +127,12 @@ int main(int argc, char *argv[])
 			result = parse_keys(packets, &keys);
 			free_packet_list(packets);
 			packets = NULL;
-			if (verbose) {
-				fprintf(stderr, "Finished reading %d keys.\n",
+			logthing(LOGTHING_INFO, "Finished reading %d keys.",
 					result);
-			}
 
-			initdb();
-			fprintf(stderr, "Got %d new keys.\n",
-					update_keys(&keys, verbose));
+			initdb(false);
+			logthing(LOGTHING_NOTICE, "Got %d new keys.",
+					update_keys(&keys));
 			if (keys != NULL && update) {
 				flatten_publickey(keys,
 					&packets,
@@ -156,7 +146,7 @@ int main(int argc, char *argv[])
 			cleanupdb();
 		} else {
 			rc = 1;
-			fprintf(stderr, "No keys read.\n");
+			logthing(LOGTHING_NOTICE, "No keys read.");
 		}
 
 		if (keys != NULL) {
@@ -164,7 +154,7 @@ int main(int argc, char *argv[])
 			keys = NULL;
 		} else {
 			rc = 1;
-			fprintf(stderr, "No changes.\n");
+			logthing(LOGTHING_NOTICE, "No changes.");
 		}
 	} else if ((argc - optind) == 2) {
 		search = argv[optind+1];
@@ -176,7 +166,7 @@ int main(int argc, char *argv[])
 				ishex = true;
 			}
 		}
-		initdb();
+		initdb(false);
 		if (!strcmp("index", argv[optind])) {
 			find_keys(search, keyid, ishex, fingerprint,
 					false, false);
@@ -186,13 +176,15 @@ int main(int argc, char *argv[])
 		} else if (!strcmp("delete", argv[optind])) {
 			delete_key(getfullkeyid(keyid), false);
 		} else if (!strcmp("get", argv[optind])) {
-			if (fetch_key(keyid, &keys, false)) {
-				if (verbose) {
-					fprintf(stderr, "Got key.\n");
-				}
+			if (!ishex) {
+				puts("Can't get a key on uid text."
+					" You must supply a keyid.");
+			} else if (fetch_key(keyid, &keys, false)) {
+				logthing(LOGTHING_INFO, "Got key.");
 				flatten_publickey(keys,
 						&packets,
 						&list_end);
+				free_publickey(keys);
 				armor_openpgp_stream(stdout_putchar,
 						NULL,
 						packets);
@@ -207,6 +199,7 @@ int main(int argc, char *argv[])
 		usage();
 	}
 
+	cleanuplogthing();
 	cleanupconfig();
 
 	return rc;