diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2010-02-26 12:09:20 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2010-02-26 12:09:20 +0000 |
| commit | 07b6256d8ea03805dd8a24c184bf455ee31d6115 (patch) | |
| tree | 98e16977e063db6d46c7b13e4b82c3cef3978dd9 /Functions/Calendar/calendar_sort | |
| parent | ecc7dc91f639a5849ba2983786d932007f7a0773 (diff) | |
| download | zsh-07b6256d8ea03805dd8a24c184bf455ee31d6115.tar.gz zsh-07b6256d8ea03805dd8a24c184bf455ee31d6115.tar.xz zsh-07b6256d8ea03805dd8a24c184bf455ee31d6115.zip | |
27756: add OS file locking to calendar
add errflag test to loop over fcntl()
Diffstat (limited to 'Functions/Calendar/calendar_sort')
| -rw-r--r-- | Functions/Calendar/calendar_sort | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Functions/Calendar/calendar_sort b/Functions/Calendar/calendar_sort index 7d346efc1..4911e34a2 100644 --- a/Functions/Calendar/calendar_sort +++ b/Functions/Calendar/calendar_sort @@ -11,9 +11,16 @@ integer i # Read the calendar file from the calendar-file style zstyle -s ':datetime:calendar:' calendar-file calendar || calendar=~/calendar -# Start block for "always" to handle lockfile +# start of subshell for OS file locking +( +# start of block for following always to clear up lockfiles. +# Not needed but harmless if OS file locking is used. { - calendar_lockfiles $calendar || return 1 + if zmodload -F zsh/system b:zsystem && zsystem supports flock; then + zsystem flock $calendar + else + calendar_lockfiles $calendar || exit 1 + fi new=$calendar.new.$$ calendar_read $calendar @@ -65,3 +72,4 @@ Old calendar left in $calendar.old" } always { (( ${#lockfiles} )) && rm -rf $lockfiles } +) |