Add a FATAL error for when no manual type was assigned (you can repeat

this for yourself by having a file consisting only of comments).

diff --git a/main.c b/main.c
index 6785ed8117cfbdcc87881f3a6c05711f38ca877e..f6f52fda0c83bff0e7274a44836c5e168c9c7b44 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.157 2011/03/21 12:04:26 kristaps Exp $ */
+/*     $Id: main.c,v 1.158 2011/03/22 10:35:26 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -168,6 +168,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
 
        "generic fatal error",
 
+       "not a manual",
        "column syntax is inconsistent",
        "NOT IMPLEMENTED: .Bd -file",
        "line scope broken, syntax violated",

diff --git a/mandoc.h b/mandoc.h
index 0505eb910f4b03819dd8681ac5e82efedde58b7d..769374ef3c730d19d814331782c85c7b151144dd 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.65 2011/03/22 09:48:13 kristaps Exp $ */
+/*     $Id: mandoc.h,v 1.66 2011/03/22 10:35:26 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -137,6 +137,7 @@ enum        mandocerr {
 
        MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
 
+       MANDOCERR_NOTMANUAL, /* manual isn't really a manual */
        MANDOCERR_COLUMNS, /* column syntax is inconsistent */
        MANDOCERR_BADDISP, /* NOT IMPLEMENTED: .Bd -file */
        MANDOCERR_SYNTLINESCOPE, /* line scope broken, syntax violated */

diff --git a/read.c b/read.c
index f78d2983d0beb4c0a3488f26c8338db1c4b40426..f90306240547cc652610a76870c025e1571a7766 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.5 2011/03/22 09:50:11 kristaps Exp $ */
+/*     $Id: read.c,v 1.6 2011/03/22 10:35:26 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -496,16 +496,11 @@ mparse_end(struct mparse *curp)
                return;
        }
 
-#if 0
-       /* FIXME: NOTE a parser may not have been assigned, yet. */
-
        if ( ! (curp->man || curp->mdoc)) {
-               /* FIXME: make into an mandoc.h error. */
-               fprintf(stderr, "%s: Not a manual\n", curp->file);
+               mandoc_msg(MANDOCERR_NOTMANUAL, curp, 1, 0, NULL);
                curp->file_status = MANDOCLEVEL_FATAL;
-               goto cleanup;
+               return;
        }
-#endif
 
        roff_endparse(curp->roff);
 }