Prevent extraneous empty lines in compiler output

[gruntmaster-daemon.git] / gruntmaster-exec

diff --git a/gruntmaster-exec b/gruntmaster-exec
index c824b20a76af263223e07db9640b91d9e2dda5fa..46ac491a674ebb1eb3672783e913d1f08e6d8a30 100755 (executable)
--- a/gruntmaster-exec
+++ b/gruntmaster-exec
@@ -45,8 +45,8 @@ GetOptions(
 
 my $killuser = $ENV{GRUNTMASTER_KILL_USER};
 my @sudo;
-@sudo = (shellwords ($ENV{GRUNTMASTER_SUDO}), '--') if $ENV{GRUNTMASTER_SUDO};
-$mlimit = 1_000_000_000 if @sudo; # sudo wants a lot of address space
+@sudo = (shellwords ($ENV{GRUNTMASTER_SUDO}), '--') if $ENV{GRUNTMASTER_SUDO} && $nobody;
+undef $mlimit if @sudo; # sudo wants a lot of address space
 
 my $ret = fork // die 'Cannot fork';
 if ($ret) {
@@ -87,14 +87,16 @@ if ($ret) {
                        POSIX::close $oldfd or die $!;
                }
        }
-       my $nproc = $killuser ? 5 : 1;
+       my $nproc = $killuser ? 15 : 1;
+       my $debug = $ENV{TEST_VERBOSE};
        %ENV = (ONLINE_JUDGE => 1, PATH => $ENV{PATH}, HOME => $ENV{HOME});
        setrlimit RLIMIT_AS, $mlimit, $mlimit or die $! if $mlimit;
        setrlimit RLIMIT_FSIZE, $olimit, $olimit or die $! if $olimit;
        setrlimit RLIMIT_NPROC, $nproc, $nproc or die $! if $nobody;
        POSIX::setgid $nobody ? 65534 : USER;
        POSIX::setuid $nobody ? 65534 : GROUP;
-       unshift @ARGV, @sudo if $nobody;
+       unshift @ARGV, @sudo;
+       say STDERR "Executing: ", join ' ', map { "'$_'" } @ARGV if $debug;
        exec @ARGV;
 }