diff options
| author | Karel Zak <kzak@redhat.com> | 2014-10-07 12:12:39 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2014-10-24 11:10:06 +0200 |
| commit | 7b4e8472595a971fc3c1c006b0c189a8ab665f73 (patch) | |
| tree | 314ee41c72598c6767e3e2cf462b0549f24f107f | |
| parent | 558088cea7f8e612645d484db0e280b1fb775a70 (diff) | |
| download | util-linux-7b4e8472595a971fc3c1c006b0c189a8ab665f73.tar.gz | |
flock: zero timeout is valid
This patch reverts Sami's "timeout cannot be zero", introduced
in commit 605325b23b36238c8f3ae165e37cab9064553cf7.
The --timeout 0 has been originally interpreted as --nonblock. The
patch also add hint about this behavior to the man page.
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1149974
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | sys-utils/flock.1 | 4 | ||||
| -rw-r--r-- | sys-utils/flock.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys-utils/flock.1 b/sys-utils/flock.1 index 6c28a35d7..3c1feb2a5 100644 --- a/sys-utils/flock.1 +++ b/sys-utils/flock.1 @@ -87,7 +87,9 @@ Fail if the lock cannot be acquired within Decimal fractional values are allowed. See the .B \-E -option for the exit code used. +option for the exit code used. The zero number of +.IR seconds +is interpreted as \fB\-\-nonblock\fR. .TP \fB\-o\fP, \fB\-\-close\fP Close the file descriptor on which the lock is held before executing diff --git a/sys-utils/flock.c b/sys-utils/flock.c index f160eaca5..7ef24d2f3 100644 --- a/sys-utils/flock.c +++ b/sys-utils/flock.c @@ -175,8 +175,6 @@ int main(int argc, char *argv[]) have_timeout = 1; strtotimeval_or_err(optarg, &timeout.it_value, _("invalid timeout value")); - if (timeout.it_value.tv_sec + timeout.it_value.tv_usec == 0) - errx(EX_USAGE, _("timeout cannot be zero")); break; case 'E': conflict_exit_code = strtos32_or_err(optarg, |