9c9
< * $FreeBSD: head/contrib/cvs/src/recurse.c 102843 2002-09-02 05:57:14Z peter $
---
> * $FreeBSD: head/contrib/cvs/src/recurse.c 107487 2002-12-02 03:17:49Z peter $
37c37
< int readlock;
---
> int locktype;
70c70
< argc, argv, local, which, aflag, readlock,
---
> argc, argv, local, which, aflag, locktype,
106c106
< int readlock;
---
> int locktype;
125c125
< frame.readlock = readlock;
---
> frame.locktype = locktype;
508c508
< int should_readlock;
---
> int locktype;
515c515
< should_readlock = noexec ? 0 : frame->readlock;
---
> locktype = noexec ? LOCK_NONE : frame->locktype;
553,557c553,555
< * remote client. We should not have locks active at this point.
< */
< if (server_active
< /* If there are writelocks around, we cannot pause here. */
< && (should_readlock || noexec))
---
> * remote client. We should not have locks active at this point,
> * but if there are writelocks around, we cannot pause here. */
> if (server_active && locktype != LOCK_NONE)
710,711c708,717
< if (should_readlock && repository && Reader_Lock (repository) != 0)
< error (1, 0, "read lock failed - giving up");
---
> if (repository)
> {
> if (locktype == LOCK_READ)
> {
> if (Reader_Lock (repository) != 0)
> error (1, 0, "read lock failed - giving up");
> }
> else if (locktype == LOCK_WRITE)
> lock_dir_for_write (repository);
> }
734c740
< if (should_readlock)
---
> if (locktype != LOCK_NONE)