tenno/scq
1
0
Fork 0
Code Issues Releases 2 Activity

dd function dogtlt; added Szabolcs' patch

Browse source
This commit is contained in:
gottox@rootkit.lan 2008-01-04 11:52:10 +01:00
parent f7cd9bb510
commit b8d1753e09
2 changed files with 138 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config.mk
View file

@ -10,7 +10,10 @@ INCS = -I. -I/usr/include
LIBS = -L/usr/lib
# flags
CFLAGS = -Os -Wall -Werror -ansi ${INCS} -DVERSION=\"${VERSION}\"
CFLAGS = -g -O0 -Wall -Werror -ansi ${INCS} -DVERSION=\"${VERSION}\"
#CFLAGS = -fprofile-arcs -ftest-coverage -pg -g -O0 -Wall -Werror -ansi ${INCS} -DVERSION=\"${VERSION}\"
#CFLAGS = -Os -Wall -Werror -ansi ${INCS} -DVERSION=\"${VERSION}\"
#LDFLAGS = -fprofile-arcs -ftest-coverage -pg ${LIBS}
LDFLAGS = ${LIBS}
# compiler

120
smu.c
View file

@ -12,7 +12,7 @@
#define BUFFERSIZE 512
#define LENGTH(x) sizeof(x)/sizeof(x[0])
#define ADDC(b,i) if(i % BUFFERSIZE == 0) \
{ b = realloc(b,(i + BUFFERSIZE) * sizeof(b)); if(!b) eprint("Malloc failed."); }; b[i]
{ b = realloc(b, (i + BUFFERSIZE) * sizeof(b)); if(!b) eprint("Malloc failed."); } b[i]
typedef unsigned int (*Parser)(const char *, const char *, int);
@ -26,6 +26,8 @@ struct Tag {
void eprint(const char *format, ...); /* Prints error and exits */
unsigned int doamp(const char *begin, const char *end, int newblock);
/* Parser for & */
unsigned int dogtlt(const char *begin, const char *end, int newblock);
/* Parser for < and > */
unsigned int dohtml(const char *begin, const char *end, int newblock);
/* Parser for html */
unsigned int dolineprefix(const char *begin, const char *end, int newblock);
@ -49,9 +51,10 @@ void process(const char *begin, const char *end, int isblock);
/* Processes range between begin and end. */
Parser parsers[] = { dounderline, dohtml, dolineprefix, dolist, doparagraph,
dosurround, dolink, doshortlink, doamp, doreplace }; /* list of parsers */
dogtlt, dosurround, dolink, doshortlink, doamp, doreplace };
/* list of parsers */
FILE *source;
unsigned int bsize = 0, nohtml = 0;
unsigned int nohtml = 0;
struct Tag lineprefix[] = {
{ " ", 0, "<pre><code>", "</code></pre>" },
{ "\t", 0, "<pre><code>", "</code></pre>" },
@ -123,19 +126,26 @@ doamp(const char *begin, const char *end, int newblock) {
if(*begin != '&')
return 0;
if(!nohtml) {
for(p = begin + 1; !strchr("; \\\n\t",*p); p++);
if(*p == ';')
/* TODO: end ? */
for(p = begin + 1; p != end && !strchr("; \\\n\t", *p); p++);
if(p == end || *p == ';')
return 0;
}
fputs("&amp;", stdout);
return 1;
}
unsigned int
dogtlt(const char *begin, const char *end, int newblock) {
return 0;
}
unsigned int
dohtml(const char *begin, const char *end, int newblock) {
const char *p, *tag, *tagend;
if(nohtml || !newblock || *begin == '\n')
/* TODO: end */
if(nohtml || !newblock || *begin == '\n' || begin + 2 >= end)
return 0;
p = begin;
if(p[1] == '\n')
@ -182,9 +192,9 @@ dolineprefix(const char *begin, const char *end, int newblock) {
if(*begin == '\n')
fputs("\n", stdout);
fputs(lineprefix[i].before, stdout);
for(j = 0, p += l; p != end; p++, j++) {
for(j = 0, p += l; p < end; p++, j++) {
ADDC(buffer, j) = *p;
if(*p == '\n') {
if(*p == '\n' && p + l < end) {
if(strncmp(lineprefix[i].search, p + 1, l) != 0)
break;
p += l;
@ -259,13 +269,14 @@ dolist(const char *begin, const char *end, int newblock) {
ul = 1;
else {
ul = 0;
for(; *p && p != end && *p >= '0' && *p <= '9';p++);
if(!*p || p[0] != '.')
for(; p < end && *p >= '0' && *p <= '9'; p++);
if(p >= end || *p != '.')
return 0;
}
if(p[1] != ' ' && p[1] != '\t')
p++;
if(p >= end || !(*p == ' ' || *p == '\t'))
return 0;
for(p++; *p && p != end && (*p == ' ' || *p == '\t'); p++);
for(p++; p != end && (*p == ' ' || *p == '\t'); p++);
indent = p - q;
if(!(buffer = malloc(BUFFERSIZE)))
eprint("Malloc failed.");
@ -273,11 +284,12 @@ dolist(const char *begin, const char *end, int newblock) {
putchar('\n');
fputs(ul ? "<ul>\n" : "<ol>\n", stdout);
run = 1;
for(i = 0; p < end && *p && run; p++) {
buffer[0] = '\0';
for(i = 0; *p && p < end && run; p++,i++) {
for(; p < end && run; p++) {
for(i = 0; p < end && run; p++, i++) {
if(*p == '\n') {
if(p[1] == '\n') {
if(p + 1 >= end)
break;
else if(p[1] == '\n') {
p++;
ADDC(buffer, i) = '\n';
i++;
@ -289,13 +301,17 @@ dolist(const char *begin, const char *end, int newblock) {
if(ul && (*q == '-' || *q == '*' || *q == '+'))
j = 1;
else if(!ul) {
for(; q[j] >= '0' && q[j] <= '9' && j < indent; j++);
for(; q + j != end && q[j] >= '0' && q[j] <= '9' && j < indent; j++);
if(q + j == end)
break;
if(j > 0 && q[j] == '.')
j++;
else
j = 0;
}
for(;(q[j] == ' ' || *q == '\t') && j < indent; j++);
/* TODO: do '\t' properly */
if(q + indent < end)
for(; (q[j] == ' ' || q[j] == '\t') && j < indent; j++);
if(j == indent) {
ADDC(buffer, i) = '\n';
i++;
@ -323,20 +339,20 @@ dolist(const char *begin, const char *end, int newblock) {
unsigned int
doparagraph(const char *begin, const char *end, int newblock) {
const char *p, *q;
const char *p;
if(!newblock)
return 0;
p = begin;
q = strstr(p, "\n\n");
if(!q || q > end)
q = end;
if(q - begin <= 1)
/* TODO: can go past end */
p = strstr(begin, "\n\n");
if(!p || p > end)
p = end;
if(p - begin <= 1)
return 0;
fputs("<p>\n", stdout);
process(p,q,0);
process(begin, p, 0);
fputs("</p>\n", stdout);
return -(q - begin);
return -(p - begin);
}
unsigned int
@ -365,8 +381,12 @@ doshortlink(const char *begin, const char *end, int newblock) {
if(*begin != '<')
return 0;
for(p = begin+1; p && p != end && !strchr(" \t\n",*p); p++) {
for(p = begin + 1; p != end; p++) {
switch(*p) {
case ' ':
case '\t':
case '\n':
return 0;
case '#':
case ':':
ismail = -1;
@ -382,14 +402,12 @@ doshortlink(const char *begin, const char *end, int newblock) {
if(ismail == 1) {
/* mailto: */
fputs("&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:", stdout);
for(c = begin+1; *c != '>'; c++) {
for(c = begin + 1; *c != '>'; c++)
printf("&#%u;", *c);
}
fputs("\">", stdout);
for(c = begin+1; *c != '>'; c++) {
for(c = begin + 1; *c != '>'; c++)
printf("&#%u;", *c);
}
}
else {
hprint(begin + 1, p);
fputs("\">", stdout);
@ -417,7 +435,7 @@ dosurround(const char *begin, const char *end, int newblock) {
do {
p = strstr(p + 1, ps);
} while(p && p[-1] == '\\');
if(!p || p > end)
if(!p || p == end)
continue;
fputs(surround[i].before, stdout);
for(q = begin + strlen(surround[i].search); *q == ' '; q++);
@ -440,12 +458,12 @@ dounderline(const char *begin, const char *end, int newblock) {
if(!newblock)
return 0;
p = begin;
for(l = 0; p[l] != '\n' && p[l] && p+l != end; l++);
for(l = 0; p + l != end && p[l] != '\n'; l++);
p += l + 1;
if(l == 0)
return 0;
for(i = 0; i < LENGTH(underline); i++) {
for(j = 0; p[j] != '\n' && p[j] == underline[i].search[0] && p+j != end; j++);
for(j = 0; p + j != end && p[j] != '\n' && p[j] == underline[i].search[0]; j++);
if(j >= l) {
fputs(underline[i].before, stdout);
if(underline[i].process)
@ -463,7 +481,7 @@ void
hprint(const char *begin, const char *end) {
const char *p;
for(p = begin; p && p != end; p++) {
for(p = begin; p != end; p++) {
if(*p == '&')
fputs("&amp;", stdout);
else if(*p == '"')
@ -483,9 +501,11 @@ process(const char *begin, const char *end, int newblock) {
int affected;
unsigned int i;
for(p = begin; *p && p < end;) {
for(p = begin; p != end;) {
if(newblock)
while(*p == '\n') p++;
while(*p == '\n')
if (++p == end)
return;
affected = 0;
for(i = 0; i < LENGTH(parsers) && affected == 0; i++)
affected = parsers[i](p, end, newblock);
@ -497,10 +517,10 @@ process(const char *begin, const char *end, int newblock) {
putchar(*p);
p++;
}
for(q = p; *q == '\n' && q < end; q++);
for(q = p; q != end && *q == '\n'; q++);
if(q == end)
return;
else if(p[0] == '\n' && p[1] == '\n')
else if(p[0] == '\n' && p + 1 != end && p[1] == '\n')
newblock = 1;
else
newblock = affected < 0;
@ -509,8 +529,9 @@ process(const char *begin, const char *end, int newblock) {
int
main(int argc, char *argv[]) {
char *p, *buffer;
int s;
char *buffer;
int s, len;
unsigned int bsize;
source = stdin;
if(argc > 1 && strcmp("-v", argv[1]) == 0)
@ -522,21 +543,20 @@ main(int argc, char *argv[]) {
if(argc > 1 + nohtml && strcmp("-", argv[1 + nohtml]) != 0
&& !(source = fopen(argv[1 + nohtml],"r")))
eprint("Cannot open file `%s`\n",argv[1 + nohtml]);
if(!(buffer = malloc(BUFFERSIZE)))
bsize = 2 * BUFFERSIZE;
if(!(buffer = malloc(bsize)))
eprint("Malloc failed.");
bsize = BUFFERSIZE;
buffer[0] = '\0';
p = buffer+strlen(buffer);
while((s = fread(p, sizeof(char),BUFFERSIZE, source))) {
p += s;
*p = '\0';
if(BUFFERSIZE + strlen(buffer) > bsize) {
len = 0;
while((s = fread(buffer + len, 1, BUFFERSIZE, source))) {
len += s;
if(BUFFERSIZE + len + 1 > bsize) {
bsize += BUFFERSIZE;
if(!(buffer = realloc(buffer, bsize)))
eprint("Malloc failed.");
}
}
process(buffer,buffer+strlen(buffer),1);
buffer[len] = '\0';
process(buffer, buffer + len, 1);
fclose(source);
free(buffer);
return EXIT_SUCCESS;