Commit Diff

Commit:
c71af67adc9946fe2a560259f5e79174dfa07e8d
From:
rsc <devnull@localhost>
Date:
Message:
do not depend on flock
Actions:
Patch | Tree
commit - 9e863cf5617925a7f7e855207e56f94fc72a662e
commit + c71af67adc9946fe2a560259f5e79174dfa07e8d
blob - 526b2a944d654393cdad08b674a79e17b252ec74
blob + 896ca52854c12b313907c949124949f81dbbe7da
--- src/lib9/open.c
+++ src/lib9/open.c
@@ -12,6 +12,7 @@ p9open(char *name, int mode)
 {
 	int cexec, rclose;
 	int fd, umode, lock, rdwr;
+	struct flock fl;
 
 	rdwr = mode&3;
 	umode = rdwr;
@@ -34,7 +35,11 @@ p9open(char *name, int mode)
 	fd = open(name, umode);
 	if(fd >= 0){
 		if(lock){
-			if(flock(fd, (rdwr==OREAD) ? LOCK_SH : LOCK_EX) < 0){
+			fl.l_type = (rdwr==OREAD) ? F_RDLCK : F_WRLCK;
+			fl.l_whence = SEEK_SET;
+			fl.l_start = 0;
+			fl.l_len = 0;
+			if(fcntl(fd, F_SETLK, &fl) < 0){
 				close(fd);
 				return -1;
 			}