Remove unused variables

[onak.git] / keyd.c

diff --git a/keyd.c b/keyd.c
index 05f9fe9b025742dbad205741d4f881002b446770..eab3b5495b951ecbe52b023829975b9b4e61a294 100644 (file)
--- a/keyd.c
+++ b/keyd.c
@@ -6,6 +6,7 @@
  * Copyright 2004 Project Purple
  */
 
+#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <stdio.h>
@@ -28,6 +29,32 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 
+void daemonize(void)
+{
+       pid_t pid;
+
+       pid = fork();
+
+       if (pid < 0) {
+               logthing(LOGTHING_CRITICAL,
+                       "Failed to fork into background: %d (%s)",
+                       errno,
+                       strerror(errno));
+               exit(EXIT_FAILURE);
+       } else if (pid > 0) {
+               logthing(LOGTHING_INFO, "Backgrounded as pid %d.", pid);
+               exit(EXIT_SUCCESS);
+       }
+
+       pid = setsid();
+
+       freopen("/dev/null", "r", stdin);
+       freopen("/dev/null", "w", stdout);
+       freopen("/dev/null", "w", stderr);
+
+       return;
+}
+
 void iteratefunc(void *ctx, struct openpgp_publickey *key)
 {
        struct openpgp_packet_list *packets = NULL;
@@ -42,7 +69,7 @@ void iteratefunc(void *ctx, struct openpgp_publickey *key)
                storebuf.buffer = malloc(8192);
 
                logthing(LOGTHING_TRACE,
-                               "Iterating over 0x%016llX.",
+                               "Iterating over 0x%016" PRIX64 ".",
                                get_keyid(key));
 
                flatten_publickey(key,
@@ -137,7 +164,8 @@ int sock_do(int fd)
                        storebuf.offset = 0;
                        if (ret == 0) {
                                logthing(LOGTHING_INFO,
-                                               "Fetching 0x%llX, result: %d",
+                                               "Fetching 0x%" PRIX64
+                                               ", result: %d",
                                                keyid,
                                                config.dbbackend->
                                                fetch_key(keyid, &key, false));
@@ -267,7 +295,8 @@ int sock_do(int fd)
                        }
                        if (ret == 0) {
                                logthing(LOGTHING_INFO,
-                                               "Deleting 0x%llX, result: %d",
+                                               "Deleting 0x%" PRIX64
+                                               ", result: %d",
                                                keyid,
                                                config.dbbackend->delete_key(
                                                        keyid, false));
@@ -343,13 +372,17 @@ int main(int argc, char *argv[])
        fd_set rfds;
        char sockname[1024];
        char *configfile = NULL;
+       bool foreground = false;
        int optchar;
 
-       while ((optchar = getopt(argc, argv, "c:")) != -1 ) {
+       while ((optchar = getopt(argc, argv, "c:f")) != -1 ) {
                switch (optchar) {
                case 'c':
                        configfile = strdup(optarg);
                        break;
+               case 'f':
+                       foreground = true;
+                       break;
                }
        }
 
@@ -357,6 +390,11 @@ int main(int argc, char *argv[])
        free(configfile);
        configfile = NULL;
        initlogthing("keyd", config.logfile);
+       config.use_keyd = false;
+
+       if (!foreground) {
+               daemonize();
+       }
 
        catchsignals();