X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=index.cgi;h=6209b0fe3b69e3bdfabd0ae0e231daf791a8929e;hb=b062c2441862905aaad8a3a684ebc9ca615b0f5f;hp=0c5eeba32858e1bd7a46c4484729443ed8a09db8;hpb=a07ccda119f77da7aae5aa22bd9c9dfd687618bf;p=vpaste diff --git a/index.cgi b/index.cgi index 0c5eeba..6209b0f 100755 --- a/index.cgi +++ b/index.cgi @@ -12,7 +12,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# Remove url codings form stdin +# Remove url codings from stdin function get_modeline { modeline=$( echo "$QUERY_STRING" | @@ -25,37 +25,32 @@ function get_modeline { # Extract an uploaded file from standard input # $1 is the boundary delimiter for the file function cut_file { - awk " - /--$1/ {st=1}; - st==2 {print \$0}; - /$1--/ {st=0}; - /^\\r$/ && st==1 {st=2}; - " | head -c -2 + awk -v "bnd=$1" '{ + if ($0 == "--"bnd"\r") { st=1; } + if ($0 == "--"bnd"--\r") { st=0; } + if (st == 2) { print $0; } + if ($0 == "\r" && st == 1) { st=2; } + }' | head -c -2 | head -c $((128*1024)) # Remove trailing ^M's that come with CGI + # Limit size to 128K } # Print out a generic header -function start_html { - echo "Content-Type: text/html; charset=UTF-8" - echo -} - -# Print out a generic header -function start_text { - echo "Content-Type: text/plain; charset=UTF-8" +function header { + echo "Content-Type: $1; charset=UTF-8" echo } # Format a file for viewing function do_print { - if [ -f "$1" ]; then + if [ -f "./$1" ]; then input="$1" elif [ -f "db/$1" ]; then input="db/$1" - trim='1d' # sed command to remove cruft + trim='1,/^$/d' # sed command to remove cruft else - echo "Status: 404" - start_text + echo "Status: 404 Not Found" + header text/plain echo "File '$1' not found" return fi @@ -65,26 +60,30 @@ function do_print { # Create a temp file with the provided modeline output="$(mktemp)" tmp="$(mktemp)" - cat "$input" >> "$tmp" - get_modeline >> "$tmp" + sed "1a$(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, not that we also have to set + # - Run ex in a pty 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 -u vimrc \ - '+$d|'$trim \ + /home/andy/bin/pty ex -nXZ -i NONE -u vimrc \ + '+set bexpr= fde= fdt= fex= inde= inex= key= pa= pexpr' \ + '+set iconstring= ruf= stl= tal=' \ + "+set titlestring=$1\ -\ vpaste.net" \ + '+set noml' \ + '+2d|'$trim \ + '+%s/\r//g' \ '+TOhtml' \ "+sav! $output" \ '+qall!' \ - "$tmp" + "$tmp" /dev/null 2>&1 - start_html + header text/html cat "$output" rm "$tmp" "$output" else - start_text + header text/plain sed "$trim" "$input" fi } @@ -92,43 +91,101 @@ function do_print { # Upload handler function do_upload { + text=$(cut_file "$1") + if [ -z "$text" ]; then + header text/plain + echo "No text pasted" + exit + fi output="$(mktemp db/XXXXX)" - uri="$SCRIPT_URI$(basename "$output")" - (get_modeline; cut_file "$1") > "$output" - start_text - echo "$uri${QUERY_STRING:+"?"}" + uri="$url$(basename "$output")${QUERY_STRING:+"?"}" + + # Format, spam check, and save message + ( + get_modeline + echo "Date: $(date -R)" + echo "From: $REMOTE_ADDR" + echo + echo "$text" + ) | HOME=/home/vpaste spamc -E > "$output" + + # Test for spam + if [ "$?" -ne 0 ]; then + # Report spam + header text/plain + echo "Your post has been marked as spam!" + echo "Spam test results are as folllows.. " + echo + cat "$output" + mv "$output" spam + else + # Redirect user + echo "Status: 302 Found" + echo "Location: $uri" + header text/plain + echo "$uri" + fi + } # Default index page function do_help { filetypes=$( - ls /usr/share/vim/vim{72,files}/syntax/ /home/andy/.vim/after/syntax/ | - sed -n 's/.vim$//p' | sort | uniq + ls /usr/share/vim/vim*/syntax/ /home/andy/.vim/syntax/ | + sed -n '/^\(syntax\|manual\|synload\|2html\|colortest\|hitest\).vim$/d; s/.vim$//p' | + sort | uniq ) -uploads=$(ls -t db | head -n 5 | sed "s!^!$SCRIPT_URI!") +uploads=$(ls -t db | head -n 5) -start_html +header text/html cat - < + + - +
+
+ + + +
+
+

NAME

-

vpaste: Vim enabled pastebin

+

vpaste: Vim based pastebin

SYNOPSIS

+ 
 vpaste file [option=value,..]
 <command> | vpaste [option=value,..]
-
- 
 <command> | curl -F 'x=<-' $SCRIPT_URI[?option=value,..]
+
+ 
 <command> | curl -F 'x=<-' $url[?option=value,..]
+
+ 
 :map vp :exec "w !vpaste ft=".&ft<CR>
+ 
 :vmap vp <ESC>:exec "'<,'>w !vpaste ft=".&ft<CR>
+

DESCRIPTION

Add ?[option[=value],..] to make your text a rainbow.

@@ -137,7 +194,7 @@ cat - <OPTIONS
ft, filetype={filetype}
-
A filetype to use for highlighting, see FILETYPES
+
A filetype to use for highlighting, see above menu for supported types
bg, background={light|dark}
Background color to use for the page
et, expandtab
@@ -148,35 +205,46 @@ cat - <See :help modeline for more information
+

BUGS

+ +

SOURCE

LATEST UPLOADS

-