d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Un-break handling of -t 0 which was broken in my previous commit.

Browse Source 
Add a flags argument to wait_for_lock so that O_NONBLOCK can be
passed to open if a user doesn't want the open to sleep until the
lock becomes available.

Submitted by:	Amir Shalem (partially modified)
This commit is contained in:
Christian S.J. Peron 2005-10-05 22:02:07 +00:00
parent 48ce90210f
commit 4ccbe0c50d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=150984
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/lockf/lockf.c
View File

@ -42,7 +42,7 @@ static void cleanup(void);
static void killed(int sig);
static void timeout(int sig);
static void usage(void);
static int wait_for_lock(const char *name);
static int wait_for_lock(const char *name, int flags);
static const char *lockname;
static int lockfd = -1;
@ -105,8 +105,9 @@ main(int argc, char **argv)
alarm(waitsec);
}
lockfd = wait_for_lock(lockname, O_NONBLOCK);
while (lockfd == -1 && !timed_out && waitsec != 0)
lockfd = wait_for_lock(lockname);
lockfd = wait_for_lock(lockname, 0);
if (waitsec > 0)
alarm(0);
@ -190,12 +191,12 @@ usage(void)
* Wait until it might be possible to acquire a lock on the given file.
*/
static int
wait_for_lock(const char *name)
wait_for_lock(const char *name, int flags)
{
int fd;
if ((fd = open(name, O_CREAT|O_RDONLY|O_EXLOCK, 0666)) == -1) {
if (errno == ENOENT || errno == EINTR)
if ((fd = open(name, O_CREAT|O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
if (errno == ENOENT || errno == EINTR || errno == EAGAIN)
return (-1);
err(EX_CANTCREAT, "cannot open %s", name);
}