Prefix messages about bad command line options and arguments

with "mandoc: " or "makewhatis: ", respectively,
similar to what we already do for other messages.

diff --git a/main.c b/main.c
index f7f107a15b70dc2582fb8b6d1e246122f96999a9..2323cd8daba83076aae9e11604dbe3c8139b5bb0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.175 2014/06/20 23:02:31 schwarze Exp $ */
+/*     $Id: main.c,v 1.176 2014/06/21 16:18:25 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -108,13 +108,14 @@ main(int argc, char *argv[])
                case 'I':
                        if (strncmp(optarg, "os=", 3)) {
                                fprintf(stderr,
                case 'I':
                        if (strncmp(optarg, "os=", 3)) {
                                fprintf(stderr,

-                                   "-I%s: Bad argument\n", optarg);
+                                   "%s: -I%s: Bad argument\n",
+                                   progname, optarg);

                                return((int)MANDOCLEVEL_BADARG);
                        }
                        if (defos) {
                                fprintf(stderr,
                                return((int)MANDOCLEVEL_BADARG);
                        }
                        if (defos) {
                                fprintf(stderr,

-                                   "-I%s: Duplicate argument\n",
-                                   optarg);
+                                   "%s: -I%s: Duplicate argument\n",
+                                   progname, optarg);

                                return((int)MANDOCLEVEL_BADARG);
                        }
                        defos = mandoc_strdup(optarg + 3);
                                return((int)MANDOCLEVEL_BADARG);
                        }
                        defos = mandoc_strdup(optarg + 3);


@@ -324,7 +325,8 @@ moptions(int *options, char *arg)
        else if (0 == strcmp(arg, "an"))
                *options |= MPARSE_MAN;
        else {
        else if (0 == strcmp(arg, "an"))
                *options |= MPARSE_MAN;
        else {

-               fprintf(stderr, "%s: Bad argument\n", arg);
+               fprintf(stderr, "%s: -m%s: Bad argument\n",
+                   progname, arg);

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


@@ -357,7 +359,8 @@ toptions(struct curparse *curp, char *arg)
        else if (0 == strcmp(arg, "pdf"))
                curp->outtype = OUTT_PDF;
        else {
        else if (0 == strcmp(arg, "pdf"))
                curp->outtype = OUTT_PDF;
        else {

-               fprintf(stderr, "%s: Bad argument\n", arg);
+               fprintf(stderr, "%s: -T%s: Bad argument\n",
+                   progname, arg);

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


@@ -395,7 +398,8 @@ woptions(struct curparse *curp, char *arg)
                        curp->wlevel = MANDOCLEVEL_FATAL;
                        break;
                default:
                        curp->wlevel = MANDOCLEVEL_FATAL;
                        break;
                default:

-                       fprintf(stderr, "-W%s: Bad argument\n", o);
+                       fprintf(stderr, "%s: -W%s: Bad argument\n",
+                           progname, o);

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

diff --git a/mandocdb.c b/mandocdb.c
index 930133ccfdf55d762227c5817cd72afb257c2458..b3e34d05958d2198bdcba9b6add7e9ed7d3d0079 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.152 2014/06/20 02:24:40 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.153 2014/06/21 16:18:25 schwarze Exp $ */

 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -355,7 +355,8 @@ main(int argc, char *argv[])
         */
 #define        CHECKOP(_op, _ch) do \
        if (OP_DEFAULT != (_op)) { \
         */
 #define        CHECKOP(_op, _ch) do \
        if (OP_DEFAULT != (_op)) { \

-               fprintf(stderr, "-%c: Conflicting option\n", (_ch)); \
+               fprintf(stderr, "%s: -%c: Conflicting option\n", \
+                   progname, (_ch)); \

                goto usage; \
        } while (/*CONSTCOND*/0)
 
                goto usage; \
        } while (/*CONSTCOND*/0)
 


@@ -391,8 +392,9 @@ main(int argc, char *argv[])
                        break;
                case 'T':
                        if (strcmp(optarg, "utf8")) {
                        break;
                case 'T':
                        if (strcmp(optarg, "utf8")) {

-                               fprintf(stderr, "-T%s: Unsupported "
-                                   "output format\n", optarg);
+                               fprintf(stderr, "%s: -T%s: "
+                                   "Unsupported output format\n",
+                                   progname, optarg);

                                goto usage;
                        }
                        write_utf8 = 1;
                                goto usage;
                        }
                        write_utf8 = 1;


@@ -419,7 +421,8 @@ main(int argc, char *argv[])
        argv += optind;
 
        if (OP_CONFFILE == op && argc > 0) {
        argv += optind;
 
        if (OP_CONFFILE == op && argc > 0) {

-               fprintf(stderr, "-C: Too many arguments\n");
+               fprintf(stderr, "%s: -C: Too many arguments\n",
+                   progname);

                goto usage;
        }
 
                goto usage;
        }