From b120cc197f0a598d7a8c5f721fcba2aacb24b77b Mon Sep 17 00:00:00 2001
From: cassio <cassiopc@gmail.com>
Date: Sat, 14 Sep 2013 02:08:21 +0200
Subject: fix java scripts for running with multiple inputs/outputs

---
 doc/problemexamples/abacaxi.zip              | Bin 22384 -> 22435 bytes
 doc/problemexamples/abacaxi/run/java         |  11 +++++++----
 doc/problemexamples/bits.zip                 | Bin 22200 -> 22251 bytes
 doc/problemexamples/bits/run/java            |  11 +++++++----
 doc/problemexamples/formiga.zip              | Bin 22321 -> 22372 bytes
 doc/problemexamples/formiga/run/java         |  11 +++++++----
 doc/problemexamples/multas.zip               | Bin 24161 -> 24212 bytes
 doc/problemexamples/multas/run/java          |  11 +++++++----
 doc/problemexamples/problemtemplate.zip      | Bin 22267 -> 22318 bytes
 doc/problemexamples/problemtemplate/run/java |  11 +++++++----
 src/private/autojudging.php                  |  20 ++++++++++----------
 11 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/doc/problemexamples/abacaxi.zip b/doc/problemexamples/abacaxi.zip
index 2dcf701..7c23ccc 100644
Binary files a/doc/problemexamples/abacaxi.zip and b/doc/problemexamples/abacaxi.zip differ
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
index 5be7f38..cc7b5c4 100644
Binary files a/doc/problemexamples/bits.zip and b/doc/problemexamples/bits.zip differ
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
index 98a416c..70e7243 100644
Binary files a/doc/problemexamples/formiga.zip and b/doc/problemexamples/formiga.zip differ
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
index 8bc6f1d..3b9ec09 100644
Binary files a/doc/problemexamples/multas.zip and b/doc/problemexamples/multas.zip differ
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
index d98c53e..c3ddf4a 100644
Binary files a/doc/problemexamples/problemtemplate.zip and b/doc/problemexamples/problemtemplate.zip differ
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);
-- 
cgit v1.2.3