projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cscvs to tla changeset 75
[onak.git]
/
onak.c
diff --git
a/onak.c
b/onak.c
index f673bd38b5038dcb26042f6dcb6a92038c7bec39..870e1bd57d3fc329483b857114d58b3a835a281e 100644
(file)
--- a/
onak.c
+++ b/
onak.c
@@
-18,6
+18,7
@@
#include "keyid.h"
#include "keyindex.h"
#include "keystructs.h"
#include "keyid.h"
#include "keyindex.h"
#include "keystructs.h"
+#include "log.h"
#include "mem.h"
#include "merge.h"
#include "onak-conf.h"
#include "mem.h"
#include "merge.h"
#include "onak-conf.h"
@@
-77,6
+78,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("\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");
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");
@@
-112,11
+115,13
@@
int main(int argc, char *argv[])
break;
case 'v':
verbose = true;
break;
case 'v':
verbose = true;
+ setlogthreshold(LOGTHING_INFO);
break;
}
}
readconfig();
break;
}
}
readconfig();
+ initlogthing("onak", config.logfile);
if ((argc - optind) < 1) {
usage();
if ((argc - optind) < 1) {
usage();
@@
-128,10
+133,8
@@
int main(int argc, char *argv[])
if (binary) {
result = read_openpgp_stream(stdin_getchar, NULL,
&packets);
if (binary) {
result = read_openpgp_stream(stdin_getchar, NULL,
&packets);
- if (verbose) {
- fprintf(stderr,
- "read_openpgp_stream: %d\n", result);
- }
+ logthing(LOGTHING_INFO,
+ "read_openpgp_stream: %d", result);
} else {
dearmor_openpgp_stream(stdin_getchar, NULL, &packets);
}
} else {
dearmor_openpgp_stream(stdin_getchar, NULL, &packets);
}
@@
-139,14
+142,12
@@
int main(int argc, char *argv[])
result = parse_keys(packets, &keys);
free_packet_list(packets);
packets = NULL;
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);
result);
- }
initdb();
initdb();
-
fprintf(stderr, "Got %d new keys.\n
",
- update_keys(&keys
, verbose
));
+
logthing(LOGTHING_NOTICE, "Got %d new keys.
",
+ update_keys(&keys));
if (keys != NULL && update) {
flatten_publickey(keys,
&packets,
if (keys != NULL && update) {
flatten_publickey(keys,
&packets,
@@
-160,7
+161,7
@@
int main(int argc, char *argv[])
cleanupdb();
} else {
rc = 1;
cleanupdb();
} else {
rc = 1;
-
fprintf(stderr, "No keys read.\n
");
+
logthing(LOGTHING_NOTICE, "No keys read.
");
}
if (keys != NULL) {
}
if (keys != NULL) {
@@
-168,7
+169,7
@@
int main(int argc, char *argv[])
keys = NULL;
} else {
rc = 1;
keys = NULL;
} else {
rc = 1;
-
fprintf(stderr, "No changes.\n
");
+
logthing(LOGTHING_NOTICE, "No changes.
");
}
} else if ((argc - optind) == 2) {
search = argv[optind+1];
}
} else if ((argc - optind) == 2) {
search = argv[optind+1];
@@
-191,12
+192,11
@@
int main(int argc, char *argv[])
delete_key(getfullkeyid(keyid), false);
} else if (!strcmp("get", argv[optind])) {
if (fetch_key(keyid, &keys, false)) {
delete_key(getfullkeyid(keyid), false);
} else if (!strcmp("get", argv[optind])) {
if (fetch_key(keyid, &keys, false)) {
- if (verbose) {
- fprintf(stderr, "Got key.\n");
- }
+ logthing(LOGTHING_INFO, "Got key.");
flatten_publickey(keys,
&packets,
&list_end);
flatten_publickey(keys,
&packets,
&list_end);
+ free_publickey(keys);
armor_openpgp_stream(stdout_putchar,
NULL,
packets);
armor_openpgp_stream(stdout_putchar,
NULL,
packets);
@@
-211,6
+211,7
@@
int main(int argc, char *argv[])
usage();
}
usage();
}
+ cleanuplogthing();
cleanupconfig();
return rc;
cleanupconfig();
return rc;