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 3
[onak.git]
/
lookup.c
diff --git
a/lookup.c
b/lookup.c
index 3c55a61f1f2e6022fa1a699b38da197aacab1a09..94f38c851fa44be2158700dd7c6cf079bfbdfd3c 100644
(file)
--- a/
lookup.c
+++ b/
lookup.c
@@
-18,7
+18,7
@@
#include "keydb.h"
#include "keyindex.h"
#include "mem.h"
#include "keydb.h"
#include "keyindex.h"
#include "mem.h"
-#include "onak
_
conf.h"
+#include "onak
-
conf.h"
#include "parsekey.h"
#define OP_UNKNOWN 0
#include "parsekey.h"
#define OP_UNKNOWN 0
@@
-26,9
+26,9
@@
#define OP_INDEX 2
#define OP_VINDEX 3
#define OP_INDEX 2
#define OP_VINDEX 3
-int putnextchar(void *ctx,
unsigned char
c)
+int putnextchar(void *ctx,
size_t count, unsigned char *
c)
{
{
-
return putchar(
c);
+
return printf("%.*s", count,
c);
}
void find_keys(char *search, uint64_t keyid, bool ishex,
}
void find_keys(char *search, uint64_t keyid, bool ishex,
@@
-38,7
+38,7
@@
void find_keys(char *search, uint64_t keyid, bool ishex,
int count = 0;
if (ishex) {
int count = 0;
if (ishex) {
- count = fetch_key(keyid, &publickey);
+ count = fetch_key(keyid, &publickey
, false
);
} else {
count = fetch_key_text(search, &publickey);
}
} else {
count = fetch_key_text(search, &publickey);
}
@@
-115,7
+115,7
@@
int main(int argc, char *argv[])
initdb();
switch (op) {
case OP_GET:
initdb();
switch (op) {
case OP_GET:
- if (fetch_key(keyid, &publickey)) {
+ if (fetch_key(keyid, &publickey
, false
)) {
puts("<pre>");
flatten_publickey(publickey,
&packets,
puts("<pre>");
flatten_publickey(publickey,
&packets,