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 58
[onak.git]
/
lookup.c
diff --git
a/lookup.c
b/lookup.c
index 3c55a61f1f2e6022fa1a699b38da197aacab1a09..d6017d23267d5bb34038f9de901e2bc2977c7aaa 100644
(file)
--- a/
lookup.c
+++ b/
lookup.c
@@
-17,8
+17,9
@@
#include "getcgi.h"
#include "keydb.h"
#include "keyindex.h"
#include "getcgi.h"
#include "keydb.h"
#include "keyindex.h"
+#include "log.h"
#include "mem.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
+27,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", (int) count,
c);
}
void find_keys(char *search, uint64_t keyid, bool ishex,
}
void find_keys(char *search, uint64_t keyid, bool ishex,
@@
-38,7
+39,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);
}
@@
-82,6
+83,7
@@
int main(int argc, char *argv[])
}
} else if (!strcmp(params[i], "search")) {
search = params[i+1];
}
} else if (!strcmp(params[i], "search")) {
search = params[i+1];
+ params[i+1] = NULL;
if (search != NULL) {
keyid = strtoul(search, &end, 16);
if (*search != 0 &&
if (search != NULL) {
keyid = strtoul(search, &end, 16);
if (*search != 0 &&
@@
-99,23
+101,31
@@
int main(int argc, char *argv[])
exact = true;
}
}
exact = true;
}
}
+ free(params[i]);
+ params[i] = NULL;
+ if (params[i+1] != NULL) {
+ free(params[i+1]);
+ params[i+1] = NULL;
+ }
+ }
+ if (params != NULL) {
+ free(params);
+ params = NULL;
}
}
-// puts("HTTP/1.0 200 OK");
-// puts("Server: onak 0.0.1");
- puts("Content-Type: text/html\n");
- puts("<html>\n<title>Lookup of key</title>");
- puts("<body>");
+ start_html("Lookup of key");
if (op == OP_UNKNOWN) {
puts("Error: No operation supplied.");
} else if (search == NULL) {
puts("Error: No key to search for supplied.");
} else {
if (op == OP_UNKNOWN) {
puts("Error: No operation supplied.");
} else if (search == NULL) {
puts("Error: No key to search for supplied.");
} else {
+ readconfig();
+ initlogthing("lookup", config.logfile);
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,
@@
-140,9
+150,17
@@
int main(int argc, char *argv[])
puts("Unknown operation!");
}
cleanupdb();
puts("Unknown operation!");
}
cleanupdb();
+ cleanuplogthing();
+ cleanupconfig();
}
puts("<hr>");
puts("Produced by onak " VERSION " by Jonathan McDowell");
}
puts("<hr>");
puts("Produced by onak " VERSION " by Jonathan McDowell");
- puts("</body>\n</html>");
+ end_html();
+
+ if (search != NULL) {
+ free(search);
+ search = NULL;
+ }
+
return (EXIT_SUCCESS);
}
return (EXIT_SUCCESS);
}