texi2mdoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / texi2mdoc

Diff for /texi2mdoc/main.c between version 1.70 and 1.71

version 1.70, 2015/03/13 08:13:21

version 1.71, 2015/03/19 09:53:35

Line 376 dodefindex(struct texi *p, enum texicmd cmd, size_t *p

if (*pos == BUFSZ(p)) {

texiwarn(p, "unexpected EOF");

return;

}

if (0 == *pos - start)

texiwarn(p, "zero-length index definition");

else

Line 464 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

case (TEXICMD_DEFMAC):

case (TEXICMD_DEFMACX):

teximacroopen(p, "Dv");

while (parselinearg(p, pos))

/* Spin. */ ;

teximacroclose(p);

break;

Line 476 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

parselinearg(p, pos);

teximacroclose(p);

teximacroopen(p, "Fa");

while (parselinearg(p, pos))

/* Spin. */ ;

teximacroclose(p);

teximacro(p, "Fc");

Line 496 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

parselinearg(p, pos);

teximacroclose(p);

teximacroopen(p, "Fa");

while (parselinearg(p, pos))

/* Spin. */ ;

teximacroclose(p);

teximacro(p, "Fc");

Line 508 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

case (TEXICMD_DEFTYPEVR):

case (TEXICMD_DEFTYPEVRX):

teximacroopen(p, "Vt");

while (parselinearg(p, pos))

/* Spin. */ ;

teximacroclose(p);

break;

Line 519 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

case (TEXICMD_DEFVR):

case (TEXICMD_DEFVRX):

teximacroopen(p, "Va");

while (parselinearg(p, pos))

/* Spin. */ ;

teximacroclose(p);

break;

Line 639 domacro(struct texi *p, enum texicmd cmd, size_t *pos)

while (&BUF(p)[*pos] != blk)

advance(p, pos);

assert('@' == BUF(p)[*pos]);

if ('\n' != BUF(p)[*pos - 1])

texierr(p, "cannot handle @end macro in-line");

len = blk - &BUF(p)[start];

Line 651 domacro(struct texi *p, enum texicmd cmd, size_t *pos)

p->macros = realloc

(p->macros,

(p->macrosz + 1) *

sizeof(struct teximacro));

if (NULL == p->macros)

texiabort(p, NULL);

Line 667 doignblock(struct texi *p, enum texicmd cmd, size_t *p

const char *endt, *startt;

size_t esz, ssz, newpos, stack;

* FIXME: this is cheating.

* These tokens are supposed to begin on a newline.

* However, if we do that, then we would need to check within

* the loop for trailer (or leading, as the case may be)

* newline, and that's just a bit too complicated right now.

* This is becasue

* @ifset BAR

* @ifset FOO

* @end ifset

* won't work right now: we'd read after the first "@end ifset"

* to the next line, then look for the next line after that.

ssz = snprintf(start, sizeof(start),

"@%s", texitoks[cmd].tok);

assert(ssz < sizeof(start));

esz = snprintf(end, sizeof(end),

"@end %s", texitoks[cmd].tok);

assert(esz < sizeof(end));

stack = 1;

Line 706 doignblock(struct texi *p, enum texicmd cmd, size_t *p

"block", texitoks[cmd].tok);

*pos = BUFSZ(p);

break;

}

newpos = *pos;

if (NULL == startt || startt > endt) {

Line 726 doignblock(struct texi *p, enum texicmd cmd, size_t *p

static void

doblock(struct texi *p, enum texicmd cmd, size_t *pos)

{

parseto(p, pos, texitoks[cmd].tok);

}

Line 782 doinline(struct texi *p, enum texicmd cmd, size_t *pos

return;

}

* If we haven't seen any whitespace, then we don't want the

* subsequent macro to insert any whitespace.

if (p->outmacro && 0 == p->seenws) {

teximacroopen(p, "Ns");

Line 829 doverb(struct texi *p, enum texicmd cmd, size_t *pos)

start = *pos;

/* Read until we see the delimiter then end-brace. */

while (*pos < BUFSZ(p) - 1) {

if (BUF(p)[*pos] == delim && BUF(p)[*pos + 1] == '}')

break;

advance(p, pos);

}

Line 941 doverbatim(struct texi *p, enum texicmd cmd, size_t *p

static void

doverbinclude(struct texi *p, enum texicmd cmd, size_t *pos)

{

char fname[PATH_MAX], path[PATH_MAX];

int rc;

size_t i, end;

const char *v;

enum texicmd type;

Line 960 doverbinclude(struct texi *p, enum texicmd cmd, size_t

}

type = texicmd(p, *pos, &end, NULL);

advanceto(p, pos, end);

if (TEXICMD_VALUE != type)

texierr(p, "unknown verbatiminclude command");

v = valueblookup(p, pos);

if (NULL == v)

Line 985 doverbinclude(struct texi *p, enum texicmd cmd, size_t

if (strstr(fname, "../") || strstr(fname, "/.."))

texierr(p, "insecure path");

rc = snprintf(path, sizeof(path),

"%s/%s", p->dirs[0], fname);

if (rc < 0)

texierr(p, "couldn't format path");

else if ((size_t)rc >= sizeof(path))

texierr(p, "path too long");

Line 998 doverbinclude(struct texi *p, enum texicmd cmd, size_t

static void

doinclude(struct texi *p, enum texicmd cmd, size_t *pos)

{

char fname[PATH_MAX], path[PATH_MAX];

size_t i, end;

int rc;

const char *v;

enum texicmd type;

Line 1018 doinclude(struct texi *p, enum texicmd cmd, size_t *po

}

type = texicmd(p, *pos, &end, NULL);

advanceto(p, pos, end);

if (TEXICMD_VALUE != type)

texierr(p, "unknown include command");

v = valueblookup(p, pos);

if (NULL == v)

Line 1044 doinclude(struct texi *p, enum texicmd cmd, size_t *po

texierr(p, "insecure path");

for (i = 0; i < p->dirsz; i++) {

rc = snprintf(path, sizeof(path),

"%s/%s", p->dirs[i], fname);

if (rc < 0)

texierr(p, "couldn't format path");

else if ((size_t)rc >= sizeof(path))

texierr(p, "path too long");

Line 1167 doaccent(struct texi *p, enum texicmd cmd, size_t *pos

if ('{' == BUF(p)[*pos]) {

brace = 1;

advance(p, pos);

} else if (isalpha((unsigned char)texitoks[cmd].tok[0]))

while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))

advance(p, pos);

Line 1285 doaccent(struct texi *p, enum texicmd cmd, size_t *pos

}

if (*pos < BUFSZ(p))

advance(p, pos);

}

switch (cmd) {

case (TEXICMD_TIEACCENT):

Line 1499 dosymbol(struct texi *p, enum texicmd cmd, size_t *pos

static void

doquotation(struct texi *p, enum texicmd cmd, size_t *pos)

{

teximacro(p, "Qo");

parseto(p, pos, "quotation");

teximacro(p, "Qc");

Line 1517 static void

doprintindex(struct texi *p, enum texicmd cmd, size_t *pos)

{

static size_t guard = 0;

size_t i, j, start, end, len;

#if HAVE_INDEX

char *cp;

char buf[PATH_MAX];

Line 1567 doprintindex(struct texi *p, enum texicmd cmd, size_t

}

/* Alphabetically sort our indices. */

qsort(p->indexs[i].index,

p->indexs[i].indexsz,

sizeof(struct texiterm), indexcmp);

texivspace(p);

Line 1598 doprintindex(struct texi *p, enum texicmd cmd, size_t

p->literal++;

}

#endif

texisplice(p, p->indexs[i].index[j].term,

strlen(p->indexs[i].index[j].term), *pos);

parseeoln(p, pos);

#if HAVE_INDEX

Line 1649 donode(struct texi *p, enum texicmd cmd, size_t *pos)

p->nodecur = texicache(p, &BUF(p)[start], end - start);

if (NULL != p->chapters) {

snprintf(fname, sizeof(fname),

"%s-%zd.7", p->chapters, p->nodecur);

p->outfile = fopen(fname, "w");

if (NULL == p->outfile)

Line 1679 domenu(struct texi *p, enum texicmd cmd, size_t *pos)

{

size_t nodename, entryname;

size_t nodenameend, entrynameend, i;

ssize_t ppos, lastppos;

char buf[PATH_MAX];

enum texicmd tcmd;

advanceeoln(p, pos, 1);

* Parse past initial stuff.

* TODO: the manual says we're supposed to make this in bold or

* something.

Line 1705 domenu(struct texi *p, enum texicmd cmd, size_t *pos)

texivspace(p);

teximacro(p, "Bl -tag -width Ds -compact");

while (*pos < BUFSZ(p)) {

* Read to next menu item.

* We simply parse every line until we get a magic '*'.

* These lines might occur interspersed OR as the

* description of an entry.

Line 1723 domenu(struct texi *p, enum texicmd cmd, size_t *pos)

tcmd = peeklinecmd(p, *pos);

if (TEXICMD_END == tcmd)

break;

else if (TEXICMD_COMMENT == tcmd)

advanceeoln(p, pos, 1);

else

parseeoln(p, pos);

continue;

}

/* Now we're parsing a menu item. */

advance(p, pos);

Line 1763 domenu(struct texi *p, enum texicmd cmd, size_t *pos)

if (*pos + 1 == BUFSZ(p)) {

advance(p, pos);

continue;

}

if (' ' == BUF(p)[*pos + 1]) {

advance(p, pos);

break;

Line 1782 domenu(struct texi *p, enum texicmd cmd, size_t *pos)

nodename = entryname;

nodenameend = entrynameend;

}

ppos = texicache(p, &BUF(p)[nodename],

nodenameend - nodename);

if (-1 != lastppos)

p->nodecache[lastppos].next = ppos;

Line 1801 domenu(struct texi *p, enum texicmd cmd, size_t *pos)

texiputchars(p, "\"");

teximacroclose(p);

} else {

snprintf(buf, sizeof(buf),

"%s-%zd 7 ", p->chapters, ppos);

teximacroopen(p, "Xr");

texiputchars(p, buf);

Line 2019 dosection(struct texi *p, enum texicmd cmd, size_t *po

if (sec < 2)

p->seenvs = -1;

else

texivspace(p);

teximacroopen(p, sects[sec]);

Line 2052 doitem(struct texi *p, enum texicmd cmd, size_t *pos)

if (p->outcol > 0)

texiputchar(p, '\n');

return;

}

if (p->outmacro)

texierr(p, "item in open line scope!?");

else if (p->literal)

Line 2101 domultitable(struct texi *p, enum texicmd cmd, size_t

texivspace(p);

p->list = TEXILIST_TABLE;

* TS/TE blocks aren't "in mdoc(7)", so we can disregard the

* fact that we're in literal mode right now.

Line 2116 domultitable(struct texi *p, enum texicmd cmd, size_t

/* Make sure we don't print anything when scanning. */

p->ign++;

if (*pos < BUFSZ(p) && '@' == BUF(p)[*pos]) {

* Look for @columnfractions.

* We ignore these, but we do use the number of

* arguments to set the number of columns that we'll

Line 2124 domultitable(struct texi *p, enum texicmd cmd, size_t

type = texicmd(p, *pos, &end, NULL);

advanceto(p, pos, end);

if (TEXICMD_COLUMNFRACTIONS != type)

texierr(p, "unknown multitable command");

while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) {

while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))

Line 2136 domultitable(struct texi *p, enum texicmd cmd, size_t

}

columns++;

}

} else

* We have arguments.

* We could parse these, but it's easier to just let

Line 2193 doend(struct texi *p, enum texicmd cmd, size_t *pos)

while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos])

advance(p, pos);

texiwarn(p, "unexpected \"end\": %.*s",

(int)(*pos - start), &BUF(p)[start]);

advanceeoln(p, pos, 1);

}

Line 2307 doignline(struct texi *p, enum texicmd cmd, size_t *po

static char **

parsedirs(struct texi *p, const char *base, const char *cp, size_t *sz)

{

char *tok, *str, *tofree;

const char *cpp;

size_t i = 0;

char **dirs;

/* Count up our expected arguments. */

Line 2322 parsedirs(struct texi *p, const char *base, const char

return(NULL);

if (NULL == (dirs = calloc(*sz, sizeof(char *))))

texiabort(p, NULL);

if (NULL != base && NULL == (dirs[i++] = strdup(base)))

texiabort(p, NULL);

if (NULL == cp)

return(dirs);

if (NULL == (tofree = tok = str = strdup(cp)))

texiabort(p, NULL);

for ( ; NULL != (tok = strsep(&str, ":")); i++)

if (NULL == (dirs[i] = strdup(tok)))

texiabort(p, NULL);

free(tofree);

Line 2357 main(int argc, char *argv[])

texi.seenvs = -1;

Idir = NULL;

while (-1 != (c = getopt(argc, argv, "C:I:")))

switch (c) {

case ('C'):

texi.chapters = optarg;

Line 2383 main(int argc, char *argv[])

texiabort(&texi, NULL);

if (NULL == (dir = dirname(dirpath)))

texiabort(&texi, NULL);

if (NULL != (cp = strrchr(argv[0], '/')))

texi.title = strdup(cp + 1);

else

texi.title = strdup(argv[0]);

CVSweb