Merge pull request #3746 from tuffnatty/patch-1

Don't use global variable as local in recursion context
This commit is contained in:
neil 2021-10-09 21:29:36 +08:00 committed by GitHub
commit ab6f1b6df7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3168,7 +3168,7 @@ _checkConf() {
for included in $(cat "$2" | tr "\t" " " | grep "^ *include *.*;" | sed "s/include //" | tr -d " ;"); do for included in $(cat "$2" | tr "\t" " " | grep "^ *include *.*;" | sed "s/include //" | tr -d " ;"); do
_debug "check included $included" _debug "check included $included"
if ! _startswith "$included" "/" && _exists dirname; then if ! _startswith "$included" "/" && _exists dirname; then
_relpath="$(dirname "$_c_file")" _relpath="$(dirname "$2")"
_debug "_relpath" "$_relpath" _debug "_relpath" "$_relpath"
included="$_relpath/$included" included="$_relpath/$included"
fi fi