Update

1 files changed, 14 insertions, 7 deletions

@@ -3,15 +3,22 @@
 # usage: et <file> | sh
 
 BEGIN {
-        xend = xend ? xend : "...xend..."
-        dend = dend ? dend : "...dend..."
+        xend = xend ? xend : "...end...shexpand..."
+        dend = dend ? dend : "...end...document..."
         # We shell out to sed for this because awk doesn't do capture groups ;-;
-        shellfix = "sed -E -e 's/`/\\\\`/g' " \
-                "-e 's/(^|[^\\$])\\$([^\\$]|$)/\\1\\\\$\\2/g' " \
-                "-e 's/(^|[^\\$])\\$(\\$+)([^\\$]|$)/\\1\\2\\3/g'"
+        shellfix = "sed -E" \
+                " -e 's/`/\\\\`/g'" \
+                " -e 's/(^|[^\\$])\\$([^\\$]|$)/\\1\\\\$\\2/g'" \
+                " -e 's/(^|[^\\$])\\$(\\$+)([^\\$]|$)/\\1\\2\\3/g'"
+        htmlfix = "sed -E" \
+                " -e 's#([^\\\\]|^)&#\\1\\&amp;#g;'" \
+                " -e 's#([^\\\\]|^)<#\\1\\&lt;#g;'" \
+                " -e 's#([^\\\\]|^)>#\\1\\&gt;#g;'" \
+                " -e 's#\\\\([&<>])#\\1#g;'"
         true = 1 ; false = 0
-        print "shellexpand()(eval \"$(echo \"cat<<'"xend"'\";cat;echo "xend")\")"
+        print "shexpand()(eval \"$(echo \"cat<<'"xend"'\";cat;echo "xend")\")"
         print "shellfix()(" shellfix ")"
+        print "htmlfix()(" htmlfix ")"
 }
 
 end[endn] && $0 == end[endn] {
@@ -32,7 +39,7 @@ end[endn] && $0 == end[endn] {
         docp = !docp
         docend = $2 ? $2 : dend
         if (docp)
-                print "shellexpand<<" docend
+                print "shexpand<<" docend
         else
                 print docend "\n"
         next