search for: xml_quote_pcdata

...+++ b/v2v/DOM.ml @@ -46,43 +46,48 @@ let e name attrs children = * we will be writing, ie. libvirt XML and OVF metadata, where * whitespace is generally not significant, but readability is useful. *) -let rec node_to_chan ?(indent = 0) chan = function - | PCData str -> output_string chan (xml_quote_pcdata str) +let rec node_to_buf ?(indent = 0) buf = function + | PCData str -> + Buffer.add_string buf (xml_quote_pcdata str) | Comment str -> - output_spaces chan indent; - fprintf chan "<!-- %s -->" (xml_quote_pcdata str) - | Element e -> element_to_chan ~indent...

Just refactoring. Rich.

The first four patches are straightforward. The final patch adds the -o rhv-upload output mode. It is still spooling into a temporary file because I've had some trouble getting streaming conversions working. There are other problems as outlined in the commit message, so this patch is not ready for upstream but is good for discussion. Also I hit this, which I'm assuming for now will be

...= String.replace str "&" "&amp;" in + let str = String.replace str "'" "&apos;" in + let str = String.replace str "<" "&lt;" in + let str = String.replace str ">" "&gt;" in str let xml_quote_pcdata str = - let str = replace_str str "&" "&amp;" in - let str = replace_str str "<" "&lt;" in - let str = replace_str str ">" "&gt;" in + let str = String.replace str "&" "&amp;" in + let...

Hide/prevent the use of bad string functions like String.lowercase. These are replaced by safe functions that won't break UTF-8 strings. Other miscellaneous refactoring. Rich.