X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-runscript.c;h=db337beef3d9d154fa090be93c36daa43f645d4a;hb=b547a6673cbb8bf2685fa0c03e143f14d3c803ed;hp=84764b6acf2b4d7ee46193540c7cd33a583953ee;hpb=9c309fd6577327188b61cb6508e02ab037987e1d;p=zpackage

diff --git a/zpm-runscript.c b/zpm-runscript.c
index 84764b6..db337be 100644
--- a/zpm-runscript.c
+++ b/zpm-runscript.c
@@ -2,13 +2,14 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-
+#include <unistd.h>
 
 #include <sys/mman.h>
 
@@ -32,7 +33,7 @@ int run(char *program, char **args, char *output, int *status) {
 	/* if stdout is a terminal, leave stdout where it goes,
 	 * if it's not a terminal, redirect stdout to output.
 	 * in either case, send stderr to output, unless null
-	 * if output is null, just run the program
+	 * if output is null or "-", just run the program
 	 */
 	int interactive = 0;
 	pid_t pid;
@@ -51,7 +52,7 @@ int run(char *program, char **args, char *output, int *status) {
 
 	if (pid == 0) {
 		/* child */
-		if (output) {
+		if (output && strcmp(output, "-") != 0) {
 			close(2);
 			rv = open(output, O_NOFOLLOW|O_TRUNC|O_CREAT|O_WRONLY,
 				       	0600);
@@ -97,10 +98,10 @@ int main(int ac, char **av){
 	int required = 0;
 
 	char hash[ZPM_HASH_STRLEN+1];
-	char *args[3];
+	char *args[4];
 	char *pkgid;
 
-	char *chroot = 0;
+	char *rootdir = 0;
 	char *db = "/var/lib/zpm/zpm.db";
 	char *script = "/var/tmp/zpm-script";
 	char *output = "/var/tmp/zpm-script.out";
@@ -111,12 +112,15 @@ int main(int ac, char **av){
 	}
 	/* ZPM_PACKAGE_FILE ? */
 
-	while ((opt = getopt(ac, av, "f:p:s:r:R")) != -1) {
+	rootdir = getenv("ZPM_ROOT_DIR");
+
+	while ((opt = getopt(ac, av, "f:p:o:s:r:R")) != -1) {
 		switch (opt) {
 			case 'f': db = optarg; break;
 			case 'p': phase = optarg; break;
 			case 's': script = optarg; break;
-			case 'r': chroot = optarg; break;
+			case 'o': output = optarg; break;
+			case 'r': rootdir = optarg; break;
 			case 'R': required = 1; break;
 			default:
 				  usage();
@@ -151,8 +155,29 @@ int main(int ac, char **av){
 			args[0] = script;
 			args[1] = pkgid;
 			args[2] = 0;
-			if (chroot) {
-				fprintf(stderr, "failing to chroot %s\n", chroot);
+			args[3] = 0;
+			if (argn + 1 <= ac) {
+				args[2] = av[argn+1];
+			}
+			if (rootdir) {
+				if (chdir(rootdir) == -1) {
+					perror("can not chdir to rootdir");
+					exit(EXIT_FAILURE);
+				}
+				if (geteuid() == 0) {
+					/* chroot is deprecated, and not in
+					 * posix.  need to use OS/kernel
+					 * specific code.
+					 */
+					fprintf(stderr, "support for chroot equivalent not supported on this OS\n");
+				} else {
+					fprintf(stderr, "unable to chroot as non root use\n");
+				}
+			} else {
+				if (chdir("/") == -1) {
+					perror("can not chdir to /");
+					exit(EXIT_FAILURE);
+				}
 			}
 			rv = run(script, args, output, &status);
 			if (rv) {