diff options
| author | Karel Zak | 2014-10-07 12:12:39 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-10-07 12:12:39 +0200 |
| commit | c4604c38b503c8c46e50fc2048ebbcbcfcad3802 (patch) | |
| tree | 76c437a9bdd22f6afd872cfb72ce3d41f390f8e8 /sys-utils/flock.c | |
| parent | losetup: improve man page -D docs (diff) | |
| download | kernel-qcow2-util-linux-c4604c38b503c8c46e50fc2048ebbcbcfcad3802.tar.gz kernel-qcow2-util-linux-c4604c38b503c8c46e50fc2048ebbcbcfcad3802.tar.xz kernel-qcow2-util-linux-c4604c38b503c8c46e50fc2048ebbcbcfcad3802.zip | |
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>
Diffstat (limited to 'sys-utils/flock.c')
| -rw-r--r-- | sys-utils/flock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys-utils/flock.c b/sys-utils/flock.c index 62c6f7c7c..2550a5be7 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, |