summaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'main.c')
-rw-r--r--main.c297
1 files changed, 141 insertions, 156 deletions
diff --git a/main.c b/main.c
index 4a5d9a30..b59310dd 100644
--- a/main.c
+++ b/main.c
@@ -98,13 +98,10 @@ static int fs_lookup(const struct manpaths *,
static int fs_search(const struct mansearch *,
const struct manpaths *, int, char**,
struct manpage **, size_t *);
-static int koptions(int *, char *);
-static void moptions(int *, char *);
static void outdata_alloc(struct curparse *);
static void parse(struct curparse *, int, const char *);
-static void passthrough(const char *, int, int);
+static void passthrough(int, int);
static pid_t spawn_pager(struct tag_files *);
-static int toptions(struct curparse *, char *);
static void usage(enum argmode) __attribute__((__noreturn__));
static int woptions(struct curparse *, char *);
@@ -155,10 +152,11 @@ main(int argc, char *argv[])
return mandocdb(argc, argv);
#if HAVE_PLEDGE
- if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1)
- err((int)MANDOCLEVEL_SYSERR, "pledge");
+ if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1) {
+ mandoc_msg(MANDOCERR_PLEDGE, 0, 0, "%s", strerror(errno));
+ return mandoc_msg_getrc();
+ }
#endif
-
#if HAVE_SANDBOX_INIT
if (sandbox_init(kSBXProfileNoInternet, SANDBOX_NAMED, NULL) == -1)
errx((int)MANDOCLEVEL_SYSERR, "sandbox_init");
@@ -222,19 +220,29 @@ main(int argc, char *argv[])
outmode = OUTMODE_ALL;
break;
case 'I':
- if (strncmp(optarg, "os=", 3)) {
- warnx("-I %s: Bad argument", optarg);
- return (int)MANDOCLEVEL_BADARG;
+ if (strncmp(optarg, "os=", 3) != 0) {
+ mandoc_msg(MANDOCERR_BADARG_BAD, 0, 0,
+ "-I %s", optarg);
+ return mandoc_msg_getrc();
}
if (curp.os_s != NULL) {
- warnx("-I %s: Duplicate argument", optarg);
- return (int)MANDOCLEVEL_BADARG;
+ mandoc_msg(MANDOCERR_BADARG_DUPE, 0, 0,
+ "-I %s", optarg);
+ return mandoc_msg_getrc();
}
curp.os_s = mandoc_strdup(optarg + 3);
break;
case 'K':
- if ( ! koptions(&options, optarg))
- return (int)MANDOCLEVEL_BADARG;
+ options &= ~(MPARSE_UTF8 | MPARSE_LATIN1);
+ if (strcmp(optarg, "utf-8") == 0)
+ options |= MPARSE_UTF8;
+ else if (strcmp(optarg, "iso-8859-1") == 0)
+ options |= MPARSE_LATIN1;
+ else if (strcmp(optarg, "us-ascii") != 0) {
+ mandoc_msg(MANDOCERR_BADARG_BAD, 0, 0,
+ "-K %s", optarg);
+ return mandoc_msg_getrc();
+ }
break;
case 'k':
search.argmode = ARG_EXPR;
@@ -259,12 +267,37 @@ main(int argc, char *argv[])
search.sec = optarg;
break;
case 'T':
- if ( ! toptions(&curp, optarg))
- return (int)MANDOCLEVEL_BADARG;
+ if (strcmp(optarg, "ascii") == 0)
+ curp.outtype = OUTT_ASCII;
+ else if (strcmp(optarg, "lint") == 0) {
+ curp.outtype = OUTT_LINT;
+ mandoc_msg_setoutfile(stdout);
+ mandoc_msg_setmin(MANDOCERR_BASE);
+ } else if (strcmp(optarg, "tree") == 0)
+ curp.outtype = OUTT_TREE;
+ else if (strcmp(optarg, "man") == 0)
+ curp.outtype = OUTT_MAN;
+ else if (strcmp(optarg, "html") == 0)
+ curp.outtype = OUTT_HTML;
+ else if (strcmp(optarg, "markdown") == 0)
+ curp.outtype = OUTT_MARKDOWN;
+ else if (strcmp(optarg, "utf8") == 0)
+ curp.outtype = OUTT_UTF8;
+ else if (strcmp(optarg, "locale") == 0)
+ curp.outtype = OUTT_LOCALE;
+ else if (strcmp(optarg, "ps") == 0)
+ curp.outtype = OUTT_PS;
+ else if (strcmp(optarg, "pdf") == 0)
+ curp.outtype = OUTT_PDF;
+ else {
+ mandoc_msg(MANDOCERR_BADARG_BAD, 0, 0,
+ "-T %s", optarg);
+ return mandoc_msg_getrc();
+ }
break;
case 'W':
- if ( ! woptions(&curp, optarg))
- return (int)MANDOCLEVEL_BADARG;
+ if (woptions(&curp, optarg) == -1)
+ return mandoc_msg_getrc();
break;
case 'w':
outmode = OUTMODE_FLN;
@@ -302,7 +335,7 @@ main(int argc, char *argv[])
while (oarg != NULL) {
if (manconf_output(&conf.output,
strsep(&oarg, ","), 0) == -1)
- return (int)MANDOCLEVEL_BADARG;
+ return mandoc_msg_getrc();
}
}
}
@@ -326,9 +359,13 @@ main(int argc, char *argv[])
}
#if HAVE_PLEDGE
- if (!use_pager)
- if (pledge("stdio rpath", NULL) == -1)
- err((int)MANDOCLEVEL_SYSERR, "pledge");
+ if (use_pager == 0) {
+ if (pledge("stdio rpath", NULL) == -1) {
+ mandoc_msg(MANDOCERR_PLEDGE, 0, 0,
+ "%s", strerror(errno));
+ return mandoc_msg_getrc();
+ }
+ }
#endif
/* Parse arguments. */
@@ -393,7 +430,7 @@ main(int argc, char *argv[])
usage(search.argmode);
if (sz == 0 && search.argmode == ARG_NAME)
- fs_search(&search, &conf.manpath,
+ (void)fs_search(&search, &conf.manpath,
argc, argv, &res, &sz);
if (search.argmode == ARG_NAME) {
@@ -401,7 +438,10 @@ main(int argc, char *argv[])
if (strchr(argv[c], '/') == NULL)
continue;
if (access(argv[c], R_OK) == -1) {
- warn("%s", argv[c]);
+ mandoc_msg_setinfilename(argv[c]);
+ mandoc_msg(MANDOCERR_BADARG_BAD,
+ 0, 0, "%s", strerror(errno));
+ mandoc_msg_setinfilename(NULL);
continue;
}
res = mandoc_reallocarray(res,
@@ -487,16 +527,26 @@ main(int argc, char *argv[])
#if HAVE_PLEDGE
if (use_pager) {
- if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1)
- err((int)MANDOCLEVEL_SYSERR, "pledge");
+ if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1) {
+ mandoc_msg(MANDOCERR_PLEDGE, 0, 0,
+ "%s", strerror(errno));
+ return mandoc_msg_getrc();
+ }
} else {
- if (pledge("stdio rpath", NULL) == -1)
- err((int)MANDOCLEVEL_SYSERR, "pledge");
+ if (pledge("stdio rpath", NULL) == -1) {
+ mandoc_msg(MANDOCERR_PLEDGE, 0, 0,
+ "%s", strerror(errno));
+ return mandoc_msg_getrc();
+ }
}
#endif
- if (search.argmode == ARG_FILE)
- moptions(&options, auxpaths);
+ if (search.argmode == ARG_FILE && auxpaths != NULL) {
+ if (strcmp(auxpaths, "doc") == 0)
+ options |= MPARSE_MDOC;
+ else if (strcmp(auxpaths, "an") == 0)
+ options |= MPARSE_MAN;
+ }
mchars_alloc();
curp.mp = mparse_alloc(options, curp.os_e, curp.os_s);
@@ -538,6 +588,7 @@ main(int argc, char *argv[])
} else
thisarg = *argv;
+ mandoc_msg_setinfilename(thisarg);
fd = mparse_open(curp.mp, thisarg);
if (fd != -1) {
if (use_pager) {
@@ -547,22 +598,21 @@ main(int argc, char *argv[])
tag_files->tagname = conf.output.tag;
}
- mandoc_msg_setinfilename(thisarg);
if (resp == NULL || resp->form == FORM_SRC)
parse(&curp, fd, thisarg);
else
- passthrough(resp->file, fd,
- conf.output.synopsisonly);
- mandoc_msg_setinfilename(NULL);
+ passthrough(fd, conf.output.synopsisonly);
if (ferror(stdout)) {
if (tag_files != NULL) {
- warn("%s", tag_files->ofn);
+ mandoc_msg(MANDOCERR_WRITE, 0, 0,
+ "%s: %s", tag_files->ofn,
+ strerror(errno));
tag_unlink();
tag_files = NULL;
} else
- warn("stdout");
- mandoc_msg_setrc(MANDOCLEVEL_SYSERR);
+ mandoc_msg(MANDOCERR_WRITE, 0, 0,
+ "%s", strerror(errno));
break;
}
@@ -572,8 +622,10 @@ main(int argc, char *argv[])
terminal_sepline(curp.outdata);
}
} else
- mandoc_msg(MANDOCERR_FILE, 0, 0,
- "%s: %s", thisarg, strerror(errno));
+ mandoc_msg(resp == NULL ? MANDOCERR_BADARG_BAD :
+ MANDOCERR_OPEN, 0, 0, "%s", strerror(errno));
+
+ mandoc_msg_setinfilename(NULL);
if (curp.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK)
break;
@@ -665,8 +717,8 @@ out:
continue;
if (pid == -1) {
- warn("wait");
- mandoc_msg_setrc(MANDOCLEVEL_SYSERR);
+ mandoc_msg(MANDOCERR_WAIT, 0, 0,
+ "%s", strerror(errno));
break;
}
if (!WIFSTOPPED(status))
@@ -682,7 +734,6 @@ out:
static void
usage(enum argmode argmode)
{
-
switch (argmode) {
case ARG_FILE:
fputs("usage: mandoc [-ac] [-I os=name] "
@@ -747,7 +798,8 @@ 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)
- warn("%s: glob", file);
+ mandoc_msg(MANDOCERR_GLOB, 0, 0,
+ "%s: %s", file, strerror(errno));
free(file);
if (globres == 0)
file = mandoc_strdup(*globinfo.gl_pathv);
@@ -758,21 +810,21 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
free(file);
}
if (res != NULL || ipath + 1 != paths->sz)
- return 0;
+ return -1;
mandoc_asprintf(&file, "%s.%s", name, sec);
globres = stat(file, &sb);
free(file);
- return globres != -1;
+ return globres;
found:
warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",
name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);
if (res == NULL) {
free(file);
- return 1;
+ return 0;
}
- *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
+ *res = mandoc_reallocarray(*res, ++*ressz, sizeof(**res));
page = *res + (*ressz - 1);
page->file = file;
page->names = NULL;
@@ -781,7 +833,7 @@ found:
page->ipath = ipath;
page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10;
page->form = form;
- return 1;
+ return 0;
}
static int
@@ -803,14 +855,14 @@ fs_search(const struct mansearch *cfg, const struct manpaths *paths,
for (ipath = 0; ipath < paths->sz; ipath++) {
if (cfg->sec != NULL) {
if (fs_lookup(paths, ipath, cfg->sec,
- cfg->arch, *argv, res, ressz) &&
+ cfg->arch, *argv, res, ressz) != -1 &&
cfg->firstmatch)
- return 1;
+ return 0;
} else for (isec = 0; isec < nsec; isec++)
if (fs_lookup(paths, ipath, sections[isec],
- cfg->arch, *argv, res, ressz) &&
+ cfg->arch, *argv, res, ressz) != -1 &&
cfg->firstmatch)
- return 1;
+ return 0;
}
if (res != NULL && *ressz == lastsz &&
strchr(*argv, '/') == NULL) {
@@ -829,7 +881,7 @@ fs_search(const struct mansearch *cfg, const struct manpaths *paths,
argv++;
argc--;
}
- return 0;
+ return -1;
}
static void
@@ -936,7 +988,7 @@ check_xr(void)
search.firstmatch = 1;
if (mansearch(&search, &paths, 1, &xr->name, NULL, &sz))
continue;
- if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz))
+ if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz) != -1)
continue;
if (xr->count == 1)
mandoc_msg(MANDOCERR_XR_BAD, xr->line,
@@ -976,34 +1028,34 @@ outdata_alloc(struct curparse *curp)
}
static void
-passthrough(const char *file, int fd, int synopsis_only)
+passthrough(int fd, int synopsis_only)
{
const char synb[] = "S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS";
const char synr[] = "SYNOPSIS";
FILE *stream;
- const char *syscall;
char *line, *cp;
size_t linesz;
ssize_t len, written;
- int print;
+ int lno, print;
+ stream = NULL;
line = NULL;
linesz = 0;
if (fflush(stdout) == EOF) {
- syscall = "fflush";
- goto fail;
+ mandoc_msg(MANDOCERR_FFLUSH, 0, 0, "%s", strerror(errno));
+ goto done;
}
-
if ((stream = fdopen(fd, "r")) == NULL) {
close(fd);
- syscall = "fdopen";
- goto fail;
+ mandoc_msg(MANDOCERR_FDOPEN, 0, 0, "%s", strerror(errno));
+ goto done;
}
- print = 0;
+ lno = print = 0;
while ((len = getline(&line, &linesz, stream)) != -1) {
+ lno++;
cp = line;
if (synopsis_only) {
if (print) {
@@ -1021,94 +1073,20 @@ passthrough(const char *file, int fd, int synopsis_only)
}
}
for (; len > 0; len -= written) {
- if ((written = write(STDOUT_FILENO, cp, len)) != -1)
- continue;
- fclose(stream);
- syscall = "write";
- goto fail;
+ if ((written = write(STDOUT_FILENO, cp, len)) == -1) {
+ mandoc_msg(MANDOCERR_WRITE, 0, 0,
+ "%s", strerror(errno));
+ goto done;
+ }
}
}
-
- if (ferror(stream)) {
- fclose(stream);
- syscall = "getline";
- goto fail;
- }
+ if (ferror(stream))
+ mandoc_msg(MANDOCERR_GETLINE, lno, 0, "%s", strerror(errno));
done:
free(line);
- fclose(stream);
- return;
-
-fail:
- free(line);
- warn("%s: SYSERR: %s", file, syscall);
- mandoc_msg_setrc(MANDOCLEVEL_SYSERR);
-}
-
-static int
-koptions(int *options, char *arg)
-{
-
- if ( ! strcmp(arg, "utf-8")) {
- *options |= MPARSE_UTF8;
- *options &= ~MPARSE_LATIN1;
- } else if ( ! strcmp(arg, "iso-8859-1")) {
- *options |= MPARSE_LATIN1;
- *options &= ~MPARSE_UTF8;
- } else if ( ! strcmp(arg, "us-ascii")) {
- *options &= ~(MPARSE_UTF8 | MPARSE_LATIN1);
- } else {
- warnx("-K %s: Bad argument", arg);
- return 0;
- }
- return 1;
-}
-
-static void
-moptions(int *options, char *arg)
-{
-
- if (arg == NULL)
- return;
- if (strcmp(arg, "doc") == 0)
- *options |= MPARSE_MDOC;
- else if (strcmp(arg, "an") == 0)
- *options |= MPARSE_MAN;
-}
-
-static int
-toptions(struct curparse *curp, char *arg)
-{
-
- if (0 == strcmp(arg, "ascii"))
- curp->outtype = OUTT_ASCII;
- else if (0 == strcmp(arg, "lint")) {
- curp->outtype = OUTT_LINT;
- mandoc_msg_setoutfile(stdout);
- mandoc_msg_setmin(MANDOCERR_BASE);
- } else if (0 == strcmp(arg, "tree"))
- curp->outtype = OUTT_TREE;
- else if (0 == strcmp(arg, "man"))
- curp->outtype = OUTT_MAN;
- else if (0 == strcmp(arg, "html"))
- curp->outtype = OUTT_HTML;
- else if (0 == strcmp(arg, "markdown"))
- curp->outtype = OUTT_MARKDOWN;
- else if (0 == strcmp(arg, "utf8"))
- curp->outtype = OUTT_UTF8;
- else if (0 == strcmp(arg, "locale"))
- curp->outtype = OUTT_LOCALE;
- else if (0 == strcmp(arg, "ps"))
- curp->outtype = OUTT_PS;
- else if (0 == strcmp(arg, "pdf"))
- curp->outtype = OUTT_PDF;
- else {
- warnx("-T %s: Bad argument", arg);
- return 0;
- }
-
- return 1;
+ if (stream != NULL)
+ fclose(stream);
}
static int
@@ -1152,7 +1130,7 @@ woptions(struct curparse *curp, char *arg)
mandoc_msg_setmin(MANDOCERR_UNSUPP);
break;
case 7:
- mandoc_msg_setmin(MANDOCERR_MAX);
+ mandoc_msg_setmin(MANDOCERR_BADARG);
break;
case 8:
mandoc_msg_setmin(MANDOCERR_BASE);
@@ -1163,11 +1141,11 @@ woptions(struct curparse *curp, char *arg)
curp->os_e = MANDOC_OS_NETBSD;
break;
default:
- warnx("-W %s: Bad argument", o);
- return 0;
+ mandoc_msg(MANDOCERR_BADARG_BAD, 0, 0, "-W %s", o);
+ return -1;
}
}
- return 1;
+ return 0;
}
static pid_t
@@ -1232,15 +1210,19 @@ spawn_pager(struct tag_files *tag_files)
switch (pager_pid = fork()) {
case -1:
- err((int)MANDOCLEVEL_SYSERR, "fork");
+ mandoc_msg(MANDOCERR_FORK, 0, 0, "%s", strerror(errno));
+ exit(mandoc_msg_getrc());
case 0:
break;
default:
(void)setpgid(pager_pid, 0);
(void)tcsetpgrp(tag_files->ofd, pager_pid);
#if HAVE_PLEDGE
- if (pledge("stdio rpath tmppath tty proc", NULL) == -1)
- err((int)MANDOCLEVEL_SYSERR, "pledge");
+ if (pledge("stdio rpath tmppath tty proc", NULL) == -1) {
+ mandoc_msg(MANDOCERR_PLEDGE, 0, 0,
+ "%s", strerror(errno));
+ exit(mandoc_msg_getrc());
+ }
#endif
tag_files->pager_pid = pager_pid;
return pager_pid;
@@ -1248,8 +1230,10 @@ spawn_pager(struct tag_files *tag_files)
/* The child process becomes the pager. */
- if (dup2(tag_files->ofd, STDOUT_FILENO) == -1)
- err((int)MANDOCLEVEL_SYSERR, "pager stdout");
+ if (dup2(tag_files->ofd, STDOUT_FILENO) == -1) {
+ mandoc_msg(MANDOCERR_DUP, 0, 0, "%s", strerror(errno));
+ _exit(mandoc_msg_getrc());
+ }
close(tag_files->ofd);
assert(tag_files->tfd == -1);
@@ -1259,5 +1243,6 @@ spawn_pager(struct tag_files *tag_files)
nanosleep(&timeout, NULL);
execvp(argv[0], argv);
- err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]);
+ mandoc_msg(MANDOCERR_EXEC, 0, 0, "%s: %s", argv[0], strerror(errno));
+ _exit(mandoc_msg_getrc());
}
generated by cgit (git 2.34.1) at 2024-11-18 10:42:09 +0000