From c4604c38b503c8c46e50fc2048ebbcbcfcad3802 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 7 Oct 2014 12:12:39 +0200 Subject: 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 --- sys-utils/flock.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'sys-utils/flock.c') 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, -- cgit v1.2.3-55-g7522