File util-linux-flock-zero-timeout-is-valid.patch of Package util-linux

Overview Repositories Revisions Requests Users Attributes Meta

File util-linux-flock-zero-timeout-is-valid.patch of Package util-linux (Revision 5599d54f8f6fd230baab4ae44f9f0033)

Currently displaying revision 5599d54f8f6fd230baab4ae44f9f0033 , Show latest

From c4604c38b503c8c46e50fc2048ebbcbcfcad3802 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 7 Oct 2014 12:12:39 +0200
Subject: [PATCH] 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>
Signed-off-by: Robert Milasan <rmilasan@suse.com>
---
 sys-utils/flock.1 | 4 +++-
 sys-utils/flock.c | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: util-linux-2.25/sys-utils/flock.1
===================================================================
--- util-linux-2.25.orig/sys-utils/flock.1
+++ util-linux-2.25/sys-utils/flock.1
@@ -87,7 +87,9 @@ Fail if the lock cannot be acquired with
 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
Index: util-linux-2.25/sys-utils/flock.c
===================================================================
--- util-linux-2.25.orig/sys-utils/flock.c
+++ util-linux-2.25/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,

Places

File util-linux-flock-zero-timeout-is-valid.patch of Package util-linux (Revision 5599d54f8f6fd230baab4ae44f9f0033)

Places