Fix an obvious bug found during the /* FALLTHROUGH */ cleanup:

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 574fc64a91a1c9b7612b091976e53206c2938d11..e4d42b55544f1769550646d2a5f0b8826db15903 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.246 2015/10/10 13:21:18 schwarze Exp $ */
+/*     $Id: main.c,v 1.248 2015/10/12 00:08:15 schwarze Exp $ */

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


@@ -24,7 +24,7 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <errno.h>
+#include <err.h>

 #include <fcntl.h>
 #include <glob.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <glob.h>
 #include <signal.h>


@@ -109,10 +109,11 @@ static    int               toptions(struct curparse *, char *);
 static void              usage(enum argmode) __attribute__((noreturn));
 static int               woptions(struct curparse *, char *);
 
 static void              usage(enum argmode) __attribute__((noreturn));
 static int               woptions(struct curparse *, char *);
 

+extern char             *__progname;
+

 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
 static char              help_arg[] = "help";
 static char             *help_argv[] = {help_arg, NULL};
 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
 static char              help_arg[] = "help";
 static char             *help_argv[] = {help_arg, NULL};

-static const char       *progname;

 static enum mandoclevel  rc;
 
 
 static enum mandoclevel  rc;
 
 


@@ -139,15 +140,17 @@ main(int argc, char *argv[])
        int              use_pager;
        int              c;
 
        int              use_pager;
        int              c;
 

+#if !HAVE_PROGNAME

        if (argc < 1)
        if (argc < 1)

-               progname = "mandoc";
-       else if ((progname = strrchr(argv[0], '/')) == NULL)
-               progname = argv[0];
+               __progname = mandoc_strdup("mandoc");
+       else if ((__progname = strrchr(argv[0], '/')) == NULL)
+               __progname = argv[0];

        else
        else

-               ++progname;
+               ++__progname;
+#endif

 
 #if HAVE_SQLITE3
 
 #if HAVE_SQLITE3

-       if (strcmp(progname, BINM_MAKEWHATIS) == 0)
+       if (strcmp(__progname, BINM_MAKEWHATIS) == 0)

                return mandocdb(argc, argv);
 #endif
 
                return mandocdb(argc, argv);
 #endif
 


@@ -160,13 +163,13 @@ main(int argc, char *argv[])
        memset(&search, 0, sizeof(struct mansearch));
        search.outkey = "Nd";
 
        memset(&search, 0, sizeof(struct mansearch));
        search.outkey = "Nd";
 

-       if (strcmp(progname, BINM_MAN) == 0)
+       if (strcmp(__progname, BINM_MAN) == 0)

                search.argmode = ARG_NAME;
                search.argmode = ARG_NAME;

-       else if (strcmp(progname, BINM_APROPOS) == 0)
+       else if (strcmp(__progname, BINM_APROPOS) == 0)

                search.argmode = ARG_EXPR;
                search.argmode = ARG_EXPR;

-       else if (strcmp(progname, BINM_WHATIS) == 0)
+       else if (strcmp(__progname, BINM_WHATIS) == 0)

                search.argmode = ARG_WORD;
                search.argmode = ARG_WORD;

-       else if (strncmp(progname, "help", 4) == 0)
+       else if (strncmp(__progname, "help", 4) == 0)

                search.argmode = ARG_NAME;
        else
                search.argmode = ARG_FILE;
                search.argmode = ARG_NAME;
        else
                search.argmode = ARG_FILE;


