version 1.66, 2015/03/11 12:51:41 |
version 1.71, 2015/03/19 09:53:35 |
Line 76 static void donode(struct texi *, enum texicmd, size_t |
|
Line 76 static void donode(struct texi *, enum texicmd, size_t |
|
static void doprintindex(struct texi *, enum texicmd, size_t *); |
static void doprintindex(struct texi *, enum texicmd, size_t *); |
static void doquotation(struct texi *, enum texicmd, size_t *); |
static void doquotation(struct texi *, enum texicmd, size_t *); |
static void dotable(struct texi *, enum texicmd, size_t *); |
static void dotable(struct texi *, enum texicmd, size_t *); |
static void dotop(struct texi *, enum texicmd, size_t *); |
|
static void dosecoffs(struct texi *, enum texicmd, size_t *); |
static void dosecoffs(struct texi *, enum texicmd, size_t *); |
static void dosection(struct texi *, enum texicmd, size_t *); |
static void dosection(struct texi *, enum texicmd, size_t *); |
static void dosp(struct texi *, enum texicmd, size_t *); |
static void dosp(struct texi *, enum texicmd, size_t *); |
Line 135 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
Line 134 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
{ dodefindex, "defindex", 8 }, /* TEXICMD_DEFINDEX */ |
{ dodefindex, "defindex", 8 }, /* TEXICMD_DEFINDEX */ |
{ dodefn, "defmac", 6 }, /* TEXICMD_DEFMAC */ |
{ dodefn, "defmac", 6 }, /* TEXICMD_DEFMAC */ |
{ dodefn, "defmacx", 7 }, /* TEXICMD_DEFMACX */ |
{ dodefn, "defmacx", 7 }, /* TEXICMD_DEFMACX */ |
|
{ dodefn, "defop", 5 }, /* TEXICMD_DEFOP */ |
|
{ dodefn, "defopx", 6 }, /* TEXICMD_DEFOPX */ |
|
{ dodefn, "defopt", 6 }, /* TEXICMD_DEFOPT */ |
|
{ dodefn, "defoptx", 7 }, /* TEXICMD_DEFOPTX */ |
{ dodefn, "deftp", 5 }, /* TEXICMD_DEFTP */ |
{ dodefn, "deftp", 5 }, /* TEXICMD_DEFTP */ |
{ dodefn, "deftpx", 6 }, /* TEXICMD_DEFTPX */ |
{ dodefn, "deftpx", 6 }, /* TEXICMD_DEFTPX */ |
{ dodefn, "deftypefn", 9 }, /* TEXICMD_DEFTYPEFN */ |
{ dodefn, "deftypefn", 9 }, /* TEXICMD_DEFTYPEFN */ |
Line 153 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
Line 156 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
{ dodefn, "defvarx", 7 }, /* TEXICMD_DEFVARX */ |
{ dodefn, "defvarx", 7 }, /* TEXICMD_DEFVARX */ |
{ dodefn, "defvr", 5 }, /* TEXICMD_DEFVR */ |
{ dodefn, "defvr", 5 }, /* TEXICMD_DEFVR */ |
{ dodefn, "defvrx", 6 }, /* TEXICMD_DEFVRX */ |
{ dodefn, "defvrx", 6 }, /* TEXICMD_DEFVRX */ |
{ domenu, "detailmenu", 10 }, /* TEXICMD_DETAILMENU */ |
{ doignblock, "detailmenu", 10 }, /* TEXICMD_DETAILMENU */ |
{ doinline, "dfn", 3 }, /* TEXICMD_DFN */ |
{ doinline, "dfn", 3 }, /* TEXICMD_DFN */ |
{ dosymbol, "DH", 2 }, /* TEXICMD_DH */ |
{ dosymbol, "DH", 2 }, /* TEXICMD_DH */ |
{ dosymbol, "dh", 2 }, /* TEXICMD_DHSMALL */ |
{ dosymbol, "dh", 2 }, /* TEXICMD_DHSMALL */ |
Line 326 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
Line 329 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
{ doignline, "title", 5 }, /* TEXICMD_TITLE */ |
{ doignline, "title", 5 }, /* TEXICMD_TITLE */ |
{ dobracket, "titlefont", 9 }, /* TEXICMD_TITLEFONT */ |
{ dobracket, "titlefont", 9 }, /* TEXICMD_TITLEFONT */ |
{ doignblock, "titlepage", 9 }, /* TEXICMD_TITLEPAGE */ |
{ doignblock, "titlepage", 9 }, /* TEXICMD_TITLEPAGE */ |
{ dotop, "top", 3 }, /* TEXICMD_TOP */ |
{ dosection, "top", 3 }, /* TEXICMD_TOP */ |
{ doindex, "tpindex", 7 }, /* TEXICMD_TPINDEX */ |
{ doindex, "tpindex", 7 }, /* TEXICMD_TPINDEX */ |
{ doaccent, "u", 1 }, /* TEXICMD_U */ |
{ doaccent, "u", 1 }, /* TEXICMD_U */ |
{ doaccent, "ubaraccent", 10 }, /* TEXICMD_UBARACCENT */ |
{ doaccent, "ubaraccent", 10 }, /* TEXICMD_UBARACCENT */ |
Line 373 dodefindex(struct texi *p, enum texicmd cmd, size_t *p |
|
Line 376 dodefindex(struct texi *p, enum texicmd cmd, size_t *p |
|
if (*pos == BUFSZ(p)) { |
if (*pos == BUFSZ(p)) { |
texiwarn(p, "unexpected EOF"); |
texiwarn(p, "unexpected EOF"); |
return; |
return; |
} |
} |
if (0 == *pos - start) |
if (0 == *pos - start) |
texiwarn(p, "zero-length index definition"); |
texiwarn(p, "zero-length index definition"); |
else |
else |
Line 394 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 397 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
switch (cmd) { |
switch (cmd) { |
case (TEXICMD_DEFFN): |
case (TEXICMD_DEFFN): |
case (TEXICMD_DEFMAC): |
case (TEXICMD_DEFMAC): |
|
case (TEXICMD_DEFOP): |
|
case (TEXICMD_DEFOPT): |
case (TEXICMD_DEFTP): |
case (TEXICMD_DEFTP): |
case (TEXICMD_DEFTYPEFN): |
case (TEXICMD_DEFTYPEFN): |
case (TEXICMD_DEFTYPEFUN): |
case (TEXICMD_DEFTYPEFUN): |
Line 430 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 435 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
case (TEXICMD_DEFMACX): |
case (TEXICMD_DEFMACX): |
texiputchars(p, "Macro"); |
texiputchars(p, "Macro"); |
break; |
break; |
|
case (TEXICMD_DEFOPT): |
|
case (TEXICMD_DEFOPTX): |
|
texiputchars(p, "User Option"); |
|
break; |
case (TEXICMD_DEFTYPEVAR): |
case (TEXICMD_DEFTYPEVAR): |
case (TEXICMD_DEFTYPEVARX): |
case (TEXICMD_DEFTYPEVARX): |
case (TEXICMD_DEFVAR): |
case (TEXICMD_DEFVAR): |
Line 455 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 464 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
case (TEXICMD_DEFMAC): |
case (TEXICMD_DEFMAC): |
case (TEXICMD_DEFMACX): |
case (TEXICMD_DEFMACX): |
teximacroopen(p, "Dv"); |
teximacroopen(p, "Dv"); |
while (parselinearg(p, pos)) |
while (parselinearg(p, pos)) |
/* Spin. */ ; |
/* Spin. */ ; |
teximacroclose(p); |
teximacroclose(p); |
break; |
break; |
Line 467 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 476 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
parselinearg(p, pos); |
parselinearg(p, pos); |
teximacroclose(p); |
teximacroclose(p); |
teximacroopen(p, "Fa"); |
teximacroopen(p, "Fa"); |
while (parselinearg(p, pos)) |
while (parselinearg(p, pos)) |
/* Spin. */ ; |
/* Spin. */ ; |
teximacroclose(p); |
teximacroclose(p); |
teximacro(p, "Fc"); |
teximacro(p, "Fc"); |
break; |
break; |
|
case (TEXICMD_DEFOP): |
|
case (TEXICMD_DEFOPX): |
case (TEXICMD_DEFTYPEFUN): |
case (TEXICMD_DEFTYPEFUN): |
case (TEXICMD_DEFTYPEFUNX): |
case (TEXICMD_DEFTYPEFUNX): |
case (TEXICMD_DEFTYPEFN): |
case (TEXICMD_DEFTYPEFN): |
Line 485 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 496 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
parselinearg(p, pos); |
parselinearg(p, pos); |
teximacroclose(p); |
teximacroclose(p); |
teximacroopen(p, "Fa"); |
teximacroopen(p, "Fa"); |
while (parselinearg(p, pos)) |
while (parselinearg(p, pos)) |
/* Spin. */ ; |
/* Spin. */ ; |
teximacroclose(p); |
teximacroclose(p); |
teximacro(p, "Fc"); |
teximacro(p, "Fc"); |
Line 497 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 508 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
case (TEXICMD_DEFTYPEVR): |
case (TEXICMD_DEFTYPEVR): |
case (TEXICMD_DEFTYPEVRX): |
case (TEXICMD_DEFTYPEVRX): |
teximacroopen(p, "Vt"); |
teximacroopen(p, "Vt"); |
while (parselinearg(p, pos)) |
while (parselinearg(p, pos)) |
/* Spin. */ ; |
/* Spin. */ ; |
teximacroclose(p); |
teximacroclose(p); |
break; |
break; |
|
case (TEXICMD_DEFOPT): |
|
case (TEXICMD_DEFOPTX): |
case (TEXICMD_DEFVAR): |
case (TEXICMD_DEFVAR): |
case (TEXICMD_DEFVARX): |
case (TEXICMD_DEFVARX): |
case (TEXICMD_DEFVR): |
case (TEXICMD_DEFVR): |
case (TEXICMD_DEFVRX): |
case (TEXICMD_DEFVRX): |
teximacroopen(p, "Va"); |
teximacroopen(p, "Va"); |
while (parselinearg(p, pos)) |
while (parselinearg(p, pos)) |
/* Spin. */ ; |
/* Spin. */ ; |
teximacroclose(p); |
teximacroclose(p); |
break; |
break; |
Line 532 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 545 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
switch (peekcmd(p, *pos)) { |
switch (peekcmd(p, *pos)) { |
case (TEXICMD_DEFFNX): |
case (TEXICMD_DEFFNX): |
case (TEXICMD_DEFMACX): |
case (TEXICMD_DEFMACX): |
|
case (TEXICMD_DEFOPX): |
|
case (TEXICMD_DEFOPTX): |
case (TEXICMD_DEFTPX): |
case (TEXICMD_DEFTPX): |
case (TEXICMD_DEFTYPEFNX): |
case (TEXICMD_DEFTYPEFNX): |
case (TEXICMD_DEFTYPEFUNX): |
case (TEXICMD_DEFTYPEFUNX): |
Line 592 domacro(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 607 domacro(struct texi *p, enum texicmd cmd, size_t *pos) |
|
m.key[end - start] = '\0'; |
m.key[end - start] = '\0'; |
|
|
m.args = argparse(p, pos, &m.argsz, 0); |
m.args = argparse(p, pos, &m.argsz, 0); |
|
if (*pos == BUFSZ(p)) { |
|
texiwarn(p, "unexpected EOF"); |
|
return; |
|
} |
|
|
/* Note: we advance to the beginning of the macro. */ |
/* Note: we advance to the beginning of the macro. */ |
advanceeoln(p, pos, 1); |
advanceeoln(p, pos, 1); |
|
if ((start = *pos) == BUFSZ(p)) { |
|
texiwarn(p, "unexpected EOF"); |
|
return; |
|
} |
|
|
/* |
/* |
* According to the Texinfo manual, the macro ends on the |
* According to the Texinfo manual, the macro ends on the |
Line 607 domacro(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 630 domacro(struct texi *p, enum texicmd cmd, size_t *pos) |
|
* @end macro without the leading newline else we might look |
* @end macro without the leading newline else we might look |
* past empty macros. |
* past empty macros. |
*/ |
*/ |
start = *pos; |
|
endtok = "@end macro\n"; |
endtok = "@end macro\n"; |
endtoksz = strlen(endtok); |
endtoksz = strlen(endtok); |
blk = memmem(&BUF(p)[start], BUFSZ(p) - start, endtok, endtoksz); |
blk = memmem(&BUF(p)[start], BUFSZ(p) - start, endtok, endtoksz); |
Line 617 domacro(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 639 domacro(struct texi *p, enum texicmd cmd, size_t *pos) |
|
while (&BUF(p)[*pos] != blk) |
while (&BUF(p)[*pos] != blk) |
advance(p, pos); |
advance(p, pos); |
assert('@' == BUF(p)[*pos]); |
assert('@' == BUF(p)[*pos]); |
if ('\n' != BUF(p)[*pos - 1]) |
if ('\n' != BUF(p)[*pos - 1]) |
texierr(p, "cannot handle @end macro in-line"); |
texierr(p, "cannot handle @end macro in-line"); |
|
|
len = blk - &BUF(p)[start]; |
len = blk - &BUF(p)[start]; |
Line 629 domacro(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 651 domacro(struct texi *p, enum texicmd cmd, size_t *pos) |
|
|
|
p->macros = realloc |
p->macros = realloc |
(p->macros, |
(p->macros, |
(p->macrosz + 1) * |
(p->macrosz + 1) * |
sizeof(struct teximacro)); |
sizeof(struct teximacro)); |
if (NULL == p->macros) |
if (NULL == p->macros) |
texiabort(p, NULL); |
texiabort(p, NULL); |
Line 645 doignblock(struct texi *p, enum texicmd cmd, size_t *p |
|
Line 667 doignblock(struct texi *p, enum texicmd cmd, size_t *p |
|
const char *endt, *startt; |
const char *endt, *startt; |
size_t esz, ssz, newpos, stack; |
size_t esz, ssz, newpos, stack; |
|
|
/* |
/* |
* FIXME: this is cheating. |
* FIXME: this is cheating. |
* These tokens are supposed to begin on a newline. |
* These tokens are supposed to begin on a newline. |
* However, if we do that, then we would need to check within |
* However, if we do that, then we would need to check within |
* the loop for trailer (or leading, as the case may be) |
* the loop for trailer (or leading, as the case may be) |
* newline, and that's just a bit too complicated right now. |
* newline, and that's just a bit too complicated right now. |
* This is becasue |
* This is becasue |
* @ifset BAR |
* @ifset BAR |
* @ifset FOO |
* @ifset FOO |
* @end ifset |
* @end ifset |
* @end ifset |
* @end ifset |
* won't work right now: we'd read after the first "@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. |
* to the next line, then look for the next line after that. |
*/ |
*/ |
ssz = snprintf(start, sizeof(start), |
ssz = snprintf(start, sizeof(start), |
"@%s", texitoks[cmd].tok); |
"@%s", texitoks[cmd].tok); |
assert(ssz < sizeof(start)); |
assert(ssz < sizeof(start)); |
esz = snprintf(end, sizeof(end), |
esz = snprintf(end, sizeof(end), |
"@end %s\n", texitoks[cmd].tok); |
"@end %s", texitoks[cmd].tok); |
assert(esz < sizeof(end)); |
assert(esz < sizeof(end)); |
stack = 1; |
stack = 1; |
|
|
Line 684 doignblock(struct texi *p, enum texicmd cmd, size_t *p |
|
Line 706 doignblock(struct texi *p, enum texicmd cmd, size_t *p |
|
"block", texitoks[cmd].tok); |
"block", texitoks[cmd].tok); |
*pos = BUFSZ(p); |
*pos = BUFSZ(p); |
break; |
break; |
} |
} |
|
|
newpos = *pos; |
newpos = *pos; |
if (NULL == startt || startt > endt) { |
if (NULL == startt || startt > endt) { |
Line 704 doignblock(struct texi *p, enum texicmd cmd, size_t *p |
|
Line 726 doignblock(struct texi *p, enum texicmd cmd, size_t *p |
|
static void |
static void |
doblock(struct texi *p, enum texicmd cmd, size_t *pos) |
doblock(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
|
|
parseto(p, pos, texitoks[cmd].tok); |
parseto(p, pos, texitoks[cmd].tok); |
} |
} |
|
|
Line 760 doinline(struct texi *p, enum texicmd cmd, size_t *pos |
|
Line 782 doinline(struct texi *p, enum texicmd cmd, size_t *pos |
|
return; |
return; |
} |
} |
|
|
/* |
/* |
* If we haven't seen any whitespace, then we don't want the |
* If we haven't seen any whitespace, then we don't want the |
* subsequent macro to insert any whitespace. |
* subsequent macro to insert any whitespace. |
*/ |
*/ |
if (p->outmacro && 0 == p->seenws) { |
if (p->outmacro && 0 == p->seenws) { |
teximacroopen(p, "Ns"); |
teximacroopen(p, "Ns"); |
Line 807 doverb(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 829 doverb(struct texi *p, enum texicmd cmd, size_t *pos) |
|
start = *pos; |
start = *pos; |
/* Read until we see the delimiter then end-brace. */ |
/* Read until we see the delimiter then end-brace. */ |
while (*pos < BUFSZ(p) - 1) { |
while (*pos < BUFSZ(p) - 1) { |
if (BUF(p)[*pos] == delim && BUF(p)[*pos + 1] == '}') |
if (BUF(p)[*pos] == delim && BUF(p)[*pos + 1] == '}') |
break; |
break; |
advance(p, pos); |
advance(p, pos); |
} |
} |
Line 847 docopying(struct texi *p, enum texicmd cmd, size_t *po |
|
Line 869 docopying(struct texi *p, enum texicmd cmd, size_t *po |
|
} |
} |
|
|
term = memmem(&BUF(p)[*pos], BUFSZ(p) - *pos, end, endsz); |
term = memmem(&BUF(p)[*pos], BUFSZ(p) - *pos, end, endsz); |
if (NULL == term) { |
if (NULL == term) |
texiwarn(p, "unterminated \"%s\"", texitoks[cmd].tok); |
texierr(p, "unterminated \"%s\"", texitoks[cmd].tok); |
endpos = BUFSZ(p); |
else |
} else |
|
endpos = *pos + (size_t)(term - &BUF(p)[*pos]); |
endpos = *pos + (size_t)(term - &BUF(p)[*pos]); |
|
|
assert(endpos <= BUFSZ(p)); |
if (endpos == *pos) { |
|
advanceeoln(p, pos, 1); |
|
return; |
|
} |
|
|
|
assert(endpos < BUFSZ(p) && endpos > *pos); |
assert('\n' == BUF(p)[*pos]); |
assert('\n' == BUF(p)[*pos]); |
advance(p, pos); |
advance(p, pos); |
|
|
|
if (*pos == BUFSZ(p)) { |
|
texiwarn(p, "unterminated \"%s\"", texitoks[cmd].tok); |
|
return; |
|
} |
|
|
p->copying = malloc(endpos - *pos + 1); |
p->copying = malloc(endpos - *pos + 1); |
p->copyingsz = endpos - *pos; |
p->copyingsz = endpos - *pos; |
memcpy(p->copying, &BUF(p)[*pos], p->copyingsz); |
memcpy(p->copying, &BUF(p)[*pos], p->copyingsz); |
Line 910 doverbatim(struct texi *p, enum texicmd cmd, size_t *p |
|
Line 941 doverbatim(struct texi *p, enum texicmd cmd, size_t *p |
|
static void |
static void |
doverbinclude(struct texi *p, enum texicmd cmd, size_t *pos) |
doverbinclude(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
char fname[PATH_MAX], path[PATH_MAX]; |
char fname[PATH_MAX], path[PATH_MAX]; |
int rc; |
int rc; |
size_t i, end; |
size_t i, end; |
const char *v; |
const char *v; |
enum texicmd type; |
enum texicmd type; |
|
|
Line 929 doverbinclude(struct texi *p, enum texicmd cmd, size_t |
|
Line 960 doverbinclude(struct texi *p, enum texicmd cmd, size_t |
|
} |
} |
type = texicmd(p, *pos, &end, NULL); |
type = texicmd(p, *pos, &end, NULL); |
advanceto(p, pos, end); |
advanceto(p, pos, end); |
if (TEXICMD_VALUE != type) |
if (TEXICMD_VALUE != type) |
texierr(p, "unknown verbatiminclude command"); |
texierr(p, "unknown verbatiminclude command"); |
v = valueblookup(p, pos); |
v = valueblookup(p, pos); |
if (NULL == v) |
if (NULL == v) |
Line 954 doverbinclude(struct texi *p, enum texicmd cmd, size_t |
|
Line 985 doverbinclude(struct texi *p, enum texicmd cmd, size_t |
|
if (strstr(fname, "../") || strstr(fname, "/..")) |
if (strstr(fname, "../") || strstr(fname, "/..")) |
texierr(p, "insecure path"); |
texierr(p, "insecure path"); |
|
|
rc = snprintf(path, sizeof(path), |
rc = snprintf(path, sizeof(path), |
"%s/%s", p->dirs[0], fname); |
"%s/%s", p->dirs[0], fname); |
if (rc < 0) |
if (rc < 0) |
texierr(p, "couldn't format path"); |
texierr(p, "couldn't format path"); |
else if ((size_t)rc >= sizeof(path)) |
else if ((size_t)rc >= sizeof(path)) |
texierr(p, "path too long"); |
texierr(p, "path too long"); |
Line 967 doverbinclude(struct texi *p, enum texicmd cmd, size_t |
|
Line 998 doverbinclude(struct texi *p, enum texicmd cmd, size_t |
|
static void |
static void |
doinclude(struct texi *p, enum texicmd cmd, size_t *pos) |
doinclude(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
char fname[PATH_MAX], path[PATH_MAX]; |
char fname[PATH_MAX], path[PATH_MAX]; |
size_t i, end; |
size_t i, end; |
int rc; |
int rc; |
const char *v; |
const char *v; |
enum texicmd type; |
enum texicmd type; |
|
|
Line 987 doinclude(struct texi *p, enum texicmd cmd, size_t *po |
|
Line 1018 doinclude(struct texi *p, enum texicmd cmd, size_t *po |
|
} |
} |
type = texicmd(p, *pos, &end, NULL); |
type = texicmd(p, *pos, &end, NULL); |
advanceto(p, pos, end); |
advanceto(p, pos, end); |
if (TEXICMD_VALUE != type) |
if (TEXICMD_VALUE != type) |
texierr(p, "unknown include command"); |
texierr(p, "unknown include command"); |
v = valueblookup(p, pos); |
v = valueblookup(p, pos); |
if (NULL == v) |
if (NULL == v) |
Line 1013 doinclude(struct texi *p, enum texicmd cmd, size_t *po |
|
Line 1044 doinclude(struct texi *p, enum texicmd cmd, size_t *po |
|
texierr(p, "insecure path"); |
texierr(p, "insecure path"); |
|
|
for (i = 0; i < p->dirsz; i++) { |
for (i = 0; i < p->dirsz; i++) { |
rc = snprintf(path, sizeof(path), |
rc = snprintf(path, sizeof(path), |
"%s/%s", p->dirs[i], fname); |
"%s/%s", p->dirs[i], fname); |
if (rc < 0) |
if (rc < 0) |
texierr(p, "couldn't format path"); |
texierr(p, "couldn't format path"); |
else if ((size_t)rc >= sizeof(path)) |
else if ((size_t)rc >= sizeof(path)) |
texierr(p, "path too long"); |
texierr(p, "path too long"); |
Line 1136 doaccent(struct texi *p, enum texicmd cmd, size_t *pos |
|
Line 1167 doaccent(struct texi *p, enum texicmd cmd, size_t *pos |
|
if ('{' == BUF(p)[*pos]) { |
if ('{' == BUF(p)[*pos]) { |
brace = 1; |
brace = 1; |
advance(p, pos); |
advance(p, pos); |
} else if (isalpha((unsigned char)texitoks[cmd].tok[0])) |
} else if (isalpha((unsigned char)texitoks[cmd].tok[0])) |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
advance(p, pos); |
advance(p, pos); |
|
|
Line 1254 doaccent(struct texi *p, enum texicmd cmd, size_t *pos |
|
Line 1285 doaccent(struct texi *p, enum texicmd cmd, size_t *pos |
|
} |
} |
if (*pos < BUFSZ(p)) |
if (*pos < BUFSZ(p)) |
advance(p, pos); |
advance(p, pos); |
} |
} |
|
|
switch (cmd) { |
switch (cmd) { |
case (TEXICMD_TIEACCENT): |
case (TEXICMD_TIEACCENT): |
Line 1468 dosymbol(struct texi *p, enum texicmd cmd, size_t *pos |
|
Line 1499 dosymbol(struct texi *p, enum texicmd cmd, size_t *pos |
|
static void |
static void |
doquotation(struct texi *p, enum texicmd cmd, size_t *pos) |
doquotation(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
|
|
teximacro(p, "Qo"); |
teximacro(p, "Qo"); |
parseto(p, pos, "quotation"); |
parseto(p, pos, "quotation"); |
teximacro(p, "Qc"); |
teximacro(p, "Qc"); |
Line 1477 doquotation(struct texi *p, enum texicmd cmd, size_t * |
|
Line 1508 doquotation(struct texi *p, enum texicmd cmd, size_t * |
|
static int |
static int |
indexcmp(const void *p1, const void *p2) |
indexcmp(const void *p1, const void *p2) |
{ |
{ |
|
const struct texiterm *t1 = p1, *t2 = p2; |
|
|
return(strcasecmp(*(const char **)p1, *(const char **)p2)); |
return(strcasecmp(t1->term, t2->term)); |
} |
} |
|
|
static void |
static void |
doprintindex(struct texi *p, enum texicmd cmd, size_t *pos) |
doprintindex(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
size_t i, j, start, end, len; |
static size_t guard = 0; |
|
size_t i, j, start, end, len; |
#if HAVE_INDEX |
#if HAVE_INDEX |
char *cp; |
char *cp; |
|
char buf[PATH_MAX]; |
#endif |
#endif |
|
|
|
if (guard++ > 8) |
|
texierr(p, "recursive @printindex"); |
|
|
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
advance(p, pos); |
advance(p, pos); |
start = *pos; |
start = *pos; |
Line 1496 doprintindex(struct texi *p, enum texicmd cmd, size_t |
|
Line 1533 doprintindex(struct texi *p, enum texicmd cmd, size_t |
|
advance(p, pos); |
advance(p, pos); |
if ((end = *pos) == BUFSZ(p)) { |
if ((end = *pos) == BUFSZ(p)) { |
texiwarn(p, "unexpected EOF"); |
texiwarn(p, "unexpected EOF"); |
|
guard--; |
return; |
return; |
} |
} |
|
|
advance(p, pos); |
advance(p, pos); |
if (0 == (len = end - start)) { |
if (*pos == BUFSZ(p)) { |
|
texiwarn(p, "unexpected EOF"); |
|
guard--; |
|
return; |
|
} else if (0 == (len = end - start)) { |
texiwarn(p, "zero-length index"); |
texiwarn(p, "zero-length index"); |
|
guard--; |
return; |
return; |
} |
} |
|
|
Line 1516 doprintindex(struct texi *p, enum texicmd cmd, size_t |
|
Line 1559 doprintindex(struct texi *p, enum texicmd cmd, size_t |
|
|
|
if (i == p->indexsz) { |
if (i == p->indexsz) { |
texiwarn(p, "cannot find index"); |
texiwarn(p, "cannot find index"); |
|
guard--; |
return; |
return; |
} else if (0 == p->indexs[i].indexsz) |
} else if (0 == p->indexs[i].indexsz) { |
|
guard--; |
return; |
return; |
|
} |
|
|
/* Alphabetically sort our indices. */ |
/* Alphabetically sort our indices. */ |
qsort(p->indexs[i].index, |
qsort(p->indexs[i].index, |
p->indexs[i].indexsz, sizeof(char *), indexcmp); |
p->indexs[i].indexsz, |
|
sizeof(struct texiterm), indexcmp); |
|
|
texivspace(p); |
texivspace(p); |
teximacro(p, "Bl -tag -width Ds -compact"); |
teximacro(p, "Bl -tag -width Ds -compact"); |
for (j = 0; j < p->indexs[i].indexsz; j++) { |
for (j = 0; j < p->indexs[i].indexsz; j++) { |
teximacroopen(p, "It"); |
teximacroopen(p, "It"); |
#if HAVE_INDEX |
#if HAVE_INDEX |
teximacroopen(p, "Lkx"); |
if (NULL == p->chapters) { |
texiputchars(p, "\"idx"); |
teximacroopen(p, "Lkx"); |
texiputchars(p, p->indexs[i].name); |
texiputchars(p, "\"idx"); |
cp = p->indexs[i].index[j]; |
texiputchars(p, p->indexs[i].name); |
while ('\n' != *cp) { |
cp = p->indexs[i].index[j].term; |
assert('\0' != *cp); |
while ('\n' != *cp) |
texiputchar(p, *cp++); |
texiputchar(p, *cp++); |
|
texiputchars(p, "\" \""); |
|
p->literal++; |
|
} else { |
|
teximacroopen(p, "Xr"); |
|
snprintf(buf, sizeof(buf), "%s-%zd 7 \"idx", |
|
p->chapters, p->indexs[i].index[j].chapter); |
|
texiputchars(p, buf); |
|
texiputchars(p, p->indexs[i].name); |
|
cp = p->indexs[i].index[j].term; |
|
while ('\n' != *cp) |
|
texiputchar(p, *cp++); |
|
texiputchars(p, "\" \""); |
|
p->literal++; |
} |
} |
texiputchars(p, "\" \""); |
|
p->literal++; |
|
#endif |
#endif |
texisplice(p, p->indexs[i].index[j], |
texisplice(p, p->indexs[i].index[j].term, |
strlen(p->indexs[i].index[j]), *pos); |
strlen(p->indexs[i].index[j].term), *pos); |
parseeoln(p, pos); |
parseeoln(p, pos); |
#if HAVE_INDEX |
#if HAVE_INDEX |
p->literal--; |
p->literal--; |
Line 1553 doprintindex(struct texi *p, enum texicmd cmd, size_t |
|
Line 1611 doprintindex(struct texi *p, enum texicmd cmd, size_t |
|
p->seenvs = 0; |
p->seenvs = 0; |
teximacro(p, "El"); |
teximacro(p, "El"); |
texivspace(p); |
texivspace(p); |
|
guard--; |
} |
} |
|
|
static void |
static void |
donode(struct texi *p, enum texicmd cmd, size_t *pos) |
donode(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
int sv = p->seenvs; |
int sv = p->seenvs; |
|
char fname[PATH_MAX]; |
|
size_t end, start; |
|
|
if (NULL != p->chapters) { |
if (0 == p->nodesz++) |
advanceeoln(p, pos, 1); |
p->ign--; |
return; |
|
} |
|
|
|
#if HAVE_INDEX |
/* Grab our node name. */ |
p->seenvs = -1; |
|
teximacroopen(p, "Ix"); |
|
texiputchars(p, "node"); |
|
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
advance(p, pos); |
advance(p, pos); |
|
start = *pos; |
while (*pos < BUFSZ(p)) { |
while (*pos < BUFSZ(p)) { |
if (BUF(p)[*pos] == ',') |
if (BUF(p)[*pos] == ',') |
break; |
break; |
else if (BUF(p)[*pos] == '\n') |
else if (BUF(p)[*pos] == '\n') |
break; |
break; |
texiputchar(p, BUF(p)[*pos]); |
|
advance(p, pos); |
advance(p, pos); |
} |
} |
teximacroclose(p); |
if (*pos == BUFSZ(p)) { |
#endif |
texiwarn(p, "unexpected EOF"); |
|
return; |
|
} |
|
end = *pos; |
advanceeoln(p, pos, 1); |
advanceeoln(p, pos, 1); |
p->seenvs = sv; |
|
|
if (NULL != p->chapters) |
|
teximdocclose(p, 0); |
|
|
|
/* Cache our node name. */ |
|
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) |
|
texiabort(p, fname); |
|
teximdocopen(p, pos); |
|
} else if (p->nodesz > 1) { |
|
/* Otherwise, mark our index. */ |
|
p->seenvs = -1; |
|
#if HAVE_INDEX |
|
teximacroopen(p, "Ix"); |
|
texiputchars(p, "node"); |
|
texiputchars(p, p->nodecache[p->nodecur].name); |
|
teximacroclose(p); |
|
#endif |
|
p->seenvs = sv; |
|
} else |
|
teximdocopen(p, pos); |
} |
} |
|
|
/* |
/* |
Line 1593 donode(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 1677 donode(struct texi *p, enum texicmd cmd, size_t *pos) |
|
static void |
static void |
domenu(struct texi *p, enum texicmd cmd, size_t *pos) |
domenu(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
size_t start, end, sv; |
size_t nodename, entryname; |
|
size_t nodenameend, entrynameend, i; |
|
ssize_t ppos, lastppos; |
|
char buf[PATH_MAX]; |
|
enum texicmd tcmd; |
|
|
if (NULL != p->chapters) { |
|
doignblock(p, cmd, pos); |
|
return; |
|
} |
|
|
|
advanceeoln(p, pos, 1); |
advanceeoln(p, pos, 1); |
|
|
/* |
/* |
* Parse past initial stuff. |
* Parse past initial stuff. |
* TODO: the manual says we're supposed to make this in bold or |
* TODO: the manual says we're supposed to make this in bold or |
* something. |
* something. |
*/ |
*/ |
while (*pos < BUFSZ(p)) { |
while (*pos < BUFSZ(p)) { |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
advance(p, pos); |
advance(p, pos); |
if ('*' != BUF(p)[*pos]) { |
if (*pos < BUFSZ(p) && '*' != BUF(p)[*pos]) { |
if (TEXICMD_END == peeklinecmd(p, *pos)) |
if (TEXICMD_END == peeklinecmd(p, *pos)) |
break; |
break; |
parseeoln(p, pos); |
parseeoln(p, pos); |
Line 1618 domenu(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 1701 domenu(struct texi *p, enum texicmd cmd, size_t *pos) |
|
break; |
break; |
} |
} |
|
|
|
lastppos = -1; |
texivspace(p); |
texivspace(p); |
teximacro(p, "Bl -tag -width Ds -compact"); |
teximacro(p, "Bl -tag -width Ds -compact"); |
while (*pos < BUFSZ(p)) { |
while (*pos < BUFSZ(p)) { |
/* |
/* |
* Read to next menu item. |
* Read to next menu item. |
* We simply parse every line until we get a magic '*'. |
* We simply parse every line until we get a magic '*'. |
* These lines might occur interspersed OR as the |
* These lines might occur interspersed OR as the |
* description of an entry. |
* description of an entry. |
Line 1632 domenu(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 1716 domenu(struct texi *p, enum texicmd cmd, size_t *pos) |
|
p->seenws = *pos < BUFSZ(p) && isws(BUF(p)[*pos]); |
p->seenws = *pos < BUFSZ(p) && isws(BUF(p)[*pos]); |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
advance(p, pos); |
advance(p, pos); |
if ('*' != BUF(p)[*pos]) { |
if (*pos == BUFSZ(p)) { |
if (TEXICMD_END == peeklinecmd(p, *pos)) |
texiwarn(p, "unexpected EOF"); |
|
return; |
|
} else if ('*' != BUF(p)[*pos]) { |
|
tcmd = peeklinecmd(p, *pos); |
|
if (TEXICMD_END == tcmd) |
break; |
break; |
parseeoln(p, pos); |
else if (TEXICMD_COMMENT == tcmd) |
|
advanceeoln(p, pos, 1); |
|
else |
|
parseeoln(p, pos); |
continue; |
continue; |
} |
} |
|
|
/* Now we're parsing a menu item. */ |
/* Now we're parsing a menu item. */ |
advance(p, pos); |
advance(p, pos); |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
advance(p, pos); |
advance(p, pos); |
start = sv = *pos; |
entryname = *pos; |
while (*pos < BUFSZ(p) && ':' != BUF(p)[*pos]) |
while (*pos < BUFSZ(p) && ':' != BUF(p)[*pos]) |
advance(p, pos); |
advance(p, pos); |
end = *pos; |
entrynameend = *pos; |
|
if (*pos == BUFSZ(p)) { |
|
texiwarn(p, "unexpected EOF"); |
|
return; |
|
} |
advance(p, pos); |
advance(p, pos); |
|
|
|
p->seenvs = 0; |
|
teximacroopen(p, "It"); |
if (*pos == BUFSZ(p)) { |
if (*pos == BUFSZ(p)) { |
texiwarn(p, "bad menu syntax"); |
texiwarn(p, "bad menu syntax"); |
break; |
break; |
} else if (':' != BUF(p)[*pos]) { |
} else if (':' != BUF(p)[*pos]) { |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
advance(p, pos); |
advance(p, pos); |
teximacroopen(p, "It"); |
nodename = *pos; |
#ifdef HAVE_INDEX |
|
teximacroopen(p, "Lkx"); |
|
texiputchars(p, "\"node"); |
|
#endif |
|
while (*pos < BUFSZ(p)) { |
while (*pos < BUFSZ(p)) { |
switch (BUF(p)[*pos]) { |
switch (BUF(p)[*pos]) { |
case ('\t'): |
case ('\t'): |
Line 1670 domenu(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 1763 domenu(struct texi *p, enum texicmd cmd, size_t *pos) |
|
if (*pos + 1 == BUFSZ(p)) { |
if (*pos + 1 == BUFSZ(p)) { |
advance(p, pos); |
advance(p, pos); |
continue; |
continue; |
} |
} |
if (' ' == BUF(p)[*pos + 1]) { |
if (' ' == BUF(p)[*pos + 1]) { |
advance(p, pos); |
advance(p, pos); |
break; |
break; |
} |
} |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
texiputchar(p, BUF(p)[*pos]); |
|
advance(p, pos); |
advance(p, pos); |
continue; |
continue; |
} |
} |
advance(p, pos); |
advance(p, pos); |
break; |
break; |
} |
} |
#ifdef HAVE_INDEX |
nodenameend = *pos; |
texiputchars(p, "\" \""); |
|
for (start = sv; start < end; start++) |
|
texiputchar(p, BUF(p)[start]); |
|
texiputchar(p, '"'); |
|
#endif |
|
} else { |
} else { |
advance(p, pos); |
advance(p, pos); |
p->seenvs = 0; |
nodename = entryname; |
teximacroopen(p, "It"); |
nodenameend = entrynameend; |
|
} |
|
ppos = texicache(p, &BUF(p)[nodename], |
|
nodenameend - nodename); |
|
if (-1 != lastppos) |
|
p->nodecache[lastppos].next = ppos; |
|
p->nodecache[ppos].prev = lastppos; |
|
p->nodecache[ppos].up = p->nodecur; |
|
lastppos = ppos; |
#ifdef HAVE_INDEX |
#ifdef HAVE_INDEX |
|
if (NULL == p->chapters) { |
teximacroopen(p, "Lkx"); |
teximacroopen(p, "Lkx"); |
texiputchars(p, "\"node"); |
texiputchars(p, "\"node"); |
for (start = sv; start < end; start++) |
for (i = nodename; i < nodenameend; i++) |
texiputchar(p, BUF(p)[start]); |
texiputchar(p, BUF(p)[i]); |
texiputchars(p, "\" \""); |
texiputchars(p, "\" \""); |
#endif |
for (i = entryname; i < entrynameend; i++) |
for (start = sv; start < end; start++) |
texiputchar(p, BUF(p)[i]); |
texiputchar(p, BUF(p)[start]); |
texiputchars(p, "\""); |
#ifdef HAVE_INDEX |
teximacroclose(p); |
texiputchar(p, '"'); |
} else { |
#endif |
snprintf(buf, sizeof(buf), |
|
"%s-%zd 7 ", p->chapters, ppos); |
|
teximacroopen(p, "Xr"); |
|
texiputchars(p, buf); |
|
texiputchars(p, "\"node"); |
|
for (i = nodename; i < nodenameend; i++) |
|
texiputchar(p, BUF(p)[i]); |
|
texiputchars(p, "\" \""); |
|
for (i = entryname; i < entrynameend; i++) |
|
texiputchar(p, BUF(p)[i]); |
|
texiputchars(p, "\""); |
|
teximacroclose(p); |
} |
} |
#ifdef HAVE_INDEX |
#else |
teximacroclose(p); |
for (i = entryname; i < entrynameend; i++) |
|
texiputchar(p, BUF(p)[i]); |
#endif |
#endif |
teximacroclose(p); |
teximacroclose(p); |
} |
} |
Line 1911 dosection(struct texi *p, enum texicmd cmd, size_t *po |
|
Line 2019 dosection(struct texi *p, enum texicmd cmd, size_t *po |
|
|
|
if (sec < 2) |
if (sec < 2) |
p->seenvs = -1; |
p->seenvs = -1; |
else |
else |
texivspace(p); |
texivspace(p); |
|
|
if (0 == sec && NULL != p->chapters) { |
|
teximdocclose(p, 0); |
|
teximdocopen(p, pos); |
|
} |
|
|
|
teximacroopen(p, sects[sec]); |
teximacroopen(p, sects[sec]); |
parseeoln(p, pos); |
parseeoln(p, pos); |
teximacroclose(p); |
teximacroclose(p); |
Line 1930 dosection(struct texi *p, enum texicmd cmd, size_t *po |
|
Line 2033 dosection(struct texi *p, enum texicmd cmd, size_t *po |
|
} |
} |
|
|
static void |
static void |
dotop(struct texi *p, enum texicmd cmd, size_t *pos) |
|
{ |
|
|
|
if (--p->ign) |
|
texierr(p, "@top command while ignoring"); |
|
|
|
if (NULL == p->chapters) |
|
teximdocopen(p, pos); |
|
dosection(p, cmd, pos); |
|
} |
|
|
|
static void |
|
dosp(struct texi *p, enum texicmd cmd, size_t *pos) |
dosp(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
|
|
Line 1961 doitem(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 2052 doitem(struct texi *p, enum texicmd cmd, size_t *pos) |
|
if (p->outcol > 0) |
if (p->outcol > 0) |
texiputchar(p, '\n'); |
texiputchar(p, '\n'); |
return; |
return; |
} |
} |
|
|
if (p->outmacro) |
if (p->outmacro) |
texierr(p, "item in open line scope!?"); |
texierr(p, "item in open line scope!?"); |
else if (p->literal) |
else if (p->literal) |
Line 2010 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
Line 2101 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
|
|
texivspace(p); |
texivspace(p); |
p->list = TEXILIST_TABLE; |
p->list = TEXILIST_TABLE; |
/* |
/* |
* TS/TE blocks aren't "in mdoc(7)", so we can disregard the |
* TS/TE blocks aren't "in mdoc(7)", so we can disregard the |
* fact that we're in literal mode right now. |
* fact that we're in literal mode right now. |
*/ |
*/ |
Line 2025 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
Line 2116 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
/* Make sure we don't print anything when scanning. */ |
/* Make sure we don't print anything when scanning. */ |
p->ign++; |
p->ign++; |
if (*pos < BUFSZ(p) && '@' == BUF(p)[*pos]) { |
if (*pos < BUFSZ(p) && '@' == BUF(p)[*pos]) { |
/* |
/* |
* Look for @columnfractions. |
* Look for @columnfractions. |
* We ignore these, but we do use the number of |
* We ignore these, but we do use the number of |
* arguments to set the number of columns that we'll |
* arguments to set the number of columns that we'll |
Line 2033 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
Line 2124 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
*/ |
*/ |
type = texicmd(p, *pos, &end, NULL); |
type = texicmd(p, *pos, &end, NULL); |
advanceto(p, pos, end); |
advanceto(p, pos, end); |
if (TEXICMD_COLUMNFRACTIONS != type) |
if (TEXICMD_COLUMNFRACTIONS != type) |
texierr(p, "unknown multitable command"); |
texierr(p, "unknown multitable command"); |
while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) { |
while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) { |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
Line 2045 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
Line 2136 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
} |
} |
columns++; |
columns++; |
} |
} |
} else |
} else |
/* |
/* |
* We have arguments. |
* We have arguments. |
* We could parse these, but it's easier to just let |
* We could parse these, but it's easier to just let |
Line 2102 doend(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 2193 doend(struct texi *p, enum texicmd cmd, size_t *pos) |
|
while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) |
while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) |
advance(p, pos); |
advance(p, pos); |
|
|
texiwarn(p, "unexpected \"end\": %.*s", |
texiwarn(p, "unexpected \"end\": %.*s", |
(int)(*pos - start), &BUF(p)[start]); |
(int)(*pos - start), &BUF(p)[start]); |
advanceeoln(p, pos, 1); |
advanceeoln(p, pos, 1); |
} |
} |
Line 2216 doignline(struct texi *p, enum texicmd cmd, size_t *po |
|
Line 2307 doignline(struct texi *p, enum texicmd cmd, size_t *po |
|
static char ** |
static char ** |
parsedirs(struct texi *p, const char *base, const char *cp, size_t *sz) |
parsedirs(struct texi *p, const char *base, const char *cp, size_t *sz) |
{ |
{ |
char *tok, *str, *tofree; |
char *tok, *str, *tofree; |
const char *cpp; |
const char *cpp; |
size_t i = 0; |
size_t i = 0; |
char **dirs; |
char **dirs; |
|
|
/* Count up our expected arguments. */ |
/* Count up our expected arguments. */ |
Line 2231 parsedirs(struct texi *p, const char *base, const char |
|
Line 2322 parsedirs(struct texi *p, const char *base, const char |
|
return(NULL); |
return(NULL); |
if (NULL == (dirs = calloc(*sz, sizeof(char *)))) |
if (NULL == (dirs = calloc(*sz, sizeof(char *)))) |
texiabort(p, NULL); |
texiabort(p, NULL); |
if (NULL != base && NULL == (dirs[i++] = strdup(base))) |
if (NULL != base && NULL == (dirs[i++] = strdup(base))) |
texiabort(p, NULL); |
texiabort(p, NULL); |
if (NULL == cp) |
if (NULL == cp) |
return(dirs); |
return(dirs); |
if (NULL == (tofree = tok = str = strdup(cp))) |
if (NULL == (tofree = tok = str = strdup(cp))) |
texiabort(p, NULL); |
texiabort(p, NULL); |
|
|
for ( ; NULL != (tok = strsep(&str, ":")); i++) |
for ( ; NULL != (tok = strsep(&str, ":")); i++) |
if (NULL == (dirs[i] = strdup(tok))) |
if (NULL == (dirs[i] = strdup(tok))) |
texiabort(p, NULL); |
texiabort(p, NULL); |
|
|
free(tofree); |
free(tofree); |
Line 2266 main(int argc, char *argv[]) |
|
Line 2357 main(int argc, char *argv[]) |
|
texi.seenvs = -1; |
texi.seenvs = -1; |
Idir = NULL; |
Idir = NULL; |
|
|
while (-1 != (c = getopt(argc, argv, "C:I:"))) |
while (-1 != (c = getopt(argc, argv, "C:I:"))) |
switch (c) { |
switch (c) { |
case ('C'): |
case ('C'): |
texi.chapters = optarg; |
texi.chapters = optarg; |
Line 2292 main(int argc, char *argv[]) |
|
Line 2383 main(int argc, char *argv[]) |
|
texiabort(&texi, NULL); |
texiabort(&texi, NULL); |
if (NULL == (dir = dirname(dirpath))) |
if (NULL == (dir = dirname(dirpath))) |
texiabort(&texi, NULL); |
texiabort(&texi, NULL); |
if (NULL != (cp = strrchr(argv[0], '/'))) |
if (NULL != (cp = strrchr(argv[0], '/'))) |
texi.title = strdup(cp + 1); |
texi.title = strdup(cp + 1); |
else |
else |
texi.title = strdup(argv[0]); |
texi.title = strdup(argv[0]); |