From d64de1f5562e33581a6dfa209976571404cb7e7c Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 17 Jul 1999 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1999-07-17

---
 pc/trap.c      | 2 +-
 port/sysfile.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pc/trap.c b/pc/trap.c
index e678cc9d6ac098bc9fce2bbd1beac004d8d7adc3..8fce934ca978d1eec3c15230332a0d27714b4e9f 100644
--- a/pc/trap.c
+++ b/pc/trap.c
@@ -335,7 +335,7 @@ dumpstack(void)
 			p = (uchar*)v;
 			if(*(p-5) == 0xE8
 			|| (*(p-2) == 0xFF && *(p-1) == 0xD0)){
-				print("%lux ", p-5);
+				print("%p ", p-5);
 				i++;
 			}
 		}
diff --git a/port/sysfile.c b/port/sysfile.c
index 2ae6310f5d3a7855d048e27371a858d70da869b2..7f2eff5b9ebdddca2e810185898e91dc8c21e8cf 100644
--- a/port/sysfile.c
+++ b/port/sysfile.c
@@ -622,8 +622,10 @@ bindmount(ulong *arg, int ismount)
 			error(Ebadarg);
 
 		bogus.spec = (char*)arg[3];
-		if(strchr(bogus.spec, ' '))
+		if(waserror())
 			error(Ebadspec);
+		nameok(bogus.spec);
+		poperror();
 
 		ret = devno('M', 0);
 		c0 = devtab[ret]->attach((char*)&bogus);