From 6d084fb565bcf1fd4705aa88aeba5fa869b73cad Mon Sep 17 00:00:00 2001 From: Johannes Stezenbach Date: Fri, 30 Jul 2010 17:50:34 +0200 Subject: Fix CT_SanitizePath Replace the over-engineered and buggy test in CT_SanitizePath with a straight forward string pattern match, and also handle empty PATH elements which are qeuivalent to ".". Thanks-To: Arnaud Lacombe Signed-off-by: Johannes Stezenbach diff --git a/scripts/functions b/scripts/functions index 0250f05..16f894b 100644 --- a/scripts/functions +++ b/scripts/functions @@ -137,18 +137,16 @@ CT_DoEnd() CT_DoLog ${level:-INFO} "(elapsed: ${elapsed_min}:${elapsed_sec}.${elapsed_csec})" } -# Remove entries referring to ., /tmp and non-existing directories from $PATH +# Remove entries referring to . and other relative paths # Usage: CT_SanitizePath CT_SanitizePath() { local new - local tmp + local p local IFS=: for p in $PATH; do - # Replace any occurence of . with $(pwd -P) - # Use /tmp as a default if the directory is non-existent - # Do not add /tmp in the PATH - tmp="$( cd /tmp; cd "${p}" 2>/dev/null || true; pwd -P )" - if [ "${tmp}" != "/tmp" ]; then + # Only accept absolute paths; + # Note: as a special case the empty string in PATH is equivalent to . + if [ -n "${p}" -a -z "${p%%/*}" ]; then new="${new}${new:+:}${p}" fi done -- cgit v0.10.2-6-g49f6