diff options
| -rw-r--r-- | doc/problemexamples/abacaxi.zip | bin | 22384 -> 22435 bytes | |||
| -rwxr-xr-x | doc/problemexamples/abacaxi/run/java | 11 | ||||
| -rw-r--r-- | doc/problemexamples/bits.zip | bin | 22200 -> 22251 bytes | |||
| -rwxr-xr-x | doc/problemexamples/bits/run/java | 11 | ||||
| -rw-r--r-- | doc/problemexamples/formiga.zip | bin | 22321 -> 22372 bytes | |||
| -rwxr-xr-x | doc/problemexamples/formiga/run/java | 11 | ||||
| -rw-r--r-- | doc/problemexamples/multas.zip | bin | 24161 -> 24212 bytes | |||
| -rwxr-xr-x | doc/problemexamples/multas/run/java | 11 | ||||
| -rw-r--r-- | doc/problemexamples/problemtemplate.zip | bin | 22267 -> 22318 bytes | |||
| -rwxr-xr-x | doc/problemexamples/problemtemplate/run/java | 11 | ||||
| -rwxr-xr-x | src/private/autojudging.php | 20 |
11 files changed, 45 insertions, 30 deletions
diff --git a/doc/problemexamples/abacaxi.zip b/doc/problemexamples/abacaxi.zip Binary files differindex 2dcf701..7c23ccc 100644 --- a/doc/problemexamples/abacaxi.zip +++ b/doc/problemexamples/abacaxi.zip diff --git a/doc/problemexamples/abacaxi/run/java b/doc/problemexamples/abacaxi/run/java index d6a73a5..c7eb74a 100755 --- a/doc/problemexamples/abacaxi/run/java +++ b/doc/problemexamples/abacaxi/run/java @@ -67,16 +67,18 @@ if [ "$1" == "" -o "$2" == "" -o "$3" == "" ]; then exit 43 fi if [ -r run.exe ]; then - mv run.exe run.jar + rm -f run.jar + cp run.exe run.jar fi if [ -r "$1" ]; then - mv "$1" run.jar + rm -f run.jar + cp "$1" run.jar fi if [ ! -r run.jar ]; then echo "ERROR: file run.jar not found - possible error during compilation" exit 1 fi -name="$1" +name=`basename "$1"` if [ "${name##*.}" == "class" -a "${name##*.}" == "CLASS" ]; then echo "WARNING: removing .class file extension" fi @@ -144,7 +146,8 @@ if [ ! -x \$java ]; then fi export CLASSPATH=.:./run.jar:$CLASSPATH $sf -r$nruns -t$time -T$ttime -istdin0 -F256 -u256 -ostdout0 -estderr0 -U$bocau -G$bocag -n0 -C. -f20000 -d20000000 -m20000000 -- \$java -Xmx${maxm}K -Xms${maxm}K "$name" -echo \$? > runit.retcode +retval=\$? +echo \$retval > runit.retcode if [ ! -d /bocajail ]; then /bin/umount /proc 2>/dev/null #/bin/umount /dev diff --git a/doc/problemexamples/bits.zip b/doc/problemexamples/bits.zip Binary files differindex 5be7f38..cc7b5c4 100644 --- a/doc/problemexamples/bits.zip +++ b/doc/problemexamples/bits.zip diff --git a/doc/problemexamples/bits/run/java b/doc/problemexamples/bits/run/java index d6a73a5..c7eb74a 100755 --- a/doc/problemexamples/bits/run/java +++ b/doc/problemexamples/bits/run/java @@ -67,16 +67,18 @@ if [ "$1" == "" -o "$2" == "" -o "$3" == "" ]; then exit 43 fi if [ -r run.exe ]; then - mv run.exe run.jar + rm -f run.jar + cp run.exe run.jar fi if [ -r "$1" ]; then - mv "$1" run.jar + rm -f run.jar + cp "$1" run.jar fi if [ ! -r run.jar ]; then echo "ERROR: file run.jar not found - possible error during compilation" exit 1 fi -name="$1" +name=`basename "$1"` if [ "${name##*.}" == "class" -a "${name##*.}" == "CLASS" ]; then echo "WARNING: removing .class file extension" fi @@ -144,7 +146,8 @@ if [ ! -x \$java ]; then fi export CLASSPATH=.:./run.jar:$CLASSPATH $sf -r$nruns -t$time -T$ttime -istdin0 -F256 -u256 -ostdout0 -estderr0 -U$bocau -G$bocag -n0 -C. -f20000 -d20000000 -m20000000 -- \$java -Xmx${maxm}K -Xms${maxm}K "$name" -echo \$? > runit.retcode +retval=\$? +echo \$retval > runit.retcode if [ ! -d /bocajail ]; then /bin/umount /proc 2>/dev/null #/bin/umount /dev diff --git a/doc/problemexamples/formiga.zip b/doc/problemexamples/formiga.zip Binary files differindex 98a416c..70e7243 100644 --- a/doc/problemexamples/formiga.zip +++ b/doc/problemexamples/formiga.zip diff --git a/doc/problemexamples/formiga/run/java b/doc/problemexamples/formiga/run/java index d6a73a5..c7eb74a 100755 --- a/doc/problemexamples/formiga/run/java +++ b/doc/problemexamples/formiga/run/java @@ -67,16 +67,18 @@ if [ "$1" == "" -o "$2" == "" -o "$3" == "" ]; then exit 43 fi if [ -r run.exe ]; then - mv run.exe run.jar + rm -f run.jar + cp run.exe run.jar fi if [ -r "$1" ]; then - mv "$1" run.jar + rm -f run.jar + cp "$1" run.jar fi if [ ! -r run.jar ]; then echo "ERROR: file run.jar not found - possible error during compilation" exit 1 fi -name="$1" +name=`basename "$1"` if [ "${name##*.}" == "class" -a "${name##*.}" == "CLASS" ]; then echo "WARNING: removing .class file extension" fi @@ -144,7 +146,8 @@ if [ ! -x \$java ]; then fi export CLASSPATH=.:./run.jar:$CLASSPATH $sf -r$nruns -t$time -T$ttime -istdin0 -F256 -u256 -ostdout0 -estderr0 -U$bocau -G$bocag -n0 -C. -f20000 -d20000000 -m20000000 -- \$java -Xmx${maxm}K -Xms${maxm}K "$name" -echo \$? > runit.retcode +retval=\$? +echo \$retval > runit.retcode if [ ! -d /bocajail ]; then /bin/umount /proc 2>/dev/null #/bin/umount /dev diff --git a/doc/problemexamples/multas.zip b/doc/problemexamples/multas.zip Binary files differindex 8bc6f1d..3b9ec09 100644 --- a/doc/problemexamples/multas.zip +++ b/doc/problemexamples/multas.zip diff --git a/doc/problemexamples/multas/run/java b/doc/problemexamples/multas/run/java index d6a73a5..c7eb74a 100755 --- a/doc/problemexamples/multas/run/java +++ b/doc/problemexamples/multas/run/java @@ -67,16 +67,18 @@ if [ "$1" == "" -o "$2" == "" -o "$3" == "" ]; then exit 43 fi if [ -r run.exe ]; then - mv run.exe run.jar + rm -f run.jar + cp run.exe run.jar fi if [ -r "$1" ]; then - mv "$1" run.jar + rm -f run.jar + cp "$1" run.jar fi if [ ! -r run.jar ]; then echo "ERROR: file run.jar not found - possible error during compilation" exit 1 fi -name="$1" +name=`basename "$1"` if [ "${name##*.}" == "class" -a "${name##*.}" == "CLASS" ]; then echo "WARNING: removing .class file extension" fi @@ -144,7 +146,8 @@ if [ ! -x \$java ]; then fi export CLASSPATH=.:./run.jar:$CLASSPATH $sf -r$nruns -t$time -T$ttime -istdin0 -F256 -u256 -ostdout0 -estderr0 -U$bocau -G$bocag -n0 -C. -f20000 -d20000000 -m20000000 -- \$java -Xmx${maxm}K -Xms${maxm}K "$name" -echo \$? > runit.retcode +retval=\$? +echo \$retval > runit.retcode if [ ! -d /bocajail ]; then /bin/umount /proc 2>/dev/null #/bin/umount /dev diff --git a/doc/problemexamples/problemtemplate.zip b/doc/problemexamples/problemtemplate.zip Binary files differindex d98c53e..c3ddf4a 100644 --- a/doc/problemexamples/problemtemplate.zip +++ b/doc/problemexamples/problemtemplate.zip diff --git a/doc/problemexamples/problemtemplate/run/java b/doc/problemexamples/problemtemplate/run/java index d6a73a5..c7eb74a 100755 --- a/doc/problemexamples/problemtemplate/run/java +++ b/doc/problemexamples/problemtemplate/run/java @@ -67,16 +67,18 @@ if [ "$1" == "" -o "$2" == "" -o "$3" == "" ]; then exit 43 fi if [ -r run.exe ]; then - mv run.exe run.jar + rm -f run.jar + cp run.exe run.jar fi if [ -r "$1" ]; then - mv "$1" run.jar + rm -f run.jar + cp "$1" run.jar fi if [ ! -r run.jar ]; then echo "ERROR: file run.jar not found - possible error during compilation" exit 1 fi -name="$1" +name=`basename "$1"` if [ "${name##*.}" == "class" -a "${name##*.}" == "CLASS" ]; then echo "WARNING: removing .class file extension" fi @@ -144,7 +146,8 @@ if [ ! -x \$java ]; then fi export CLASSPATH=.:./run.jar:$CLASSPATH $sf -r$nruns -t$time -T$ttime -istdin0 -F256 -u256 -ostdout0 -estderr0 -U$bocau -G$bocag -n0 -C. -f20000 -d20000000 -m20000000 -- \$java -Xmx${maxm}K -Xms${maxm}K "$name" -echo \$? > runit.retcode +retval=\$? +echo \$retval > runit.retcode if [ ! -d /bocajail ]; then /bin/umount /proc 2>/dev/null #/bin/umount /dev diff --git a/src/private/autojudging.php b/src/private/autojudging.php index 72b6b3c..df4fdc0 100755 --- a/src/private/autojudging.php +++ b/src/private/autojudging.php @@ -306,12 +306,12 @@ echo "Executing " . $ex . " at " . getcwd() . "\n"; if(system($ex, $retval)===false) $retval=-1; if(is_readable('stdout')) { - system('echo ##### COMPILATION STDOUT: >> allerr'); - system('cat stdout >> allerr'); + system('/bin/echo ##### COMPILATION STDOUT: >> allerr'); + system('/bin/cat stdout >> allerr'); } if(is_readable('stderr')) { - system('echo ##### COMPILATION STDERR: >> allerr'); - system('cat stderr >> allerr'); + system('/bin/echo ##### COMPILATION STDERR: >> allerr'); + system('/bin/cat stderr >> allerr'); } if($retval != 0) { @@ -419,12 +419,12 @@ if($retval != 0) { @chmod($fne,0755); } if(is_readable('stderr0')) - system('cat stderr0 >> ' . $dir . $ds . 'stderr'); - system('echo ##### STDERR FOR FILE ' . escapeshellarg($file) . ' >> ' . $dir . $ds . 'allerr'); - system('cat stderr >> ' . $dir . $ds . 'allerr'); - system('cat stdout > ' . $dir . $ds . 'team' . $ds . escapeshellarg($file)); - system('echo ##### STDOUT FOR FILE ' . escapeshellarg($file) . ' >> ' . $dir . $ds . 'allout'); - system('cat stdout >> ' . $dir . $ds . 'allout'); + system('/bin/cat stderr0 >> stderr'); + system('/bin/echo ##### STDERR FOR FILE ' . escapeshellarg($file) . ' >> ' . $dir . $ds . 'allerr'); + system('/bin/cat stderr >> ' . $dir . $ds . 'allerr'); + system('/bin/cat stdout > ' . $dir . $ds . 'team' . $ds . escapeshellarg($file)); + system('/bin/echo ##### STDOUT FOR FILE ' . escapeshellarg($file) . ' >> ' . $dir . $ds . 'allout'); + system('/bin/cat stdout >> ' . $dir . $ds . 'allout'); chdir($dir); if($localretval != 0) { list($retval,$answer) = exitmsg($localretval); |