---- /usr/share/vim/vim72/syntax/2html.vim 2009-12-03 18:45:27.000000000 +0000
-+++ /home/andy/.vim/syntax/2html.vim 2009-11-23 04:52:46.000000000 +0000
-@@ -22,6 +22,13 @@
- let s:htmlfont = "monospace"
- endif
+--- /usr/share/vim/vim73/syntax/2html.vim 2010-08-28 18:59:26.000000000 +0000
++++ /home/andy/.vim/syntax/2html.vim 2010-08-31 04:34:00.000000000 +0000
+@@ -33,6 +33,13 @@
+
+ let s:settings = tohtml#GetUserSettings()
+" Whitespace
+if &wrap
" When not in gui we can only guess the colors.
if has("gui_running")
let s:whatterm = "gui"
-@@ -192,7 +199,6 @@
- let s:old_report = &report
+@@ -211,7 +218,6 @@
let s:old_search = @/
+ let s:old_more = &more
set notitle noicon
-setlocal et
+ set nomore
set report=1000000
-
- " Split window to create a buffer with the HTML file.
-@@ -245,7 +251,7 @@
- " HTML header, with the title and generator ;-). Left free space for the CSS,
- " to be filled at the end.
- exe "normal! a<html>\n\e"
--exe "normal! a<head>\n<title>" . expand("%:p:~") . "</title>\n\e"
-+exe "normal! a<head>\n<title>" . &titlestring . "</title>\n\e"
- exe "normal! a<meta name=\"Generator\" content=\"Vim/" . v:version/100 . "." . v:version %100 . '"' . s:tag_close . "\n\e"
- if s:html_encoding != ""
- exe "normal! a<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:html_encoding . '"' . s:tag_close . "\n\e"
-@@ -257,7 +263,7 @@
- if exists("html_no_pre")
- exe "normal! a</head>\n<body>\n\e"
+ setlocal noscrollbind
+@@ -298,7 +304,7 @@
+ call add(s:lines, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . s:tag_close)
+ endif
+ call extend(s:lines, [
+- \ ("<title>".expand("%:p:~")."</title>"),
++ \ ("<title>".&titlestring."</title>"),
+ \ ("<meta name=\"Generator\" content=\"Vim/".v:version/100.".".v:version%100.'"'.s:tag_close),
+ \ ("<meta name=\"plugin-version\" content=\"".g:loaded_2html_plugin.'"'.s:tag_close)
+ \ ])
+@@ -408,7 +414,7 @@
+ if s:settings.no_pre
+ call extend(s:lines, ["</head>", "<body>"])
else
-- exe "normal! a</head>\n<body>\n<pre>\n\e"
-+ exe "normal! a</head>\n<body><pre>\n\e"
+- call extend(s:lines, ["</head>", "<body>", "<pre>"])
++ call extend(s:lines, ["</head>", "<body><pre>"])
endif
exe s:orgwin . "wincmd w"
-@@ -393,12 +399,16 @@
-
- " Expand tabs
- let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
-- let idx = stridx(s:expandedtab, "\t")
-- while idx >= 0
-- let i = &ts - ((idx + s:startcol - 1) % &ts)
-- let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '')
-- let idx = stridx(s:expandedtab, "\t")
-- endwhile
-+ if &et
-+ let idx = stridx(s:expandedtab, "\t")
-+ while idx >= 0
-+ let i = &ts - ((idx + s:startcol - 1) % &ts)
-+ let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '')
-+ let idx = stridx(s:expandedtab, "\t")
-+ endwhile
-+ else
-+ setlocal isprint+=9
-+ endif
+@@ -873,6 +879,7 @@
+ if s:settings.ignore_conceal || !s:concealinfo[0]
+ " Expand tabs
+ let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
++ if &expandtab
+ let s:offset = 0
+ let s:idx = stridx(s:expandedtab, "\t")
+ while s:idx >= 0
+@@ -895,6 +902,9 @@
+ let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
+ let s:idx = stridx(s:expandedtab, "\t")
+ endwhile
++ else
++ setlocal isprint+=9
++ end
- " Output the text with the same synID, with class set to {s:id_name}
- let s:id = synIDtrans(s:id)
-@@ -423,7 +433,7 @@
- if exists("html_no_pre")
- exe "normal! a</body>\n</html>\e"
+ " get the highlight group name to use
+ let s:id = synIDtrans(s:id)
+@@ -945,12 +955,12 @@
+ if s:settings.no_pre
+ if !s:settings.use_css
+ " Close off the font tag that encapsulates the whole <body>
+- call extend(s:lines, ["</font>", "</body>", "</html>"])
++ call extend(s:lines, ["</font></body></html>"])
+ else
+- call extend(s:lines, ["</body>", "</html>"])
++ call extend(s:lines, ["</body></html>"])
+ endif
else
-- exe "normal! a</pre>\n</body>\n</html>\e"
-+ exe "normal! a</pre></body>\n</html>\e"
+- call extend(s:lines, ["</pre>", "</body>", "</html>"])
++ call extend(s:lines, ["</pre></body></html>"])
endif
-
-@@ -449,7 +459,7 @@
- if exists("html_no_pre")
+ exe s:newwin . "wincmd w"
+@@ -979,7 +989,7 @@
+ if s:settings.no_pre
execute "normal! A\nbody { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: ". s:htmlfont ."; }\e"
else
- execute "normal! A\npre { font-family: ". s:htmlfont ."; color: " . s:fgc . "; background-color: " . s:bgc . "; }\e"
yank
put
execute "normal! ^cwbody\e"
+@@ -1077,8 +1087,8 @@
+ exec 'resize' s:old_winheight
+ let &l:winfixheight = s:old_winfixheight
+
+-call setwinvar(s:orgwin,'&stl', s:origwin_stl)
+-call setwinvar(s:newwin,'&stl', s:newwin_stl)
++"call setwinvar(s:orgwin,'&stl', s:origwin_stl)
++"call setwinvar(s:newwin,'&stl', s:newwin_stl)
+ let &ls=s:ls
+
+ " Save a little bit of memory (worth doing?)
}
# Extract an uploaded file from standard input
-# $1 is the boundary delimiter for the file
+# $2 is the name of the input to extract
function cut_file {
- awk -v "bnd=$1" '{
- if ($0 == "--"bnd"\r") { st=1; }
- if ($0 == "--"bnd"--\r") { st=0; }
- if (st == 2) { print $0; }
- if ($0 == "\r" && st == 1) { st=2; }
- }' | head -c -2 | head -c $((128*1024))
- # Remove trailing ^M's that come with CGI
- # Limit size to 128K
+ bnd="${CONTENT_TYPE/*boundary\=/}"
+ awk -v "want=$1" -v "bnd=$bnd" '
+ BEGIN { RS="\r\n" }
+
+ # reset based on boundaries
+ $0 == "--"bnd"" { st=1; next; }
+ $0 == "--"bnd"--" { st=0; next; }
+ $0 == "--"bnd"--\r" { st=0; next; }
+
+ # search for wanted file
+ st == 1 && $0 ~ "^Content-Disposition:.* name=\""want"\"" { st=2; next; }
+ st == 1 && $0 == "" { st=9; next; }
+
+ # wait for newline, then start printing
+ st == 2 && $0 == "" { st=3; next; }
+ st == 3 { print $0 }
+ ' | head -c $((128*1024)) # Limit size to 128K
}
# Print out a generic header
# term=xterm-256color in vimrc
HOME=/home/andy \
screen -D -m 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" \
- '+set noml' \
- '+2d|'$trim \
- '+%s/\r//g' \
- '+TOhtml' \
+ '+sil! set fde= fdt= fex= inde= inex= key= pa= pexpr=' \
+ '+sil! set iconstring= ruf= stl= tal=' \
+ "+sil! set titlestring=$1\ -\ vpaste.net" \
+ '+sil! set noml' \
+ '+sil! 2d|'$trim \
+ '+sil! %s/\r//g' \
+ '+sil! TOhtml' \
"+sav! $output" \
'+qall!' \
"$tmp"
# Upload handler
function do_upload {
- text=$(cut_file "$1")
+ body=$(cat -)
+ spam=$(echo -n "$body" | cut_file "ignoreme")
+ text=$(echo -n "$body" | cut_file "(text|x)")
+ if [ ! -z "$spam" ]; then
+ header text/plain
+ echo "Spam check.."
+ exit
+ fi
if [ -z "$text" ]; then
header text/plain
echo "No text pasted"
header text/plain
echo "$uri"
fi
-
}
# Default index page
<body>
<form id="form" method="post" action="?" enctype="multipart/form-data">
<div style="margin:0 0 1.5em 0;">
+ <input style="display:none" type="text" name="ignoreme" value="">
<textarea name="text" cols="80" rows="25" style="width:100%; height:20em;"></textarea>
<select onchange="document.getElementById('form').action =
document.location + '?ft=' + this.value;">
<pre> vpaste file [option=value,..]</pre>
<pre> <command> | vpaste [option=value,..]</pre>
<br />
- <pre> <command> | curl -F 'x=<-' $url[?option=value,..]</pre>
+ <pre> <command> | curl -F 'text=<-' $url[?option=value,..]</pre>
<br />
<pre> :map vp :exec "w !vpaste ft=".&ft<CR></pre>
<pre> :vmap vp <ESC>:exec "'<,'>w !vpaste ft=".&ft<CR></pre>
elif [ "$pathinfo" ]; then
do_print "$pathinfo"
elif [ "$CONTENT_TYPE" ]; then
- do_upload "${CONTENT_TYPE/*boundary\=/}"
+ do_upload
else
do_help
fi
projects / vpaste / commitdiff