misc

[vpaste] / index.cgi
diff --git a/index.cgi b/index.cgi

index 762e162d0bf0c9773d935c00c020f7080c1c2731..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" | 
@@ -25,12 +25,12 @@ function get_modeline {
  # Extract an uploaded file from standard input
  # $1 is the boundary delimiter for the file
  function cut_file {
-       awk "
-               /--$1/ {st=1};
-               st==2  {print \$0};
-               /$1--/ {st=0};
-               /^\\r$/ && st==1 {st=2};
-       " | head -c -2 | head -c $((128*1024))
+       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
  }
@@ -64,12 +64,15 @@ 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 \
+                       '+set bexpr= fde= fdt= fex= inde= inex= key= pa= pexpr' \
+                       '+set iconstring= ruf= stl= tal= titlestring=' \
+                       '+set noml'     \
                         '+2d|'$trim     \
-                       '+%s/\r//g'     \
+                       '+%s/\r//g'     \
                         '+TOhtml'       \
                         "+sav! $output" \
                         '+qall!'        \
@@ -87,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
@@ -103,7 +112,7 @@ filetypes=$(
         sed -n '/^\(syntax\|manual\|synload\|2html\|colortest\|hitest\).vim$/d; s/.vim$//p' |
         sort | uniq
  )
-uploads=$(ls -t db | head -n 5 | sed "s!^!$url!")
+uploads=$(ls -t db | head -n 5)
  
  header text/html
  cat - <<EOF
@@ -120,6 +129,7 @@ cat - <<EOF
                         blockquote,dd,dl,p,pre,ul { margin:0 0 0 2em; }
                         dt { font-weight:bold; padding:0.5em 0 0 0; }
                         blockquote { width:50em; font-size:small; }
+                       span { font-family:monospace; }
                 </style>
         </head>
         <body>
@@ -187,8 +197,12 @@ cat - <<EOF
                 </ul>
  
                 <h4>LATEST UPLOADS</h4>
-               <ul>$(for uri in ${uploads[@]}; do
-                       echo "<li><a href='$uri'>$uri</a></li>"
+               <ul>$(for upload in ${uploads[@]}; do
+                       echo -n "<li>"
+                       echo -n "<span>$upload</span> "
+                       echo -n "<a href='$upload'>text</a> "
+                       echo -n "<a href='$upload?'>rainbow</a>"
+                       echo "</li>"
                 done)</ul>
         </body>
  </html>
@@ -196,7 +210,7 @@ EOF
  }
  
  # Main
-url="http://$HTTP_HOST/$SCRIPT_URI"
+url="http://$HTTP_HOST${REQUEST_URI/\?*}"
  pathinfo="${REQUEST_URI/*\/}"
  pathinfo="${pathinfo/\?*}"