Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use database locking (flock) for zsh #199

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use database locking (flock) for zsh #199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb23b74
Create tempfile with mktemp to avoid conflicts
mafredri Mar 1, 2017
1eb243c
Add support for db locking in zsh (via flock)
mafredri Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions z.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,14 @@ _z() {
done

# maintain the data file
local tempfile="$datafile.$RANDOM"
local tempfile="$(mktemp "${datafile}.XXXXXXXX")"
if [ "$_Z_USE_ZSYSTEM_FLOCK" -eq 1 ]; then
# make sure datafile exists (for locking)
[ -f "$datafile" ] || touch "$datafile"
local lockfd
# grab exclusive lock (released when function exits)
zsystem flock -f lockfd "$datafile" || return
fi
_z_dirs | awk -v path="$*" -v now="$(date +%s)" -F"|" '
BEGIN {
rank[path] = 1
Expand All @@ -85,12 +92,20 @@ _z() {
} else for( x in rank ) print x "|" rank[x] "|" time[x]
}
' 2>/dev/null >| "$tempfile"
# do our best to avoid clobbering the datafile in a race condition.
if [ $? -ne 0 -a -f "$datafile" ]; then
local ret=$?
if [ "$_Z_USE_ZSYSTEM_FLOCK" -eq 1 ]; then
# replace contents of datafile with tempfile
env cat "$tempfile" >| "$datafile"
[ "$_Z_OWNER" ] && chown $_Z_OWNER:"$(id -ng $_Z_OWNER)" "$datafile"
env rm -f "$tempfile"
else
[ "$_Z_OWNER" ] && chown $_Z_OWNER:"$(id -ng $_Z_OWNER)" "$tempfile"
env mv -f "$tempfile" "$datafile" || env rm -f "$tempfile"
# do our best to avoid clobbering the datafile in a race condition.
if [ $ret -ne 0 -a -f "$datafile" ]; then
env rm -f "$tempfile"
else
[ "$_Z_OWNER" ] && chown $_Z_OWNER:"$(id -ng $_Z_OWNER)" "$tempfile"
env mv -f "$tempfile" "$datafile" || env rm -f "$tempfile"
fi
fi

# tab completion
Expand Down Expand Up @@ -216,6 +231,14 @@ alias ${_Z_CMD:-z}='_z 2>&1'

[ "$_Z_NO_RESOLVE_SYMLINKS" ] || _Z_RESOLVE_SYMLINKS="-P"

if type zmodload >/dev/null 2>&1; then
# load zsh/system for the zsystem flock builtin
zmodload zsh/system &>/dev/null
if zsystem supports flock &>/dev/null; then
_Z_USE_ZSYSTEM_FLOCK=1
fi
fi

if type compctl >/dev/null 2>&1; then
# zsh
[ "$_Z_NO_PROMPT_COMMAND" ] || {
Expand Down