From: Martin Mares <mj@ucw.cz>
Date: Wed, 19 Mar 2008 13:33:07 +0000 (+0100)
Subject: Sandbox: Added redirection of stderr on request.
X-Git-Tag: python-dummy-working~213
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=82079136e38d28d009358f9bf141f70244a79609;p=moe.git

Sandbox: Added redirection of stderr on request.
---

diff --git a/src/box.c b/src/box.c
index 585eba0..c3598b4 100644
--- a/src/box.c
+++ b/src/box.c
@@ -36,7 +36,7 @@ static int pass_environ;
 static int file_access;
 static int verbose;
 static int memory_limit;
-static char *redir_stdin, *redir_stdout;
+static char *redir_stdin, *redir_stdout, *redir_stderr;
 static char *set_cwd;
 
 static pid_t box_pid;
@@ -814,7 +814,14 @@ box_inside(int argc, char **argv)
       if (open(redir_stdout, O_WRONLY | O_CREAT | O_TRUNC, 0666) != 1)
 	die("open(\"%s\"): %m", redir_stdout);
     }
-  dup2(1, 2);
+  if (redir_stderr)
+    {
+      close(2);
+      if (open(redir_stderr, O_WRONLY | O_CREAT | O_TRUNC, 0666) != 2)
+	die("open(\"%s\"): %m", redir_stderr);
+    }
+  else
+    dup2(1, 2);
   setpgrp();
   if (memory_limit)
     {
@@ -856,6 +863,7 @@ Options:\n\
 -o <file>\tRedirect stdout to <file>\n\
 -p <path>\tPermit access to the specified path (or subtree if it ends with a `/')\n\
 -p <path>=<act>\tDefine action for the specified path (<act>=yes/no)\n\
+-r <file>\tRedirect stderr to <file>\n\
 -s <sys>\tPermit the specified syscall (be careful)\n\
 -s <sys>=<act>\tDefine action for the specified syscall (<act>=yes/no/file)\n\
 -t <time>\tSet run time limit (seconds, fractions allowed)\n\
@@ -872,7 +880,7 @@ main(int argc, char **argv)
   int c;
   uid_t uid;
 
-  while ((c = getopt(argc, argv, "a:c:eE:fi:m:o:p:s:t:Tvw:")) >= 0)
+  while ((c = getopt(argc, argv, "a:c:eE:fi:m:o:p:r:s:t:Tvw:")) >= 0)
     switch (c)
       {
       case 'a':
@@ -904,6 +912,9 @@ main(int argc, char **argv)
 	if (!set_path_action(optarg))
 	  usage();
 	break;
+      case 'r':
+	redir_stderr = optarg;
+	break;
       case 's':
 	if (!set_syscall_action(optarg))
 	  usage();