misc

[vpaste] / index.cgi

diff --git a/index.cgi b/index.cgi
index 3ed58033ad097eba58bbb9b88d7ae4a5adf19853..f70abc72105569c80d916e67421d7e5ef098f7fa 100755 (executable)
--- 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" | 
@@ -64,7 +64,7 @@ function do_print {
 
                # - 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
+               #   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 \
@@ -72,7 +72,7 @@ function do_print {
                        '+set iconstring= ruf= stl= tal= titlestring=' \
                        '+set noml'     \
                        '+2d|'$trim     \
-                       '+%s/\r//g'     \
+                       '+%s/\r//g'     \
                        '+TOhtml'       \
                        "+sav! $output" \
                        '+qall!'        \
@@ -90,9 +90,15 @@ 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="$url$(basename "$output")${QUERY_STRING:+"?"}"
-       (get_modeline; cut_file "$1") > "$output"
+       (get_modeline; echo "$text") > "$output"
        echo "Status: 302 Found"
        echo "Location: $uri"
        header text/plain