=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.45 retrieving revision 1.55 diff -u -p -r1.45 -r1.55 --- mandoc/main.c 2009/10/13 10:21:24 1.45 +++ mandoc/main.c 2009/11/02 08:08:23 1.55 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.45 2009/10/13 10:21:24 kristaps Exp $ */ +/* $Id: main.c,v 1.55 2009/11/02 08:08:23 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -17,7 +17,6 @@ #include #include -#include #include #include #include @@ -27,20 +26,19 @@ #include "mdoc.h" #include "man.h" +#include "main.h" #define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) -/* Account for FreeBSD and Linux in our declarations. */ +/* FIXME: Intel's compiler? LLVM? pcc? */ +#if !defined(__GNUC__) || (__GNUC__ < 2) +# define __attribute__(x) +#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ + #ifdef __linux__ extern int getsubopt(char **, char * const *, char **); -# ifndef __dead -# define __dead __attribute__((__noreturn__)) -# endif -#elif defined(__dead2) -# ifndef __dead -# define __dead __dead2 -# endif +extern size_t strlcat(char *, const char *, size_t); #endif typedef void (*out_mdoc)(void *, const struct mdoc *); @@ -87,20 +85,9 @@ struct curparse { out_man outman; out_free outfree; void *outdata; - char *outopts; + char outopts[BUFSIZ]; }; -extern void *html_alloc(char *); -extern void html_mdoc(void *, const struct mdoc *); -extern void html_man(void *, const struct man *); -extern void html_free(void *); -extern void *ascii_alloc(void); -extern void tree_mdoc(void *, const struct mdoc *); -extern void tree_man(void *, const struct man *); -extern void terminal_mdoc(void *, const struct mdoc *); -extern void terminal_man(void *, const struct man *); -extern void terminal_free(void *); - static int foptions(int *, char *); static int toptions(enum outt *, char *); static int moptions(enum intt *, char *); @@ -115,10 +102,10 @@ static int pset(const char *, int, struct curparse struct man **, struct mdoc **); static struct man *man_init(struct curparse *); static struct mdoc *mdoc_init(struct curparse *); -__dead static void version(void); -__dead static void usage(void); +static void version(void) __attribute__((noreturn)); +static void usage(void) __attribute__((noreturn)); -extern char *__progname; +static const char *progname; int @@ -128,13 +115,19 @@ main(int argc, char *argv[]) struct buf ln, blk; struct curparse curp; - bzero(&curp, sizeof(struct curparse)); + progname = strrchr(argv[0], '/'); + if (progname == NULL) + progname = argv[0]; + else + ++progname; + memset(&curp, 0, sizeof(struct curparse)); + curp.inttype = INTT_AUTO; curp.outtype = OUTT_ASCII; /* LINTED */ - while (-1 != (c = getopt(argc, argv, "f:m:o:T:VW:"))) + while (-1 != (c = getopt(argc, argv, "f:m:O:T:VW:"))) switch (c) { case ('f'): if ( ! foptions(&curp.fflags, optarg)) @@ -144,8 +137,9 @@ main(int argc, char *argv[]) if ( ! moptions(&curp.inttype, optarg)) return(EXIT_FAILURE); break; - case ('o'): - curp.outopts = optarg; + case ('O'): + (void)strlcat(curp.outopts, optarg, BUFSIZ); + (void)strlcat(curp.outopts, ",", BUFSIZ); break; case ('T'): if ( ! toptions(&curp.outtype, optarg)) @@ -166,8 +160,8 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - bzero(&ln, sizeof(struct buf)); - bzero(&blk, sizeof(struct buf)); + memset(&ln, 0, sizeof(struct buf)); + memset(&blk, 0, sizeof(struct buf)); rc = 1; @@ -192,11 +186,9 @@ main(int argc, char *argv[]) argv++; if (*argv && rc) { if (curp.lastman) - if ( ! man_reset(curp.lastman)) - rc = 0; + man_reset(curp.lastman); if (curp.lastmdoc) - if ( ! mdoc_reset(curp.lastmdoc)) - rc = 0; + mdoc_reset(curp.lastmdoc); curp.lastman = NULL; curp.lastmdoc = NULL; } @@ -217,22 +209,22 @@ main(int argc, char *argv[]) } -__dead static void +static void version(void) { - (void)printf("%s %s\n", __progname, VERSION); + (void)printf("%s %s\n", progname, VERSION); exit(EXIT_SUCCESS); } -__dead static void +static void usage(void) { (void)fprintf(stderr, "usage: %s [-V] [-foption...] " - "[-mformat] [-Toutput] [-Werr...]\n", - __progname); + "[-mformat] [-Ooption] [-Toutput] " + "[-Werr...]\n", progname); exit(EXIT_FAILURE); } @@ -241,7 +233,6 @@ static struct man * man_init(struct curparse *curp) { int pflags; - struct man *man; struct man_cb mancb; mancb.man_err = merr; @@ -258,10 +249,7 @@ man_init(struct curparse *curp) if (curp->fflags & NO_IGN_ESCAPE) pflags &= ~MAN_IGN_ESCAPE; - if (NULL == (man = man_alloc(curp, pflags, &mancb))) - warnx("memory exhausted"); - - return(man); + return(man_alloc(curp, pflags, &mancb)); } @@ -269,7 +257,6 @@ static struct mdoc * mdoc_init(struct curparse *curp) { int pflags; - struct mdoc *mdoc; struct mdoc_cb mdoccb; mdoccb.mdoc_err = merr; @@ -288,10 +275,7 @@ mdoc_init(struct curparse *curp) if (curp->fflags & NO_IGN_CHARS) pflags &= ~MDOC_IGN_CHARS; - if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb))) - warnx("memory exhausted"); - - return(mdoc); + return(mdoc_alloc(curp, pflags, &mdoccb)); } @@ -303,14 +287,14 @@ ffile(struct buf *blk, struct buf *ln, curp->file = file; if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { - warn("%s", curp->file); + perror(curp->file); return(-1); } c = fdesc(blk, ln, curp); if (-1 == close(curp->fd)) - warn("%s", curp->file); + perror(curp->file); return(c); } @@ -337,15 +321,15 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse */ if (-1 == fstat(curp->fd, &st)) - warn("%s", curp->file); + perror(curp->file); else if ((size_t)st.st_blksize > sz) sz = st.st_blksize; if (sz > blk->sz) { blk->buf = realloc(blk->buf, sz); if (NULL == blk->buf) { - warn("realloc"); - return(-1); + perror(NULL); + exit(EXIT_FAILURE); } blk->sz = sz; } @@ -354,7 +338,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse for (lnn = pos = comment = 0; ; ) { if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { - warn("%s", curp->file); + perror(curp->file); return(-1); } else if (0 == ssz) break; @@ -366,8 +350,8 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse ln->sz += 256; /* Step-size. */ ln->buf = realloc(ln->buf, ln->sz); if (NULL == ln->buf) { - warn("realloc"); - return(-1); + perror(NULL); + return(EXIT_FAILURE); } } @@ -430,8 +414,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse /* NOTE a parser may not have been assigned, yet. */ if ( ! (man || mdoc)) { - (void)fprintf(stderr, "%s: not a manual\n", - curp->file); + fprintf(stderr, "%s: Not a manual\n", curp->file); return(0); } @@ -546,7 +529,7 @@ moptions(enum intt *tflags, char *arg) else if (0 == strcmp(arg, "an")) *tflags = INTT_MAN; else { - warnx("bad argument: -m%s", arg); + fprintf(stderr, "%s: Bad argument", arg); return(0); } @@ -567,7 +550,7 @@ toptions(enum outt *tflags, char *arg) else if (0 == strcmp(arg, "html")) *tflags = OUTT_HTML; else { - warnx("bad argument: -T%s", arg); + fprintf(stderr, "%s: Bad argument", arg); return(0); } @@ -579,7 +562,7 @@ static int foptions(int *fflags, char *arg) { char *v, *o; - const char *toks[7]; + const char *toks[8]; toks[0] = "ign-scope"; toks[1] = "no-ign-escape"; @@ -587,7 +570,8 @@ foptions(int *fflags, char *arg) toks[3] = "no-ign-chars"; toks[4] = "ign-errors"; toks[5] = "strict"; - toks[6] = NULL; + toks[6] = "ign-escape"; + toks[7] = NULL; while (*arg) { o = arg; @@ -611,8 +595,11 @@ foptions(int *fflags, char *arg) *fflags |= NO_IGN_ESCAPE | NO_IGN_MACRO | NO_IGN_CHARS; break; + case (6): + *fflags &= ~NO_IGN_ESCAPE; + break; default: - warnx("bad argument: -f%s", o); + fprintf(stderr, "%s: Bad argument", o); return(0); } } @@ -641,7 +628,7 @@ woptions(int *wflags, char *arg) *wflags |= WARN_WERR; break; default: - warnx("bad argument: -W%s", o); + fprintf(stderr, "%s: Bad argument", o); return(0); } }