]> Pileus Git - vpaste/blobdiff - index.cgi
projects / vpaste / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
limits, title
[vpaste] / index.cgi
diff --git a/index.cgi b/index.cgi
index 1c26eff2b717d5acb7aec2a8493337b4b48e37ec..1fdb8adfa75965b0d68acaccda419a07828bbfcd 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -30,8 +30,9 @@ function cut_file {
                st==2  {print \$0};
                /$1--/ {st=0};
                /^\\r$/ && st==1 {st=2};
-       " | head -c -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
@@ -59,16 +60,15 @@ 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
                #   term=xterm-256color in vimrc
                HOME=/home/andy \
-               screen -D -m ex -u vimrc \
-                       '+$d|'$trim     \
+               screen -D -m ex -Z -u vimrc \
+                       '+2d|'$trim     \
                        '+%s/\r//g'     \
                        '+TOhtml'       \
                        "+sav! $output" \
@@ -88,7 +88,7 @@ function do_print {
 # Upload handler
 function do_upload {
        output="$(mktemp db/XXXXX)"
-       uri="$SCRIPT_URI$(basename "$output")${QUERY_STRING:+"?"}"
+       uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
        (get_modeline; cut_file "$1") > "$output"
        echo "Status: 302 Found"
        echo "Location: $uri"
@@ -102,12 +102,13 @@ filetypes=$(
        ls /usr/share/vim/vim{72,files}/syntax/ /home/andy/.vim/after/syntax/ |
        sed -n 's/.vim$//p' | sort | uniq
 )
-uploads=$(ls -t db | head -n 5 | sed "s!^!$SCRIPT_URI!")
+uploads=$(ls -t db | head -n 5 | sed "s!^!$url!")
 
 header text/html
 cat - <<EOF
 <html>
        <head>
+               <title>vpaste.net - Vim based pastebin</title>
                <style>
                * { margin:0; padding:0; }
                body { margin:1em; }
@@ -134,13 +135,16 @@ cat - <<EOF
                <br>
 
                <h4>NAME</h4>
-               <p>vpaste: Vim enabled pastebin</p>
+               <p>vpaste: Vim based pastebin</p>
 
                <h4>SYNOPSIS</h4>
                <pre> vpaste file [option=value,..]</pre>
                <pre> &lt;command&gt; | vpaste [option=value,..]</pre>
                <br>
-               <pre> &lt;command&gt; | curl -F 'x=<-' $SCRIPT_URI[?option=value,..]</pre>
+               <pre> &lt;command&gt; | curl -F 'x=<-' $url[?option=value,..]</pre>
+               <br>
+               <pre>:map vp :exec "w !vpaste ft=".&ft&lt;CR&gt;</pre>
+               <pre>:vmap vp &lt;ESC&gt;:exec "'&lt;,'&gt;w !vpaste ft=".&ft&lt;CR&gt;</pre>
 
                <h4>DESCRIPTION</h4>
                <p>Add <b>?[option[=value],..]</b> to make your text a rainbow.</p>
@@ -167,6 +171,7 @@ cat - <<EOF
                    <a href="vimrc?ft=vim">vimrc</a>
                    <a href="htaccess?ft=apache">htaccess</a>
                <li><a href="2html-et.patch?ft=diff">2html-et.patch</a>
+               <li><a href="https://lug.rose-hulman.edu/svn/misc/trunk/htdocs/vpaste/">Subversion</a>
                </ul>
 
                <h4>LATEST UPLOADS</h4>
@@ -179,7 +184,9 @@ EOF
 }
 
 # Main
-pathinfo="${SCRIPT_URL/*vpaste\/}"
+url="http://$HTTP_HOST/$SCRIPT_URI"
+pathinfo="${REQUEST_URI/*\/}"
+pathinfo="${pathinfo/\?*}"
 
 if [ "$pathinfo" ]; then
        do_print "$pathinfo"
Vim based pastebin