enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

* src/lib/evil_fcntl.c: 

fix fcntl()



SVN revision: 38766
This commit is contained in:
Vincent Torri 2009-01-24 22:29:19 +00:00
parent a3f3bf7ec3
commit 6a48f60e39
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/evil/ChangeLog
View File

@ -1,3 +1,8 @@
2009-01-24 Vincent Torri <doursse at users dot sf dot net>
* src/lib/evil_fcntl.c:
fix fcntl()
2009-01-19 Vincent Torri <doursse at users dot sf dot net> 2009-01-19 Vincent Torri <doursse at users dot sf dot net>
* src/bin/Makefile.am: * src/bin/Makefile.am:

23
legacy/evil/src/lib/evil_fcntl.c
View File

@ -56,34 +56,37 @@ int fcntl(int fd, int cmd, ...)
#if ! ( defined(__CEGCC__) || defined(__MINGW32CE__) ) #if ! ( defined(__CEGCC__) || defined(__MINGW32CE__) )
else if ((cmd == F_SETLK) || (cmd == F_SETLKW)) else if ((cmd == F_SETLK) || (cmd == F_SETLKW))
{ {
struct flock fl; struct flock *fl;
off_t length = 0; off_t length = 0;
long pos; long pos;
fl = va_arg(va, struct flock); fl = va_arg(va, struct flock *);
if (fl.l_len == 0) if (fl->l_len == 0)
{ {
length = _lseek(fd, 0L, SEEK_END); length = _lseek(fd, 0L, SEEK_END);
if (length != -1L) if (length != -1L)
res = 0; res = 0;
} }
fl.l_len = length - fl.l_start - 1; fl->l_len = length - fl->l_start - 1;
pos = _lseek(fd, fl.l_start, fl.l_whence); pos = _lseek(fd, fl->l_start, fl->l_whence);
if (pos != -1L) if (pos != -1L)
res = 0; res = 0;
if ((fl.l_type == F_RDLCK) || (fl.l_type == F_WRLCK)) printf ("Evil 1 %d %d %d\n", fl->l_type, F_RDLCK, F_WRLCK);
if ((fl->l_type == F_RDLCK) || (fl->l_type == F_WRLCK))
{ {
printf ("Evil 2\n");
if (cmd == F_SETLK) if (cmd == F_SETLK)
res = _locking(fd, _LK_NBLCK, fl.l_len); /* if cannot be locked, we return immediatly */ res = _locking(fd, _LK_NBLCK, fl->l_len); /* if cannot be locked, we return immediatly */
else /* F_SETLKW */ else /* F_SETLKW */
res = _locking(fd, _LK_LOCK, fl.l_len); /* otherwise, we try several times */ res = _locking(fd, _LK_LOCK, fl->l_len); /* otherwise, we try several times */
} }
if (fl.l_type == F_UNLCK) printf ("Evil 3\n");
res = _locking(fd, _LK_UNLCK, fl.l_len); if (fl->l_type == F_UNLCK)
res = _locking(fd, _LK_UNLCK, fl->l_len);
} }
#endif /* __CEGCC__ || __MINGW32CE__ */ #endif /* __CEGCC__ || __MINGW32CE__ */