shithub: riscv

Download patch

ref: 505bc9b491e7b36b0f18c72eea5b109e7285ad5e
parent: da2d0ee780c1542b2cbcb1f7dbd808c59356ae46
author: cinap_lenrek <cinap_lenrek@gmx.de>
date: Tue Oct 1 21:36:05 EDT 2013 

lib9p/hjfs: use x != ~0 instead (type)~x conditionals to work arround arm compiler issue


--- a/sys/src/cmd/hjfs/fs2.c
+++ b/sys/src/cmd/hjfs/fs2.c
@@ -716,7 +716,7 @@
 		ingroup(ch->fs, ch->uid, d->gid, 1) ||
 		(ch->fs->flags & FSNOPERM) != 0 ||
 		(ch->flags & CHFNOPERM) != 0;
-	if((uvlong)~di->length){
+	if(di->length != ~0){
 		if(isdir && di->length != 0)
 			goto inval;
 		if((ch->flags & CHFNOPERM) == 0)
@@ -723,9 +723,9 @@
 			if(di->length != d->size && !permcheck(ch->fs, d, ch->uid, OWRITE))
 				goto perm;
 	}
-	if((ulong)~di->mtime && !owner)
+	if(di->mtime != ~0 && !owner)
 		goto perm;
-	if((ulong)~di->mode && !owner)
+	if(di->mode != ~0 && !owner)
 		goto perm;
 	nuid = NOUID;
 	ngid = NOUID;
@@ -737,13 +737,13 @@
 		goto inval;
 	if((nuid != NOUID || ngid != NOUID) && !owner)
 		goto perm;
-	if((uvlong)~di->length && !isdir){
+	if(di->length != ~0 && !isdir){
 		trunc(ch->fs, ch->loc, b, di->length);
 		modified(ch, d);
 	}
-	if((ulong)~di->mtime)
+	if(di->mtime != ~0)
 		d->mtime = di->mtime;
-	if((ulong)~di->mode){
+	if(di->mode != ~0){
 		d->mode = d->mode & ~0777 | di->mode & 0777;
 		ch->loc->type = d->type = di->mode >> 24;
 	}
--- a/sys/src/lib9p/srv.c
+++ b/sys/src/lib9p/srv.c
@@ -668,15 +668,15 @@
 		respond(r, Ebaddir);
 		return;
 	}
-	if((ushort)~r->d.type){
+	if(r->d.type != (ushort)~0){
 		respond(r, "wstat -- attempt to change type");
 		return;
 	}
-	if((uint)~r->d.dev){
+	if(r->d.dev != ~0){
 		respond(r, "wstat -- attempt to change dev");
 		return;
 	}
-	if((uchar)~r->d.qid.type || (ulong)~r->d.qid.vers || (uvlong)~r->d.qid.path){
+	if(r->d.qid.type != (uchar)~0 || r->d.qid.vers != ~0 || r->d.qid.path != ~0){
 		respond(r, "wstat -- attempt to change qid");
 		return;
 	}
@@ -684,7 +684,7 @@
 		respond(r, "wstat -- attempt to change muid");
 		return;
 	}
-	if((ulong)~r->d.mode && ((r->d.mode&DMDIR)>>24) != (r->fid->qid.type&QTDIR)){
+	if(r->d.mode != ~0 && ((r->d.mode&DMDIR)>>24) != (r->fid->qid.type&QTDIR)){
 		respond(r, "wstat -- attempt to change DMDIR bit");
 		return;
 	}
-- 
⑨