From 000aa464d48cc64e885137e1a8040aca75e9344a Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Tue, 30 May 2006 21:35:27 +0000
Subject: [PATCH] Fix two bugs: - If -s used with GSX, really don't provide
 serial port. - Call File::Temp::cleanup() inside eval to cope with old
 versions   of File::Temp that didn't have cleanup.

---
 src/utils/pintos | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/utils/pintos b/src/utils/pintos
index 13d7e54..ccf1037 100755
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -492,7 +492,9 @@ config.version = 6
 guestOS = "linux"
 floppy0.present = FALSE
 memsize = $mem
+EOF
 
+    print VMX <<EOF if $serial;
 serial0.present = TRUE
 serial0.fileType = "file"
 serial0.fileName = "pintos.out"
@@ -754,7 +756,7 @@ sub xsystem {
 sub relay_signal {
     my ($pid, $signal, $cleanup) = @_;
     kill $signal, $pid;
-    File::Temp::cleanup();
+    eval { File::Temp::cleanup() };	# Not defined in old File::Temp.
     &$cleanup ();
     $SIG{$signal} = 'DEFAULT';
     kill $signal, getpid ();
-- 
2.30.2