Compare commits
10 commits
7f1782d525
...
4ab889aeb4
Author | SHA1 | Date | |
---|---|---|---|
4ab889aeb4 | |||
2b3ea4bb0c | |||
08352deca9 | |||
14f610e8af | |||
e195f586cd | |||
29d314255d | |||
c702617acd | |||
82048dd49e | |||
3015ce5a3c | |||
46ef0869bb |
6 changed files with 435 additions and 322 deletions
78
Makefile
78
Makefile
|
@ -1,12 +1,17 @@
|
||||||
# libsmu - simple markup
|
# libsmu - simple markup
|
||||||
# (c) 2007, 2008 Enno Boland
|
# (c) 2007, 2008 Enno Boland
|
||||||
|
|
||||||
include config.mk
|
VERSION = 1.5
|
||||||
|
PREFIX ?= /usr/local
|
||||||
|
MANPREFIX ?= ${PREFIX}/share/man
|
||||||
|
CFLAGS += -DVERSION=\"${VERSION}\"
|
||||||
|
PGO_GEN = ${CFLAGS} -fprofile-generate
|
||||||
|
PGO_USE = ${CFLAGS} -fprofile-use -fprofile-correction
|
||||||
|
LDFLAGS ?=
|
||||||
|
CC ?= cc
|
||||||
SRC = smu.c
|
SRC = smu.c
|
||||||
OBJ = ${SRC:.c=.o}
|
|
||||||
|
|
||||||
all: options smu
|
all: smu
|
||||||
|
|
||||||
options:
|
options:
|
||||||
@echo smu build options:
|
@echo smu build options:
|
||||||
|
@ -14,42 +19,51 @@ options:
|
||||||
@echo "LDFLAGS = ${LDFLAGS}"
|
@echo "LDFLAGS = ${LDFLAGS}"
|
||||||
@echo "CC = ${CC}"
|
@echo "CC = ${CC}"
|
||||||
|
|
||||||
.c.o:
|
smu: ${SRC}
|
||||||
@echo CC $<
|
@echo CC $@
|
||||||
@${CC} -c ${CFLAGS} $<
|
@${CC} -o $@ ${SRC} ${CFLAGS} ${LDFLAGS}
|
||||||
|
|
||||||
${OBJ}: config.mk
|
pgo-build: ${SRC}
|
||||||
|
@echo CC smu
|
||||||
|
@${CC} -o smu ${SRC} ${PGO_GEN} ${LDFLAGS}
|
||||||
|
@echo Generating pgo data
|
||||||
|
@printf .
|
||||||
|
@./smu testdoc > /dev/null
|
||||||
|
@printf .
|
||||||
|
@cat testdoc | ./smu > /dev/null
|
||||||
|
@printf .
|
||||||
|
@./smu -n testdoc > /dev/null
|
||||||
|
@printf .
|
||||||
|
@cat testdoc | ./smu -n > /dev/null
|
||||||
|
@printf .
|
||||||
|
@rm smu
|
||||||
|
@printf '\n'
|
||||||
|
@echo Recompiling with pgo data
|
||||||
|
@echo CC smu
|
||||||
|
@${CC} -o smu ${SRC} ${PGO_USE} ${LDFLAGS}
|
||||||
|
@rm smu.gcda
|
||||||
|
|
||||||
smu: ${OBJ}
|
|
||||||
@echo LD $@
|
|
||||||
@${CC} -o $@ ${OBJ} ${LDFLAGS}
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@echo cleaning
|
rm -f smu ${OBJ} ${LIBOBJ} smu-${VERSION}.tar.gz
|
||||||
@rm -f smu ${OBJ} ${LIBOBJ} smu-${VERSION}.tar.gz
|
|
||||||
|
|
||||||
dist: clean
|
dist: clean
|
||||||
@echo creating dist tarball
|
mkdir -p smu-${VERSION}
|
||||||
@mkdir -p smu-${VERSION}
|
cp -R LICENSE Makefile config.mk smu.1 ${SRC} smu-${VERSION}
|
||||||
@cp -R LICENSE Makefile config.mk smu.1 ${SRC} smu-${VERSION}
|
tar -cf smu-${VERSION}.tar smu-${VERSION}
|
||||||
@tar -cf smu-${VERSION}.tar smu-${VERSION}
|
gzip smu-${VERSION}.tar
|
||||||
@gzip smu-${VERSION}.tar
|
rm -rf smu-${VERSION}
|
||||||
@rm -rf smu-${VERSION}
|
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
|
mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||||
@mkdir -p ${DESTDIR}${PREFIX}/bin
|
cp -f smu ${DESTDIR}${PREFIX}/bin
|
||||||
@cp -f smu ${DESTDIR}${PREFIX}/bin
|
chmod 755 ${DESTDIR}${PREFIX}/bin/smu
|
||||||
@chmod 755 ${DESTDIR}${PREFIX}/bin/smu
|
mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
||||||
@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
|
sed "s/VERSION/${VERSION}/g" < smu.1 > ${DESTDIR}${MANPREFIX}/man1/smu.1
|
||||||
@mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
chmod 644 ${DESTDIR}${MANPREFIX}/man1/smu.1
|
||||||
@sed "s/VERSION/${VERSION}/g" < smu.1 > ${DESTDIR}${MANPREFIX}/man1/smu.1
|
|
||||||
@chmod 644 ${DESTDIR}${MANPREFIX}/man1/smu.1
|
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
@echo removing executable file from ${DESTDIR}${PREFIX}/bin
|
rm -f ${DESTDIR}${PREFIX}/bin/smu
|
||||||
@rm -f ${DESTDIR}${PREFIX}/bin/smu
|
rm -f ${DESTDIR}${MANPREFIX}/man1/smu.1
|
||||||
@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
|
|
||||||
@rm -f ${DESTDIR}${MANPREFIX}/man1/smu.1
|
|
||||||
|
|
||||||
.PHONY: all options clean dist install uninstall
|
.PHONY: all options clean dist install uninstall pgo-build
|
||||||
|
|
20
config.mk
20
config.mk
|
@ -1,20 +0,0 @@
|
||||||
# smu version
|
|
||||||
VERSION = 1.5
|
|
||||||
|
|
||||||
# paths
|
|
||||||
PREFIX = /usr/local
|
|
||||||
MANPREFIX = ${PREFIX}/share/man
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
INCS = -I. -I/usr/include
|
|
||||||
LIBS = -L/usr/lib
|
|
||||||
|
|
||||||
# flags
|
|
||||||
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
|
|
||||||
CC = cc
|
|
2
smu.1
2
smu.1
|
@ -20,4 +20,4 @@ prints usage information to standard error, then exits.
|
||||||
.B \-n
|
.B \-n
|
||||||
escapes all HTML Tags.
|
escapes all HTML Tags.
|
||||||
.SH BUGS
|
.SH BUGS
|
||||||
Please report any Bugs to https://github.com/Gottox/smu/issues or via mail.
|
Report any bugs to tenno+smu@suij.in
|
||||||
|
|
386
smu.c
386
smu.c
|
@ -1,48 +1,78 @@
|
||||||
/* smu - simple markup
|
/* smu - simple markup
|
||||||
* Copyright (C) <2007, 2008> Enno Boland <g s01 de>
|
* Copyright (C) <2007, 2008> Enno Boland <g s01 de>
|
||||||
|
* Copyright (C) 2025 Enno Tensing <tenno+smu@suij.in>
|
||||||
*
|
*
|
||||||
* See LICENSE for further informations
|
* See LICENSE for further informations
|
||||||
*/
|
*/
|
||||||
|
#define _LARGEFILE64_SOURCE
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
#ifndef PACKAGE
|
||||||
|
#define PACKAGE "smu"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef VERSION
|
||||||
|
#define VERSION "0.0"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define CHARWIDTH 4
|
||||||
#define LENGTH(x) sizeof(x) / sizeof(x[0])
|
#define LENGTH(x) sizeof(x) / sizeof(x[0])
|
||||||
#define ADDC(b,i) if(i % BUFSIZ == 0) { b = realloc(b, (i + BUFSIZ) * sizeof(char)); if(!b) eprint("Malloc failed."); } b[i]
|
#define ADDC(b, i, a) \
|
||||||
|
do { \
|
||||||
|
if (i % BUFSIZ == 0) { \
|
||||||
|
b = realloc(b, (i + BUFSIZ) * sizeof(char)); \
|
||||||
|
if (!b) { \
|
||||||
|
eprint("Malloc failed."); \
|
||||||
|
return -1; \
|
||||||
|
} \
|
||||||
|
} \
|
||||||
|
b[i] = a; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
typedef int (*Parser)(const char *, const char *, int);
|
typedef int (*Parser)(const char *, const char *, int);
|
||||||
typedef struct {
|
struct tag {
|
||||||
char *search;
|
char *search;
|
||||||
int process;
|
int process;
|
||||||
char *before, *after;
|
char *before;
|
||||||
} Tag;
|
char *after;
|
||||||
|
};
|
||||||
|
|
||||||
static int doamp(const char *begin, const char *end, int newblock); /* Parser for & */
|
off64_t get_file_size(const char *);
|
||||||
static int docomment(const char *begin, const char *end, int newblock); /* Parser for html-comments */
|
char *read_file(const char *, off64_t);
|
||||||
static int dogtlt(const char *begin, const char *end, int newblock); /* Parser for < and > */
|
|
||||||
static int dohtml(const char *begin, const char *end, int newblock); /* Parser for html */
|
static int doamp(const char *begin, const char *end, int newblock);
|
||||||
static int dolineprefix(const char *begin, const char *end, int newblock);/* Parser for line prefix tags */
|
static int docomment(const char *begin, const char *end, int newblock);
|
||||||
static int dolink(const char *begin, const char *end, int newblock); /* Parser for links and images */
|
static int dogtlt(const char *begin, const char *end, int newblock);
|
||||||
static int dolist(const char *begin, const char *end, int newblock); /* Parser for lists */
|
static int dohtml(const char *begin, const char *end, int newblock);
|
||||||
static int doparagraph(const char *begin, const char *end, int newblock); /* Parser for paragraphs */
|
static int dolineprefix(const char *begin, const char *end, int newblock);
|
||||||
static int doreplace(const char *begin, const char *end, int newblock); /* Parser for simple replaces */
|
static int dolink(const char *begin, const char *end, int newblock);
|
||||||
static int doshortlink(const char *begin, const char *end, int newblock); /* Parser for links and images */
|
static int dolist(const char *begin, const char *end, int newblock);
|
||||||
static int dosurround(const char *begin, const char *end, int newblock); /* Parser for surrounding tags */
|
static int doparagraph(const char *begin, const char *end, int newblock);
|
||||||
static int dounderline(const char *begin, const char *end, int newblock); /* Parser for underline tags */
|
static int doreplace(const char *begin, const char *end, int newblock);
|
||||||
|
static int doshortlink(const char *begin, const char *end, int newblock);
|
||||||
|
static int dosurround(const char *begin, const char *end, int newblock);
|
||||||
|
static int dounderline(const char *begin, const char *end, int newblock);
|
||||||
static void *ereallocz(void *p, size_t size);
|
static void *ereallocz(void *p, size_t size);
|
||||||
static void eprint(const char *format, ...);
|
static void eprint(const char *format, ...);
|
||||||
static void hprint(const char *begin, const char *end); /* escapes HTML and prints it to output */
|
static void hprint(const char *begin, const char *end);
|
||||||
static void process(const char *begin, const char *end, int isblock); /* Processes range between begin and end. */
|
static int process(const char *begin, const char *end, int isblock);
|
||||||
|
|
||||||
/* list of parsers */
|
/* list of parsers */
|
||||||
static Parser parsers[] = { dounderline, docomment, dolineprefix,
|
static Parser parsers[] = { dounderline, docomment, dolineprefix, dolist,
|
||||||
dolist, doparagraph, dogtlt, dosurround, dolink,
|
doparagraph, dogtlt, dosurround, dolink,
|
||||||
doshortlink, dohtml, doamp, doreplace };
|
doshortlink, dohtml, doamp, doreplace };
|
||||||
static int nohtml = 0;
|
static int nohtml = 0;
|
||||||
|
|
||||||
static Tag lineprefix[] = {
|
static struct tag lineprefix[] = {
|
||||||
{ " ", 0, "<pre><code>", "\n</code></pre>" },
|
{ " ", 0, "<pre><code>", "\n</code></pre>" },
|
||||||
{ "\t", 0, "<pre><code>", "\n</code></pre>" },
|
{ "\t", 0, "<pre><code>", "\n</code></pre>" },
|
||||||
{ ">", 2, "<blockquote>", "</blockquote>" },
|
{ ">", 2, "<blockquote>", "</blockquote>" },
|
||||||
|
@ -55,12 +85,13 @@ static Tag lineprefix[] = {
|
||||||
{ "- - -\n", 1, "<hr />", "" },
|
{ "- - -\n", 1, "<hr />", "" },
|
||||||
};
|
};
|
||||||
|
|
||||||
static Tag underline[] = {
|
static struct tag underline[] = {
|
||||||
{ "=", 1, "<h1>", "</h1>\n" },
|
{ "=", 1, "<h1>", "</h1>\n" },
|
||||||
{ "-", 1, "<h2>", "</h2>\n" },
|
{ "-", 1, "<h2>", "</h2>\n" },
|
||||||
};
|
};
|
||||||
|
|
||||||
static Tag surround[] = {
|
static struct tag surround[] = {
|
||||||
|
{ "```", 0, "<code>", "</code>" },
|
||||||
{ "``", 0, "<code>", "</code>" },
|
{ "``", 0, "<code>", "</code>" },
|
||||||
{ "`", 0, "<code>", "</code>" },
|
{ "`", 0, "<code>", "</code>" },
|
||||||
{ "___", 1, "<strong><em>", "</em></strong>" },
|
{ "___", 1, "<strong><em>", "</em></strong>" },
|
||||||
|
@ -72,45 +103,70 @@ static Tag surround[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char *replace[][2] = {
|
static const char *replace[][2] = {
|
||||||
{ "\\\\", "\\" },
|
{ "\\\\", "\\" }, { "\\`", "`" }, { "\\*", "*" }, { "\\_", "_" },
|
||||||
{ "\\`", "`" },
|
{ "\\{", "{" }, { "\\}", "}" }, { "\\[", "[" }, { "\\]", "]" },
|
||||||
{ "\\*", "*" },
|
{ "\\(", "(" }, { "\\)", ")" }, { "\\#", "#" }, { "\\+", "+" },
|
||||||
{ "\\_", "_" },
|
{ "\\-", "-" }, { "\\.", "." }, { "\\!", "!" },
|
||||||
{ "\\{", "{" },
|
|
||||||
{ "\\}", "}" },
|
|
||||||
{ "\\[", "[" },
|
|
||||||
{ "\\]", "]" },
|
|
||||||
{ "\\(", "(" },
|
|
||||||
{ "\\)", ")" },
|
|
||||||
{ "\\#", "#" },
|
|
||||||
{ "\\+", "+" },
|
|
||||||
{ "\\-", "-" },
|
|
||||||
{ "\\.", "." },
|
|
||||||
{ "\\!", "!" },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char *insert[][2] = {
|
static const char *insert[][2] = {
|
||||||
{ " \n", "<br />" },
|
{ " \n", "<br />" },
|
||||||
};
|
};
|
||||||
|
|
||||||
void
|
off64_t get_file_size(const char *path)
|
||||||
eprint(const char *format, ...) {
|
{
|
||||||
|
struct stat st;
|
||||||
|
|
||||||
|
if (stat(path, &st) == 0)
|
||||||
|
return st.st_size;
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *read_file(const char *path, off64_t file_size)
|
||||||
|
{
|
||||||
|
int fd = open(path, O_LARGEFILE | O_NONBLOCK);
|
||||||
|
|
||||||
|
ssize_t bytes;
|
||||||
|
char *buf = calloc(file_size + CHARWIDTH, sizeof(char));
|
||||||
|
|
||||||
|
if (!buf) {
|
||||||
|
perror(PACKAGE);
|
||||||
|
close(fd);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
bytes = read(fd, buf, file_size);
|
||||||
|
if (bytes != file_size) {
|
||||||
|
perror(PACKAGE);
|
||||||
|
close(fd);
|
||||||
|
free(buf);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
close(fd);
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
void eprint(const char *format, ...)
|
||||||
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
||||||
va_start(ap, format);
|
va_start(ap, format);
|
||||||
vfprintf(stderr, format, ap);
|
vfprintf(stderr, format, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int doamp(const char *begin, const char *end, int newblock)
|
||||||
doamp(const char *begin, const char *end, int newblock) {
|
{
|
||||||
const char *p;
|
const char *p;
|
||||||
|
|
||||||
if (*begin != '&')
|
if (*begin != '&')
|
||||||
return 0;
|
return 0;
|
||||||
if (!nohtml) {
|
if (!nohtml) {
|
||||||
for(p = begin + 1; p != end && !strchr("; \\\n\t", *p); p++);
|
for (p = begin + 1; p != end && !strchr("; \\\n\t", *p); p++)
|
||||||
|
;
|
||||||
if (p == end || *p == ';')
|
if (p == end || *p == ';')
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -118,8 +174,8 @@ doamp(const char *begin, const char *end, int newblock) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int dogtlt(const char *begin, const char *end, int newblock)
|
||||||
dogtlt(const char *begin, const char *end, int newblock) {
|
{
|
||||||
int brpos;
|
int brpos;
|
||||||
char c;
|
char c;
|
||||||
|
|
||||||
|
@ -132,16 +188,16 @@ dogtlt(const char *begin, const char *end, int newblock) {
|
||||||
if (!brpos && (c < 'a' || c > 'z') && (c < 'A' || c > 'Z')) {
|
if (!brpos && (c < 'a' || c > 'z') && (c < 'A' || c > 'Z')) {
|
||||||
fputs("<", stdout);
|
fputs("<", stdout);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
} else if (brpos && (c < 'a' || c > 'z') && (c < 'A' || c > 'Z') &&
|
||||||
else if(brpos && (c < 'a' || c > 'z') && (c < 'A' || c > 'Z') && !strchr("/\"'",c)) {
|
!strchr("/\"'", c)) {
|
||||||
fprintf(stdout, "%c>", c);
|
fprintf(stdout, "%c>", c);
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int docomment(const char *begin, const char *end, int newblock)
|
||||||
docomment(const char *begin, const char *end, int newblock) {
|
{
|
||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
if (nohtml || strncmp("<!--", begin, 4))
|
if (nohtml || strncmp("<!--", begin, 4))
|
||||||
|
@ -153,8 +209,8 @@ docomment(const char *begin, const char *end, int newblock) {
|
||||||
return (p + 3 - begin) * (newblock ? -1 : 1);
|
return (p + 3 - begin) * (newblock ? -1 : 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int dohtml(const char *begin, const char *end, int newblock)
|
||||||
dohtml(const char *begin, const char *end, int newblock) {
|
{
|
||||||
const char *p, *tag, *tagend;
|
const char *p, *tag, *tagend;
|
||||||
|
|
||||||
if (nohtml || begin + 2 >= end)
|
if (nohtml || begin + 2 >= end)
|
||||||
|
@ -164,15 +220,18 @@ dohtml(const char *begin, const char *end, int newblock) {
|
||||||
return 0;
|
return 0;
|
||||||
p++;
|
p++;
|
||||||
tag = p;
|
tag = p;
|
||||||
for(; isalnum(*p) && p < end; p++);
|
for (; isalnum(*p) && p < end; p++)
|
||||||
|
;
|
||||||
tagend = p;
|
tagend = p;
|
||||||
if (p > end || tag == tagend)
|
if (p > end || tag == tagend)
|
||||||
return 0;
|
return 0;
|
||||||
while ((p = strstr(p, "</")) && p < end) {
|
while ((p = strstr(p, "</")) && p < end) {
|
||||||
p += 2;
|
p += 2;
|
||||||
if(strncmp(p, tag, tagend - tag) == 0 && p[tagend - tag] == '>') {
|
if (strncmp(p, tag, tagend - tag) == 0 &&
|
||||||
|
p[tagend - tag] == '>') {
|
||||||
p++;
|
p++;
|
||||||
fwrite(begin, sizeof(char), p - begin + tagend - tag - 1, stdout);
|
fwrite(begin, sizeof(char),
|
||||||
|
p - begin + tagend - tag - 1, stdout);
|
||||||
return p - begin + tagend - tag - 1;
|
return p - begin + tagend - tag - 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -180,13 +239,12 @@ dohtml(const char *begin, const char *end, int newblock) {
|
||||||
if (p) {
|
if (p) {
|
||||||
fwrite(begin, sizeof(char), p - begin + 1, stdout);
|
fwrite(begin, sizeof(char), p - begin + 1, stdout);
|
||||||
return p - begin + 1;
|
return p - begin + 1;
|
||||||
}
|
} else
|
||||||
else
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int dolineprefix(const char *begin, const char *end, int newblock)
|
||||||
dolineprefix(const char *begin, const char *end, int newblock) {
|
{
|
||||||
unsigned int i, j, l;
|
unsigned int i, j, l;
|
||||||
char *buffer;
|
char *buffer;
|
||||||
const char *p;
|
const char *p;
|
||||||
|
@ -216,7 +274,8 @@ dolineprefix(const char *begin, const char *end, int newblock) {
|
||||||
|
|
||||||
/* Collect lines into buffer while they start with the prefix */
|
/* Collect lines into buffer while they start with the prefix */
|
||||||
j = 0;
|
j = 0;
|
||||||
while((strncmp(lineprefix[i].search, p, l) == 0) && p + l < end) {
|
while ((strncmp(lineprefix[i].search, p, l) == 0) &&
|
||||||
|
p + l < end) {
|
||||||
p += l;
|
p += l;
|
||||||
|
|
||||||
/* Special case for blockquotes: optional space after > */
|
/* Special case for blockquotes: optional space after > */
|
||||||
|
@ -225,7 +284,7 @@ dolineprefix(const char *begin, const char *end, int newblock) {
|
||||||
}
|
}
|
||||||
|
|
||||||
while (p < end) {
|
while (p < end) {
|
||||||
ADDC(buffer, j) = *p;
|
ADDC(buffer, j, *p);
|
||||||
j++;
|
j++;
|
||||||
if (*(p++) == '\n')
|
if (*(p++) == '\n')
|
||||||
break;
|
break;
|
||||||
|
@ -237,9 +296,10 @@ dolineprefix(const char *begin, const char *end, int newblock) {
|
||||||
j--;
|
j--;
|
||||||
}
|
}
|
||||||
|
|
||||||
ADDC(buffer, j) = '\0';
|
ADDC(buffer, j, '\0');
|
||||||
if (lineprefix[i].process)
|
if (lineprefix[i].process)
|
||||||
process(buffer, buffer + strlen(buffer), lineprefix[i].process >= 2);
|
process(buffer, buffer + strlen(buffer),
|
||||||
|
lineprefix[i].process >= 2);
|
||||||
else
|
else
|
||||||
hprint(buffer, buffer + strlen(buffer));
|
hprint(buffer, buffer + strlen(buffer));
|
||||||
puts(lineprefix[i].after);
|
puts(lineprefix[i].after);
|
||||||
|
@ -249,8 +309,8 @@ dolineprefix(const char *begin, const char *end, int newblock) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int dolink(const char *begin, const char *end, int newblock)
|
||||||
dolink(const char *begin, const char *end, int newblock) {
|
{
|
||||||
int img, len, sep, parens_depth = 1;
|
int img, len, sep, parens_depth = 1;
|
||||||
const char *desc, *link, *p, *q, *descend, *linkend;
|
const char *desc, *link, *p, *q, *descend, *linkend;
|
||||||
const char *title = NULL, *titleend = NULL;
|
const char *title = NULL, *titleend = NULL;
|
||||||
|
@ -264,7 +324,8 @@ dolink(const char *begin, const char *end, int newblock) {
|
||||||
p = desc = begin + 1 + img;
|
p = desc = begin + 1 + img;
|
||||||
if (!(p = strstr(desc, "](")) || p > end)
|
if (!(p = strstr(desc, "](")) || p > end)
|
||||||
return 0;
|
return 0;
|
||||||
for(q = strstr(desc, ") || p > end)
|
if (!(p = strstr(p + 1, "](")) || p > end)
|
||||||
return 0;
|
return 0;
|
||||||
descend = p;
|
descend = p;
|
||||||
|
@ -287,13 +348,16 @@ dolink(const char *begin, const char *end, int newblock) {
|
||||||
sep = p[0]; /* separator: can be " or ' */
|
sep = p[0]; /* separator: can be " or ' */
|
||||||
title = p + 1;
|
title = p + 1;
|
||||||
/* strip trailing whitespace */
|
/* strip trailing whitespace */
|
||||||
for(linkend = p; linkend > link && isspace(*(linkend - 1)); linkend--);
|
for (linkend = p; linkend > link && isspace(*(linkend - 1));
|
||||||
for(titleend = q - 1; titleend > title && isspace(*(titleend)); titleend--);
|
linkend--)
|
||||||
|
;
|
||||||
|
for (titleend = q - 1; titleend > title && isspace(*(titleend));
|
||||||
|
titleend--)
|
||||||
|
;
|
||||||
if (*titleend != sep) {
|
if (*titleend != sep) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
linkend = q;
|
linkend = q;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -316,8 +380,7 @@ dolink(const char *begin, const char *end, int newblock) {
|
||||||
fputs("\" ", stdout);
|
fputs("\" ", stdout);
|
||||||
}
|
}
|
||||||
fputs("/>", stdout);
|
fputs("/>", stdout);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
fputs("<a href=\"", stdout);
|
fputs("<a href=\"", stdout);
|
||||||
hprint(link, linkend);
|
hprint(link, linkend);
|
||||||
fputs("\"", stdout);
|
fputs("\"", stdout);
|
||||||
|
@ -333,8 +396,8 @@ dolink(const char *begin, const char *end, int newblock) {
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int dolist(const char *begin, const char *end, int newblock)
|
||||||
dolist(const char *begin, const char *end, int newblock) {
|
{
|
||||||
unsigned int i, j, indent, run, ul, isblock;
|
unsigned int i, j, indent, run, ul, isblock;
|
||||||
const char *p, *q;
|
const char *p, *q;
|
||||||
char *buffer = NULL;
|
char *buffer = NULL;
|
||||||
|
@ -353,14 +416,16 @@ dolist(const char *begin, const char *end, int newblock) {
|
||||||
marker = *p;
|
marker = *p;
|
||||||
} else {
|
} else {
|
||||||
ul = 0;
|
ul = 0;
|
||||||
for(; p < end && *p >= '0' && *p <= '9'; p++);
|
for (; p < end && *p >= '0' && *p <= '9'; p++)
|
||||||
|
;
|
||||||
if (p >= end || *p != '.')
|
if (p >= end || *p != '.')
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
p++;
|
p++;
|
||||||
if (p >= end || !(*p == ' ' || *p == '\t'))
|
if (p >= end || !(*p == ' ' || *p == '\t'))
|
||||||
return 0;
|
return 0;
|
||||||
for(p++; p != end && (*p == ' ' || *p == '\t'); p++);
|
for (p++; p != end && (*p == ' ' || *p == '\t'); p++)
|
||||||
|
;
|
||||||
indent = p - q;
|
indent = p - q;
|
||||||
buffer = ereallocz(buffer, BUFSIZ);
|
buffer = ereallocz(buffer, BUFSIZ);
|
||||||
if (!newblock)
|
if (!newblock)
|
||||||
|
@ -374,9 +439,13 @@ dolist(const char *begin, const char *end, int newblock) {
|
||||||
break;
|
break;
|
||||||
else {
|
else {
|
||||||
/* Handle empty lines */
|
/* Handle empty lines */
|
||||||
for(q = p + 1; (*q == ' ' || *q == '\t') && q < end; q++);
|
for (q = p + 1;
|
||||||
|
(*q == ' ' || *q == '\t') &&
|
||||||
|
q < end;
|
||||||
|
q++)
|
||||||
|
;
|
||||||
if (*q == '\n') {
|
if (*q == '\n') {
|
||||||
ADDC(buffer, i) = '\n';
|
ADDC(buffer, i, '\0');
|
||||||
i++;
|
i++;
|
||||||
run = 0;
|
run = 0;
|
||||||
isblock++;
|
isblock++;
|
||||||
|
@ -388,7 +457,10 @@ dolist(const char *begin, const char *end, int newblock) {
|
||||||
if (ul && *q == marker)
|
if (ul && *q == marker)
|
||||||
j = 1;
|
j = 1;
|
||||||
else if (!ul) {
|
else if (!ul) {
|
||||||
for(; q + j != end && 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)
|
if (q + j == end)
|
||||||
break;
|
break;
|
||||||
if (j > 0 && q[j] == '.')
|
if (j > 0 && q[j] == '.')
|
||||||
|
@ -397,9 +469,12 @@ dolist(const char *begin, const char *end, int newblock) {
|
||||||
j = 0;
|
j = 0;
|
||||||
}
|
}
|
||||||
if (q + indent < end)
|
if (q + indent < end)
|
||||||
for(; (q[j] == ' ' || q[j] == '\t') && j < indent; j++);
|
for (; (q[j] == ' ' || q[j] == '\t') &&
|
||||||
|
j < indent;
|
||||||
|
j++)
|
||||||
|
;
|
||||||
if (j == indent) {
|
if (j == indent) {
|
||||||
ADDC(buffer, i) = '\n';
|
ADDC(buffer, i, '\n');
|
||||||
i++;
|
i++;
|
||||||
p += indent;
|
p += indent;
|
||||||
run = 1;
|
run = 1;
|
||||||
|
@ -407,26 +482,27 @@ dolist(const char *begin, const char *end, int newblock) {
|
||||||
p++;
|
p++;
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
}
|
} else if (j < indent)
|
||||||
else if (j < indent)
|
|
||||||
run = 0;
|
run = 0;
|
||||||
}
|
}
|
||||||
ADDC(buffer, i) = *p;
|
ADDC(buffer, i, *p);
|
||||||
}
|
}
|
||||||
ADDC(buffer, i) = '\0';
|
ADDC(buffer, i, '\0');
|
||||||
fputs("<li>", stdout);
|
fputs("<li>", stdout);
|
||||||
process(buffer, buffer + i, isblock > 1 || (isblock == 1 && run));
|
process(buffer, buffer + i,
|
||||||
|
isblock > 1 || (isblock == 1 && run));
|
||||||
fputs("</li>\n", stdout);
|
fputs("</li>\n", stdout);
|
||||||
}
|
}
|
||||||
fputs(ul ? "</ul>\n" : "</ol>\n", stdout);
|
fputs(ul ? "</ul>\n" : "</ol>\n", stdout);
|
||||||
free(buffer);
|
free(buffer);
|
||||||
p--;
|
p--;
|
||||||
while(*(--p) == '\n');
|
while (*(--p) == '\n')
|
||||||
|
;
|
||||||
return -(p - begin + 1);
|
return -(p - begin + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int doparagraph(const char *begin, const char *end, int newblock)
|
||||||
doparagraph(const char *begin, const char *end, int newblock) {
|
{
|
||||||
const char *p;
|
const char *p;
|
||||||
|
|
||||||
if (!newblock)
|
if (!newblock)
|
||||||
|
@ -442,8 +518,8 @@ doparagraph(const char *begin, const char *end, int newblock) {
|
||||||
return -(p - begin);
|
return -(p - begin);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int doreplace(const char *begin, const char *end, int newblock)
|
||||||
doreplace(const char *begin, const char *end, int newblock) {
|
{
|
||||||
unsigned int i, l;
|
unsigned int i, l;
|
||||||
|
|
||||||
for (i = 0; i < LENGTH(insert); i++)
|
for (i = 0; i < LENGTH(insert); i++)
|
||||||
|
@ -461,8 +537,8 @@ doreplace(const char *begin, const char *end, int newblock) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int doshortlink(const char *begin, const char *end, int newblock)
|
||||||
doshortlink(const char *begin, const char *end, int newblock) {
|
{
|
||||||
const char *p, *c;
|
const char *p, *c;
|
||||||
int ismail = 0;
|
int ismail = 0;
|
||||||
|
|
||||||
|
@ -488,14 +564,14 @@ doshortlink(const char *begin, const char *end, int newblock) {
|
||||||
fputs("<a href=\"", stdout);
|
fputs("<a href=\"", stdout);
|
||||||
if (ismail == 1) {
|
if (ismail == 1) {
|
||||||
/* mailto: */
|
/* mailto: */
|
||||||
fputs("mailto:", stdout);
|
fputs("mailto:",
|
||||||
|
stdout);
|
||||||
for (c = begin + 1; *c != '>'; c++)
|
for (c = begin + 1; *c != '>'; c++)
|
||||||
fprintf(stdout, "&#%u;", *c);
|
fprintf(stdout, "&#%u;", *c);
|
||||||
fputs("\">", stdout);
|
fputs("\">", stdout);
|
||||||
for (c = begin + 1; *c != '>'; c++)
|
for (c = begin + 1; *c != '>'; c++)
|
||||||
fprintf(stdout, "&#%u;", *c);
|
fprintf(stdout, "&#%u;", *c);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
hprint(begin + 1, p);
|
hprint(begin + 1, p);
|
||||||
fputs("\">", stdout);
|
fputs("\">", stdout);
|
||||||
hprint(begin + 1, p);
|
hprint(begin + 1, p);
|
||||||
|
@ -507,14 +583,15 @@ doshortlink(const char *begin, const char *end, int newblock) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int dosurround(const char *begin, const char *end, int newblock)
|
||||||
dosurround(const char *begin, const char *end, int newblock) {
|
{
|
||||||
unsigned int i, l;
|
unsigned int i, l;
|
||||||
const char *p, *start, *stop;
|
const char *p, *start, *stop;
|
||||||
|
|
||||||
for (i = 0; i < LENGTH(surround); i++) {
|
for (i = 0; i < LENGTH(surround); i++) {
|
||||||
l = strlen(surround[i].search);
|
l = strlen(surround[i].search);
|
||||||
if(end - begin < 2*l || strncmp(begin, surround[i].search, l) != 0)
|
if (end - begin < 2 * l ||
|
||||||
|
strncmp(begin, surround[i].search, l) != 0)
|
||||||
continue;
|
continue;
|
||||||
start = begin + l;
|
start = begin + l;
|
||||||
p = start - 1;
|
p = start - 1;
|
||||||
|
@ -545,20 +622,24 @@ dosurround(const char *begin, const char *end, int newblock) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int dounderline(const char *begin, const char *end, int newblock)
|
||||||
dounderline(const char *begin, const char *end, int newblock) {
|
{
|
||||||
unsigned int i, j, l;
|
unsigned int i, j, l;
|
||||||
const char *p;
|
const char *p;
|
||||||
|
|
||||||
if (!newblock)
|
if (!newblock)
|
||||||
return 0;
|
return 0;
|
||||||
p = begin;
|
p = begin;
|
||||||
for(l = 0; p + l + 1 != end && p[l] != '\n'; l++);
|
for (l = 0; p + l + 1 != end && p[l] != '\n'; l++)
|
||||||
|
;
|
||||||
p += l + 1;
|
p += l + 1;
|
||||||
if (l == 0)
|
if (l == 0)
|
||||||
return 0;
|
return 0;
|
||||||
for (i = 0; i < LENGTH(underline); i++) {
|
for (i = 0; i < LENGTH(underline); i++) {
|
||||||
for(j = 0; p + j != end && p[j] != '\n' && p[j] == underline[i].search[0]; j++);
|
for (j = 0; p + j != end && p[j] != '\n' &&
|
||||||
|
p[j] == underline[i].search[0];
|
||||||
|
j++)
|
||||||
|
;
|
||||||
if (j >= l) {
|
if (j >= l) {
|
||||||
fputs(underline[i].before, stdout);
|
fputs(underline[i].before, stdout);
|
||||||
if (underline[i].process)
|
if (underline[i].process)
|
||||||
|
@ -572,8 +653,8 @@ dounderline(const char *begin, const char *end, int newblock) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void *
|
void *ereallocz(void *p, size_t size)
|
||||||
ereallocz(void *p, size_t size) {
|
{
|
||||||
void *res;
|
void *res;
|
||||||
if (p)
|
if (p)
|
||||||
res = realloc(p, size);
|
res = realloc(p, size);
|
||||||
|
@ -585,8 +666,8 @@ ereallocz(void *p, size_t size) {
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void hprint(const char *begin, const char *end)
|
||||||
hprint(const char *begin, const char *end) {
|
{
|
||||||
const char *p;
|
const char *p;
|
||||||
|
|
||||||
for (p = begin; p != end; p++) {
|
for (p = begin; p != end; p++) {
|
||||||
|
@ -603,9 +684,10 @@ hprint(const char *begin, const char *end) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
int process(const char *begin, const char *end, int newblock)
|
||||||
process(const char *begin, const char *end, int newblock) {
|
{
|
||||||
const char *p, *q;
|
const char *q;
|
||||||
|
const char *p;
|
||||||
int affected;
|
int affected;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
|
@ -613,11 +695,13 @@ process(const char *begin, const char *end, int newblock) {
|
||||||
if (newblock)
|
if (newblock)
|
||||||
while (*p == '\n')
|
while (*p == '\n')
|
||||||
if (++p == end)
|
if (++p == end)
|
||||||
return;
|
return 1;
|
||||||
affected = 0;
|
affected = 0;
|
||||||
for (i = 0; i < LENGTH(parsers) && !affected; i++)
|
for (i = 0; i < LENGTH(parsers) && !affected; i++)
|
||||||
affected = parsers[i](p, end, newblock);
|
affected = parsers[i](p, end, newblock);
|
||||||
p += abs(affected);
|
p += abs(affected);
|
||||||
|
if (affected == -1)
|
||||||
|
return 0;
|
||||||
if (!affected) {
|
if (!affected) {
|
||||||
if (nohtml)
|
if (nohtml)
|
||||||
hprint(p, p + 1);
|
hprint(p, p + 1);
|
||||||
|
@ -625,22 +709,24 @@ process(const char *begin, const char *end, int newblock) {
|
||||||
fputc(*p, stdout);
|
fputc(*p, stdout);
|
||||||
p++;
|
p++;
|
||||||
}
|
}
|
||||||
for(q = p; q != end && *q == '\n'; q++);
|
for (q = p; q != end && *q == '\n'; q++)
|
||||||
|
;
|
||||||
if (q == end)
|
if (q == end)
|
||||||
return;
|
return 1;
|
||||||
else if (p[0] == '\n' && p + 1 != end && p[1] == '\n')
|
else if (p[0] == '\n' && p + 1 != end && p[1] == '\n')
|
||||||
newblock = 1;
|
newblock = 1;
|
||||||
else
|
else
|
||||||
newblock = affected < 0;
|
newblock = affected < 0;
|
||||||
}
|
}
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int main(int argc, char *argv[])
|
||||||
main(int argc, char *argv[]) {
|
{
|
||||||
char *buffer = NULL;
|
char *buffer = NULL;
|
||||||
int s, i;
|
const char *path = "STDIN";
|
||||||
unsigned long len, bsize;
|
int i;
|
||||||
FILE *source = stdin;
|
int ret = EXIT_SUCCESS;
|
||||||
|
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 1; i < argc; i++) {
|
||||||
if (!strcmp("-v", argv[i]))
|
if (!strcmp("-v", argv[i]))
|
||||||
|
@ -652,26 +738,58 @@ main(int argc, char *argv[]) {
|
||||||
else if (!strcmp("--", argv[i])) {
|
else if (!strcmp("--", argv[i])) {
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
|
} else
|
||||||
|
eprint("Usage %s [-n] [file]\n -n escape html strictly\n",
|
||||||
|
argv[0]);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
eprint("Usage %s [-n] [file]\n -n escape html strictly\n", argv[0]);
|
if (i < argc) {
|
||||||
}
|
path = argv[i];
|
||||||
if(i < argc && !(source = fopen(argv[i], "r")))
|
|
||||||
eprint("Cannot open file `%s`\n",argv[i]);
|
off64_t len = get_file_size(path);
|
||||||
bsize = 2 * BUFSIZ;
|
if (len == -1) {
|
||||||
buffer = ereallocz(buffer, bsize);
|
eprint("%s: %s: %s\n", argv[0], path, strerror(errno));
|
||||||
len = 0;
|
ret = EXIT_FAILURE;
|
||||||
while((s = fread(buffer + len, 1, BUFSIZ, source))) {
|
goto exit;
|
||||||
len += s;
|
|
||||||
if(BUFSIZ + len + 1 > bsize) {
|
|
||||||
bsize += BUFSIZ;
|
|
||||||
if(!(buffer = realloc(buffer, bsize)))
|
|
||||||
eprint("realloc failed.");
|
|
||||||
}
|
}
|
||||||
|
buffer = read_file(path, len);
|
||||||
|
if (!buffer) {
|
||||||
|
perror(PACKAGE);
|
||||||
|
ret = EXIT_FAILURE;
|
||||||
|
goto exit;
|
||||||
}
|
}
|
||||||
buffer[len] = '\0';
|
buffer[len] = '\0';
|
||||||
process(buffer, buffer + len, 1);
|
process(buffer, buffer + len, 1);
|
||||||
fclose(source);
|
|
||||||
free(buffer);
|
free(buffer);
|
||||||
return EXIT_SUCCESS;
|
} else {
|
||||||
|
size_t buffer_size = 1024 * CHARWIDTH;
|
||||||
|
buffer = calloc(buffer_size + CHARWIDTH, sizeof(char));
|
||||||
|
if (!buffer) {
|
||||||
|
perror(PACKAGE);
|
||||||
|
ret = EXIT_FAILURE;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t read_bytes;
|
||||||
|
while (1) {
|
||||||
|
read_bytes = read(STDIN_FILENO, buffer, buffer_size);
|
||||||
|
if (read_bytes <= 0) {
|
||||||
|
if (errno) {
|
||||||
|
perror(PACKAGE);
|
||||||
|
ret = EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
free(buffer);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
buffer[read_bytes] = '\0';
|
||||||
|
if (!process(buffer, buffer + read_bytes, 1)) {
|
||||||
|
ret = EXIT_FAILURE;
|
||||||
|
free(buffer);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
exit:
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
1
smu.h
1
smu.h
|
@ -16,4 +16,3 @@ int smu_convert(FILE *out, FILE *in, int suppresshtml);
|
||||||
|
|
||||||
/** utility */
|
/** utility */
|
||||||
void eprint(const char *format, ...);
|
void eprint(const char *format, ...);
|
||||||
|
|
||||||
|
|
2
testdoc
2
testdoc
|
@ -47,9 +47,11 @@ list in list:
|
||||||
entity: &, <, >
|
entity: &, <, >
|
||||||
|
|
||||||
code:
|
code:
|
||||||
|
```
|
||||||
int powerof2(unsigned int n) {
|
int powerof2(unsigned int n) {
|
||||||
return !((n - 1) & n) && n > 0;
|
return !((n - 1) & n) && n > 0;
|
||||||
}
|
}
|
||||||
|
```
|
||||||
|
|
||||||
links
|
links
|
||||||
-----
|
-----
|
||||||
|
|
Loading…
Add table
Reference in a new issue