xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
ftrvxmtrx 2015-06-11 22:14:24 +02:00
commit 98640950d7
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/src/9/zynq/screen.c
View file

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

2
sys/src/cmd/ip/cifsd/smb.c
View file

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