From 43c58ba25e47635c8f44e6b1cbda9247219a16b5 Mon Sep 17 00:00:00 2001
From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 31 Aug 2010 23:51:33 +0200
Subject: [PATCH] htparser: Added pidfile generation.

---
 src/htparser.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/htparser.c b/src/htparser.c
index 4835549..17ad93a 100644
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -37,6 +37,7 @@
 #include "htparser.h"
 
 static int plex;
+static char *pidfile = NULL;
 
 static void trimx(struct hthead *req)
 {
@@ -351,7 +352,7 @@ static void plexwatch(struct muth *muth, va_list args)
 
 static void usage(FILE *out)
 {
-    fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] PORTSPEC... -- ROOT [ARGS...]\n");
+    fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] [-p PIDFILE] PORTSPEC... -- ROOT [ARGS...]\n");
     fprintf(out, "\twhere PORTSPEC is HANDLER[:PAR[=VAL][(,PAR[=VAL])...]] (try HANDLER:help)\n");
     fprintf(out, "\tavailable handlers are `plain' and `ssl'.\n");
 }
@@ -407,12 +408,13 @@ int main(int argc, char **argv)
     int i, s1;
     int daemonize, logsys;
     char *root;
+    FILE *pidout;
     struct passwd *pwent;
     
     daemonize = logsys = 0;
     root = NULL;
     pwent = NULL;
-    while((c = getopt(argc, argv, "+hSfu:r:")) >= 0) {
+    while((c = getopt(argc, argv, "+hSfu:r:p:")) >= 0) {
 	switch(c) {
 	case 'h':
 	    usage(stdout);
@@ -432,6 +434,9 @@ int main(int argc, char **argv)
 	case 'r':
 	    root = optarg;
 	    break;
+	case 'p':
+	    pidfile = optarg;
+	    break;
 	default:
 	    usage(stderr);
 	    exit(1);
@@ -453,6 +458,13 @@ int main(int argc, char **argv)
 	return(1);
     }
     mustart(plexwatch, plex);
+    pidout = NULL;
+    if(pidfile != NULL) {
+	if((pidout = fopen(pidfile, "w")) == NULL) {
+	    flog(LOG_ERR, "could not open %s for writing: %s", pidfile, strerror(errno));
+	    return(1);
+	}
+    }
     if(logsys)
 	opensyslog();
     if(root) {
@@ -474,6 +486,9 @@ int main(int argc, char **argv)
     if(daemonize) {
 	daemon(0, 0);
     }
+    if(pidout != NULL)
+	fprintf(pidout, "%i\n", getpid());
+    fclose(pidout);
     ioloop();
     return(0);
 }
-- 
2.11.0