Do not fork/exec in gruntmaster-compile

[gruntmaster-daemon.git] / gruntmaster-exec

diff --git a/gruntmaster-exec b/gruntmaster-exec
index c824b20a76af263223e07db9640b91d9e2dda5fa..9590b4e34173feaa8198bfa13e84e424d810bea6 100755 (executable)
--- a/gruntmaster-exec
+++ b/gruntmaster-exec
@@ -45,8 +45,8 @@ GetOptions(
 
 my $killuser = $ENV{GRUNTMASTER_KILL_USER};
 my @sudo;
 
 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) {
 
 my $ret = fork // die 'Cannot fork';
 if ($ret) {


@@ -64,7 +64,7 @@ if ($ret) {
        alarm 0;
        if (@sudo) {
                $? = $? >> 8;
        alarm 0;
        if (@sudo) {
                $? = $? >> 8;

-               $? = $? < 128 ? ($? << 8) : $? - 128;
+               $? = $? < 128 || $? > 128+32 ? ($? << 8) : $? - 128;

        }
        my $sig = $? & 127;
        my $signame = sig_name $sig;
        }
        my $sig = $? & 127;
        my $signame = sig_name $sig;


@@ -87,14 +87,16 @@ if ($ret) {
                        POSIX::close $oldfd or die $!;
                }
        }
                        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;
        %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;
 }
 
        exec @ARGV;
 }