From c89b0b3c238ff4e288f259be211f3b878bd0c30d Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Wed, 10 Jun 2015 01:27:44 +0200 Subject: [PATCH 1/2] zynq: fix flushmemscreen() --- sys/src/9/zynq/screen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/src/9/zynq/screen.c b/sys/src/9/zynq/screen.c index 0b1affce2..c65a1e0ae 100644 --- a/sys/src/9/zynq/screen.c +++ b/sys/src/9/zynq/screen.c @@ -41,7 +41,10 @@ setcursor(Cursor*) void flushmemscreen(Rectangle r) { - combinerect(&fbscreen.rect, r); + if(badrect(fbscreen.rect)) + fbscreen.rect = r; + else + combinerect(&fbscreen.rect, r); wakeup(&fbscreen); } @@ -117,7 +120,6 @@ flushproc(void *arg) fbscreen.proc = up; if(waserror()){ - print("flushproc: %s\n", up->errstr); fbscreen.addr = 0; fbscreen.proc = nil; return; From 036ae2e397eb62ca95f05d180df14c1320dcdfe4 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Wed, 10 Jun 2015 17:18:31 +0200 Subject: [PATCH 2/2] cifsd: smbrename is still ok when file is readonly (fixed git) --- sys/src/cmd/ip/cifsd/smb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/src/cmd/ip/cifsd/smb.c b/sys/src/cmd/ip/cifsd/smb.c index 9e6f9cf3c..47e065c32 100644 --- a/sys/src/cmd/ip/cifsd/smb.c +++ b/sys/src/cmd/ip/cifsd/smb.c @@ -659,7 +659,7 @@ smbrename(Req *r, uchar *h, uchar *p, uchar *e) r->respond(r, smbmkerror()); goto out; } - if(!matchattr(d, sattr) || (dosfileattr(d) & ATTR_READONLY)){ + if(!matchattr(d, sattr)){ r->respond(r, STATUS_NO_SUCH_FILE); goto out; }