=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- texi2mdoc/main.c 2015/02/20 15:37:33 1.26 +++ texi2mdoc/main.c 2015/02/21 17:00:33 1.27 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.26 2015/02/20 15:37:33 kristaps Exp $ */ +/* $Id: main.c,v 1.27 2015/02/21 17:00:33 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -44,6 +44,7 @@ static void doaccent(struct texi *, enum texicmd, cons static void doblock(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dobracket(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dobye(struct texi *, enum texicmd, const char *, size_t, size_t *); +static void dodefindex(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dodefn(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dodisplay(struct texi *, enum texicmd, const char *, size_t, size_t *); static void doenumerate(struct texi *, enum texicmd, const char *, size_t, size_t *); @@ -107,8 +108,10 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { doignline, "contents", 8 }, /* TEXICMD_CONTENTS */ { doignblock, "copying", 7 }, /* TEXICMD_COPYING */ { dosymbol, "copyright", 9 }, /* TEXICMD_COPYRIGHT */ + { dodefindex, "defcodeindex", 12 }, /* TEXICMD_DEFCODEINDEX */ { dodefn, "deffn", 5 }, /* TEXICMD_DEFFN */ { dodefn, "deffnx", 6 }, /* TEXICMD_DEFFNX */ + { dodefindex, "defindex", 8 }, /* TEXICMD_DEFINDEX */ { dodefn, "defmac", 6 }, /* TEXICMD_DEFMAC */ { dodefn, "defmacx", 7 }, /* TEXICMD_DEFMACX */ { dodefn, "deftp", 5 }, /* TEXICMD_DEFTP */ @@ -173,6 +176,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { doignbracket, "image", 5 }, /* TEXICMD_IMAGE */ { doinclude, "include", 7 }, /* TEXICMD_INCLUDE */ { dodisplay, "indentblock", 11 }, /* TEXICMD_INDENTBLOCK */ + { doignline, "", 0 }, /* TEXICMD_INDEX */ { doignline, "insertcopying", 13 }, /* TEXICMD_INSERTCOPYING */ { doitem, "item", 4 }, /* TEXICMD_ITEM */ { doitemize, "itemize", 7 }, /* TEXICMD_ITEMIZE */ @@ -227,6 +231,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { dosubsubsection, "subsubsection", 13 }, /* TEXICMD_SUBSUBSECTION */ { doignline, "subtitle", 8 }, /* TEXICMD_SUBTITLE */ { doignline, "summarycontents", 15 }, /* TEXICMD_SUMMARYCONTENTS */ + { doignline, "synindex", 8 }, /* TEXICMD_SYNINDEX */ { doignline, "syncodeindex", 12 }, /* TEXICMD_SYNCODEINDEX */ { doinline, "t", 1 }, /* TEXICMD_T */ { dotab, "tab", 3 }, /* TEXICMD_TAB */ @@ -262,6 +267,37 @@ static const struct texitok __texitoks[TEXICMD__MAX] = const struct texitok *const texitoks = __texitoks; static void +dodefindex(struct texi *p, enum texicmd cmd, + const char *buf, size_t sz, size_t *pos) +{ + size_t start, end; + char *cp; + + while (*pos < sz && isws(buf[*pos])) + advance(p, buf, pos); + + start = end = *pos; + while (end < sz && ! ismspace(buf[end])) + end++; + + if (start == end) { + advanceeoln(p, buf, sz, pos, 1); + return; + } else if (NULL == (cp = malloc(end - start + 1))) + texiabort(p, NULL); + + memcpy(cp, &buf[start], end - start); + cp[end - start] = '\0'; + + p->indexs = realloc(p->indexs, + sizeof(char *) * (p->indexsz + 1)); + + if (NULL == p->indexs) + texiabort(p, NULL); + p->indexs[p->indexsz++] = cp; +} + +static void dodefn(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { @@ -713,6 +749,8 @@ dotitle(struct texi *p, enum texicmd cmd, advanceeoln(p, buf, sz, pos, 1); free(p->subtitle); p->subtitle = malloc(end - start + 1); + if (NULL == p->subtitle) + texiabort(p, NULL); memcpy(p->subtitle, &buf[start], end - start); p->subtitle[end - start] = '\0'; } @@ -939,10 +977,8 @@ dovalue(struct texi *p, enum texicmd cmd, advanceto(p, buf, pos, end); key = malloc(end - start + 1); - if (NULL == key) { - perror(NULL); - exit(EXIT_FAILURE); - } + if (NULL == key) + texiabort(p, NULL); memcpy(key, &buf[start], end - start); key[end - start] = '\0'; @@ -955,10 +991,8 @@ dovalue(struct texi *p, enum texicmd cmd, advanceeoln(p, buf, sz, pos, 1); val = malloc(end - start + 1); - if (NULL == val) { - perror(NULL); - exit(EXIT_FAILURE); - } + if (NULL == val) + texiabort(p, NULL); memcpy(val, &buf[start], end - start); val[end - start] = '\0'; valueadd(p, key, val); @@ -1368,7 +1402,7 @@ doignline(struct texi *p, enum texicmd cmd, * This does NOT sanitise the directories! */ static char ** -parsedirs(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; const char *cpp; @@ -1380,28 +1414,20 @@ parsedirs(const char *base, const char *cp, size_t *sz for ( ; NULL != (cpp = strchr(cpp, ':')); (*sz)++) cpp++; - dirs = calloc(*sz, sizeof(char *)); - if (NULL == dirs) { - perror(NULL); - exit(EXIT_FAILURE); - } else if (NULL == (dirs[0] = strdup(base))) { - perror(NULL); - exit(EXIT_FAILURE); - } + if (NULL == (dirs = calloc(*sz, sizeof(char *)))) + texiabort(p, NULL); + else if (NULL == (dirs[0] = strdup(base))) + texiabort(p, NULL); if (NULL == cp) return(dirs); - if (NULL == (tofree = tok = str = strdup(cp))) { - perror(NULL); - exit(EXIT_FAILURE); - } + if (NULL == (tofree = tok = str = strdup(cp))) + texiabort(p, NULL); for (i = 1; NULL != (tok = strsep(&str, ":")); i++) - if (NULL == (dirs[i] = strdup(tok))) { - perror(NULL); - exit(EXIT_FAILURE); - } + if (NULL == (dirs[i] = strdup(tok))) + texiabort(p, NULL); free(tofree); return(dirs); @@ -1437,14 +1463,11 @@ main(int argc, char *argv[]) if (0 == (argc -= optind)) goto usage; - if (NULL == (path = strdup(argv[0]))) { - perror(NULL); - exit(EXIT_FAILURE); - } else if (NULL == (dir = dirname(path))) { - perror(argv[0]); - free(path); - exit(EXIT_FAILURE); - } + if (NULL == (path = strdup(argv[0]))) + texiabort(&texi, NULL); + else if (NULL == (dir = dirname(path))) + texiabort(&texi, NULL); + free(path); if (NULL != (cp = strrchr(argv[0], '/'))) @@ -1452,14 +1475,13 @@ main(int argc, char *argv[]) else texi.title = strdup(argv[0]); - if (NULL == texi.title) { - perror(NULL); - exit(EXIT_FAILURE); - } else if (NULL != (path = strchr(texi.title, '.'))) + if (NULL == texi.title) + texiabort(&texi, NULL); + else if (NULL != (path = strchr(texi.title, '.'))) *path = '\0'; texi.ign = 1; - texi.dirs = parsedirs(dir, Idir, &texi.dirsz); + texi.dirs = parsedirs(&texi, dir, Idir, &texi.dirsz); parsefile(&texi, argv[0], 1); /* We shouldn't get here. */ texiexit(&texi);