X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcallcgi.c;h=e51a06a71e3fd7404b9dcf745444230b2cb6c3a8;hb=2d65add085285c9df22b9c9bf7d5f2521d9f61cd;hp=fb2596bff6c6b4825afa5c08f42f5563e3a3719e;hpb=33f29d6778ddc733a054e07d0d255f63a77797ac;p=ashd.git

diff --git a/src/callcgi.c b/src/callcgi.c
index fb2596b..e51a06a 100644
--- a/src/callcgi.c
+++ b/src/callcgi.c
@@ -90,17 +90,13 @@ static void forkchild(int inpath, char *prog, char *file, char *method, char *ur
 	if(getenv("HTTP_VERSION"))
 	    putenv(sprintf2("SERVER_PROTOCOL=%s", getenv("HTTP_VERSION")));
 	putenv(sprintf2("REQUEST_METHOD=%s", method));
-	if(*rest)
-	    putenv(sprintf2("PATH_INFO=/%s", rest));
-	else
-	    putenv("PATH_INFO=");
+	putenv(sprintf2("PATH_INFO=%s", rest));
 	name = url;
 	/* XXX: This is an ugly hack (I think), but though I can think
 	 * of several alternatives, none seem to be better. */
-	if(*rest && (strlen(url) > strlen(rest)) &&
-	   !strcmp(rest, url + strlen(url) - strlen(rest)) &&
-	   (url[strlen(url) - strlen(rest) - 1] == '/')) {
-	    name = sprintf2("%.*s", (int)(strlen(url) - strlen(rest) - 1), url);
+	if(*rest && (strlen(url) >= strlen(rest)) &&
+	   !strcmp(rest, url + strlen(url) - strlen(rest))) {
+	    name = sprintf2("%.*s", (int)(strlen(url) - strlen(rest)), url);
 	}
 	putenv(sprintf2("SCRIPT_NAME=%s", name));
 	putenv(sprintf2("QUERY_STRING=%s", qp?qp:""));
@@ -289,14 +285,14 @@ static void sendheaders(char **headers, FILE *out)
 
 static void usage(void)
 {
-    flog(LOG_ERR, "usage: callcgi [-p PROGRAM] METHOD URL REST");
+    flog(LOG_ERR, "usage: callcgi [-c] [-p PROGRAM] METHOD URL REST");
 }
 
 int main(int argc, char **argv, char **envp)
 {
     int c;
-    char *file, *prog;
-    int inpath;
+    char *file, *prog, *sp;
+    int inpath, cd;
     int infd, outfd;
     FILE *in, *out;
     char **headers;
@@ -306,8 +302,12 @@ int main(int argc, char **argv, char **envp)
     
     prog = NULL;
     inpath = 0;
-    while((c = getopt(argc, argv, "p:")) >= 0) {
+    cd = 0;
+    while((c = getopt(argc, argv, "cp:")) >= 0) {
 	switch(c) {
+	case 'c':
+	    cd = 1;
+	    break;
 	case 'p':
 	    prog = optarg;
 	    inpath = 1;
@@ -326,6 +326,21 @@ int main(int argc, char **argv, char **envp)
 	flog(LOG_ERR, "callcgi: needs to be called with the X-Ash-File header");
 	exit(1);
     }
+    
+    if(cd) {
+	/* This behavior is encouraged by the CGI specification (RFC 3875, 7.2),
+	 * but not strictly required, and I get the feeling it might break some
+	 * relative paths here or there, so it's not the default for now. */
+	if((sp = strrchr(file, '/')) != NULL) {
+	    *sp = 0;
+	    if(chdir(file)) {
+		*sp = '/';
+	    } else {
+		file = sp + 1;
+	    }
+	}
+    }
+    
     if(prog == NULL)
 	prog = file;
     forkchild(inpath, prog, file, argv[optind], argv[optind + 1], argv[optind + 2], &infd, &outfd);