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
parent a25758dce7 036ae2e397
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

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

@ -41,6 +41,9 @@ setcursor(Cursor*)
void void
flushmemscreen(Rectangle r) flushmemscreen(Rectangle r)
{ {
if(badrect(fbscreen.rect))
fbscreen.rect = r;
else
combinerect(&fbscreen.rect, r); combinerect(&fbscreen.rect, r);
wakeup(&fbscreen); wakeup(&fbscreen);
} }
@ -117,7 +120,6 @@ flushproc(void *arg)
fbscreen.proc = up; fbscreen.proc = up;
if(waserror()){ if(waserror()){
print("flushproc: %s\n", up->errstr);
fbscreen.addr = 0; fbscreen.addr = 0;
fbscreen.proc = nil; fbscreen.proc = nil;
return; 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()); r->respond(r, smbmkerror());
goto out; goto out;
} }
if(!matchattr(d, sattr) || (dosfileattr(d) & ATTR_READONLY)){ if(!matchattr(d, sattr)){
r->respond(r, STATUS_NO_SUCH_FILE); r->respond(r, STATUS_NO_SUCH_FILE);
goto out; goto out;
} }