From: paul Date: Wed, 30 Sep 2015 16:14:53 +0000 (+0000) Subject: derive structure which avoids multiple execution X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=3ff1de1d7bf98b5ee3c30a21737a31196bcb6ec3;p=cgilite derive structure which avoids multiple execution svn path=/trunk/; revision=15 --- diff --git a/debug.sh b/debug.sh new file mode 100755 index 0000000..259407b --- /dev/null +++ b/debug.sh @@ -0,0 +1,39 @@ +#!/bin/zsh + +# Copyright 2014, 2015 Paul Hänsch +# +# This file is part of shcgi. +# +# shcgi is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# shcgi is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with shcgi. If not, see . + +# put debug options in the local.opts file +DBG_ENABLED=false +DBG_FILE=/dev/stderr + +# basic functions +debug() { #change to false to disable debugging + if [ "$DBG_ENABLED" = true -a -n "$*" ]; then + printf '%s\n' "$*" >>"$DBG_FILE" + elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then + tee -a "$DBG_FILE" + elif [ -z "$*" ]; then + cat + fi +} + +die() { + debug FATAL: "$*" + printf '%s\n' "$*" >&2 + exit 1 +} diff --git a/htaccess.example b/htaccess.example new file mode 100644 index 0000000..2c8b66e --- /dev/null +++ b/htaccess.example @@ -0,0 +1,3 @@ +Options +ExecCGI +AddHandler cgi-script .cgi +DirectoryIndex index.cgi diff --git a/index.cgi b/index.cgi index b407fc1..89be69c 100755 --- a/index.cgi +++ b/index.cgi @@ -18,8 +18,16 @@ # along with shcgi. If not, see . export LC_ALL=C LANG=C -DBG_ENABLED=false -DBG_FILE=/dev/stderr + +data_dirs(){ + # create directories for object storage + + [ -d "$_DATA" -a -w "$_DATA" ] || die "storage directory must be writable" + for each in "$@"; do + [ ! -e "$_DATA/$each" ] && mkdir "$_DATA/$each" + [ -d "$_DATA/$each" -a -w "$_DATA/$each" ] || die "storage \"$_DATA/$each\" must be a writable directory" + done +} # this program is supposed to be symlinked into a http root directory # we will use the http root as object storage (data directory) and call sub @@ -31,48 +39,13 @@ _DATA="$(dirname "$call")" #storage directory _EXEC="${real%/shcgi/index.cgi}" #execution directory # put debug options in the local.opts file +. "$_EXEC/shcgi/debug.sh" [ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts" -# basic functions -debug() { #change to false to disable debugging - if [ "$DBG_ENABLED" = true -a -n "$*" ]; then - printf '%s\n' "$*" >>"$DBG_FILE" - elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then - tee -a "$DBG_FILE" - elif [ -z "$*" ]; then - cat - fi -} - -die() { - debug FATAL: "$*" - printf '%s\n' "$*" >&2 - exit 1 -} - -data_dirs(){ - # create directories for object storage - - [ -d "$_DATA" -a -w "$_DATA" ] || die "storage directory must be writable" - for each in "$@"; do - [ ! -e "$_DATA/$each" ] && mkdir "$_DATA/$each" - [ -d "$_DATA/$each" -a -w "$_DATA/$each" ] || die "storage \"$_DATA/$each\" must be a writable directory" - done -} - -# create htaccess file -[ -f "$_DATA/.htaccess" ] || cat >"$_DATA/.htaccess" <