@@ -207,15 +210,11 @@ main(int argc, char *argv[])
                        break;
                case 'I':
                        if (strncmp(optarg, "os=", 3)) {
                        break;
                case 'I':
                        if (strncmp(optarg, "os=", 3)) {

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

                                return (int)MANDOCLEVEL_BADARG;
                        }
                        if (defos) {
                                return (int)MANDOCLEVEL_BADARG;
                        }
                        if (defos) {

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

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


@@ -308,7 +307,7 @@ main(int argc, char *argv[])
         */
 
        if (search.argmode == ARG_NAME) {
         */
 
        if (search.argmode == ARG_NAME) {

-               if (*progname == 'h') {
+               if (*__progname == 'h') {

                        if (argc == 0) {
                                argv = help_argv;
                                argc = 1;
                        if (argc == 0) {
                                argv = help_argv;
                                argc = 1;


@@ -364,9 +363,7 @@ main(int argc, char *argv[])
                                fs_search(&search, &conf.manpath,
                                    argc, argv, &res, &sz);
                        else
                                fs_search(&search, &conf.manpath,
                                    argc, argv, &res, &sz);
                        else

-                               fprintf(stderr,
-                                   "%s: nothing appropriate\n",
-                                   progname);
+                               warnx("nothing appropriate");

                }
 
                if (sz == 0) {
                }
 
                if (sz == 0) {


@@ -577,8 +574,7 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
            paths->paths[ipath], sec, name);
        globres = glob(file, 0, NULL, &globinfo);
        if (globres != 0 && globres != GLOB_NOMATCH)
            paths->paths[ipath], sec, name);
        globres = glob(file, 0, NULL, &globinfo);
        if (globres != 0 && globres != GLOB_NOMATCH)

-               fprintf(stderr, "%s: %s: glob: %s\n",
-                   progname, file, strerror(errno));
+               warn("%s: glob", file);

        free(file);
        if (globres == 0)
                file = mandoc_strdup(*globinfo.gl_pathv);
        free(file);
        if (globres == 0)
                file = mandoc_strdup(*globinfo.gl_pathv);


@@ -588,8 +584,8 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
 
 found:
 #if HAVE_SQLITE3
 
 found:
 #if HAVE_SQLITE3

-       fprintf(stderr, "%s: outdated mandoc.db lacks %s(%s) entry, run "
-           "makewhatis %s\n", progname, name, sec, paths->paths[ipath]);
+       warnx("outdated mandoc.db lacks %s(%s) entry, run makewhatis %s\n",
+           name, sec, paths->paths[ipath]);

 #endif
        *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
        page = *res + (*ressz - 1);
 #endif
        *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
        page = *res + (*ressz - 1);


@@ -631,9 +627,7 @@ fs_search(const struct mansearch *cfg, const struct manpaths *paths,
                                        return;
                }
                if (*ressz == lastsz)
                                        return;
                }
                if (*ressz == lastsz)

-                       fprintf(stderr,
-                           "%s: No entry for %s in the manual.\n",
-                           progname, *argv);
+                       warnx("No entry for %s in the manual.", *argv);

                lastsz = *ressz;
                argv++;
                argc--;
                lastsz = *ressz;
                argv++;
                argc--;


@@ -715,13 +709,9 @@ parse(struct curparse *curp, int fd, const char *file)
                        curp->outman = man_man;
                        break;
                case OUTT_PDF:
                        curp->outman = man_man;
                        break;
                case OUTT_PDF:

-                       /* FALLTHROUGH */

                case OUTT_ASCII:
                case OUTT_ASCII:

-                       /* FALLTHROUGH */

                case OUTT_UTF8:
                case OUTT_UTF8:

-                       /* FALLTHROUGH */

                case OUTT_LOCALE:
                case OUTT_LOCALE:

-                       /* FALLTHROUGH */

                case OUTT_PS:
                        curp->outman = terminal_man;
                        curp->outmdoc = terminal_mdoc;
                case OUTT_PS:
                        curp->outman = terminal_man;
                        curp->outmdoc = terminal_mdoc;


@@ -804,8 +794,7 @@ done:
        return;
 
 fail:
        return;
 
 fail:

-       fprintf(stderr, "%s: %s: SYSERR: %s: %s",
-           progname, file, syscall, strerror(errno));
+       warn("%s: SYSERR: %s", file, syscall);

        if (rc < MANDOCLEVEL_SYSERR)
                rc = MANDOCLEVEL_SYSERR;
 }
        if (rc < MANDOCLEVEL_SYSERR)
                rc = MANDOCLEVEL_SYSERR;
 }


@@ -823,8 +812,7 @@ koptions(int *options, char *arg)
        } else if ( ! strcmp(arg, "us-ascii")) {
                *options &= ~(MPARSE_UTF8 | MPARSE_LATIN1);
        } else {
        } else if ( ! strcmp(arg, "us-ascii")) {
                *options &= ~(MPARSE_UTF8 | MPARSE_LATIN1);
        } else {

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

                return 0;
        }
        return 1;
                return 0;
        }
        return 1;


@@ -843,8 +831,7 @@ 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: -m %s: Bad argument\n",
-                   progname, arg);
+               warnx("-m %s: Bad argument", arg);

                return 0;
        }
 
                return 0;
        }
 


@@ -877,8 +864,7 @@ 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: -T %s: Bad argument\n",
-                   progname, arg);
+               warnx("-T %s: Bad argument", arg);

                return 0;
        }
 
                return 0;
        }
 


@@ -906,7 +892,6 @@ woptions(struct curparse *curp, char *arg)
                        curp->wstop = 1;
                        break;
                case 1:
                        curp->wstop = 1;
                        break;
                case 1:

-                       /* FALLTHROUGH */

                case 2:
                        curp->wlevel = MANDOCLEVEL_WARNING;
                        break;
                case 2:
                        curp->wlevel = MANDOCLEVEL_WARNING;
                        break;


@@ -920,8 +905,7 @@ woptions(struct curparse *curp, char *arg)
                        curp->wlevel = MANDOCLEVEL_BADARG;
                        break;
                default:
                        curp->wlevel = MANDOCLEVEL_BADARG;
                        break;
                default:

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

                        return 0;
                }
        }
                        return 0;
                }
        }


@@ -935,7 +919,7 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
 {
        const char      *mparse_msg;
 
 {
        const char      *mparse_msg;
 

-       fprintf(stderr, "%s: %s:", progname, file);
+       fprintf(stderr, "%s: %s:", __progname, file);

 
        if (line)
                fprintf(stderr, "%d:%d:", line, col + 1);
 
        if (line)
                fprintf(stderr, "%d:%d:", line, col + 1);


@@ -1001,9 +985,7 @@ spawn_pager(struct tag_files *tag_files)
 
        switch (pager_pid = fork()) {
        case -1:
 
        switch (pager_pid = fork()) {
        case -1:

-               fprintf(stderr, "%s: fork: %s\n",
-                   progname, strerror(errno));
-               exit((int)MANDOCLEVEL_SYSERR);
+               err((int)MANDOCLEVEL_SYSERR, "fork");

        case 0:
                break;
        default:
        case 0:
                break;
        default:


@@ -1012,14 +994,10 @@ spawn_pager(struct tag_files *tag_files)
 
        /* The child process becomes the pager. */
 
 
        /* The child process becomes the pager. */
 

-       if (dup2(tag_files->ofd, STDOUT_FILENO) == -1) {
-               fprintf(stderr, "pager: stdout: %s\n", strerror(errno));
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
+       if (dup2(tag_files->ofd, STDOUT_FILENO) == -1)
+               err((int)MANDOCLEVEL_SYSERR, "pager stdout");

        close(tag_files->ofd);
        close(tag_files->tfd);
        execvp(argv[0], argv);
        close(tag_files->ofd);
        close(tag_files->tfd);
        execvp(argv[0], argv);

-       fprintf(stderr, "%s: exec %s: %s\n",
-           progname, argv[0], strerror(errno));
-       exit((int)MANDOCLEVEL_SYSERR);
+       err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]);

 }
 }