@@ -321,9 +321,10 @@ int av_match_name(const char *name, const char *names);
char *av_append_path_component(const char *path, const char *component);
enum AVEscapeMode {
- AV_ESCAPE_MODE_AUTO, ///< Use auto-selected escaping mode.
- AV_ESCAPE_MODE_BACKSLASH, ///< Use backslash escaping.
- AV_ESCAPE_MODE_QUOTE, ///< Use single-quote escaping.
+ AV_ESCAPE_MODE_AUTO, ///< Use auto-selected escaping mode.
+ AV_ESCAPE_MODE_BACKSLASH, ///< Use backslash escaping.
+ AV_ESCAPE_MODE_QUOTE, ///< Use single-quote escaping.
+ AV_ESCAPE_MODE_XML_CHAR_DATA, ///< Use XML non-markup character data escaping.
};
/**
@@ -283,6 +283,21 @@ void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_cha
av_bprint_chars(dstbuf, '\'', 1);
break;
+ case AV_ESCAPE_MODE_XML_CHAR_DATA:
+ /* escape XML non-markup character data as per 2.4 */
+ /* [^<&]* - ([^<&]* ']]>' [^<&]*) */
+ for (; *src; src++) {
+ switch (*src) {
+ case '&' : av_bprintf(dstbuf, "%s", "&"); break;
+ case '<' : av_bprintf(dstbuf, "%s", "<"); break;
+ case '>' : av_bprintf(dstbuf, "%s", ">"); break;
+ case '"' : av_bprintf(dstbuf, "%s", """); break;
+ case '\'': av_bprintf(dstbuf, "%s", "'"); break;
+ default: av_bprint_chars(dstbuf, *src, 1);
+ }
+ }
+ break;
+
/* case AV_ESCAPE_MODE_BACKSLASH or unknown mode */
default:
/* \-escape characters */
@@ -101,9 +101,10 @@ int main(int argc, char **argv)
break;
}
case 'm':
- if (!strcmp(optarg, "auto")) escape_mode = AV_ESCAPE_MODE_AUTO;
- else if (!strcmp(optarg, "backslash")) escape_mode = AV_ESCAPE_MODE_BACKSLASH;
- else if (!strcmp(optarg, "quote")) escape_mode = AV_ESCAPE_MODE_QUOTE;
+ if (!strcmp(optarg, "auto")) escape_mode = AV_ESCAPE_MODE_AUTO;
+ else if (!strcmp(optarg, "backslash")) escape_mode = AV_ESCAPE_MODE_BACKSLASH;
+ else if (!strcmp(optarg, "quote")) escape_mode = AV_ESCAPE_MODE_QUOTE;
+ else if (!strcmp(optarg, "xml_char_data")) escape_mode = AV_ESCAPE_MODE_XML_CHAR_DATA;
else {
av_log(NULL, AV_LOG_ERROR,
"Invalid value '%s' for option -m, "
From: Stefano Sabatini <stefasab@gmail.com> --- libavutil/avstring.h | 7 ++++--- libavutil/bprint.c | 15 +++++++++++++++ tools/ffescape.c | 7 ++++--- 3 files changed, 23 insertions(+), 6 deletions(-)