Delete unused code in rtc_base/stringencode.cc
Bug: webrtc:6424 Change-Id: I3d72d2a80c502b3afc31af2456d220f48272b348 Reviewed-on: https://webrtc-review.googlesource.com/33006 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21290}
This commit is contained in:
@ -44,127 +44,6 @@ size_t escape(char * buffer, size_t buflen,
|
||||
return bufpos;
|
||||
}
|
||||
|
||||
size_t unescape(char * buffer, size_t buflen,
|
||||
const char * source, size_t srclen,
|
||||
char escape) {
|
||||
RTC_DCHECK(buffer); // TODO(grunell): estimate output size
|
||||
if (buflen <= 0)
|
||||
return 0;
|
||||
|
||||
size_t srcpos = 0, bufpos = 0;
|
||||
while ((srcpos < srclen) && (bufpos + 1 < buflen)) {
|
||||
char ch = source[srcpos++];
|
||||
if ((ch == escape) && (srcpos < srclen)) {
|
||||
ch = source[srcpos++];
|
||||
}
|
||||
buffer[bufpos++] = ch;
|
||||
}
|
||||
buffer[bufpos] = '\0';
|
||||
return bufpos;
|
||||
}
|
||||
|
||||
size_t encode(char * buffer, size_t buflen,
|
||||
const char * source, size_t srclen,
|
||||
const char * illegal, char escape) {
|
||||
RTC_DCHECK(buffer); // TODO(grunell): estimate output size
|
||||
if (buflen <= 0)
|
||||
return 0;
|
||||
|
||||
size_t srcpos = 0, bufpos = 0;
|
||||
while ((srcpos < srclen) && (bufpos + 1 < buflen)) {
|
||||
char ch = source[srcpos++];
|
||||
if ((ch != escape) && !::strchr(illegal, ch)) {
|
||||
buffer[bufpos++] = ch;
|
||||
} else if (bufpos + 3 >= buflen) {
|
||||
break;
|
||||
} else {
|
||||
buffer[bufpos+0] = escape;
|
||||
buffer[bufpos+1] = hex_encode((static_cast<unsigned char>(ch) >> 4) & 0xF);
|
||||
buffer[bufpos+2] = hex_encode((static_cast<unsigned char>(ch) ) & 0xF);
|
||||
bufpos += 3;
|
||||
}
|
||||
}
|
||||
buffer[bufpos] = '\0';
|
||||
return bufpos;
|
||||
}
|
||||
|
||||
size_t decode(char * buffer, size_t buflen,
|
||||
const char * source, size_t srclen,
|
||||
char escape) {
|
||||
if (buflen <= 0)
|
||||
return 0;
|
||||
|
||||
unsigned char h1, h2;
|
||||
size_t srcpos = 0, bufpos = 0;
|
||||
while ((srcpos < srclen) && (bufpos + 1 < buflen)) {
|
||||
char ch = source[srcpos++];
|
||||
if ((ch == escape)
|
||||
&& (srcpos + 1 < srclen)
|
||||
&& hex_decode(source[srcpos], &h1)
|
||||
&& hex_decode(source[srcpos+1], &h2)) {
|
||||
buffer[bufpos++] = (h1 << 4) | h2;
|
||||
srcpos += 2;
|
||||
} else {
|
||||
buffer[bufpos++] = ch;
|
||||
}
|
||||
}
|
||||
buffer[bufpos] = '\0';
|
||||
return bufpos;
|
||||
}
|
||||
|
||||
const char* unsafe_filename_characters() {
|
||||
// It might be better to have a single specification which is the union of
|
||||
// all operating systems, unless one system is overly restrictive.
|
||||
#if defined(WEBRTC_WIN)
|
||||
return "\\/:*?\"<>|";
|
||||
#else // !WEBRTC_WIN
|
||||
// TODO(grunell): Should this never be reached?
|
||||
RTC_NOTREACHED();
|
||||
return "";
|
||||
#endif // !WEBRTC_WIN
|
||||
}
|
||||
|
||||
const unsigned char URL_UNSAFE = 0x1; // 0-33 "#$%&+,/:;<=>?@[\]^`{|} 127
|
||||
const unsigned char XML_UNSAFE = 0x2; // "&'<>
|
||||
const unsigned char HTML_UNSAFE = 0x2; // "&'<>
|
||||
|
||||
// ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 6 5 7 8 9 : ; < = > ?
|
||||
//@ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _
|
||||
//` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~
|
||||
|
||||
const unsigned char ASCII_CLASS[128] = {
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,0,3,1,1,1,3,2,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,1,1,3,1,3,1,
|
||||
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,
|
||||
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,
|
||||
};
|
||||
|
||||
size_t url_encode(char * buffer, size_t buflen,
|
||||
const char * source, size_t srclen) {
|
||||
if (nullptr == buffer)
|
||||
return srclen * 3 + 1;
|
||||
if (buflen <= 0)
|
||||
return 0;
|
||||
|
||||
size_t srcpos = 0, bufpos = 0;
|
||||
while ((srcpos < srclen) && (bufpos + 1 < buflen)) {
|
||||
unsigned char ch = source[srcpos++];
|
||||
if ((ch < 128) && (ASCII_CLASS[ch] & URL_UNSAFE)) {
|
||||
if (bufpos + 3 >= buflen) {
|
||||
break;
|
||||
}
|
||||
buffer[bufpos+0] = '%';
|
||||
buffer[bufpos+1] = hex_encode((ch >> 4) & 0xF);
|
||||
buffer[bufpos+2] = hex_encode((ch ) & 0xF);
|
||||
bufpos += 3;
|
||||
} else {
|
||||
buffer[bufpos++] = ch;
|
||||
}
|
||||
}
|
||||
buffer[bufpos] = '\0';
|
||||
return bufpos;
|
||||
}
|
||||
|
||||
size_t url_decode(char * buffer, size_t buflen,
|
||||
const char * source, size_t srclen) {
|
||||
if (nullptr == buffer)
|
||||
@ -254,159 +133,6 @@ size_t utf8_encode(char* buffer, size_t buflen, unsigned long value) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
size_t html_encode(char * buffer, size_t buflen,
|
||||
const char * source, size_t srclen) {
|
||||
RTC_DCHECK(buffer); // TODO(grunell): estimate output size
|
||||
if (buflen <= 0)
|
||||
return 0;
|
||||
|
||||
size_t srcpos = 0, bufpos = 0;
|
||||
while ((srcpos < srclen) && (bufpos + 1 < buflen)) {
|
||||
unsigned char ch = source[srcpos];
|
||||
if (ch < 128) {
|
||||
srcpos += 1;
|
||||
if (ASCII_CLASS[ch] & HTML_UNSAFE) {
|
||||
const char * escseq = 0;
|
||||
size_t esclen = 0;
|
||||
switch (ch) {
|
||||
case '<': escseq = "<"; esclen = 4; break;
|
||||
case '>': escseq = ">"; esclen = 4; break;
|
||||
case '\'': escseq = "'"; esclen = 5; break;
|
||||
case '\"': escseq = """; esclen = 6; break;
|
||||
case '&': escseq = "&"; esclen = 5; break;
|
||||
default: RTC_NOTREACHED();
|
||||
}
|
||||
if (bufpos + esclen >= buflen) {
|
||||
break;
|
||||
}
|
||||
memcpy(buffer + bufpos, escseq, esclen);
|
||||
bufpos += esclen;
|
||||
} else {
|
||||
buffer[bufpos++] = ch;
|
||||
}
|
||||
} else {
|
||||
// Largest value is 0x1FFFFF => � (10 characters)
|
||||
const size_t kEscseqSize = 11;
|
||||
char escseq[kEscseqSize];
|
||||
unsigned long val;
|
||||
if (size_t vallen = utf8_decode(&source[srcpos], srclen - srcpos, &val)) {
|
||||
srcpos += vallen;
|
||||
} else {
|
||||
// Not a valid utf8 sequence, just use the raw character.
|
||||
val = static_cast<unsigned char>(source[srcpos++]);
|
||||
}
|
||||
size_t esclen = sprintfn(escseq, kEscseqSize, "&#%lu;", val);
|
||||
if (bufpos + esclen >= buflen) {
|
||||
break;
|
||||
}
|
||||
memcpy(buffer + bufpos, escseq, esclen);
|
||||
bufpos += esclen;
|
||||
}
|
||||
}
|
||||
buffer[bufpos] = '\0';
|
||||
return bufpos;
|
||||
}
|
||||
|
||||
size_t html_decode(char * buffer, size_t buflen,
|
||||
const char * source, size_t srclen) {
|
||||
RTC_DCHECK(buffer); // TODO(grunell): estimate output size
|
||||
return xml_decode(buffer, buflen, source, srclen);
|
||||
}
|
||||
|
||||
size_t xml_encode(char * buffer, size_t buflen,
|
||||
const char * source, size_t srclen) {
|
||||
RTC_DCHECK(buffer); // TODO(grunell): estimate output size
|
||||
if (buflen <= 0)
|
||||
return 0;
|
||||
|
||||
size_t srcpos = 0, bufpos = 0;
|
||||
while ((srcpos < srclen) && (bufpos + 1 < buflen)) {
|
||||
unsigned char ch = source[srcpos++];
|
||||
if ((ch < 128) && (ASCII_CLASS[ch] & XML_UNSAFE)) {
|
||||
const char * escseq = 0;
|
||||
size_t esclen = 0;
|
||||
switch (ch) {
|
||||
case '<': escseq = "<"; esclen = 4; break;
|
||||
case '>': escseq = ">"; esclen = 4; break;
|
||||
case '\'': escseq = "'"; esclen = 6; break;
|
||||
case '\"': escseq = """; esclen = 6; break;
|
||||
case '&': escseq = "&"; esclen = 5; break;
|
||||
default: RTC_NOTREACHED();
|
||||
}
|
||||
if (bufpos + esclen >= buflen) {
|
||||
break;
|
||||
}
|
||||
memcpy(buffer + bufpos, escseq, esclen);
|
||||
bufpos += esclen;
|
||||
} else {
|
||||
buffer[bufpos++] = ch;
|
||||
}
|
||||
}
|
||||
buffer[bufpos] = '\0';
|
||||
return bufpos;
|
||||
}
|
||||
|
||||
size_t xml_decode(char * buffer, size_t buflen,
|
||||
const char * source, size_t srclen) {
|
||||
RTC_DCHECK(buffer); // TODO(grunell): estimate output size
|
||||
if (buflen <= 0)
|
||||
return 0;
|
||||
|
||||
size_t srcpos = 0, bufpos = 0;
|
||||
while ((srcpos < srclen) && (bufpos + 1 < buflen)) {
|
||||
unsigned char ch = source[srcpos++];
|
||||
if (ch != '&') {
|
||||
buffer[bufpos++] = ch;
|
||||
} else if ((srcpos + 2 < srclen)
|
||||
&& (memcmp(source + srcpos, "lt;", 3) == 0)) {
|
||||
buffer[bufpos++] = '<';
|
||||
srcpos += 3;
|
||||
} else if ((srcpos + 2 < srclen)
|
||||
&& (memcmp(source + srcpos, "gt;", 3) == 0)) {
|
||||
buffer[bufpos++] = '>';
|
||||
srcpos += 3;
|
||||
} else if ((srcpos + 4 < srclen)
|
||||
&& (memcmp(source + srcpos, "apos;", 5) == 0)) {
|
||||
buffer[bufpos++] = '\'';
|
||||
srcpos += 5;
|
||||
} else if ((srcpos + 4 < srclen)
|
||||
&& (memcmp(source + srcpos, "quot;", 5) == 0)) {
|
||||
buffer[bufpos++] = '\"';
|
||||
srcpos += 5;
|
||||
} else if ((srcpos + 3 < srclen)
|
||||
&& (memcmp(source + srcpos, "amp;", 4) == 0)) {
|
||||
buffer[bufpos++] = '&';
|
||||
srcpos += 4;
|
||||
} else if ((srcpos < srclen) && (source[srcpos] == '#')) {
|
||||
int int_base = 10;
|
||||
if ((srcpos + 1 < srclen) && (source[srcpos+1] == 'x')) {
|
||||
int_base = 16;
|
||||
srcpos += 1;
|
||||
}
|
||||
char * ptr;
|
||||
// TODO(grunell): Fix hack (ptr may go past end of data)
|
||||
unsigned long val = strtoul(source + srcpos + 1, &ptr, int_base);
|
||||
if ((static_cast<size_t>(ptr - source) < srclen) && (*ptr == ';')) {
|
||||
srcpos = ptr - source + 1;
|
||||
} else {
|
||||
// Not a valid escape sequence.
|
||||
break;
|
||||
}
|
||||
if (size_t esclen = utf8_encode(buffer + bufpos, buflen - bufpos, val)) {
|
||||
bufpos += esclen;
|
||||
} else {
|
||||
// Not enough room to encode the character, or illegal character
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
// Unrecognized escape sequence.
|
||||
break;
|
||||
}
|
||||
}
|
||||
buffer[bufpos] = '\0';
|
||||
return bufpos;
|
||||
}
|
||||
|
||||
static const char HEX[] = "0123456789abcdef";
|
||||
|
||||
char hex_encode(unsigned char val) {
|
||||
@ -682,37 +408,4 @@ size_t split(const std::string& source, char delimiter,
|
||||
return fields->size();
|
||||
}
|
||||
|
||||
char make_char_safe_for_filename(char c) {
|
||||
if (c < 32)
|
||||
return '_';
|
||||
|
||||
switch (c) {
|
||||
case '<':
|
||||
case '>':
|
||||
case ':':
|
||||
case '"':
|
||||
case '/':
|
||||
case '\\':
|
||||
case '|':
|
||||
case '*':
|
||||
case '?':
|
||||
return '_';
|
||||
|
||||
default:
|
||||
return c;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
void sprintf(std::string& value, size_t maxlen, const char * format, ...) {
|
||||
char * buffer = STACK_ARRAY(char, maxlen + 1);
|
||||
va_list args;
|
||||
va_start(args, format);
|
||||
value.assign(buffer, vsprintfn(buffer, maxlen + 1, format, args));
|
||||
va_end(args);
|
||||
}
|
||||
*/
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
} // namespace rtc
|
||||
|
||||
Reference in New Issue
Block a user