texi2mdoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / texi2mdoc

Diff for /texi2mdoc/main.c between version 1.39 and 1.43

version 1.39, 2015/02/23 20:54:53

version 1.43, 2015/02/24 20:34:43

Line 17

#if defined(__linux__) || defined(__MINT__)

# define _GNU_SOURCE /* memmem */

#endif

#include <sys/mman.h>

#include <sys/stat.h>

#include <assert.h>

#include <ctype.h>

#include <fcntl.h>

#include <getopt.h>

#include <libgen.h>

#include <limits.h>

Line 31

Line 27

#include <stdlib.h>

#include <string.h>

#include <time.h>

#include <unistd.h>

#include "extern.h"

Line 82 static void doverbinclude(struct texi *, enum texicmd,

Line 77 static void doverbinclude(struct texi *, enum texicmd,

static const struct texitok __texitoks[TEXICMD__MAX] = {

/* TEXICMD__BEGIN */

{ doignline, "afourpaper", 10 }, /* TEXICMD_A4PAPER */

{ dosymbol, "AA", 2 }, /* TEXICMD_AA */

{ dosymbol, "aa", 2 }, /* TEXICMD_AASMALL */

{ doignargn, "acronym", 7 }, /* TEXICMD_ACRONYM */

{ doaccent, "'", 1 }, /* TEXICMD_ACUTE */

{ doignline, "afourpaper", 10 }, /* TEXICMD_A4PAPER */

{ dosymbol, "AE", 2 }, /* TEXICMD_AE */

{ dosymbol, "ae", 2 }, /* TEXICMD_AESMALL */

{ doignbracket, "anchor", 6 }, /* TEXICMD_ANCHOR */

{ dosection, "appendix", 8 }, /* TEXICMD_APPENDIX */

{ dosection, "appendixsec", 11 }, /* TEXICMD_APPENDIXSEC */

Line 142 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 141 static const struct texitok __texitoks[TEXICMD__MAX] =

{ dodefn, "defvrx", 6 }, /* TEXICMD_DEFVRX */

{ doignblock, "detailmenu", 10 }, /* TEXICMD_DETAILMENU */

{ doinline, "dfn", 3 }, /* TEXICMD_DFN */

{ dosymbol, "DH", 2 }, /* TEXICMD_DH */

{ dosymbol, "dh", 2 }, /* TEXICMD_DHSMALL */

{ doignline, "dircategory", 11 }, /* TEXICMD_DIRCATEGORY */

{ doignblock, "direntry", 8 }, /* TEXICMD_DIRENTRY */

{ dodisplay, "display", 7 }, /* TEXICMD_DISPLAY */

{ doignbracket, "dmn", 3 }, /* TEXICMD_DMN */

{ doignblock, "documentdescription", 19 }, /* TEXICMD_DOCUMENTDESCRIPTION */

{ doignline, "documentencoding", 16 }, /* TEXICMD_DOCUMENTENCODING */

{ doaccent, "dotaccent", 9 }, /* TEXICMD_DOTACCENT */

{ doaccent, "dotless", 7 }, /* TEXICMD_DOTLESS */

{ dosymbol, "dots", 4 }, /* TEXICMD_DOTS */

{ dolink, "email", 5 }, /* TEXICMD_EMAIL */

{ doinline, "emph", 4 }, /* TEXICMD_EMPH */

Line 155 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 160 static const struct texitok __texitoks[TEXICMD__MAX] =

{ doinline, "env", 3 }, /* TEXICMD_ENV */

{ dosymbol, "equiv", 5 }, /* TEXICMD_EQUIV */

{ dosymbol, "error", 5 }, /* TEXICMD_ERROR */

{ dosymbol, "euro", 4 }, /* TEXICMD_EURO */

{ doexample, "example", 7 }, /* TEXICMD_EXAMPLE */

{ dosymbol, "exclamdown", 10 }, /* TEXICMD_EXCLAMDOWN */

{ doignline, "exdent", 6 }, /* TEXICMD_EXDENT */

{ dosymbol, "expansion", 9 }, /* TEXICMD_EXPANSION */

{ doinline, "file", 4 }, /* TEXICMD_FILE */

Line 164 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 171 static const struct texitok __texitoks[TEXICMD__MAX] =

{ doignbracket, "footnote", 8 }, /* TEXICMD_FOOTNOTE */

{ dotable, "ftable", 6 }, /* TEXICMD_FTABLE */

{ dodisplay, "format", 6 }, /* TEXICMD_FORMAT */

{ dosymbol, "geq", 3 }, /* TEXICMD_GEQ */

{ doaccent, "`", 1 }, /* TEXICMD_GRAVE */

{ doblock, "group", 5 }, /* TEXICMD_GROUP */

{ dosymbol, "guillemetleft", 13 }, /* TEXICMD_GUILLEMETLEFT */

{ dosymbol, "guillemetright", 14 }, /* TEXICMD_GUILLEMETRIGHT */

{ dosymbol, "guillemotleft", 13 }, /* TEXICMD_GUILLEMOTLEFT */

{ dosymbol, "guillemotright", 14 }, /* TEXICMD_GUILLEMOTRIGHT */

{ dosymbol, "guilsinglleft", 13 }, /* TEXICMD_GUILSINGLLEFT */

{ dosymbol, "guilsinglright", 14 }, /* TEXICMD_GUILSINGLRIGHT */

{ doaccent, "H", 1 }, /* TEXICMD_H */

{ dosection, "heading", 7 }, /* TEXICMD_HEADING */

{ doignline, "headings", 8 }, /* TEXICMD_HEADINGS */

{ doitem, "headitem", 8 }, /* TEXICMD_HEADITEM */

Line 198 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 213 static const struct texitok __texitoks[TEXICMD__MAX] =

{ doinline, "kbd", 3 }, /* TEXICMD_KBD */

{ dobracket, "key", 3 }, /* TEXICMD_KEY */

{ doignline, "kindex", 6 }, /* TEXICMD_KINDEX */

{ dosymbol, "L", 1 }, /* TEXICMD_L */

{ dosymbol, "LaTeX", 5 }, /* TEXICMD_LATEX */

{ dosymbol, "leq", 3 }, /* TEXICMD_LEQ */

{ dosecoffs, "lowersections", 13 }, /* TEXICMD_LOWERSECTIONS */

{ dosymbol, "l", 1 }, /* TEXICMD_LSMALL */

{ domacro, "macro", 5 }, /* TEXICMD_MACRO */

{ doaccent, "=", 1 }, /* TEXICMD_MACRON */

{ domath, "math", 4 }, /* TEXICMD_MATH */

{ doignblock, "menu", 4 }, /* TEXICMD_MENU */

{ dosymbol, "minus", 5 }, /* TEXICMD_MINUS */

Line 209 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 228 static const struct texitok __texitoks[TEXICMD__MAX] =

{ dosymbol, "\n", 1 }, /* TEXICMD_NEWLINE */

{ doignline, "node", 4 }, /* TEXICMD_NODE */

{ doignline, "noindent", 8 }, /* TEXICMD_NOINDENT */

{ dosymbol, "O", 1 }, /* TEXICMD_O */

{ dosymbol, "OE", 2 }, /* TEXICMD_OE */

{ dosymbol, "oe", 2 }, /* TEXICMD_OESMALL */

{ doaccent, "ogonek", 6 }, /* TEXICMD_OGONEK */

{ doinline, "option", 6 }, /* TEXICMD_OPTION */

{ dolink, "pxref", 5 }, /* TEXICMD_PXREF */

{ dosymbol, "ordf", 4 }, /* TEXICMD_ORDF */

{ dosymbol, "?", 1 }, /* TEXICMD_QUESTIONMARK */

{ dosymbol, "ordm", 4 }, /* TEXICMD_ORDM */

{ doquotation, "quotation", 9 }, /* TEXICMD_QUOTATION */

{ dosymbol, "o", 1 }, /* TEXICMD_OSMALL */

{ doignline, "page", 4 }, /* TEXICMD_PAGE */

{ doignline, "paragraphindent", 15 }, /* TEXICMD_PARINDENT */

{ dosymbol, ".", 1 }, /* TEXICMD_PERIOD */

{ doignline, "pindex", 6 }, /* TEXICMD_PINDEX */

{ dosymbol, "pounds", 6 }, /* TEXICMD_POUNDS */

{ doignline, "printindex", 10 }, /* TEXICMD_PRINTINDEX */

{ dolink, "pxref", 5 }, /* TEXICMD_PXREF */

{ dosymbol, "questiondown", 12 }, /* TEXICMD_QUESTIONDOWN */

{ dosymbol, "?", 1 }, /* TEXICMD_QUESTIONMARK */

{ doquotation, "quotation", 9 }, /* TEXICMD_QUOTATION */

{ dosymbol, "quotedblbase", 12 }, /* TEXICMD_QUOTEDBLBASE */

{ dosymbol, "quotedblleft", 12 }, /* TEXICMD_QUOTEDBLLEFT */

{ dosymbol, "quotedblright", 13 }, /* TEXICMD_QUOTEDBLRIGHT */

{ dosymbol, "quotesinglbase", 14 }, /* TEXICMD_QUOTESINGLBASE */

{ dosymbol, "quoteleft", 9 }, /* TEXICMD_QUOTELEFT */

{ dosymbol, "quoteright", 10 }, /* TEXICMD_QUOTERIGHT */

{ doinline, "r", 1 }, /* TEXICMD_R */

{ dosecoffs, "raisesections", 13 }, /* TEXICMD_RAISESECTIONS */

{ dobracket, "ref", 3 }, /* TEXICMD_REF */

{ doignline, "refill", 6 }, /* TEXICMD_REFILL */

{ dosymbol, "registeredsymbol", 16 }, /* TEXICMD_REGISTEREDSYMBOL */

{ dosymbol, "result", 6 }, /* TEXICMD_RESULT */

{ doaccent, "ringaccent", 10 }, /* TEXICMD_RINGACCENT */

{ doinline, "samp", 4 }, /* TEXICMD_SAMP */

{ doinline, "sansserif", 9 }, /* TEXICMD_SANSSERIF */

{ dobracket, "sc", 2 }, /* TEXICMD_SC */

Line 260 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 296 static const struct texitok __texitoks[TEXICMD__MAX] =

{ dotable, "table", 5 }, /* TEXICMD_TABLE */

{ doignblock, "tex", 3 }, /* TEXICMD_TEX */

{ dosymbol, "TeX", 3 }, /* TEXICMD_TEXSYM */

{ dosymbol, "textdegree", 10 }, /* TEXICMD_TEXTDEGREE */

{ dosymbol, "TH", 2 }, /* TEXICMD_TH */

{ dosymbol, "th", 2 }, /* TEXICMD_THSMALL */

{ dosymbol, "tie", 3 }, /* TEXICMD_TIE */

{ doaccent, "tieaccent", 9 }, /* TEXICMD_TIEACCENT */

{ doaccent, "~", 1 }, /* TEXICMD_TILDE */

{ doignline, "tindex", 6 }, /* TEXICMD_TINDEX */

{ doignline, "title", 5 }, /* TEXICMD_TITLE */

{ dobracket, "titlefont", 9 }, /* TEXICMD_TITLEFONT */

{ doignblock, "titlepage", 9 }, /* TEXICMD_TITLEPAGE */

{ dotop, "top", 3 }, /* TEXICMD_TOP */

{ doaccent, "u", 1 }, /* TEXICMD_U */

{ doaccent, "ubaraccent", 10 }, /* TEXICMD_UBARACCENT */

{ doaccent, "udotaccent", 10 }, /* TEXICMD_UDOTACCENT */

{ doaccent, "\"", 1 }, /* TEXICMD_UMLAUT */

{ dosection, "unnumbered", 10 }, /* TEXICMD_UNNUMBERED */

{ dosection, "unnumberedsec", 13 }, /* TEXICMD_UNNUMBEREDSEC */

Line 275 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 318 static const struct texitok __texitoks[TEXICMD__MAX] =

{ dolink, "uref", 4 }, /* TEXICMD_UREF */

{ dolink, "url", 3 }, /* TEXICMD_URL */

{ doignline, "", 0 }, /* TEXICMD_USER_INDEX */

{ doaccent, "v", 1 }, /* TEXICMD_V */

{ dovalue, "value", 5 }, /* TEXICMD_VALUE */

{ doinline, "var", 3 }, /* TEXICMD_VAR */

{ doverb, "verb", 4 }, /* TEXICMD_VERB */

Line 672 doverbatim(struct texi *p, enum texicmd cmd,

Line 716 doverbatim(struct texi *p, enum texicmd cmd,

teximacro(p, "Bd -literal -offset indent");

assert(endpos <= sz);

while (*pos < endpos) {

if (buf[*pos] == '\n')

texiputchar(p, buf[*pos]);

p->outcol = 0;

else

p->outcol++;

if (*pos > 0 && '.' == buf[*pos])

if ('\n' == buf[*pos - 1])

fputs("\\&", stdout);

putchar(buf[*pos]);

if ('\\' == buf[*pos])

putchar('e');

advance(p, buf, pos);

}

teximacro(p, "Ed");

Line 889 static void

Line 924 static void

doaccent(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

int brace = 0;

if (*pos == sz)

if (*pos == sz) {

texiwarn(p, "truncated: @%s", texitoks[cmd].tok);

return;

if (p->seenws && p->outcol && 0 == p->literal)

}

/* Pad us with space, if necessary. */

if (p->seenws && p->outcol && 0 == p->literal) {

texiputchar(p, ' ');

p->seenws = 0;

switch (cmd) {

}

case (TEXICMD_CEDILLA):

/* Strange rules... */

* If we're braced, then that's that.

* Otherwise, in a special Texinfo case: if we're a non

* alphabetic command of one letter, then the next character is

* the critical one.

* Otherwise, space can sit between us and our argument.

if ('{' == buf[*pos]) {

brace = 1;

advance(p, buf, pos);

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

while (*pos < sz && isws(buf[*pos]))

advance(p, buf, pos);

if (*pos == sz || '{' != buf[*pos])

return;

if (*pos == sz) {

advance(p, buf, pos);

texiwarn(p, "truncated: @%s", texitoks[cmd].tok);

switch (buf[*pos]) {

return;

case ('c'): case ('C'):

}

texiputchars(p, "\\(,");

texiputchar(p, buf[*pos]);

switch (cmd) {

break;

default:

texiputchar(p, buf[*pos]);

break;

}

advance(p, buf, pos);

break;

case (TEXICMD_ACUTE):

switch (buf[*pos]) {

case ('a'): case ('A'):

Line 922 doaccent(struct texi *p, enum texicmd cmd,

Line 965 doaccent(struct texi *p, enum texicmd cmd,

case ('o'): case ('O'):

case ('u'): case ('U'):

texiputchars(p, "\\(\'");

texiputchar(p, buf[*pos]);

break;

default:

texiputchar(p, buf[*pos]);

texiwarn(p, "ignoring accent");

break;

}

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

break;

case (TEXICMD_CEDILLA):

if ('c' == buf[*pos] || 'C' == buf[*pos])

texiputchars(p, "\\(,");

else

texiwarn(p, "ignoring accent");

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

break;

case (TEXICMD_CIRCUMFLEX):

switch (buf[*pos]) {

case ('a'): case ('A'):

Line 936 doaccent(struct texi *p, enum texicmd cmd,

Line 989 doaccent(struct texi *p, enum texicmd cmd,

case ('o'): case ('O'):

case ('u'): case ('U'):

texiputchars(p, "\\(^");

texiputchar(p, buf[*pos]);

break;

default:

texiputchar(p, buf[*pos]);

texiwarn(p, "ignoring accent");

break;

}

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

break;

case (TEXICMD_DOTLESS):

if ('i' == buf[*pos] || 'j' == buf[*pos])

texiputchars(p, "\\(.");

else

texiwarn(p, "ignoring accent");

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

break;

case (TEXICMD_GRAVE):

switch (buf[*pos]) {

case ('a'): case ('A'):

Line 951 doaccent(struct texi *p, enum texicmd cmd,

Line 1013 doaccent(struct texi *p, enum texicmd cmd,

case ('o'): case ('O'):

case ('u'): case ('U'):

texiputchars(p, "\\(`");

texiputchar(p, buf[*pos]);

break;

default:

texiputchar(p, buf[*pos]);

texiwarn(p, "ignoring accent");

break;

}

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

break;

case (TEXICMD_TILDE):

switch (buf[*pos]) {

Line 963 doaccent(struct texi *p, enum texicmd cmd,

Line 1027 doaccent(struct texi *p, enum texicmd cmd,

case ('n'): case ('N'):

case ('o'): case ('O'):

texiputchars(p, "\\(~");

texiputchar(p, buf[*pos]);

break;

default:

texiputchar(p, buf[*pos]);

texiwarn(p, "ignoring accent");

break;

}

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

break;

case (TEXICMD_UMLAUT):

switch (buf[*pos]) {

Line 979 doaccent(struct texi *p, enum texicmd cmd,

Line 1044 doaccent(struct texi *p, enum texicmd cmd,

case ('u'): case ('U'):

case ('y'):

texiputchars(p, "\\(:");

texiputchar(p, buf[*pos]);

break;

default:

texiputchar(p, buf[*pos]);

texiwarn(p, "ignoring accent");

break;

}

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

break;

default:

abort();

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

break;

}

advance(p, buf, pos);

if (brace) {

while (*pos < sz && '}' != buf[*pos]) {

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

}

if (*pos < sz)

advance(p, buf, pos);

}

switch (cmd) {

case (TEXICMD_TIEACCENT):

texiputchar(p, ']');

break;

case (TEXICMD_DOTACCENT):

texiputchar(p, '*');

break;

default:

break;

}

static void

Line 997 dosymbol(struct texi *p, enum texicmd cmd,

Line 1084 dosymbol(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

if (p->seenws && p->outcol && 0 == p->literal) {

/* Remember to pad us. */

if (p->seenws && p->outcol && 0 == p->literal)

texiputchar(p, ' ');

p->seenws = 0;

}

p->seenws = 0;

switch (cmd) {

case (TEXICMD_AA):

texiputchars(p, "\\(oA");

break;

case (TEXICMD_AASMALL):

texiputchars(p, "\\(oa");

break;

case (TEXICMD_AE):

texiputchars(p, "\\(AE");

break;

case (TEXICMD_AESMALL):

texiputchars(p, "\\(ae");

break;

case (TEXICMD_ASTERISK):

case (TEXICMD_NEWLINE):

case (TEXICMD_SPACE):

Line 1024 dosymbol(struct texi *p, enum texicmd cmd,

Line 1124 dosymbol(struct texi *p, enum texicmd cmd,

case (TEXICMD_COPYRIGHT):

texiputchars(p, "\\(co");

break;

case (TEXICMD_DH):

texiputchars(p, "\\(-D");

break;

case (TEXICMD_DHSMALL):

texiputchars(p, "\\(Sd");

break;

case (TEXICMD_DOTS):

case (TEXICMD_ENDDOTS):

texiputchars(p, "...");

Line 1034 dosymbol(struct texi *p, enum texicmd cmd,

Line 1140 dosymbol(struct texi *p, enum texicmd cmd,

case (TEXICMD_ERROR):

texiputchars(p, "error\\(->");

break;

case (TEXICMD_EURO):

texiputchars(p, "\\(Eu");

break;

case (TEXICMD_EXCLAMDOWN):

texiputchars(p, "\\(r!");

break;

case (TEXICMD_EXPANSION):

texiputchars(p, "\\(->");

break;

case (TEXICMD_GEQ):

texiputchars(p, "\\(>=");

break;

case (TEXICMD_GUILLEMETLEFT):

case (TEXICMD_GUILLEMOTLEFT):

texiputchars(p, "\\(Fo");

break;

case (TEXICMD_GUILLEMETRIGHT):

case (TEXICMD_GUILLEMOTRIGHT):

texiputchars(p, "\\(Fc");

break;

case (TEXICMD_GUILSINGLLEFT):

texiputchars(p, "\\(fo");

break;

case (TEXICMD_GUILSINGLRIGHT):

texiputchars(p, "\\(fc");

break;

case (TEXICMD_L):

texiputchars(p, "\\(/L");

break;

case (TEXICMD_LATEX):

texiputchars(p, "LaTeX");

break;

case (TEXICMD_LEQ):

texiputchars(p, "\\(<=");

break;

case (TEXICMD_LSMALL):

texiputchars(p, "\\(/l");

break;

case (TEXICMD_MINUS):

texiputchars(p, "\\-");

break;

case (TEXICMD_O):

texiputchars(p, "\\(/O");

break;

case (TEXICMD_OE):

texiputchars(p, "\\(OE");

break;

case (TEXICMD_OESMALL):

texiputchars(p, "\\(oe");

break;

case (TEXICMD_ORDF):

texiputchars(p, "a");

break;

case (TEXICMD_ORDM):

texiputchars(p, "o");

break;

case (TEXICMD_OSMALL):

texiputchars(p, "\\(/o");

break;

case (TEXICMD_PERIOD):

texiputchar(p, '.');

break;

case (TEXICMD_POUNDS):

texiputchars(p, "\\(Po");

break;

case (TEXICMD_QUESTIONDOWN):

texiputchars(p, "\\(r?");

break;

case (TEXICMD_QUESTIONMARK):

texiputchar(p, '?');

break;

case (TEXICMD_QUOTEDBLBASE):

texiputchars(p, "\\(Bq");

break;

case (TEXICMD_QUOTEDBLLEFT):

texiputchars(p, "\\(lq");

break;

case (TEXICMD_QUOTEDBLRIGHT):

texiputchars(p, "\\(rq");

break;

case (TEXICMD_QUOTESINGLBASE):

texiputchars(p, "\\(bq");

break;

case (TEXICMD_QUOTELEFT):

texiputchars(p, "\\(oq");

break;

case (TEXICMD_QUOTERIGHT):

texiputchars(p, "\\(cq");

break;

case (TEXICMD_REGISTEREDSYMBOL):

texiputchars(p, "\\(rg");

break;

case (TEXICMD_RESULT):

texiputchars(p, "\\(rA");

break;

Line 1067 dosymbol(struct texi *p, enum texicmd cmd,

Line 1250 dosymbol(struct texi *p, enum texicmd cmd,

case (TEXICMD_TEXSYM):

texiputchars(p, "TeX");

break;

case (TEXICMD_TEXTDEGREE):

texiputchars(p, "\\(de");

break;

case (TEXICMD_TH):

texiputchars(p, "\\(TP");

break;

case (TEXICMD_THSMALL):

texiputchars(p, "\\(Tp");

break;

case (TEXICMD_TIE):

texiputchars(p, "\\ ");

break;

Line 1077 dosymbol(struct texi *p, enum texicmd cmd,

Line 1269 dosymbol(struct texi *p, enum texicmd cmd,

abort();

}

if (texitoks[cmd].len > 1)

/* Alphabetic commands have braces we ignore. */

if (isalpha(texitoks[cmd].tok[0]))

doignbracket(p, cmd, buf, sz, pos);

}

Line 1398 dotop(struct texi *p, enum texicmd cmd,

Line 1591 dotop(struct texi *p, enum texicmd cmd,

teximacro(p, "Os");

teximacro(p, "Sh NAME");

teximacroopen(p, "Nm");

texiputchars(p, p->title);

for (cp = p->title; '\0' != *cp; cp++)

texiputchar(p, *cp);

teximacroclose(p);

teximacroopen(p, "Nd");

texiputchars(p, NULL != p->subtitle ?

if (NULL != p->subtitle)

p->subtitle : "Unknown description");

for (cp = p->subtitle; '\0' != *cp; cp++)

texiputchar(p, *cp);

else

texiputchars(p, "Unknown description");

teximacroclose(p);

p->seenvs = 1;

dosection(p, cmd, buf, sz, pos);

Line 1597 doignline(struct texi *p, enum texicmd cmd,

Line 1794 doignline(struct texi *p, enum texicmd cmd,

* Parse colon-separated directories from "cp" (if not NULL) and returns

* the array of pointers.

* Prepends "base" to the array.

* Prepends "base" to the array, if found.

* This does NOT sanitise the directories!

static char **

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

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

{

char *tok, *str, *tofree;

const char *cpp;

size_t i;

size_t i = 0;

char **dirs;

*sz = NULL != (cpp = cp) ? 2 : 1;

/* Count up our expected arguments. */

if (*sz > 1)

*sz = NULL != base;

for ( ; NULL != (cpp = strchr(cpp, ':')); (*sz)++)

if (NULL != (cpp = cp))

for ((*sz)++; NULL != (cpp = strchr(cpp, ':')); (*sz)++)

cpp++;

if (0 == *sz)

return(NULL);

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

texiabort(p, NULL);

else if (NULL == (dirs[0] = strdup(base)))

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 (i = 1; NULL != (tok = strsep(&str, ":")); i++)

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

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

texiabort(p, NULL);

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

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

++progname;

memset(&texi, 0, sizeof(struct texi));

texi.ign = 1;

Idir = NULL;

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

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

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

}

argv += optind;

if (0 == (argc -= optind))

argc -= optind;

goto usage;

if (NULL == (dirpath = strdup(argv[0])))

if (argc > 0) {

texiabort(&texi, NULL);

if (NULL == (dirpath = strdup(argv[0])))

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

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]);

if (NULL == texi.title)

texiabort(&texi, NULL);

else if (NULL != (ccp = strchr(texi.title, '.')))

*ccp = '\0';

texi.dirs = parsedirs(&texi, dir, Idir, &texi.dirsz);

free(dirpath);

parsefile(&texi, argv[0], 1);

} else {

texi.title = strdup("Unknown Manual");

texi.dirs = parsedirs(&texi, NULL, Idir, &texi.dirsz);

parsestdin(&texi);

}

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

texi.title = strdup(cp + 1);

else

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

if (NULL == texi.title)

texiabort(&texi, NULL);

else if (NULL != (ccp = strchr(texi.title, '.')))

*ccp = '\0';

texi.ign = 1;

texi.dirs = parsedirs(&texi, dir, Idir, &texi.dirsz);

free(dirpath);

parsefile(&texi, argv[0], 1);

/* We shouldn't get here. */

texiexit(&texi);

return(EXIT_FAILURE);

usage:

fprintf(stderr, "usage: %s [-Idirs] file\n", progname);

fprintf(stderr, "usage: %s [-Idirs] [file]\n", progname);

return(EXIT_FAILURE);

}

CVSweb