(Fix again for default `Bf Li' font.)

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 128f311191ec035af614edf7f76239ff22175fbb..d6a51d8aabe1e3a38884dd3ed65a3e9ed08aa03e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.50 2009/10/26 15:44:51 kristaps Exp $ */
+/*     $Id: main.c,v 1.57 2009/11/02 08:29:25 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -17,7 +17,6 @@
 #include <sys/stat.h>
 
 #include <assert.h>
-#include <err.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdint.h>
@@ -31,18 +30,17 @@
 
 #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)
+# if !defined(lint)
+#  define __attribute__(x)
+# endif
+#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
 
 #ifdef __linux__
 extern int               getsubopt(char **, char * const *, char **);
 extern size_t            strlcat(char *, const char *, size_t);
-# ifndef __dead
-#  define __dead __attribute__((__noreturn__))
-# endif
-#elif defined(__dead2)
-# ifndef __dead
-#  define __dead __dead2
-# endif
 #endif
 
 typedef        void            (*out_mdoc)(void *, const struct mdoc *);
@@ -106,10 +104,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
@@ -119,7 +117,13 @@ 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;
@@ -158,8 +162,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;
 
@@ -184,11 +188,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;
                }
@@ -209,22 +211,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] [-Ooption] [-Toutput] "
-                       "[-Werr...]\n", __progname);
+                       "[-Werr...]\n", progname);
        exit(EXIT_FAILURE);
 }
 
@@ -233,7 +235,6 @@ static struct man *
 man_init(struct curparse *curp)
 {
        int              pflags;
-       struct man      *man;
        struct man_cb    mancb;
 
        mancb.man_err = merr;
@@ -250,10 +251,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));
 }
 
 
@@ -261,7 +259,6 @@ static struct mdoc *
 mdoc_init(struct curparse *curp)
 {
        int              pflags;
-       struct mdoc     *mdoc;
        struct mdoc_cb   mdoccb;
 
        mdoccb.mdoc_err = merr;
@@ -280,10 +277,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));
 }
 
 
@@ -295,14 +289,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);
 }
@@ -329,15 +323,15 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
         */
 
        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;
        }
@@ -346,7 +340,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
 
        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;
@@ -358,8 +352,8 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
                                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);
                                }
                        }
 
@@ -422,8 +416,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
        /* 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);
        }
 
@@ -538,7 +531,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\n", arg);
                return(0);
        }
 
@@ -559,7 +552,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\n", arg);
                return(0);
        }
 
@@ -608,7 +601,7 @@ foptions(int *fflags, char *arg)
                        *fflags &= ~NO_IGN_ESCAPE;
                        break;
                default:
-                       warnx("bad argument: -f%s", o);
+                       fprintf(stderr, "%s: Bad argument\n", o);
                        return(0);
                }
        }
@@ -637,7 +630,7 @@ woptions(int *wflags, char *arg)
                        *wflags |= WARN_WERR;
                        break;
                default:
-                       warnx("bad argument: -W%s", o);
+                       fprintf(stderr, "%s: Bad argument\n", o);
                        return(0);
                }
        }