some reformating
fixing shortlink
This commit is contained in:
parent
dc845c2152
commit
a22d09e23c
2 changed files with 8 additions and 13 deletions
19
cmarkdown.c
19
cmarkdown.c
|
@ -200,10 +200,7 @@ dolist(const char *begin, const char *end) {
|
||||||
if(!(buffer = malloc(end - begin+1)))
|
if(!(buffer = malloc(end - begin+1)))
|
||||||
ERRMALLOC;
|
ERRMALLOC;
|
||||||
|
|
||||||
if(ul)
|
puts(ul ? "<ul>" : "<ol>");
|
||||||
puts("<ul>");
|
|
||||||
else
|
|
||||||
puts("<ol>");
|
|
||||||
run = 1;
|
run = 1;
|
||||||
for(i = 0, p = begin+1+indent; *p && p != end && run; p++) {
|
for(i = 0, p = begin+1+indent; *p && p != end && run; p++) {
|
||||||
buffer[0] = '\0';
|
buffer[0] = '\0';
|
||||||
|
@ -228,10 +225,7 @@ dolist(const char *begin, const char *end) {
|
||||||
process(buffer,buffer+i);
|
process(buffer,buffer+i);
|
||||||
fputs("</li>\n",stdout);
|
fputs("</li>\n",stdout);
|
||||||
}
|
}
|
||||||
if(ul)
|
puts(ul ? "<ul>" : "<ol>");
|
||||||
puts("</ul>");
|
|
||||||
else
|
|
||||||
puts("</ol>");
|
|
||||||
free(buffer);
|
free(buffer);
|
||||||
return p - begin;
|
return p - begin;
|
||||||
}
|
}
|
||||||
|
@ -259,7 +253,7 @@ doshortlink(const char *begin, const char *end) {
|
||||||
|
|
||||||
if(*begin != '<')
|
if(*begin != '<')
|
||||||
return 0;
|
return 0;
|
||||||
for(p = begin+1; p && p != end && !strstr(" \t\n",p); p++) {
|
for(p = begin+1; p && p != end && !strchr(" \t\n",*p); p++) {
|
||||||
switch(*p) {
|
switch(*p) {
|
||||||
case ':':
|
case ':':
|
||||||
ismail = -1;
|
ismail = -1;
|
||||||
|
@ -269,6 +263,8 @@ doshortlink(const char *begin, const char *end) {
|
||||||
ismail = 1;
|
ismail = 1;
|
||||||
break;
|
break;
|
||||||
case '>':
|
case '>':
|
||||||
|
if(ismail == 0)
|
||||||
|
return 0;
|
||||||
fputs("<a href=\"",stdout);
|
fputs("<a href=\"",stdout);
|
||||||
if(ismail == 1) {
|
if(ismail == 1) {
|
||||||
/* mailto: */
|
/* mailto: */
|
||||||
|
@ -282,9 +278,9 @@ doshortlink(const char *begin, const char *end) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
hprint(begin+1,p-1);
|
hprint(begin+1,p);
|
||||||
fputs("\">",stdout);
|
fputs("\">",stdout);
|
||||||
hprint(begin+1,p-1);
|
hprint(begin+1,p);
|
||||||
}
|
}
|
||||||
fputs("</a>",stdout);
|
fputs("</a>",stdout);
|
||||||
return p - begin + 1;
|
return p - begin + 1;
|
||||||
|
@ -380,7 +376,6 @@ main(int argc, char *argv[]) {
|
||||||
eprint("markdown in C %s (C) Enno Boland\n",VERSION);
|
eprint("markdown in C %s (C) Enno Boland\n",VERSION);
|
||||||
else if(argc > 1 && strcmp("-h", argv[1]) == 0)
|
else if(argc > 1 && strcmp("-h", argv[1]) == 0)
|
||||||
eprint("Usage %s [-n] [file]\n -n escape html strictly\n",argv[0]);
|
eprint("Usage %s [-n] [file]\n -n escape html strictly\n",argv[0]);
|
||||||
|
|
||||||
if(argc > 1 && strcmp("-n", argv[1]) == 0)
|
if(argc > 1 && strcmp("-n", argv[1]) == 0)
|
||||||
nohtml = 1;
|
nohtml = 1;
|
||||||
if(argc > 1 + nohtml && strcmp("-", argv[1 + nohtml]) != 0 && !(source = fopen(argv[1 + nohtml],"r")))
|
if(argc > 1 + nohtml && strcmp("-", argv[1 + nohtml]) != 0 && !(source = fopen(argv[1 + nohtml],"r")))
|
||||||
|
|
|
@ -11,7 +11,7 @@ LIBS = -L/usr/lib
|
||||||
|
|
||||||
# flags
|
# flags
|
||||||
CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
|
CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
|
||||||
LDFLAGS = -s ${LIBS}
|
LDFLAGS = ${LIBS}
|
||||||
|
|
||||||
# compiler
|
# compiler
|
||||||
CC = cc
|
CC = cc
|
||||||
|
|
Loading…
Add table
Reference in a new issue