Reduce the verbosity of error messages caused by open(2) failures.

Suggested by and ok jmc@.

diff --git a/main.c b/main.c
index 2323cd8daba83076aae9e11604dbe3c8139b5bb0..d97c8e2393b0b9b68f0a1f4bbf1861bdae52070d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.176 2014/06/21 16:18:25 schwarze Exp $ */
+/*     $Id: main.c,v 1.177 2014/06/21 22:24:01 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -411,14 +411,17 @@ static void
 mmsg(enum mandocerr t, enum mandoclevel lvl,
                const char *file, int line, int col, const char *msg)
 {
+       const char      *mparse_msg;
 
        fprintf(stderr, "%s: %s:", progname, file);
 
        if (line)
                fprintf(stderr, "%d:%d:", line, col + 1);
 
-       fprintf(stderr, " %s: %s", mparse_strlevel(lvl),
-           mparse_strerror(t));
+       fprintf(stderr, " %s", mparse_strlevel(lvl));
+
+       if (NULL != (mparse_msg = mparse_strerror(t)))
+               fprintf(stderr, ": %s", mparse_msg);
 
        if (msg)
                fprintf(stderr, ": %s", msg);

diff --git a/read.c b/read.c
index b47c5e1041d155f12116876dba898a6c4b6bd152..224460465b606d620cbcb626cfe817be6ab604e1 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.50 2014/06/20 23:02:31 schwarze Exp $ */
+/*     $Id: read.c,v 1.51 2014/06/21 22:24:01 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -210,7 +210,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "static buffer exhausted",
 
        /* system errors */
-       "cannot open file",
+       NULL,
        "cannot stat file",
        "cannot read file",
 };