From 5cdf0f5fe227aa21b3f8d9854db27d2f1be492f3 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Wed, 17 Aug 2011 06:06:28 +0000 Subject: [PATCH] Fix bugs --- index.cgi | 69 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/index.cgi b/index.cgi index d4b3b54..c804607 100755 --- a/index.cgi +++ b/index.cgi @@ -50,7 +50,7 @@ function header { # Print plain message and exit function message { while [ "$1" == '-h' ]; do - shift; echo $1; shift + shift; echo "$1"; shift done header text/plain echo "$*" @@ -87,37 +87,40 @@ function do_print { "File '$1' not found" fi - if [[ "$HTTP_ACCEPT" == *'html'* && - "$QUERY_STRING" != 'raw'* ]]; then - # Create a temp file with the provided modeline - output="$(mktemp)" - tmp="$(mktemp)" - sed "\$avim: $(get_modeline)" "$input" > "$tmp" - - # - I have some plugins in ~/.vim - # - Run ex in screen to trick it into thinking that it - # has a real terminal, note that we also have to set - # term=xterm-256color in vimrc - HOME=/home/andy \ - screen -D -m ex -nXZ -i NONE -u vimrc \ - '+sil! set fde= fdt= fex= inde= inex= key= pa= pexpr=' \ - '+sil! set iconstring= ruf= stl= tal=' \ - "+sil! set titlestring=$1\ -\ vpaste.net" \ - '+sil! set noml' \ - '+sil! $d|'$trim \ - '+sil! %s/\r//g' \ - '+sil! TOhtml' \ - "+sav! $output" \ - '+qall!' \ - "$tmp" - - header text/html - cat "$output" - rm "$tmp" "$output" - else + # Check for raw paste + if [[ "$QUERY_STRING" == 'raw'* || + "$REQUEST_URI" != *'?'* && + "$HTTP_ACCEPT" != *'html'* ]]; then header text/plain sed "$trim" "$input" + exit fi + + # Create a temp file with the provided modeline + output="$(mktemp)" + tmp="$(mktemp)" + sed "\$avim: $(get_modeline)" "$input" > "$tmp" + + # - I have some plugins in ~/.vim + # - Run ex in screen to trick it into thinking that it + # has a real terminal, note that we also have to set + # term=xterm-256color in vimrc + HOME=/home/andy \ + screen -D -m ex -nXZ -i NONE -u vimrc \ + '+sil! set fde= fdt= fex= inde= inex= key= pa= pexpr=' \ + '+sil! set iconstring= ruf= stl= tal=' \ + "+sil! set titlestring=$1\ -\ vpaste.net" \ + '+sil! set noml' \ + '+sil! $d|'$trim \ + '+sil! %s/\r//g' \ + '+sil! TOhtml' \ + "+sav! $output" \ + '+qall!' \ + "$tmp" + + header text/html + cat "$output" + rm "$tmp" "$output" } @@ -140,7 +143,7 @@ function do_upload { EOF # Redirect user - uri="$SCRIPT_URI$(basename "$output")" + uri="$url$(basename "$output")" message -h 'Status: 302 Found' \ -h "Location: $uri" \ "$uri" @@ -176,7 +179,7 @@ function do_help { -