Description:
remove pyflake; allow more syscall
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r221:59c4defa0c58 - - 2 files changed: 13 inserted, 11 deleted
@@ -138,38 +138,40 | |||||
|
138 | command = "#{RUBY_INTERPRETER} -c #{params[:source_file]}" |
|
138 | command = "#{RUBY_INTERPRETER} -c #{params[:source_file]}" |
|
139 | if system(command, err: params[:message_file]) |
|
139 | if system(command, err: params[:message_file]) |
|
140 | File.open(params[:output_file],"w") do |out_file| |
|
140 | File.open(params[:output_file],"w") do |out_file| |
|
141 | out_file.puts "#!#{RUBY_INTERPRETER}" |
|
141 | out_file.puts "#!#{RUBY_INTERPRETER}" |
|
142 | File.open(params[:source_file],"r").each do |line| |
|
142 | File.open(params[:source_file],"r").each do |line| |
|
143 | out_file.print line |
|
143 | out_file.print line |
|
144 | end |
|
144 | end |
|
145 | end |
|
145 | end |
|
146 | File.chmod(0755, params[:output_file]) |
|
146 | File.chmod(0755, params[:output_file]) |
|
147 | end |
|
147 | end |
|
148 |
|
148 | ||
|
149 | when "python" |
|
149 | when "python" |
|
150 | - command = "#{PYTHON_CHECKER} #{params[:source_file]}" |
|
150 | + #command = "#{PYTHON_CHECKER} #{params[:source_file]}" |
|
151 | - if system(command, out: params[:message_file]) |
|
151 | + #if system(command, out: params[:message_file]) |
|
152 | #compile to python bytecode |
|
152 | #compile to python bytecode |
|
153 | command = "#{PYTHON_INTERPRETER} -c \"import py_compile; py_compile.compile('#{params[:source_file]}','#{params[:source_file]}c');\"" |
|
153 | command = "#{PYTHON_INTERPRETER} -c \"import py_compile; py_compile.compile('#{params[:source_file]}','#{params[:source_file]}c');\"" |
|
154 | puts "compile: #{command}" |
|
154 | puts "compile: #{command}" |
|
155 | - system(command) |
|
155 | + system(command, err: params[:message_file]) |
|
156 | - puts "pwd: " + Dir.pwd |
|
156 | + if FileTest.exists?("#{params[:source_file]}c") |
|
157 | - Dir.new('.').each {|file| puts file} |
|
157 | + puts "pwd: " + Dir.pwd |
|
158 | - File.open(params[:output_file],"w") do |out_file| |
|
158 | + Dir.new('.').each {|file| puts file} |
|
159 | - out_file.puts "#!#{PYTHON_INTERPRETER} #{params[:source_file]}c" |
|
159 | + File.open(params[:output_file],"w") do |out_file| |
|
|
160 | + out_file.puts "#!#{PYTHON_INTERPRETER} #{params[:source_file]}c" | ||
|
|
161 | + end | ||
|
|
162 | + File.chmod(0755, params[:output_file]) | ||
|
|
163 | + FileUtils.cp("#{params[:source_file]}c",params[:output_file]) | ||
|
160 | end |
|
164 | end |
|
161 | - File.chmod(0755, params[:output_file]) |
|
165 | + #end |
|
162 | - FileUtils.cp("#{params[:source_file]}c",params[:output_file]) |
|
||
|
163 | - end |
|
||
|
164 |
|
166 | ||
|
165 | when "php" |
|
167 | when "php" |
|
166 | command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]}" |
|
168 | command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]}" |
|
167 | if system(command, err: params[:message_file]) |
|
169 | if system(command, err: params[:message_file]) |
|
168 | File.open(params[:output_file],"w") do |out_file| |
|
170 | File.open(params[:output_file],"w") do |out_file| |
|
169 | out_file.puts "#!#{PHP_INTERPRETER}" |
|
171 | out_file.puts "#!#{PHP_INTERPRETER}" |
|
170 | File.open(params[:source_file],"r").each do |line| |
|
172 | File.open(params[:source_file],"r").each do |line| |
|
171 | out_file.print line |
|
173 | out_file.print line |
|
172 | end |
|
174 | end |
|
173 | end |
|
175 | end |
|
174 | File.chmod(0755, params[:output_file]) |
|
176 | File.chmod(0755, params[:output_file]) |
|
175 | end |
|
177 | end |
@@ -83,25 +83,25 | |||||
|
83 | end |
|
83 | end |
|
84 |
|
84 | ||
|
85 | # Hide PROBLEM_HOME |
|
85 | # Hide PROBLEM_HOME |
|
86 | ENV['PROBLEM_HOME'] = nil |
|
86 | ENV['PROBLEM_HOME'] = nil |
|
87 | ENV['SOURCE_NAME'] = nil |
|
87 | ENV['SOURCE_NAME'] = nil |
|
88 |
|
88 | ||
|
89 | # Run the program. |
|
89 | # Run the program. |
|
90 | #run_command = "/usr/bin/time -f \"#{time_output_format}\" 2>run_result #{problem_home}/script/box_new -a 2 -f -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name}" |
|
90 | #run_command = "/usr/bin/time -f \"#{time_output_format}\" 2>run_result #{problem_home}/script/box_new -a 2 -f -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name}" |
|
91 | # |
|
91 | # |
|
92 |
|
92 | ||
|
93 | JAVA_OPTION = "-s set_robust_list -s futex -s clone -s getppid -s clone -s wait4 -p /usr/bin/ -p ./" |
|
93 | JAVA_OPTION = "-s set_robust_list -s futex -s clone -s getppid -s clone -s wait4 -p /usr/bin/ -p ./" |
|
94 | RUBY_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /lib64/ -p /dev/urandom -p #{sandbox_dir}/#{program_name} -p #{sandbox_dir}/ -s set_robust_list -s sched_getaffinity -s clock_gettime -s sigaltstack -s pipe2 -s clone -s futex -s openat -s pipe" |
|
94 | RUBY_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /lib64/ -p /dev/urandom -p #{sandbox_dir}/#{program_name} -p #{sandbox_dir}/ -s set_robust_list -s sched_getaffinity -s clock_gettime -s sigaltstack -s pipe2 -s clone -s futex -s openat -s pipe" |
|
95 | - PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p /dev/urandom -p /usr/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -p /proc/sys/crypto/fips_enabled -p /proc/mounts -p /var/lib/dpkg/status -s statfs -s set_robust_list -s openat -s sysinfo -s recvmsg -s connect -s socket -s sendto -s futex -s sigaltstack -E PYTHONNOUSERSITE=yes" |
|
95 | + PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p /dev/urandom -p /usr/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -p /proc/sys/crypto/fips_enabled -p /proc/self/status -p /proc/mounts -p /var/lib/dpkg/status -s statfs -s set_robust_list -s openat -s sysinfo -s recvmsg -s connect -s socket -s sendto -s futex -s sigaltstack -E PYTHONNOUSERSITE=yes" |
|
96 | PHP_OPTION = "-p /usr/lib64/ -p/lib64/ -p /usr/bin/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p /usr/share/ -s setfsuid -s setfsgid -s openat -s set_robust_list -s futex -s clone -s socket -s connect" |
|
96 | PHP_OPTION = "-p /usr/lib64/ -p/lib64/ -p /usr/bin/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p /usr/share/ -s setfsuid -s setfsgid -s openat -s set_robust_list -s futex -s clone -s socket -s connect" |
|
97 | HASKELL_OPTION = "-s set_robust_list -s clock_gettime -s sysinfo -s timer_create -s timer_settime -s futex -s timer_delete" |
|
97 | HASKELL_OPTION = "-s set_robust_list -s clock_gettime -s sysinfo -s timer_create -s timer_settime -s futex -s timer_delete" |
|
98 |
|
98 | ||
|
99 | case language |
|
99 | case language |
|
100 | when "java" |
|
100 | when "java" |
|
101 | # for java, extract the classname |
|
101 | # for java, extract the classname |
|
102 | # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...) |
|
102 | # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...) |
|
103 | classname = 'DUMMY' |
|
103 | classname = 'DUMMY' |
|
104 | File.open(program_name,"r").each do |line| |
|
104 | File.open(program_name,"r").each do |line| |
|
105 | classname = line |
|
105 | classname = line |
|
106 | end |
|
106 | end |
|
107 | #for java, we cannot really check the memory limit... |
|
107 | #for java, we cannot really check the memory limit... |
You need to be logged in to leave comments.
Login now