diff options
| author | Richard Nelson <unixabg@gmail.com> | 2010-06-22 22:38:24 -0500 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:12 +0100 |
| commit | 059d512fec977595718d1a3f7049767c1c862f4e (patch) | |
| tree | 964ae698429d3bf3657235a661dce434480c1d24 | |
| parent | ccf66067c05658811812dd27c4dce53e51bcd806 (diff) | |
| download | live-build-059d512fec977595718d1a3f7049767c1c862f4e.zip live-build-059d512fec977595718d1a3f7049767c1c862f4e.tar.gz | |
LH_MEMTEST expression cleanup.
| -rwxr-xr-x | cgi/cgi | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -47,9 +47,10 @@ else # Converting '/': sed 's/%2F/\//g' # Converting '~': sed 's/%7E/\~/g' # Converting '=': sed 's/%3D/=/g' + # Converting '+': sed 's/%2B/+/g' # Translate parameters - QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g') + QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g' -e 's/%2B/+/g') # Debug the filtering string # echo ${QUERY_STRING} @@ -88,7 +89,7 @@ else LH_ISO_PREPARER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_preparer=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1) LH_ISO_PUBLISHER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_publisher=[-0-9a-zA-Z. ~;:/_@]+' | cut -f 2 -d '=' | head -n1) LH_ISO_VOLUME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_volume=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1) - LH_MEMTEST=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])memtest=[0-9,a-z,A-Z,.,_,-]+' | cut -f 2 -d '=' | head -n1) + LH_MEMTEST=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])memtest=[0-9a-z+]+' | cut -f 2 -d '=' | head -n1) LH_NET_ROOT_PATH=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_path=[0-9,a-z,A-Z,.,_,/,-]+' | cut -f 2 -d '=' | head -n1) LH_NET_ROOT_SERVER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_server=[0-9,a-z,A-Z,.,_,-]+' | cut -f 2 -d '=' | head -n1) LH_USERNAME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])username=[0-9,a-z,A-Z,.,-]+' | cut -f 2 -d '=' | head -n1) |