X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=57de2367ddc95a85850be7ab19b687f52115429a;hb=5908d44ebd530cdc8c604a0f7dea757400e33cfe;hp=ef9c74778fab4626587dbb15727d35bec0420ec8;hpb=a3ea41c50acacc5387a3434b7c318b71269d9109;p=lobster diff --git a/index.cgi b/index.cgi index ef9c747..57de236 100755 --- a/index.cgi +++ b/index.cgi @@ -2,7 +2,7 @@ for n in "$@"; do case ${n%%=*} in data) _DATA="${n#data=}";; - exec) _exec="${n#exec=}";; + exec) _EXEC="${n#exec=}";; noerr) exec 2>&-;; esac; done @@ -18,8 +18,16 @@ ACTION="$(GET a)" message="$(COOKIE message)" [ "$message" ] && SET_COOKIE 0 message='' -checked(){ [ "$1" = "$2" ] || [ "$1" -eq "$2" ] && printf 'checked="checked"' 2>/dev/null; } -selected(){ [ "$1" = "$2" ] || [ "$1" -eq "$2" ] && printf 'selected="selected"' 2>/dev/null; } +checked(){ + if [ "$1" = "$2" ] || [ "$1" -eq "$2" ]; then + printf 'checked="checked"' + fi 2>/dev/null +} +selected(){ + if [ "$1" = "$2" ] || [ "$1" -eq "$2" ]; then + printf 'selected="selected"' + fi 2>/dev/null +} yield_page() { local class="$1" style="$2" @@ -43,6 +51,9 @@ yield_page() { | "${_EXEC}/cgilite/html-sh.sed" } +topdir="${_PATH#/}" +topdir="/${topdir%%/*}" + if [ -d "${_EXEC}/${_PATH}" -a -x "${_EXEC}/${_PATH}/index.cgi" ]; then . "${_EXEC}/${_PATH}/index.cgi" elif [ ! -d "${_EXEC}/${_PATH}" -a -x "${_EXEC}/${_PATH}" ]; then @@ -50,6 +61,8 @@ elif [ ! -d "${_EXEC}/${_PATH}" -a -x "${_EXEC}/${_PATH}" ]; then elif [ ! -x "${_EXEC}/${_PATH}" -a -r "${_EXEC}/${_PATH}" ]; then . "$_EXEC/cgilite/file.sh" FILE "${_EXEC}/${_PATH}" +elif [ -d "${_EXEC}/${topdir}" -a -x "${_EXEC}/${topdir}/index.cgi" ]; then + . "${_EXEC}/${topdir}/index.cgi" else printf 'Status: 404 Not Found\r\nContent-Length: 0\r\n\r\n' fi