X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fuserprog%2Fprep-disk;h=f525b07adc38fbfb6bf21d81d469066a809887f3;hb=c9933c8af7ba2af6aaccf381471bc757d78ce6b2;hp=f37a68297b11d2502190f71a51305dc41f5510a2;hpb=59bbbf9d74b6c6b430c51def30a9e1437f5e14a1;p=pintos-anon diff --git a/grading/userprog/prep-disk b/grading/userprog/prep-disk index f37a682..f525b07 100755 --- a/grading/userprog/prep-disk +++ b/grading/userprog/prep-disk @@ -34,7 +34,7 @@ if (! -e $os_disk) { our ($formatted) = 0; unlink $fs_disk; -xsystem (0, "$pintos make-disk '$fs_disk' 2"); +xsystem ("$pintos make-disk '$fs_disk' 2"); put_file ("$test"); put_file ("sample.txt") if grep ($_ eq $test, @@ -56,13 +56,11 @@ sub put_file { my ($cmd) = "$pintos -v --os-disk='$os_disk' --fs-disk='$fs_disk' put"; $cmd .= " -f", $formatted = 1 if !$formatted; $cmd .= " '$fn'"; - xsystem (1, $cmd); + xsystem ($cmd); } sub xsystem { - my ($expect, $cmd) = @_; + my ($cmd) = @_; print "$cmd\n"; - my ($code) = system ($cmd); - WIFEXITED ($code) && WEXITSTATUS ($code) == $expect - or die "command failed\n"; + system ($cmd) == 0 or die "command failed\n"; }