From 5d4eca5257a60c5f1de043fdf3f67e0a9df011f4 Mon Sep 17 00:00:00 2001 From: cassiopc Date: Wed, 8 Aug 2012 19:52:19 +0200 Subject: many small bug fixes --- .../doc/problemexamples/problemtemplate/compile/c | 41 +++++++---- .../problemexamples/problemtemplate/compile/cpp | 41 +++++++---- .../problemexamples/problemtemplate/compile/java | 61 +++++++++------- .../doc/problemexamples/problemtemplate/run/c | 29 ++++---- .../doc/problemexamples/problemtemplate/run/cpp | 24 +++---- .../doc/problemexamples/problemtemplate/run/java | 83 ++++++++++++---------- .../doc/problemexamples/problemtemplate/tests/c | 17 +++-- 7 files changed, 173 insertions(+), 123 deletions(-) (limited to 'boca-1.5.0/doc/problemexamples/problemtemplate') diff --git a/boca-1.5.0/doc/problemexamples/problemtemplate/compile/c b/boca-1.5.0/doc/problemexamples/problemtemplate/compile/c index 04a08e9..4cb7ea8 100644 --- a/boca-1.5.0/doc/problemexamples/problemtemplate/compile/c +++ b/boca-1.5.0/doc/problemexamples/problemtemplate/compile/c @@ -59,7 +59,7 @@ if [ "${name##*.}" == "zip" -a "${name##*.}" == "ZIP" ]; then unzip "$name" -d src name="*.c" else - mv $name src + cp "$name" src fi id -u bocajail >/dev/null 2>/dev/null if [ $? == 0 ]; then @@ -85,8 +85,10 @@ if [ ! -x $sf ]; then exit 46 fi maxm=512000 -if [ "$4" != "" -a "$4" -gt "0" ]; then -maxm=${4}000 +if [ "$4" != "" ]; then + if [ "$4" -gt "0" ]; then + maxm=${4}000 + fi fi # setting up the timelimit according to the problem @@ -95,7 +97,7 @@ time=5 else time=$3 fi -let ttime=$time+30 +let "ttime = $time + 30" if [ "$2" == "" ]; then exe=run.exe @@ -103,7 +105,7 @@ else exe=$2 fi -rm -f ../$exe 2>/dev/null +rm -f $exe compileit.retcode runit.retcode 2>/dev/null cat < compileit.sh #!/bin/bash cc=\`which gcc\` @@ -113,8 +115,8 @@ if [ ! -x "\$cc" ]; then exit 47 fi cd src -"\$cc" -static -O2 -lm -o ../$exe "$name" -echo \$? > compileit.retcode +"\$cc" -static -O2 -o ../$exe $name -lm +echo \$? > ../compileit.retcode exit 0 EOF chmod 755 compileit.sh @@ -124,29 +126,40 @@ echo "Current directory is $cdir" >&2 echo $cdir | grep -q "/bocajail" if [ $? == 0 ]; then cdir=`echo $cdir | sed "s/.*\/bocajail//"` + echo "Internal directory is $cdir" cat < runit.sh #!/bin/bash +cd "$cdir" [ -f /proc/cpuinfo ] || /bin/mount -t proc proc /proc #/bin/mount --bind /dev /dev [ -d /sys/kernel ] || /bin/mount -t sysfs sysfs /sys $sf -r1 -F1000 -n0 -U$bocau -G$bocag -C. -ostdout0 -estderr0 -d$maxm -m$maxm -f20000 -t$ttime -T$ttime ./compileit.sh echo \$? > runit.retcode -/bin/umount /proc 2>/dev/null -#/bin/umount /dev -/bin/umount /sys 2>/dev/null +if [ ! -d /bocajail ]; then + /bin/umount /proc 2>/dev/null + #/bin/umount /dev + /bin/umount /sys 2>/dev/null +fi EOF chmod 755 runit.sh chroot /bocajail "$cdir/runit.sh" - ret=`cat runit.retcode` + if [ -r runit.retcode ]; then + ret=`cat runit.retcode` + else + ret=99 + fi else echo "COMPILATION IS NOT BEING CHROOTED -- THIS IS NOT AN IDEAL SETTING" $sf -r1 -F1000 -n0 -U$bocau -G$bocag -C. -ostdout0 -estderr0 -d$maxm -m$maxm -f20000 -t$ttime -T$ttime ./compileit.sh ret=$? fi -rm -rf src/ -if [ -f stdout0 ]; then - cat stdout0 +if [ -f "stdout0" ]; then + cat "stdout0" fi +if [ -f "stderr0" ]; then + cat "stderr0" +fi +rm -rf src/ if [ "$ret" != "0" ]; then echo "Compilation Error: $ret" exit $ret diff --git a/boca-1.5.0/doc/problemexamples/problemtemplate/compile/cpp b/boca-1.5.0/doc/problemexamples/problemtemplate/compile/cpp index 2ec55ac..6a61bc1 100644 --- a/boca-1.5.0/doc/problemexamples/problemtemplate/compile/cpp +++ b/boca-1.5.0/doc/problemexamples/problemtemplate/compile/cpp @@ -59,7 +59,7 @@ if [ "${name##*.}" == "zip" -a "${name##*.}" == "ZIP" ]; then unzip "$name" -d src name="*.c" else - mv $name src + cp "$name" src fi id -u bocajail >/dev/null 2>/dev/null if [ $? == 0 ]; then @@ -85,8 +85,10 @@ if [ ! -x $sf ]; then exit 46 fi maxm=512000 -if [ "$4" != "" -a "$4" -gt "0" ]; then -maxm=${4}000 +if [ "$4" != "" ]; then + if [ "$4" -gt "0" ]; then + maxm=${4}000 + fi fi # setting up the timelimit according to the problem @@ -95,7 +97,7 @@ time=5 else time=$3 fi -let ttime=$time+30 +let "ttime = $time + 30" if [ "$2" == "" ]; then exe=run.exe @@ -103,7 +105,7 @@ else exe=$2 fi -rm -f ../$exe 2>/dev/null +rm -f $exe compileit.retcode runit.retcode 2>/dev/null cat < compileit.sh #!/bin/bash cc=\`which g++\` @@ -113,8 +115,8 @@ if [ ! -x "\$cc" ]; then exit 47 fi cd src -"\$cc" -static -O2 -lm -o ../$exe "$name" -echo \$? > compileit.retcode +"\$cc" -static -O2 -o ../$exe $name -lm +echo \$? > ../compileit.retcode exit 0 EOF chmod 755 compileit.sh @@ -124,29 +126,40 @@ echo "Current directory is $cdir" >&2 echo $cdir | grep -q "/bocajail" if [ $? == 0 ]; then cdir=`echo $cdir | sed "s/.*\/bocajail//"` + echo "Internal directory is $cdir" cat < runit.sh #!/bin/bash +cd "$cdir" [ -f /proc/cpuinfo ] || /bin/mount -t proc proc /proc #/bin/mount --bind /dev /dev [ -d /sys/kernel ] || /bin/mount -t sysfs sysfs /sys $sf -r1 -F1000 -n0 -U$bocau -G$bocag -C. -ostdout0 -estderr0 -d$maxm -m$maxm -f20000 -t$ttime -T$ttime ./compileit.sh echo \$? > runit.retcode -/bin/umount /proc 2>/dev/null -#/bin/umount /dev -/bin/umount /sys 2>/dev/null +if [ ! -d /bocajail ]; then + /bin/umount /proc 2>/dev/null + #/bin/umount /dev + /bin/umount /sys 2>/dev/null +fi EOF chmod 755 runit.sh chroot /bocajail "$cdir/runit.sh" - ret=`cat runit.retcode` + if [ -r runit.retcode ]; then + ret=`cat runit.retcode` + else + ret=99 + fi else echo "COMPILATION IS NOT BEING CHROOTED -- THIS IS NOT AN IDEAL SETTING" $sf -r1 -F1000 -n0 -U$bocau -G$bocag -C. -ostdout0 -estderr0 -d$maxm -m$maxm -f20000 -t$ttime -T$ttime ./compileit.sh ret=$? fi -rm -rf src/ -if [ -f stdout0 ]; then - cat stdout0 +if [ -f "stdout0" ]; then + cat "stdout0" fi +if [ -f "stderr0" ]; then + cat "stderr0" +fi +rm -rf src/ if [ "$ret" != "0" ]; then echo "Compilation Error: $ret" exit $ret diff --git a/boca-1.5.0/doc/problemexamples/problemtemplate/compile/java b/boca-1.5.0/doc/problemexamples/problemtemplate/compile/java index dae050e..f62215b 100644 --- a/boca-1.5.0/doc/problemexamples/problemtemplate/compile/java +++ b/boca-1.5.0/doc/problemexamples/problemtemplate/compile/java @@ -49,18 +49,6 @@ if [ ! -r "$1" ]; then echo "$1 not found or it's not readable" exit 44 fi -mkdir -p src -if [ "${name##*.}" == "zip" -a "${name##*.}" == "ZIP" ]; then - unzip "$name" -d src - if [ "${name##*.}" == "zip" ]; then - name=`basename $name .zip` - else - name=`basename $name .ZIP` - fi -else - mv $name src -fi - id -u bocajail >/dev/null 2>/dev/null if [ $? == 0 ]; then bocau=`id -u bocajail` @@ -76,6 +64,20 @@ if [ "$bocau" == "" -o "$bocag" == "" ]; then exit 43 fi +mkdir -p src +if [ "${name##*.}" == "zip" -a "${name##*.}" == "ZIP" ]; then + unzip "$name" -d src + if [ "${name##*.}" == "zip" ]; then + name=`basename $name .zip` + else + name=`basename $name .ZIP` + fi +else + cp $name src +fi +chown -R $bocau src +chmod -R 700 src + # this script makes use of safeexec to execute the code with less privilegies # make sure that directories below are correct. sf=`which safeexec` @@ -124,15 +126,16 @@ fi export CLASSPATH=.:\$CLASSPATH cd src if [ -r "$name" ]; then - \$javac -Xmx${maxm}M -Xms${maxm}M "$name" - echo \$? > compileit.retcode + \$javac "$name" + echo \$? > ../compileit.retcode fi find . -name "*.java" | while read lin; do - \$javac -Xmx${maxm}M -Xms${maxm}M "\$lin" - echo \$? > compileit.retcode + \$javac "\$lin" + echo \$? > ../compileit.retcode done rm -f ../$jarfile \$jar cvf ../$jarfile * +exit 0 EOF chmod 755 compileit.sh @@ -141,29 +144,39 @@ if [ $? == 0 ]; then cdir=`echo $cdir | sed "s/.*\/bocajail//"` cat < runit.sh #!/bin/bash +cd "$cdir" [ -f /proc/cpuinfo ] || /bin/mount -t proc proc /proc #/bin/mount --bind /dev /dev [ -d /sys/kernel ] || /bin/mount -t sysfs sysfs /sys $sf -r1 -t$time -T$ttime -F256 -u256 -ostdout0 -estderr0 -U$bocau -G$bocag -n0 -C. -f20000 -d20000000 -m20000000 ./compileit.sh - -/bin/umount /proc 2>/dev/null -#/bin/umount /dev -/bin/umount /sys 2>/dev/null +echo \$? > runit.retcode +if [ ! -d /bocajail ]; then + /bin/umount /proc 2>/dev/null + #/bin/umount /dev + /bin/umount /sys 2>/dev/null +fi EOF chmod 755 runit.sh chroot /bocajail "$cdir/runit.sh" - ret=`cat runit.retcode` + if [ -r runit.retcode ]; then + ret=`cat runit.retcode` + else + ret=99 + fi else echo "COMPILATION IS NOT BEING CHROOTED -- THIS IS NOT AN IDEAL SETTING" # $javac "$name" $sf -r1 -t$time -T$ttime -F256 -u256 -U$bocau -G$bocag -ostdout0 -estderr0 -n0 -C. -d20000000 -m20000000 ./compileit.sh ret=$? fi -rm -rf src/ -if [ -f stdout0 ]; then - cat stdout0 +if [ -f "stdout0" ]; then + cat "stdout0" +fi +if [ -f "stderr0" ]; then + cat "stderr0" fi +rm -rf src/ if [ "$ret" != "0" ]; then echo "Compilation Error: $ret" exit $ret diff --git a/boca-1.5.0/doc/problemexamples/problemtemplate/run/c b/boca-1.5.0/doc/problemexamples/problemtemplate/run/c index d65ed58..75720ee 100755 --- a/boca-1.5.0/doc/problemexamples/problemtemplate/run/c +++ b/boca-1.5.0/doc/problemexamples/problemtemplate/run/c @@ -65,16 +65,11 @@ if [ "$1" == "" -o "$2" == "" -o "$3" == "" ]; then echo "parameter problem" exit 43 fi -name=`basename "$1"` -if [ ! -x "$name" ]; then +if [ ! -x "$1" ]; then echo "$1 not found (or is not in the current dir) or it's not executable" exit 44 fi -if [ "${name##*.}" != "exe" -a "${name##*.}" != "EXE" ]; then - echo "WARNING: executable file extension is not .exe" -fi -input=`basename "$2"` -if [ ! -r "$input" ]; then +if [ ! -r "$2" ]; then echo "$2 not found (or is not in the current dir) or it's not readable" exit 45 fi @@ -92,22 +87,24 @@ else fi nruns=1 -if [ "$4" != "" -a "$4" -gt "0" ]; then -nruns=$4 +if [ "$4" != "" ]; then + if [ "$4" -gt "0" ]; then + nruns=$4 + fi fi maxm=512000 -if [ "$5" != "" -a "$5" -gt "0" ]; then -maxm=${5}000 +if [ "$5" != "" ]; then + if [ "$5" -gt "0" ]; then + maxm=${5}000 + fi fi -rm -f stdin0 2>/dev/null -mv "$input" stdin0 +cp "$2" stdin0 2>/dev/null +cp "$1" run.exe 2>/dev/null -rm -f run.exe 2>/dev/null -mv "$name" run.exe file run.exe | grep -iq "statically linked" if [ "$?" != "0" ]; then - echo "Aborting because $name is not statically linked" + echo "Aborting because $1 is not statically linked" exit 47 fi diff --git a/boca-1.5.0/doc/problemexamples/problemtemplate/run/cpp b/boca-1.5.0/doc/problemexamples/problemtemplate/run/cpp index 9b2d092..e5c7620 100755 --- a/boca-1.5.0/doc/problemexamples/problemtemplate/run/cpp +++ b/boca-1.5.0/doc/problemexamples/problemtemplate/run/cpp @@ -69,10 +69,6 @@ if [ ! -x "$1" ]; then echo "$1 not found or it's not executable" exit 44 fi -name="$1" -if [ "${name##*.}" != "exe" -a "${name##*.}" != "EXE" ]; then - echo "WARNING: executable file extension is not .exe" -fi if [ ! -r "$2" ]; then echo "$2 not found or it's not readable" exit 45 @@ -91,22 +87,24 @@ else fi nruns=1 -if [ "$4" != "" -a "$4" -gt "0" ]; then -nruns=$4 +if [ "$4" != "" ]; then + if [ "$4" -gt "0" ]; then + nruns=$4 + fi fi maxm=512000 -if [ "$5" != "" -a "$5" -gt "0" ]; then -maxm=${5}000 +if [ "$5" != "" ]; then + if [ "$5" -gt "0" ]; then + maxm=${5}000 + fi fi -rm -f stdin0 2>/dev/null -mv "$2" stdin0 +cp "$2" stdin0 2>/dev/null +cp "$1" run.exe 2>/dev/null -rm -f run.exe 2>/dev/null -mv "$name" run.exe file run.exe | grep -iq "statically linked" if [ "$?" != "0" ]; then - echo "Aborting because $name is not statically linked" + echo "Aborting because $1 is not statically linked" exit 47 fi diff --git a/boca-1.5.0/doc/problemexamples/problemtemplate/run/java b/boca-1.5.0/doc/problemexamples/problemtemplate/run/java index 945f15d..c24d842 100755 --- a/boca-1.5.0/doc/problemexamples/problemtemplate/run/java +++ b/boca-1.5.0/doc/problemexamples/problemtemplate/run/java @@ -65,6 +65,12 @@ if [ "$1" == "" -o "$2" == "" -o "$3" == "" ]; then echo "parameter problem" exit 43 fi +if [ -r run.exe ]; then + mv run.exe run.jar +fi +if [ -r "$1" ]; then + mv "$1" run.jar +fi if [ ! -r run.jar ]; then echo "ERROR: file run.jar not found - possible error during compilation" exit 1 @@ -79,8 +85,7 @@ fi if [ "${name##*.}" == "CLASS" ]; then name=`basename "$1" .CLASS` fi -input=`basename "$2"` -if [ ! -r "$input" ]; then +if [ ! -r "$2" ]; then echo "$2 not found (or is not in the current dir) or it's not readable" exit 45 fi @@ -98,16 +103,20 @@ else fi nruns=1 -if [ "$4" != "" -a "$4" -gt "0" ]; then -nruns=$4 +if [ "$4" != "" ]; then + if [ "$4" -gt "0" ]; then + nruns=$4 + fi fi maxm=512 -if [ "$5" != "" -a "$5" -gt "0" ]; then -maxm=${5} +if [ "$5" != "" ]; then + if [ "$5" -gt "0" ]; then + maxm=${5} + fi fi -rm -f stdin0 2>/dev/null -mv "$input" stdin0 +rm -f runit.retcode 2>/dev/null +cp "$2" stdin0 2>/dev/null cdir=`pwd` echo "Current directory is $cdir" >&2 @@ -116,46 +125,44 @@ if [ $? == 0 ]; then cdir=`echo $cdir | sed "s/.*\/bocajail//"` cat < runit.sh #!/bin/bash +cd "$cdir" [ -f /proc/cpuinfo ] || /bin/mount -t proc proc /proc #/bin/mount --bind /dev /dev [ -d /sys/kernel ] || /bin/mount -t sysfs sysfs /sys java=`which java` -[ -x "$java" ] || java=/usr/bin/java -if [ ! -x $java ]; then - echo "$java not found or it's not executable" +[ -x "\$java" ] || java=/usr/bin/java +if [ ! -x \$java ]; then + echo "\$java not found or it's not executable" exit 47 fi export CLASSPATH=.:./run.jar:$CLASSPATH -cd $cdir -$sf -r$nruns -t$time -T$ttime -istdin0 -F256 -u256 -ostdout0 -estderr0 -U$bocau -G$bocag -n0 -C. -f20000 -d20000000 -m20000000 -- $java -Xmx${maxm}M -Xms${maxm}M "$name" +$sf -r$nruns -t$time -T$ttime -istdin0 -F256 -u256 -ostdout0 -estderr0 -U$bocau -G$bocag -n0 -C. -f20000 -d20000000 -m20000000 -- \$java -Xmx${maxm}M -Xms${maxm}M "$name" echo \$? > runit.retcode -/bin/umount /proc 2>/dev/null -#/bin/umount /dev -/bin/umount /sys 2>/dev/null +if [ ! -d /bocajail ]; then + /bin/umount /proc 2>/dev/null + #/bin/umount /dev + /bin/umount /sys 2>/dev/null +fi EOF - chmod 755 runit.sh - chroot /bocajail $cdir/runit.sh - ret=`cat runit.retcode` - if [ "$ret" == "" ]; then - echo "Execution error - check autojudging" - exit 49 - fi - if [ $ret -gt 10 ]; then - echo "> > > > > > > Nonzero return code - possible runtime error - I'M GUESSING IT IS RUNTIME ERROR < < < < < < < <" - exit 9 - fi - else - echo "CODE NOT BEING CHROOTED. DO NOT RUN THIS ON THE MAIN SERVER" >&2 - echo "CODE NOT BEING CHROOTED. DO NOT RUN THIS ON THE MAIN SERVER" >&2 - echo "CODE NOT BEING CHROOTED. DO NOT RUN THIS ON THE MAIN SERVER" >&2 -# $java "$name" < stdin0 - $sf -r$nruns -t$time -T$ttime -istdin0 -F256 -u256 -U$bocau -G$bocag -ostdout0 -estderr0 -n0 -C. -d20000000 -m20000000 -- $java -cp run.jar -Xmx${maxm}M -Xms${maxm}M "$name" - ret=$? - fi - if [ $ret -gt 10 ]; then - echo "> > > > > > > Nonzero return code - possible runtime error - I'M GUESSING IT IS RUNTIME ERROR < < < < < < < <" - ret=9 + chmod 755 runit.sh + chroot /bocajail "$cdir/runit.sh" + if [ -r runit.retcode ]; then + ret=`cat runit.retcode` fi + if [ "$ret" == "" ]; then + echo "Execution error - check autojudging" + exit 49 + fi +else + echo "CODE NOT BEING CHROOTED. DO NOT RUN THIS ON THE MAIN SERVER" >&2 + echo "CODE NOT BEING CHROOTED. DO NOT RUN THIS ON THE MAIN SERVER" >&2 + echo "CODE NOT BEING CHROOTED. DO NOT RUN THIS ON THE MAIN SERVER" >&2 + $sf -r$nruns -t$time -T$ttime -istdin0 -F256 -u256 -U$bocau -G$bocag -ostdout0 -estderr0 -n0 -C. -d20000000 -m20000000 -- $java -cp run.jar -Xmx${maxm}M -Xms${maxm}M "$name" + ret=$? +fi +if [ $ret -gt 10 ]; then + echo "> > > > > > > Nonzero return code - possible runtime error - I'M GUESSING IT IS RUNTIME ERROR < < < < < < < <" + ret=9 fi if [ -f stdout0 ]; then cat stdout0 diff --git a/boca-1.5.0/doc/problemexamples/problemtemplate/tests/c b/boca-1.5.0/doc/problemexamples/problemtemplate/tests/c index d7d0411..de0a9c5 100755 --- a/boca-1.5.0/doc/problemexamples/problemtemplate/tests/c +++ b/boca-1.5.0/doc/problemexamples/problemtemplate/tests/c @@ -4,6 +4,7 @@ # and the script files that are included in the problem package cat > test.c < int main() { char s[100]; scanf("%s", s); @@ -17,11 +18,19 @@ EOF TL=2 REP=10 -../compile/c test.c test.exe TL -../run/c test.exe test.in TL REP -output=`cat stdout0` -if [ "$output" != "inputdata" ]; then +chmod 755 ../compile/c +../compile/c test.c test.exe $TL +chmod 755 ../run/c +../run/c test.exe test.in $TL $REP +if [ -r stdout0 ]; then + output=`cat stdout0` + if [ "$output" != "inputdata" ]; then + echo "ERROR" + exit 1 + fi +else echo "ERROR" exit 1 fi +echo "TEST PASSED" exit 0 -- cgit v1.2.3