version 1.70, 2009/10/28 08:00:18 |
version 1.78, 2009/11/01 15:34:15 |
|
|
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
#include <err.h> |
|
#include <stdio.h> |
|
#include <stdarg.h> |
#include <stdarg.h> |
|
#include <stdio.h> |
#include <stdint.h> |
#include <stdint.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
Line 100 html_alloc(char *outopts) |
|
Line 99 html_alloc(char *outopts) |
|
toks[2] = "includes"; |
toks[2] = "includes"; |
toks[3] = NULL; |
toks[3] = NULL; |
|
|
if (NULL == (h = calloc(1, sizeof(struct html)))) |
h = calloc(1, sizeof(struct html)); |
return(NULL); |
if (NULL == h) { |
|
perror(NULL); |
|
exit(EXIT_FAILURE); |
|
} |
|
|
h->tags.head = NULL; |
h->tags.head = NULL; |
h->ords.head = NULL; |
h->ords.head = NULL; |
|
h->symtab = chars_init(CHARS_HTML); |
|
|
if (NULL == (h->symtab = chars_init(CHARS_HTML))) { |
|
free(h); |
|
return(NULL); |
|
} |
|
|
|
while (outopts && *outopts) |
while (outopts && *outopts) |
switch (getsubopt(&outopts, UNCONST(toks), &v)) { |
switch (getsubopt(&outopts, UNCONST(toks), &v)) { |
case (0): |
case (0): |
|
|
print_spec(struct html *h, const char *p, int len) |
print_spec(struct html *h, const char *p, int len) |
{ |
{ |
const char *rhs; |
const char *rhs; |
int i; |
|
size_t sz; |
size_t sz; |
|
|
rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz); |
rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz); |
|
|
if (NULL == rhs) |
if (NULL == rhs) |
return; |
return; |
for (i = 0; i < (int)sz; i++) |
fwrite(rhs, 1, sz, stdout); |
putchar(rhs[i]); |
|
} |
} |
|
|
|
|
|
|
print_res(struct html *h, const char *p, int len) |
print_res(struct html *h, const char *p, int len) |
{ |
{ |
const char *rhs; |
const char *rhs; |
int i; |
|
size_t sz; |
size_t sz; |
|
|
rhs = chars_a2res(h->symtab, p, (size_t)len, &sz); |
rhs = chars_a2res(h->symtab, p, (size_t)len, &sz); |
|
|
if (NULL == rhs) |
if (NULL == rhs) |
return; |
return; |
for (i = 0; i < (int)sz; i++) |
fwrite(rhs, 1, sz, stdout); |
putchar(rhs[i]); |
|
} |
} |
|
|
|
|
Line 322 print_escape(struct html *h, const char **p) |
|
Line 316 print_escape(struct html *h, const char **p) |
|
static void |
static void |
print_encode(struct html *h, const char *p) |
print_encode(struct html *h, const char *p) |
{ |
{ |
|
size_t sz; |
|
|
for (; *p; p++) { |
for (; *p; p++) { |
|
sz = strcspn(p, "\\<>&"); |
|
|
|
fwrite(p, 1, sz, stdout); |
|
p += sz; |
|
|
if ('\\' == *p) { |
if ('\\' == *p) { |
print_escape(h, &p); |
print_escape(h, &p); |
continue; |
continue; |
} |
} else if ('\0' == *p) |
switch (*p) { |
|
case ('<'): |
|
printf("<"); |
|
break; |
break; |
case ('>'): |
|
|
if ('<' == *p) |
|
printf("<"); |
|
else if ('>' == *p) |
printf(">"); |
printf(">"); |
break; |
else if ('&' == *p) |
case ('&'): |
|
printf("&"); |
printf("&"); |
break; |
|
default: |
|
putchar(*p); |
|
break; |
|
} |
|
} |
} |
} |
} |
|
|
Line 354 print_otag(struct html *h, enum htmltag tag, |
|
Line 348 print_otag(struct html *h, enum htmltag tag, |
|
struct tag *t; |
struct tag *t; |
|
|
if ( ! (HTML_NOSTACK & htmltags[tag].flags)) { |
if ( ! (HTML_NOSTACK & htmltags[tag].flags)) { |
if (NULL == (t = malloc(sizeof(struct tag)))) |
t = malloc(sizeof(struct tag)); |
err(EXIT_FAILURE, "malloc"); |
if (NULL == t) { |
|
perror(NULL); |
|
exit(EXIT_FAILURE); |
|
} |
t->tag = tag; |
t->tag = tag; |
t->next = h->tags.head; |
t->next = h->tags.head; |
h->tags.head = t; |
h->tags.head = t; |
Line 364 print_otag(struct html *h, enum htmltag tag, |
|
Line 361 print_otag(struct html *h, enum htmltag tag, |
|
|
|
if ( ! (HTML_NOSPACE & h->flags)) |
if ( ! (HTML_NOSPACE & h->flags)) |
if ( ! (HTML_CLRLINE & htmltags[tag].flags)) |
if ( ! (HTML_CLRLINE & htmltags[tag].flags)) |
printf(" "); |
putchar(' '); |
|
|
printf("<%s", htmltags[tag].name); |
printf("<%s", htmltags[tag].name); |
for (i = 0; i < sz; i++) { |
for (i = 0; i < sz; i++) { |
printf(" %s=\"", htmlattrs[p[i].key]); |
printf(" %s=\"", htmlattrs[p[i].key]); |
assert(p->val); |
assert(p->val); |
print_encode(h, p[i].val); |
print_encode(h, p[i].val); |
printf("\""); |
putchar('\"'); |
} |
} |
printf(">"); |
putchar('>'); |
|
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
if (HTML_CLRLINE & htmltags[tag].flags) |
if (HTML_CLRLINE & htmltags[tag].flags) |
Line 391 print_ctag(struct html *h, enum htmltag tag) |
|
Line 388 print_ctag(struct html *h, enum htmltag tag) |
|
{ |
{ |
|
|
printf("</%s>", htmltags[tag].name); |
printf("</%s>", htmltags[tag].name); |
if (HTML_CLRLINE & htmltags[tag].flags) |
if (HTML_CLRLINE & htmltags[tag].flags) { |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
if (HTML_CLRLINE & htmltags[tag].flags) |
|
h->flags |= HTML_NEWLINE; |
h->flags |= HTML_NEWLINE; |
else |
putchar('\n'); |
|
} else |
h->flags &= ~HTML_NEWLINE; |
h->flags &= ~HTML_NEWLINE; |
} |
} |
|
|
Line 440 print_text(struct html *h, const char *p) |
|
Line 437 print_text(struct html *h, const char *p) |
|
} |
} |
|
|
if ( ! (h->flags & HTML_NOSPACE)) |
if ( ! (h->flags & HTML_NOSPACE)) |
printf(" "); |
putchar(' '); |
|
|
h->flags &= ~HTML_NOSPACE; |
h->flags &= ~HTML_NOSPACE; |
h->flags &= ~HTML_NEWLINE; |
h->flags &= ~HTML_NEWLINE; |
Line 671 html_idcat(char *dst, const char *src, int sz) |
|
Line 668 html_idcat(char *dst, const char *src, int sz) |
|
sz--; |
sz--; |
|
|
for ( ; *src != '\0' && sz > 1; src++) { |
for ( ; *src != '\0' && sz > 1; src++) { |
ssz = snprintf(dst, sz, "%.2x", *src); |
ssz = snprintf(dst, (size_t)sz, "%.2x", *src); |
sz -= ssz; |
sz -= ssz; |
dst += ssz; |
dst += ssz; |
} |
} |