X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=3a9161f6b86c5231df65727f24031af4c618aad0;hb=5b3f77c7fbafb036d20a1577ed74f475e94ed821;hp=46f5ecf1e926a1553e06320b15acc4b9e40ab65e;hpb=fd58db2034c6781399583384055ce69fc300b26b;p=onak.git diff --git a/add.c b/add.c index 46f5ecf..3a9161f 100644 --- a/add.c +++ b/add.c @@ -23,7 +23,6 @@ #include "merge.h" #include "onak-conf.h" #include "parsekey.h" -#include "sendsync.h" int main(int argc, char *argv[]) { @@ -69,16 +68,21 @@ int main(int argc, char *argv[]) count); printf("Storing %d keys.\n", count); end_html(); - fclose(stdout); - fclose(stderr); + if (stdout != NULL && fileno(stdout) != -1) { + fclose(stdout); + } + if (stderr != NULL && stderr != stdout && + fileno(stderr) != -1) { + fclose(stderr); + } catchsignals(); - initdb(false); + config.dbbackend->initdb(false); count = cleankeys(keys); logthing(LOGTHING_INFO, "%d keys cleaned.", count); - count = update_keys(&keys, true); + count = config.dbbackend->update_keys(&keys, true); logthing(LOGTHING_NOTICE, "Got %d new keys.", count); @@ -87,7 +91,7 @@ int main(int argc, char *argv[]) keys = NULL; } - cleanupdb(); + config.dbbackend->cleanupdb(); } else { puts("No OpenPGP packets found in input."); end_html();