Fixed \(bq.

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index be4b3b54896e314e2b6abed7ef07992069651204..d2d5a8694755af5ea9b4754330e18d26e993e46c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.34 2009/07/04 11:10:36 kristaps Exp $ */
+/*     $Id: main.c,v 1.40 2009/07/27 19:43:02 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -65,15 +65,14 @@ struct      curparse {
        const char       *file;         /* Current parse. */
        int               fd;           /* Current parse. */
        int               wflags;
        const char       *file;         /* Current parse. */
        int               fd;           /* Current parse. */
        int               wflags;

-#define        WARN_WALL         0x03          /* All-warnings mask. */
-#define        WARN_WCOMPAT     (1 << 0)       /* Compatibility warnings. */
-#define        WARN_WSYNTAX     (1 << 1)       /* Syntax warnings. */
+#define        WARN_WALL        (1 << 0)       /* All-warnings mask. */

 #define        WARN_WERR        (1 << 2)       /* Warnings->errors. */
        int               fflags;
 #define        IGN_SCOPE        (1 << 0)       /* Ignore scope errors. */
 #define        NO_IGN_ESCAPE    (1 << 1)       /* Don't ignore bad escapes. */
 #define        NO_IGN_MACRO     (1 << 2)       /* Don't ignore bad macros. */
 #define        NO_IGN_CHARS     (1 << 3)       /* Don't ignore bad chars. */
 #define        WARN_WERR        (1 << 2)       /* Warnings->errors. */
        int               fflags;
 #define        IGN_SCOPE        (1 << 0)       /* Ignore scope errors. */
 #define        NO_IGN_ESCAPE    (1 << 1)       /* Don't ignore bad escapes. */
 #define        NO_IGN_MACRO     (1 << 2)       /* Don't ignore bad macros. */
 #define        NO_IGN_CHARS     (1 << 3)       /* Don't ignore bad chars. */

+#define        IGN_ERRORS       (1 << 4)       /* Ignore failed parse. */

        enum intt         inttype;      /* Input parsers... */
        struct man       *man;
        struct man       *lastman;
        enum intt         inttype;      /* Input parsers... */
        struct man       *man;
        struct man       *lastman;


@@ -98,9 +97,7 @@ static        int               toptions(enum outt *, char *);
 static int               moptions(enum intt *, char *);
 static int               woptions(int *, char *);
 static int               merr(void *, int, int, const char *);
 static int               moptions(enum intt *, char *);
 static int               woptions(int *, char *);
 static int               merr(void *, int, int, const char *);

-static int               manwarn(void *, int, int, const char *);
-static int               mdocwarn(void *, int, int, 
-                               enum mdoc_warn, const char *);
+static int               mwarn(void *, int, int, const char *);

 static int               ffile(struct buf *, struct buf *, 
                                const char *, struct curparse *);
 static int               fdesc(struct buf *, struct buf *,
 static int               ffile(struct buf *, struct buf *, 
                                const char *, struct curparse *);
 static int               fdesc(struct buf *, struct buf *,


@@ -165,13 +162,21 @@ main(int argc, char *argv[])
        if (NULL == *argv) {
                curp.file = "<stdin>";
                curp.fd = STDIN_FILENO;
        if (NULL == *argv) {
                curp.file = "<stdin>";
                curp.fd = STDIN_FILENO;

-               if ( ! fdesc(&blk, &ln, &curp))
-                       rc = 0;
+
+               c = fdesc(&blk, &ln, &curp);
+               if ( ! (IGN_ERRORS & curp.fflags)) 
+                       rc = 1 == c ? 1 : 0;
+               else
+                       rc = -1 == c ? 0 : 1;

        }
 
        while (rc && *argv) {
        }
 
        while (rc && *argv) {

-               if ( ! ffile(&blk, &ln, *argv, &curp))
-                       rc = 0;
+               c = ffile(&blk, &ln, *argv, &curp);
+               if ( ! (IGN_ERRORS & curp.fflags)) 
+                       rc = 1 == c ? 1 : 0;
+               else
+                       rc = -1 == c ? 0 : 1;
+

                argv++;
                if (*argv && rc) {
                        if (curp.lastman)
                argv++;
                if (*argv && rc) {
                        if (curp.lastman)


@@ -228,7 +233,7 @@ man_init(struct curparse *curp)
        struct man_cb    mancb;
 
        mancb.man_err = merr;
        struct man_cb    mancb;
 
        mancb.man_err = merr;

-       mancb.man_warn = manwarn;
+       mancb.man_warn = mwarn;

 
        /* Defaults from mandoc.1. */
 
 
        /* Defaults from mandoc.1. */
 


@@ -256,7 +261,7 @@ mdoc_init(struct curparse *curp)
        struct mdoc_cb   mdoccb;
 
        mdoccb.mdoc_err = merr;
        struct mdoc_cb   mdoccb;
 
        mdoccb.mdoc_err = merr;

-       mdoccb.mdoc_warn = mdocwarn;
+       mdoccb.mdoc_warn = mwarn;

 
        /* Defaults from mandoc.1. */
 
 
        /* Defaults from mandoc.1. */
 


@@ -287,7 +292,7 @@ ffile(struct buf *blk, struct buf *ln,
        curp->file = file;
        if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
                warn("%s", curp->file);
        curp->file = file;
        if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
                warn("%s", curp->file);

-               return(0);
+               return(-1);

        }
 
        c = fdesc(blk, ln, curp);
        }
 
        c = fdesc(blk, ln, curp);


@@ -328,7 +333,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
                blk->buf = realloc(blk->buf, sz);
                if (NULL == blk->buf) {
                        warn("realloc");
                blk->buf = realloc(blk->buf, sz);
                if (NULL == blk->buf) {
                        warn("realloc");

-                       return(0);
+                       return(-1);

                }
                blk->sz = sz;
        }
                }
                blk->sz = sz;
        }


@@ -338,7 +343,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);
        for (lnn = pos = comment = 0; ; ) {
                if (-1 == (ssz = read(curp->fd, blk->buf, sz))) {
                        warn("%s", curp->file);

-                       return(0);
+                       return(-1);

                } else if (0 == ssz) 
                        break;
 
                } else if (0 == ssz) 
                        break;
 


@@ -350,7 +355,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
                                ln->buf = realloc(ln->buf, ln->sz);
                                if (NULL == ln->buf) {
                                        warn("realloc");
                                ln->buf = realloc(ln->buf, ln->sz);
                                if (NULL == ln->buf) {
                                        warn("realloc");

-                                       return(0);
+                                       return(-1);

                                }
                        }
 
                                }
                        }
 


@@ -397,7 +402,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
 
                        if ( ! (man || mdoc) && ! pset(ln->buf, 
                                                pos, curp, &man, &mdoc))
 
                        if ( ! (man || mdoc) && ! pset(ln->buf, 
                                                pos, curp, &man, &mdoc))

-                               return(0);
+                               return(-1);

 
                        pos = comment = 0;
 
 
                        pos = comment = 0;
 


@@ -413,7 +418,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
        /* NOTE a parser may not have been assigned, yet. */
 
        if ( ! (man || mdoc)) {
        /* NOTE a parser may not have been assigned, yet. */
 
        if ( ! (man || mdoc)) {

-               warnx("%s: not a manual", curp->file);
+               (void)fprintf(stderr, "%s: not a manual", curp->file);

                return(0);
        }
 
                return(0);
        }
 


@@ -445,10 +450,10 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
 
        if (man && curp->outman)
                if ( ! (*curp->outman)(curp->outdata, man))
 
        if (man && curp->outman)
                if ( ! (*curp->outman)(curp->outdata, man))

-                       return(0);
+                       return(-1);

        if (mdoc && curp->outmdoc)
                if ( ! (*curp->outmdoc)(curp->outdata, mdoc))
        if (mdoc && curp->outmdoc)
                if ( ! (*curp->outmdoc)(curp->outdata, mdoc))

-                       return(0);
+                       return(-1);

 
        return(1);
 }
 
        return(1);
 }


