mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-28 15:21:03 +01:00
Code Releases Activity

46152: zsh/system: Re-allow '0' timeout in zsystem flock

Browse source
This commit is contained in:
Cedric Ware 2020-07-11 00:14:58 -05:00 • committed by dana
parent c04a391877
commit 4d7aa71d8e
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Src/Modules/system.c
View file

@ -597,7 +597,7 @@ bin_zsystem_flock(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
* a 32-bit int and CLOCK_MONOTONIC is not supported, in which
* case there is a Y2038 problem anyway.
*/
if (timeout < 1e-6 || timeout > 1073741823.) {
if (timeout > 1073741823.) {
zwarnnam(nam, "flock: invalid timeout value: '%s'",
optarg);
return 1;
@ -623,7 +623,7 @@ bin_zsystem_flock(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
timeout_param.type = MN_FLOAT;
timeout_param.u.d = (double)timeout_param.u.l;
}
timeout_param.u.d *= 1e6;
timeout_param.u.d = ceil(timeout_param.u.d * 1e6);
if (timeout_param.u.d < 1
|| timeout_param.u.d > 0.999 * LONG_MAX) {
zwarnnam(nam, "flock: invalid interval value: '%s'",
@ -704,7 +704,7 @@ bin_zsystem_flock(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
zgettime_monotonic_if_available(&now);
end.tv_sec = now.tv_sec;
end.tv_nsec = now.tv_nsec;
end.tv_nsec += modf(timeout, &timeout_s) * 1000000000L;
end.tv_nsec += ceil(modf(timeout, &timeout_s) * 1000000000L);
end.tv_sec += timeout_s;
if (end.tv_nsec >= 1000000000L) {
end.tv_nsec -= 1000000000L;