X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fproc.c;h=2e61e92501581bff2122b1920d60bdca6683827f;hb=3a42b6b1d0b8f9e8ce5c77e838e2573bbfabe593;hp=f7b0d9b454d741b3c88d089576ea6dbc6f2586b9;hpb=0c16b4068d625a9b9b384a9fc2a07ee3c5c762c9;p=ashd.git

diff --git a/lib/proc.c b/lib/proc.c
index f7b0d9b..2e61e92 100644
--- a/lib/proc.c
+++ b/lib/proc.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <errno.h>
+#include <ctype.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -28,6 +29,7 @@
 #include <utils.h>
 #include <log.h>
 #include <proc.h>
+#include <req.h>
 
 int stdmkchild(char **argv)
 {
@@ -35,7 +37,7 @@ int stdmkchild(char **argv)
     pid_t pid;
     int fd[2];
     
-    if(socketpair(PF_UNIX, SOCK_DGRAM, 0, fd))
+    if(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fd))
 	return(-1);
     if((pid = fork()) < 0)
 	return(-1);
@@ -82,7 +84,7 @@ int sendfd(int sock, int fd, char *data, size_t datalen)
 int recvfd(int sock, char **data, size_t *datalen)
 {
     int ret, fd;
-    char *buf, cbuf[1024];;
+    char *buf, cbuf[1024];
     struct msghdr msg;
     struct cmsghdr *cmsg;
     struct iovec bufvec;
@@ -98,8 +100,10 @@ int recvfd(int sock, char **data, size_t *datalen)
     msg.msg_controllen = sizeof(cbuf);
     
     ret = recvmsg(sock, &msg, 0);
-    if(ret < 0) {
+    if(ret <= 0) {
 	free(buf);
+	if(ret == 0)
+	    errno = 0;
 	return(-1);
     }
     
@@ -119,3 +123,45 @@ int recvfd(int sock, char **data, size_t *datalen)
     *datalen = ret;
     return(fd);
 }
+
+pid_t stdforkserve(char **argv, struct hthead *req, int fd)
+{
+    int i;
+    char *ebuf, *p;
+    pid_t pid;
+    struct charvbuf args;
+    
+    if((pid = fork()) < 0)
+	return(-1);
+    if(pid == 0) {
+	dup2(fd, 0);
+	dup2(fd, 1);
+	for(i = 3; i < FD_SETSIZE; i++)
+	    close(i);
+	
+	bufinit(args);
+	for(i = 0; argv[i]; i++)
+	    bufadd(args, argv[i]);
+	bufadd(args, req->method);
+	bufadd(args, req->url);
+	bufadd(args, req->rest);
+	bufadd(args, NULL);
+	
+	for(i = 0; i < req->noheaders; i++) {
+	    ebuf = sstrdup(req->headers[i][0]);
+	    for(p = ebuf; *p; p++) {
+		if(isalnum(*p))
+		    *p = toupper(*p);
+		else
+		    *p = '_';
+	    }
+	    putenv(sprintf2("REQ_%s=%s", ebuf, req->headers[i][1]));
+	}
+	putenv(sprintf2("HTTP_VERSION=%s", req->ver));
+	
+	execvp(args.b[0], args.b);
+	flog(LOG_WARNING, "could not exec child program %s: %s", argv[0], strerror(errno));
+	exit(127);
+    }
+    return(pid);
+}