X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Faccesslog.c;h=af433738a3bf7038bb617af0b8f65978868ee2ff;hb=HEAD;hp=a3894bf248b071a5302c3a99a669d8579aa804b4;hpb=bdbb6d12f5f73262685f871685cfd32bba9bdeb4;p=ashd.git

diff --git a/src/accesslog.c b/src/accesslog.c
index a3894bf..0c7ef8d 100644
--- a/src/accesslog.c
+++ b/src/accesslog.c
@@ -39,6 +39,7 @@
 #include <proc.h>
 #include <mt.h>
 #include <mtio.h>
+#include <bufio.h>
 
 #define DEFFORMAT "%{%Y-%m-%d %H:%M:%S}t %m %u %A \"%G\""
 
@@ -95,6 +96,16 @@ static void logitem(struct logdata *data, char o, char *d)
 	    qputs(h, out);
 	}
 	break;
+    case 'p':
+	if(!data->resp || ((h = getheader(data->resp, d)) == NULL)) {
+	    putc('-', out);
+	} else {
+	    qputs(h, out);
+	}
+	break;
+    case 'P':
+	logitem(data, 'p', sprintf3("X-Ash-%s", d));
+	break;
     case 'u':
 	qputs(data->req->url, out);
 	break;
@@ -215,20 +226,21 @@ static void serve(struct hthead *req, int fd)
     logreq(&data);
 }
 
-static int passdata(FILE *in, FILE *out, off_t *passed)
+static int passdata(struct bufio *in, struct bufio *out, off_t *passed)
 {
-    size_t read;
+    ssize_t read;
     off_t total;
-    char buf[8192];
     
     total = 0;
-    while(!feof(in)) {
-	read = fread(buf, 1, sizeof(buf), in);
-	if(ferror(in))
-	    return(-1);
-	if(fwrite(buf, 1, read, out) != read)
+    while(!bioeof(in)) {
+	if((read = biordata(in)) > 0) {
+	    if((read = biowritesome(out, in->rbuf.b + in->rh, read)) < 0)
+		return(-1);
+	    in->rh += read;
+	    total += read;
+	}
+	if(biorspace(in) && (biofillsome(in) < 0))
 	    return(-1);
-	total += read;
     }
     if(passed)
 	*passed = total;
@@ -241,7 +253,8 @@ static void filterreq(struct muth *mt, va_list args)
     vavar(int, fd);
     int pfds[2];
     struct hthead *resp;
-    FILE *cl, *hd;
+    struct bufio *cl, *hd;
+    struct stdiofd *cli, *hdi;
     struct logdata data;
     
     hd = NULL;
@@ -249,10 +262,10 @@ static void filterreq(struct muth *mt, va_list args)
     data = defdata;
     data.req = req;
     gettimeofday(&data.start, NULL);
-    cl = mtstdopen(fd, 1, 600, "r+", NULL);
+    cl = mtbioopen(fd, 1, 600, "r+", &cli);
     if(socketpair(PF_UNIX, SOCK_STREAM, 0, pfds))
 	goto out;
-    hd = mtstdopen(pfds[1], 1, 600, "r+", NULL);
+    hd = mtbioopen(pfds[1], 1, 600, "r+", &hdi);
     if(sendreq(ch, req, pfds[0])) {
 	close(pfds[0]);
 	goto out;
@@ -261,14 +274,16 @@ static void filterreq(struct muth *mt, va_list args)
     
     if(passdata(cl, hd, &data.bytesin))
 	goto out;
-    if(fflush(hd))
+    if(bioflush(hd))
 	goto out;
     shutdown(pfds[1], SHUT_WR);
-    if((resp = parseresponse(hd)) == NULL)
+    if((resp = parseresponseb(hd)) == NULL)
 	goto out;
+    cli->sendrights = hdi->rights;
+    hdi->rights = -1;
     data.resp = resp;
-    writeresp(cl, resp);
-    fprintf(cl, "\r\n");
+    writerespb(cl, resp);
+    bioprintf(cl, "\r\n");
     if(passdata(hd, cl, &data.bytesout))
 	goto out;
     gettimeofday(&data.end, NULL);
@@ -279,9 +294,9 @@ out:
     freehthead(req);
     if(resp != NULL)
 	freehthead(resp);
-    fclose(cl);
+    bioclose(cl);
     if(hd != NULL)
-	fclose(hd);
+	bioclose(hd);
 }
 
 static void sighandler(int sig)
@@ -503,7 +518,7 @@ int main(int argc, char **argv)
 	    pidfile = optarg;
 	    break;
 	case 'a':
-	    format = "%A - - [%{%d/%b/%Y:%H:%M:%S %z}t] \"%m %u %v\" %c %o \"%R\" \"%G\"";
+	    format = "%A - %{log-user}P [%{%d/%b/%Y:%H:%M:%S %z}t] \"%m %u %v\" %c %o \"%R\" \"%G\"";
 	    break;
 	default:
 	    usage(stderr);