Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Assert libmagic presence.
[ashd.git]
/
src
/
htparser.c
diff --git
a/src/htparser.c
b/src/htparser.c
index
4835549
..
503df99
100644
(file)
--- a/
src/htparser.c
+++ b/
src/htparser.c
@@
-22,6
+22,7
@@
#include <string.h>
#include <sys/socket.h>
#include <pwd.h>
#include <string.h>
#include <sys/socket.h>
#include <pwd.h>
+#include <sys/signal.h>
#include <errno.h>
#ifdef HAVE_CONFIG_H
#include <errno.h>
#ifdef HAVE_CONFIG_H
@@
-37,6
+38,7
@@
#include "htparser.h"
static int plex;
#include "htparser.h"
static int plex;
+static char *pidfile = NULL;
static void trimx(struct hthead *req)
{
static void trimx(struct hthead *req)
{
@@
-351,7
+353,7
@@
static void plexwatch(struct muth *muth, va_list args)
static void usage(FILE *out)
{
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");
}
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
+409,13
@@
int main(int argc, char **argv)
int i, s1;
int daemonize, logsys;
char *root;
int i, s1;
int daemonize, logsys;
char *root;
+ FILE *pidout;
struct passwd *pwent;
daemonize = logsys = 0;
root = NULL;
pwent = NULL;
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);
switch(c) {
case 'h':
usage(stdout);
@@
-432,6
+435,9
@@
int main(int argc, char **argv)
case 'r':
root = optarg;
break;
case 'r':
root = optarg;
break;
+ case 'p':
+ pidfile = optarg;
+ break;
default:
usage(stderr);
exit(1);
default:
usage(stderr);
exit(1);
@@
-448,11
+454,18
@@
int main(int argc, char **argv)
usage(stderr);
exit(1);
}
usage(stderr);
exit(1);
}
- if((plex = stdmkchild(argv + ++i)) < 0) {
+ if((plex = stdmkchild(argv + ++i
, NULL, NULL
)) < 0) {
flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
return(1);
}
mustart(plexwatch, plex);
flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
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) {
if(logsys)
opensyslog();
if(root) {
@@
-471,9
+484,14
@@
int main(int argc, char **argv)
exit(1);
}
}
exit(1);
}
}
+ signal(SIGPIPE, SIG_IGN);
if(daemonize) {
daemon(0, 0);
}
if(daemonize) {
daemon(0, 0);
}
+ if(pidout != NULL) {
+ fprintf(pidout, "%i\n", getpid());
+ fclose(pidout);
+ }
ioloop();
return(0);
}
ioloop();
return(0);
}