@@ -555,14 +560,15 @@ static int
 foptions(int *fflags, char *arg)
 {
        char            *v, *o;
 foptions(int *fflags, char *arg)
 {
        char            *v, *o;

-       char            *toks[6];
+       char            *toks[7];

 
        toks[0] = "ign-scope";
        toks[1] = "no-ign-escape";
        toks[2] = "no-ign-macro";
        toks[3] = "no-ign-chars";
 
        toks[0] = "ign-scope";
        toks[1] = "no-ign-escape";
        toks[2] = "no-ign-macro";
        toks[3] = "no-ign-chars";

-       toks[4] = "strict";
-       toks[5] = NULL;
+       toks[4] = "ign-errors";
+       toks[5] = "strict";
+       toks[6] = NULL;

 
        while (*arg) {
                o = arg;
 
        while (*arg) {
                o = arg;


@@ -580,6 +586,9 @@ foptions(int *fflags, char *arg)
                        *fflags |= NO_IGN_CHARS;
                        break;
                case (4):
                        *fflags |= NO_IGN_CHARS;
                        break;
                case (4):

+                       *fflags |= IGN_ERRORS;
+                       break;
+               case (5):

                        *fflags |= NO_IGN_ESCAPE | 
                                   NO_IGN_MACRO | NO_IGN_CHARS;
                        break;
                        *fflags |= NO_IGN_ESCAPE | 
                                   NO_IGN_MACRO | NO_IGN_CHARS;
                        break;


@@ -597,13 +606,11 @@ static int
 woptions(int *wflags, char *arg)
 {
        char            *v, *o;
 woptions(int *wflags, char *arg)
 {
        char            *v, *o;

-       char            *toks[5]; 
+       char            *toks[3]; 

 
        toks[0] = "all";
 
        toks[0] = "all";

-       toks[1] = "compat";
-       toks[2] = "syntax";
-       toks[3] = "error";
-       toks[4] = NULL;
+       toks[1] = "error";
+       toks[2] = NULL;

 
        while (*arg) {
                o = arg;
 
        while (*arg) {
                o = arg;


@@ -612,12 +619,6 @@ woptions(int *wflags, char *arg)
                        *wflags |= WARN_WALL;
                        break;
                case (1):
                        *wflags |= WARN_WALL;
                        break;
                case (1):

-                       *wflags |= WARN_WCOMPAT;
-                       break;
-               case (2):
-                       *wflags |= WARN_WSYNTAX;
-                       break;
-               case (3):

                        *wflags |= WARN_WERR;
                        break;
                default:
                        *wflags |= WARN_WERR;
                        break;
                default:


@@ -637,64 +638,30 @@ merr(void *arg, int line, int col, const char *msg)
        struct curparse *curp;
 
        curp = (struct curparse *)arg;
        struct curparse *curp;
 
        curp = (struct curparse *)arg;

-       warnx("%s:%d: error: %s (column %d)", 
-                       curp->file, line, msg, col);
+
+       (void)fprintf(stderr, "%s:%d:%d: error: %s\n", 
+                       curp->file, line, col + 1, msg);

 
        return(0);
 }
 
 
 static int
 
        return(0);
 }
 
 
 static int

-mdocwarn(void *arg, int line, int col, 
-               enum mdoc_warn type, const char *msg)
+mwarn(void *arg, int line, int col, const char *msg)

 {
        struct curparse *curp;
 {
        struct curparse *curp;

-       char            *wtype;

 
        curp = (struct curparse *)arg;
 
        curp = (struct curparse *)arg;

-       wtype = NULL;

 
 

-       switch (type) {
-       case (WARN_COMPAT):
-               wtype = "compat";
-               if (curp->wflags & WARN_WCOMPAT)
-                       break;
-               return(1);
-       case (WARN_SYNTAX):
-               wtype = "syntax";
-               if (curp->wflags & WARN_WSYNTAX)
-                       break;
+       if ( ! (curp->wflags & WARN_WALL))

                return(1);
                return(1);

-       }

 
 

-       assert(wtype);
-       warnx("%s:%d: %s warning: %s (column %d)", 
-                       curp->file, line, wtype, msg, col);
+       (void)fprintf(stderr, "%s:%d:%d: warning: %s\n", 
+                       curp->file, line, col + 1, msg);

 
        if ( ! (curp->wflags & WARN_WERR))
                return(1);
        
 
        if ( ! (curp->wflags & WARN_WERR))
                return(1);
        

-       warnx("considering warnings as errors");

        return(0);
 }
 
        return(0);
 }
 

-
-static int
-manwarn(void *arg, int line, int col, const char *msg)
-{
-       struct curparse *curp;
-
-       curp = (struct curparse *)arg;
-
-       if ( ! (curp->wflags & WARN_WSYNTAX))
-               return(1);
-
-       warnx("%s:%d: syntax warning: %s (column %d)", 
-                       curp->file, line, msg, col);
-
-       if ( ! (curp->wflags & WARN_WERR))
-               return(1);
-
-       warnx("considering warnings as errors");
-       return(0);
-}