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 118
[onak.git]
/
lookup.c
diff --git
a/lookup.c
b/lookup.c
index 71c27c3357f32e27806fd0be668a8c5d244b7a3b..b8242563d8b62d9b28b50631bd13cb27c785c5dc 100644
(file)
--- a/
lookup.c
+++ b/
lookup.c
@@
-5,7
+5,7
@@
*
* Copyright 2002 Project Purple
*
*
* Copyright 2002 Project Purple
*
- * $Id: lookup.c,v 1.1
0 2003/06/07 13:45:34
noodles Exp $
+ * $Id: lookup.c,v 1.1
3 2004/03/23 12:33:47
noodles Exp $
*/
#include <inttypes.h>
*/
#include <inttypes.h>
@@
-16,6
+16,7
@@
#include <unistd.h>
#include "armor.h"
#include <unistd.h>
#include "armor.h"
+#include "charfuncs.h"
#include "getcgi.h"
#include "keydb.h"
#include "keyindex.h"
#include "getcgi.h"
#include "keydb.h"
#include "keyindex.h"
@@
-29,11
+30,6
@@
#define OP_INDEX 2
#define OP_VINDEX 3
#define OP_INDEX 2
#define OP_VINDEX 3
-int putnextchar(void *ctx, size_t count, unsigned char *c)
-{
- return printf("%.*s", (int) count, c);
-}
-
void find_keys(char *search, uint64_t keyid, bool ishex,
bool fingerprint, bool exact, bool verbose, bool mrhkp)
{
void find_keys(char *search, uint64_t keyid, bool ishex,
bool fingerprint, bool exact, bool verbose, bool mrhkp)
{
@@
-150,9
+146,9
@@
int main(int argc, char *argv[])
} else if (search == NULL) {
puts("Error: No key to search for supplied.");
} else {
} else if (search == NULL) {
puts("Error: No key to search for supplied.");
} else {
- readconfig();
+ readconfig(
NULL
);
initlogthing("lookup", config.logfile);
initlogthing("lookup", config.logfile);
- initdb();
+ initdb(
true
);
switch (op) {
case OP_GET:
if (fetch_key(keyid, &publickey, false)) {
switch (op) {
case OP_GET:
if (fetch_key(keyid, &publickey, false)) {
@@
-160,7
+156,7
@@
int main(int argc, char *argv[])
flatten_publickey(publickey,
&packets,
&list_end);
flatten_publickey(publickey,
&packets,
&list_end);
- armor_openpgp_stream(
putnex
tchar,
+ armor_openpgp_stream(
stdout_pu
tchar,
NULL,
packets);
puts("</pre>");
NULL,
packets);
puts("</pre>");