=================================================================== RCS file: /cvs/pod2mdoc/pod2mdoc.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- pod2mdoc/pod2mdoc.c 2015/02/23 15:12:06 1.59 +++ pod2mdoc/pod2mdoc.c 2015/03/19 09:59:01 1.60 @@ -1,4 +1,4 @@ -/* $Id: pod2mdoc.c,v 1.59 2015/02/23 15:12:06 schwarze Exp $ */ +/* $Id: pod2mdoc.c,v 1.60 2015/03/19 09:59:01 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2014, 2015 Ingo Schwarze @@ -135,7 +135,7 @@ static int trylink(const char *, size_t *, size_t, si static void verbatim(struct state *, char *, size_t, size_t); static const char *const cmds[CMD__MAX] = { - "pod", /* CMD_POD */ + "pod", /* CMD_POD */ "head1", /* CMD_HEAD1 */ "head2", /* CMD_HEAD2 */ "head3", /* CMD_HEAD3 */ @@ -162,7 +162,7 @@ static const char fmts[FMT__MAX] = { 'Z' /* FMT_NULL */ }; -static unsigned char last; +static unsigned char last; static void @@ -281,9 +281,9 @@ formatescape(struct state *st, const char *buf, size_t /* * TODO: right now, we only recognise the named escapes. - * Just let the rest of them go. + * Just let the rest of them go. */ - if (0 == strcmp(esc, "lt")) + if (0 == strcmp(esc, "lt")) outbuf_addstr(st, "\\(la"); else if (0 == strcmp(esc, "gt")) outbuf_addstr(st, "\\(ra"); @@ -305,11 +305,11 @@ formatescape(struct state *st, const char *buf, size_t static int trylink(const char *buf, size_t *start, size_t end, size_t dsz) { - size_t linkstart, realend, linkend, + size_t linkstart, realend, linkend, i, j, textsz, stack; - /* - * Scan to the start of the terminus. + /* + * Scan to the start of the terminus. * This function is more or less replicated in the formatcode() * for null or index formatting codes. * However, we're slightly different because we might have @@ -328,10 +328,10 @@ trylink(const char *buf, size_t *start, size_t end, si assert(realend > 0); if (' ' != buf[realend - 1]) continue; - for (i = realend, j = 0; i < end && j < dsz; j++) + for (i = realend, j = 0; i < end && j < dsz; j++) if ('>' != buf[i++]) break; - if (dsz == j) + if (dsz == j) break; } @@ -386,11 +386,11 @@ trylink(const char *buf, size_t *start, size_t end, si (j > 3 && 0 == memcmp("smb:", &buf[linkstart], j)) || (j > 3 && 0 == memcmp("afs:", &buf[linkstart], j))) { /* Gross. */ - printf("Lk %.*s", (int)((dsz > 1 ? realend - 1 : + printf("Lk %.*s", (int)((dsz > 1 ? realend - 1 : realend) - linkstart), &buf[linkstart]); return(1); - } - + } + /* See if we qualify as a mailto. */ if (j > 6 && 0 == memcmp("mailto:", &buf[linkstart], j)) { printf("Mt %.*s", (int)j, &buf[linkstart]); @@ -398,19 +398,19 @@ trylink(const char *buf, size_t *start, size_t end, si } /* See if we're a foo(5), foo(5x), or foo(5xx) manpage. */ - if ((j > 3 && ')' == buf[linkend - 1]) && + if ((j > 3 && ')' == buf[linkend - 1]) && ('(' == buf[linkend - 3])) { - printf("Xr %.*s %c", (int)(j - 3), + printf("Xr %.*s %c", (int)(j - 3), &buf[linkstart], buf[linkend - 2]); return(1); } else if ((j > 4 && ')' == buf[linkend - 1]) && ('(' == buf[linkend - 4])) { - printf("Xr %.*s %.*s", (int)(j - 4), + printf("Xr %.*s %.*s", (int)(j - 4), &buf[linkstart], 2, &buf[linkend - 3]); return(1); } else if ((j > 5 && ')' == buf[linkend - 1]) && ('(' == buf[linkend - 5])) { - printf("Xr %.*s %.*s", (int)(j - 5), + printf("Xr %.*s %.*s", (int)(j - 5), &buf[linkstart], 3, &buf[linkend - 4]); return(1); } @@ -421,7 +421,7 @@ trylink(const char *buf, size_t *start, size_t end, si break; if (i < linkend) - printf("Xr %.*s " PERL_SECTION, + printf("Xr %.*s " PERL_SECTION, (int)j, &buf[linkstart]); else printf("Xr %.*s 1", (int)j, &buf[linkstart]); @@ -476,7 +476,7 @@ again: } printf("Fl "); - if (end - *start > 1 && + if (end - *start > 1 && isupper((int)buf[*start]) && islower((int)buf[*start + 1]) && (end - *start == 2 || @@ -515,7 +515,7 @@ again: * entering without OUST_MAC and the code is invalid. */ static int -formatcode(struct state *st, const char *buf, size_t *start, +formatcode(struct state *st, const char *buf, size_t *start, size_t end, int nomacro, int pos) { size_t i, j, dsz; @@ -526,11 +526,11 @@ formatcode(struct state *st, const char *buf, size_t * assert(*start + 1 < end); assert('<' == buf[*start + 1]); - /* - * First, look up the format code. + /* + * First, look up the format code. * If it's not valid, treat it as a NOOP. */ - for (fmt = 0; fmt < FMT__MAX; fmt++) + for (fmt = 0; fmt < FMT__MAX; fmt++) if (buf[*start] == fmts[fmt]) break; @@ -561,7 +561,7 @@ formatcode(struct state *st, const char *buf, size_t * formatescape(st, buf, start, end); return(0); } else if (FMT_NULL == fmt || FMT_INDEX == fmt) { - /* + /* * Just consume til the end delimiter, accounting for * whether it's a custom one. */ @@ -574,10 +574,10 @@ formatcode(struct state *st, const char *buf, size_t * if (' ' != buf[*start - 1]) continue; i = *start; - for (j = 0; i < end && j < dsz; j++) + for (j = 0; i < end && j < dsz; j++) if ('>' != buf[i++]) break; - if (dsz != j) + if (dsz != j) continue; (*start) += dsz; break; @@ -648,7 +648,7 @@ formatcode(struct state *st, const char *buf, size_t * switch (fmt) { case (FMT_BOLD): - if (SECT_SYNOPSIS == st->sect) { + if (SECT_SYNOPSIS == st->sect) { if (1 == dsz && '-' == buf[*start]) dosynopsisfl(buf, start, end); else if (0 == pos) @@ -715,7 +715,7 @@ formatcode(struct state *st, const char *buf, size_t * if ('>' == buf[*start] && 1 == dsz) { (*start)++; break; - } else if ('>' == buf[*start] && + } else if ('>' == buf[*start] && ' ' == buf[*start - 1]) { /* * Handle custom delimiters. @@ -935,7 +935,7 @@ command(struct state *st, const char *buf, size_t star } else if (end - start == 8) { if (0 == memcmp(&buf[start], "SYNOPSIS", 8)) st->sect = SECT_SYNOPSIS; - } + } formatcodeln(st, "Sh", buf, &start, end, 1); mdoc_newln(st); st->haspar = 1; @@ -960,7 +960,7 @@ command(struct state *st, const char *buf, size_t star st->haspar = 1; break; case (CMD_OVER): - /* + /* * If we have an existing list that hasn't had an =item * yet, then make sure that we open it now. * We use the default list type, but that can't be @@ -977,7 +977,7 @@ command(struct state *st, const char *buf, size_t star break; case (CMD_ITEM): if (0 == st->lpos) { - /* + /* * Bad markup. * Try to compensate. */ @@ -991,7 +991,7 @@ command(struct state *st, const char *buf, size_t star * list, and everything is tagged. */ if (LIST__MAX == st->lstack[st->lpos - 1]) { - st->lstack[st->lpos - 1] = + st->lstack[st->lpos - 1] = listguess(buf, start, end); switch (st->lstack[st->lpos - 1]) { case (LIST_BULLET): @@ -1033,14 +1033,14 @@ command(struct state *st, const char *buf, size_t star } break; case (CMD_BEGIN): - /* + /* * We disregard all types for now. * TODO: process at least "text" in a -literal block. */ st->paused = 1; break; case (CMD_FOR): - /* + /* * We ignore all types of encodings and formats * unilaterally. */ @@ -1114,7 +1114,7 @@ again: goto again; } - /* + /* * If we're in the SYNOPSIS, see if we're an #include block. * If we are, then print the "In" macro and re-loop. * This handles any number of inclusions, but only when they @@ -1128,7 +1128,7 @@ again: goto again; /* We're an include block! */ - if (end - i > 10 && + if (end - i > 10 && 0 == memcmp(&buf[i], "#include <", 10)) { start = i + 10; while (start < end && ' ' == buf[start]) @@ -1138,7 +1138,7 @@ again: indisplay = wantsp = 0; fputs(".In ", stdout); /* Stop til the '>' marker or we hit eoln. */ - while (start < end && + while (start < end && '>' != buf[start] && '\n' != buf[start]) putchar(buf[start++]); putchar('\n'); @@ -1317,7 +1317,7 @@ hasmatch(const char *buf, size_t start, size_t end) { size_t stack; - for (stack = 0; start < end; start++) + for (stack = 0; start < end; start++) if (buf[start] == '[') stack++; else if (buf[start] == ']' && 0 == stack) @@ -1465,8 +1465,8 @@ ordinary(struct state *st, const char *buf, size_t sta opstack = 0; for (seq = 0; start < end; seq++) { - /* - * Loop til we get either to a newline or escape. + /* + * Loop til we get either to a newline or escape. * Escape initial control characters. */ while (start < end) { @@ -1486,7 +1486,7 @@ ordinary(struct state *st, const char *buf, size_t sta */ if (SECT_SYNOPSIS == st->sect && - ('[' == buf[start] || + ('[' == buf[start] || ']' == buf[start]) && dosynopsisop(st, buf, &start, end, &opstack)) @@ -1659,7 +1659,7 @@ ordinary(struct state *st, const char *buf, size_t sta for ( ; start < end; start++) if (' ' != buf[start] && '\t' != buf[start]) break; - } + } } outbuf_flush(st); mdoc_newln(st); @@ -1692,7 +1692,7 @@ dopar(struct state *st, char *buf, size_t start, size_ * POD way. */ static void -dofile(const struct args *args, const char *fname, +dofile(const struct args *args, const char *fname, const struct tm *tm, char *buf, size_t sz) { char datebuf[64]; @@ -1788,7 +1788,7 @@ dofile(const struct args *args, const char *fname, !(verb && end + 2 < sz && isspace((unsigned char)buf[end + 2]))) break; - + /* Adjust end marker for EOF. */ if (end < sz && '\n' != buf[end]) @@ -1817,9 +1817,9 @@ readfile(const struct args *args, const char *fname) ssize_t ssz; struct tm *tm; time_t ttm; - struct stat st; + struct stat st; - fd = 0 != strcmp("-", fname) ? + fd = 0 != strcmp("-", fname) ? open(fname, O_RDONLY, 0) : STDIN_FILENO; if (-1 == fd) { @@ -1833,7 +1833,7 @@ readfile(const struct args *args, const char *fname) } else tm = localtime(&st.st_mtime); - /* + /* * Arbitrarily-sized initial buffer. * Should be big enough for most files... */ @@ -1861,7 +1861,7 @@ readfile(const struct args *args, const char *fname) return(0); } - dofile(args, STDIN_FILENO == fd ? + dofile(args, STDIN_FILENO == fd ? "STDIN" : fname, tm, buf, cur); free(buf); if (STDIN_FILENO != fd) @@ -1929,11 +1929,11 @@ main(int argc, char *argv[]) else if (1 == argc) fname = *argv; - return(readfile(&args, fname) ? + return(readfile(&args, fname) ? EXIT_SUCCESS : EXIT_FAILURE); usage: - fprintf(stderr, "usage: %s [-d date] " + fprintf(stderr, "usage: %s [-d date] " "[-n title] [-s section] [file]\n", name); return(EXIT_FAILURE);