shithub: riscv

Info  •  Files  •  Log  •  Branches

merge

--- a/sys/src/9/zynq/screen.c

+++ b/sys/src/9/zynq/screen.c

@@ -41,7 +41,10 @@

 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 @@

 	fbscreen.proc = up;

 	if(waserror()){

-		print("flushproc: %s\n", up->errstr);

 		fbscreen.addr = 0;

 		fbscreen.proc = nil;

 		return;

--- a/sys/src/cmd/ip/cifsd/smb.c

+++ b/sys/src/cmd/ip/cifsd/smb.c

@@ -659,7 +659,7 @@

 		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;

 	}

-- 

⑨