mirror/libowfat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add scan_html_tagarg

Browse Source
This commit is contained in:
leitner 2014-09-17 13:58:59 +00:00
parent 1d723c8da4
commit 8bdf66a1f5
4 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -16,7 +16,7 @@
switch epoll from level triggering to edge triggering switch epoll from level triggering to edge triggering
introduce io_eagain_read and io_eagain_write (discontinue using io_eagain plz) introduce io_eagain_read and io_eagain_write (discontinue using io_eagain plz)
fix buffer_get fix buffer_get
add fmt_html_tagarg, fmt_xml add fmt_html_tagarg, fmt_xml, scan_html_tagarg
0.29: 0.29:
save 8 bytes in taia.h for 64-bit systems save 8 bytes in taia.h for 64-bit systems

5
textcode.h
View File

@ -64,7 +64,12 @@ size_t scan_urlencoded(const char *src,char *dest,size_t *destlen);
size_t scan_urlencoded2(const char* src,char* dest,size_t* destlen); size_t scan_urlencoded2(const char* src,char* dest,size_t* destlen);
size_t scan_yenc(const char* src,char* dest,size_t* destlen); size_t scan_yenc(const char* src,char* dest,size_t* destlen);
size_t scan_hexdump(const char* src,char* dest,size_t* destlen); size_t scan_hexdump(const char* src,char* dest,size_t* destlen);
/* decodes all html5-standardized &foo; escapes, and also
* "<br>" to "\n" and "<p>" to "\n\n", leaves the rest of the tags alone */
size_t scan_html(const char* src,char* dest,size_t* destlen); size_t scan_html(const char* src,char* dest,size_t* destlen);
/* decodes all html5-standardized &foo; escapes, but leaves all tags
* alone */
size_t scan_html_tagarg(const char* src,char* dest,size_t* destlen);
size_t scan_cescape(const char* src,char* dest,size_t* destlen); size_t scan_cescape(const char* src,char* dest,size_t* destlen);
size_t scan_ldapescape(const char* src,char* dest,size_t* destlen); size_t scan_ldapescape(const char* src,char* dest,size_t* destlen);
size_t scan_jsonescape(const char* src,char* dest,size_t* destlen); size_t scan_jsonescape(const char* src,char* dest,size_t* destlen);

4
textcode/fmt_html.c
View File

@ -13,6 +13,10 @@ size_t fmt_html(char* dest,const char* src,size_t len) {
case '<': seq="&lt;"; goto doit; case '<': seq="&lt;"; goto doit;
case '>': seq="&gt;"; goto doit; case '>': seq="&gt;"; goto doit;
case '\n': case '\n':
if (i<len && s[i+1]=='\n') {
seq="<p>";
++i;
} else
seq="<br>"; seq="<br>";
doit: doit:
written+=fmt_str(dest?dest+written:0,seq); written+=fmt_str(dest?dest+written:0,seq);

12
textcode/scan_html.c
View File

@ -25,7 +25,7 @@ static const char* lookup(size_t ofs,const char* t) {
return NULL; return NULL;
} }
size_t scan_html(const char *src,char *dest,size_t *destlen) { static size_t scan_html_inner(const char *src,char *dest,size_t *destlen,int flag) {
register const unsigned char* s=(const unsigned char*) src; register const unsigned char* s=(const unsigned char*) src;
size_t written=0,i; size_t written=0,i;
for (i=0; s[i]; ++i) { for (i=0; s[i]; ++i) {
@ -58,7 +58,7 @@ size_t scan_html(const char *src,char *dest,size_t *destlen) {
continue; continue;
} else } else
dest[written]='&'; dest[written]='&';
} else if (s[i]=='<') { } else if (flag && s[i]=='<') {
if (case_starts((const char*)s+i+1,"br>")) { if (case_starts((const char*)s+i+1,"br>")) {
dest[written]='\n'; dest[written]='\n';
i+=3; i+=3;
@ -75,3 +75,11 @@ size_t scan_html(const char *src,char *dest,size_t *destlen) {
*destlen=written; *destlen=written;
return i; return i;
} }
size_t scan_html_tagarg(const char *src,char *dest,size_t *destlen) {
return scan_html_inner(src,dest,destlen,1);
}
size_t scan_html(const char *src,char *dest,size_t *destlen) {
return scan_html_inner(src,dest,destlen,0);
}