ScriptFanix/AtOM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '32-filename-sanitization-can-fail-with-ascii-only-target' into 'dev'

Browse Source 
Resolve "filename sanitization can fail with ascii-only target"

See merge request atom/AtOM!46
This commit is contained in:
ScriptFanix 2026-04-06 04:43:44 +02:00
commit 6e827d7bd9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/files/getDestFile
View File

@ -55,11 +55,13 @@ getDestFile() {
destfile="${filename##*/}" destfile="${filename##*/}"
destfile="${destfile%.*}" destfile="${destfile%.*}"
fi fi
destfile=$(sanitizeFile "$destfile")
destfile=${destfile//$'\n'/::AtOM:NewLine:SQL:Inline::}
if (( ${destinationascii["$destination"]} )) if (( ${destinationascii["$destination"]} ))
then then
destfile=${destfile//$'\n'/::AtOM:NewLine:SQL:Inline::}
echo "$destfile" >&${toascii[1]} echo "$destfile" >&${toascii[1]}
read -r -u${toascii[0]} destfile read -r -u${toascii[0]} destfile
destfile=${destfile//::AtOM:NewLine:SQL:Inline::/$'\n'}
fi fi
destfile=$(sanitizeFile "$destfile")
destfile=${destfile//$'\n'/::AtOM:NewLine:SQL:Inline::}
} }

3
lib/files/sanitizeFile
View File

@ -26,6 +26,9 @@ sanitizeFile() {
string=${string/#+(.)/} string=${string/#+(.)/}
string=${string/%+(.)/} string=${string/%+(.)/}
fi fi
# We can't have newlines either
string=${string//$'\n'/ }
fi fi
echo "$string" echo "$string"
} }