bybrooklyn/zsh
1
0
Fork 0
mirror of https://git.code.sf.net/p/zsh/code synced 2026-04-18 06:53:35 -04:00
Code Issues Packages Projects Releases Wiki 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

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2020-07-11 dana <dana@dana.is>
* Cedric Ware: 46152: Src/Modules/system.c, Test/V14system.ztst:
Re-allow '0' timeout in zsystem flock
2020-07-09 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 46215 (w/ minor tweak): Test/E01options.ztst: make the test

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;

21
Test/V14system.ztst
View File

@@ -13,27 +13,26 @@
%test
(
zsystem flock -t 0.1 -i 0.000001 $tst_dir/file
zsystem flock -t 0 -i 0.000001 $tst_dir/file &&
zsystem flock -t 0.1 -i 0.000001 $tst_dir/file &&
zsystem flock -t 0.1 -i 0.0000001 $tst_dir/file &&
zsystem flock -t 1 -i 0.000001 $tst_dir/file
)
0:zsystem flock valid time arguments
(
zsystem flock -t -1 $tst_dir/file ||
zsystem flock -t 0.49e-6 $tst_dir/file ||
zsystem flock -t 1073741824 $tst_dir/file ||
zsystem flock -t 1e100 $tst_dir/file ||
zsystem flock -i -1 $tst_dir/file ||
zsystem flock -i 0.49e-6 $tst_dir/file ||
zsystem flock -i 0 $tst_dir/file ||
zsystem flock -i 1e100 $tst_dir/file
)
1:zsystem flock invalid time arguments
?(eval):zsystem:2: flock: invalid timeout value: '-1'
?(eval):zsystem:3: flock: invalid timeout value: '0.49e-6'
?(eval):zsystem:4: flock: invalid timeout value: '1073741824'
?(eval):zsystem:5: flock: invalid timeout value: '1e100'
?(eval):zsystem:6: flock: invalid interval value: '-1'
?(eval):zsystem:7: flock: invalid interval value: '0.49e-6'
?(eval):zsystem:8: flock: invalid interval value: '1e100'
?(eval):zsystem:2: flock: invalid timeout value: '1073741824'
?(eval):zsystem:3: flock: invalid timeout value: '1e100'
?(eval):zsystem:4: flock: invalid interval value: '-1'
?(eval):zsystem:5: flock: invalid interval value: '0'
?(eval):zsystem:6: flock: invalid interval value: '1e100'
(
# Lock file for 1 second in the background.