nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

easyrsa_mktemp(): Rename 'target' -> 'want_tmp_file' - Avoid conflicts

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-04-15 14:35:57 +01:00
parent 6e80d08abb
commit 8c1971eaaa
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
easyrsa3/easyrsa
View File

@ -703,23 +703,25 @@ easyrsa_mktemp: shot-file created: $shotfile"
# which is why this extension is required.
# Current max required is 7 deep
for i in 1 2 3 4 5 6 7 8 9; do
target="${t}.${i}"
if [ -e "$target" ]; then
want_tmp_file="${t}.${i}"
if [ -e "$want_tmp_file" ]; then
verbose "\
easyrsa_mktemp: temp-file EXISTS: $target"
easyrsa_mktemp: temp-file EXISTS: $want_tmp_file"
continue
else
# atomic:
[ "$easyrsa_host_os" = win ] && \
set -o noclobber
if mv "$shotfile" "$target"; then
if mv "$shotfile" "$want_tmp_file"; then
verbose "\
easyrsa_mktemp: atomic: Create temp-file OK: $target"
easyrsa_mktemp: atomic: Create temp-file OK: $want_tmp_file"
# Assign external temp-file name
if force_set_var "$1" "$target"; then
if force_set_var "$1" "$want_tmp_file"
then
[ "$easyrsa_host_os" = win ] && \
set +o noclobber
unset -v want_tmp_file shotfile
return 0
else
die "\
@ -733,7 +735,7 @@ easyrsa_mktemp - force_set_var $1 failed"
die "\
easyrsa_mktemp - failed for: $1 @ depth=$i
target: $target"
want_tmp_file: $want_tmp_file"
} # => easyrsa_mktemp()
# remove temp files and do terminal cleanups