X-Git-Url: http://pileus.org/git/?p=vpaste;a=blobdiff_plain;f=index.cgi;h=f70abc72105569c80d916e67421d7e5ef098f7fa;hp=3af8810961d4096689680c3142b7d2155be0249c;hb=3ae2a42f3821c90b70e03150491413a7ff5116a7;hpb=557c2700a9f8cbf77e1f8bb20f0d3350cf7024ed

diff --git a/index.cgi b/index.cgi
index 3af8810..f70abc7 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" | 
@@ -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/
//g'     \
+			'+%s/\r//g'     \
 			'+TOhtml'       \
 			"+sav! $output" \
 			'+qall!'        \
@@ -90,14 +90,14 @@ function do_print {
 
 # Upload handler
 function do_upload {
-	output="$(mktemp db/XXXXX)"
-	uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
 	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; echo "$text") > "$output"
 	echo "Status: 302 Found"
 	echo "Location: $uri"