convert to email format

[vpaste] / index.cgi

diff --git a/index.cgi b/index.cgi
index 76915a726450c7f7cfa001e7dcb98140849d4619..c6aed7c77d55ce25f518004b59ff0b2136651795 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -47,7 +47,7 @@ function do_print {
                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 Not Found"
                header text/plain
@@ -63,11 +63,11 @@ function do_print {
                sed "1a$(get_modeline)" "$input" > "$tmp"
 
                # - I have some plugins in ~/.vim
-               # - Run ex in screen to trick it into thinking that it
+               # - 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 -nXZ -i NONE -u vimrc \
+               /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" \
@@ -77,7 +77,7 @@ function do_print {
                        '+TOhtml'       \
                        "+sav! $output" \
                        '+qall!'        \
-                       "$tmp"
+                       "$tmp" </dev/null >/dev/null 2>&1
 
                header text/html
                cat "$output" 
@@ -99,7 +99,11 @@ function do_upload {
        fi
        output="$(mktemp db/XXXXX)"
        uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
-       (get_modeline; echo "$text") > "$output"
+       (get_modeline
+        echo "Date: $(date -R)"
+        echo "From: $REMOTE_ADDR"
+        echo
+        echo "$text") > "$output"
        echo "Status: 302 Found"
        echo "Location: $uri"
        header text/plain
@@ -109,7 +113,7 @@ function do_upload {
 # Default index page
 function do_help {
 filetypes=$(
-       ls /usr/share/vim/vim*/syntax/ /home/andy/.vim/after/syntax/ |
+       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
 )