summaryrefslogtreecommitdiff
path: root/security/py-prewikka/files
diff options
context:
space:
mode:
authorshannonjr <shannonjr@pkgsrc.org>2006-08-23 10:30:02 +0000
committershannonjr <shannonjr@pkgsrc.org>2006-08-23 10:30:02 +0000
commitbbdaf76efe7d5fc7d414c3883a0e4e37085ab767 (patch)
tree1797cd21b8459d11341f6b3911d59f984e2cb12c /security/py-prewikka/files
parent8c01a948c93293f3e3d52b5a439af50307656d89 (diff)
downloadpkgsrc-bbdaf76efe7d5fc7d414c3883a0e4e37085ab767.tar.gz
Fixed bug in 0.9.7 release that prevented filters from working.
Diffstat (limited to 'security/py-prewikka/files')
-rw-r--r--security/py-prewikka/files/runPrewikka.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/security/py-prewikka/files/runPrewikka.c b/security/py-prewikka/files/runPrewikka.c
index 19741147146..fb27361f5d2 100644
--- a/security/py-prewikka/files/runPrewikka.c
+++ b/security/py-prewikka/files/runPrewikka.c
@@ -1,5 +1,6 @@
#define PREWIKKA_HTTPD_USER "@PREWIKKA_USER@"
#define PREWIKKA_HTTPD_PATH "@PREFIX@/bin/prewikka-httpd"
+#define PYTHON "@PYTHONBIN@"
#include <unistd.h>
#include <string.h>
@@ -116,15 +117,16 @@ int main (int argc, char **argv )
}
/* Build calling argv */
- args[0] = PREWIKKA_HTTPD_PATH;
+ args[0] = PYTHON;
+ args[1] = PREWIKKA_HTTPD_PATH;
for (i=1;i<argc;i++)
{
- args[i] = argv[i];
+ args[i+1] = argv[i];
+ args[i+2] = NULL;
}
- args[i++] = NULL;
/* Finally transform self into prewikka-httpd */
- if (execvp(PREWIKKA_HTTPD_PATH, args) < 0)
+ if (execvp(PYTHON, args) < 0)
error_sys("execve error");
else
; /* avoid if-then ambiguity */