Changeset 57

Timestamp:

03/01/08 19:57:01 (10 months ago)

Author:

scott

Message:

Bug fixes for awkbot

• Fixes for inserting quotes passed through mysql_quote(). double quotes and backslashes proved to be problematic
• Syntax hilighting! Cleaned up the output of awkpaste is now hilighted.

Location:

trunk/awkbot/src

Files:

• awkpaste.awk (modified) (4 diffs)
• mysql.awk (modified) (1 diff)

trunk/awkbot/src/awkpaste.awk

@@ -3 +3 @@
 #import <cgi-lib.awk>
 #import <config.awk>
+#import <tempfile.awk>
 #import <awkbot_db_mysql.awk>
 
 BEGIN {
     cgi_params(query)
-    cgi_headers("text/plain")
+    cgi_headers("text/html")
 
     config_load("etc/awkbot.conf")
@@ -19 +20 @@
         subject = paste["subject"]
         content = paste["content"]
+        link    = sprintf("%s?id=%d", config("paste.cgi"), id)
 
-        gsub(/\\n/, "\n", content)
+        gsub(/\r\\n/, "\n", content)
+        gsub(/\\\t/,  "\t", content)
+        gsub(/\\\\/,  "\\", content) # Outcoming escapes
     }
     else {
@@ -32 +36 @@
         # This has synchronization issues...but what the hell, this is awk
         id      = awkbot_db_paste_last()
+        link    = sprintf("%s?id=%d", config("paste.cgi"), id)
     
         if (id) {
-            printf("say %s %s pasted %s at %s?id=%s\n",    \
+            printf("say %s %s pasted %s at %s\n",    \
                     config("paste.channel"), nick, subject,\
-                    config("paste.cgi"), id) >> stream
+                    link) >> stream
     
             close(stream)
@@ -42 +47 @@
     }
 
+    workfile = tempfile("paste")
+    template = workfile ".html"
 
-    print "Id:", id
-    print "Nick:", nick
-    print "Subject:", subject
-    print content
+    print content > workfile
+    close(workfile)
+
+    system("vim -i NONE -c \"syn on\" -c \"set syntax=awk\" -c \"set nu\"" \
+            " -c TOhtml -c wq -c q " workfile " &> /dev/null")
+
+    while (getline content < template) {
+        print content
+
+        # Ghetto little thing to inject a title
+        if (content ~ /<body/) {
+            print "<h1>AWK Paste:", "<a href=\"" link "\"/>" id "</a></h1>"
+            print "<p><b>Nick:", nick, "<br/>"
+            print "Subject:", subject, "<br/>"
+            print "</b></p><hr/>"
+        }
+    }
+    close(template)
+
+#   print "Id:", id
+#   print "Nick:", nick
+#   print "Subject:", subject
+#   print content
+
+    system("rm " workfile)
+    system("rm " template)
 }

trunk/awkbot/src/mysql.awk

@@ -111 +111 @@
 
 function mysql_quote (string,   result) {
-    result = gensub("([^\\\\])'", "\\1\\\\'", "g", string)
+    gsub(/\\/, "\\\\", string)
+    result = gensub(/(['\''"])/, "\\\\\\1", "g", string)
     return "'" result "'"
 }