From 3ac4524e4a33f7e5050a1ae6bd374202c708b315 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@gmx.de>
Date: Fri, 24 Aug 2012 15:53:35 +0200
Subject: [PATCH] syscallfmt: use up->syserrstr instead of up->errstr (import
 from sources)

---
 sys/src/9/port/syscallfmt.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/sys/src/9/port/syscallfmt.c b/sys/src/9/port/syscallfmt.c
index fdd2e0519..8c13f6fed 100644
--- a/sys/src/9/port/syscallfmt.c
+++ b/sys/src/9/port/syscallfmt.c
@@ -322,15 +322,11 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
 	errstr = "\"\"";
 	switch(syscallno){
 	default:
-		if(ret == -1)
-			errstr = up->errstr;
-		fmtprint(&fmt, " = %ld", ret);
-		break;
 	case ALARM:
 	case _WRITE:
 	case PWRITE:
 		if(ret == -1)
-			errstr = up->errstr;
+			errstr = up->syserrstr;
 		fmtprint(&fmt, " = %ld", ret);
 		break;
 	case EXEC:
@@ -338,7 +334,7 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
 	case SEGATTACH:
 	case RENDEZVOUS:
 		if((void *)ret == (void*)-1)
-			errstr = up->errstr;
+			errstr = up->syserrstr;
 		fmtprint(&fmt, " = %#p", (void *)ret);
 		break;
 	case AWAIT:
@@ -350,7 +346,7 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
 		}
 		else{
 			fmtprint(&fmt, "%#p/\"\" %lud = %ld", a, l, ret);
-			errstr = up->errstr;
+			errstr = up->syserrstr;
 		}
 		break;
 	case _ERRSTR:
@@ -366,7 +362,7 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
 		}
 		else{
 			fmtprint(&fmt, "\"\" %lud = %ld", l, ret);
-			errstr = up->errstr;
+			errstr = up->syserrstr;
 		}
 		break;
 	case FD2PATH:
@@ -380,7 +376,7 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
 		}
 		else{
 			fmtprint(&fmt, "\"\" %lud = %ld", l, ret);
-			errstr = up->errstr;
+			errstr = up->syserrstr;
 		}
 		break;
 	case _READ:
@@ -395,7 +391,7 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
 		}
 		else{
 			fmtprint(&fmt, "/\"\"");
-			errstr = up->errstr;
+			errstr = up->syserrstr;
 		}
 		fmtprint(&fmt, " %ld", l);
 		if(syscallno == PREAD){