From 3ae2a42f3821c90b70e03150491413a7ff5116a7 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Sat, 10 Oct 2009 14:44:23 +0000
Subject: [PATCH] misc

---
 .htaccess |  2 +-
 index.cgi | 10 +++++-----
 vimrc     |  1 -
 vpaste    |  3 +++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.htaccess b/.htaccess
index 73b6223..f90da27 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,4 @@
-# Public domain
+# Copyright (C) 2009 Andy Spencer - Public domain
 
 AddHandler cgi-script .cgi
 Options +ExecCGI
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"
diff --git a/vimrc b/vimrc
index fd487fa..c919811 100644
--- a/vimrc
+++ b/vimrc
@@ -2,7 +2,6 @@
 
 set nocompatible
 set encoding=utf-8
-set foldtext=getline(v:foldstart)
 set term=xterm-256color
 
 filetype plugin indent on
diff --git a/vpaste b/vpaste
index 30633e0..62a4c60 100755
--- a/vpaste
+++ b/vpaste
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+# Copyright (C) 2009 Andy Spencer - Public domain
+
 uri="http://vpaste.net/"
 if [ -f "$1" ]; then
 	out=$(curl -s -F "x=<$1" "$uri?$2")
-- 
2.43.2