version 1.336, 2019/07/27 13:40:57 |
version 1.337, 2019/07/28 13:13:03 |
Line 82 struct outstate { |
|
Line 82 struct outstate { |
|
void *outdata; /* data for output */ |
void *outdata; /* data for output */ |
int use_pager; |
int use_pager; |
int wstop; /* stop after a file with a warning */ |
int wstop; /* stop after a file with a warning */ |
|
int had_output; /* Some output was generated. */ |
enum outt outtype; /* which output to use */ |
enum outt outtype; /* which output to use */ |
}; |
}; |
|
|
Line 100 static void outdata_alloc(struct outstate *, struct |
|
Line 101 static void outdata_alloc(struct outstate *, struct |
|
static void parse(struct mparse *, int, const char *, |
static void parse(struct mparse *, int, const char *, |
struct outstate *, struct manoutput *); |
struct outstate *, struct manoutput *); |
static void passthrough(int, int); |
static void passthrough(int, int); |
|
static void process_onefile(struct mparse *, struct manpage *, |
|
int, struct outstate *, struct manconf *); |
static void run_pager(struct tag_files *); |
static void run_pager(struct tag_files *); |
static pid_t spawn_pager(struct tag_files *); |
static pid_t spawn_pager(struct tag_files *); |
static void usage(enum argmode) __attribute__((__noreturn__)); |
static void usage(enum argmode) __attribute__((__noreturn__)); |
Line 121 main(int argc, char *argv[]) |
|
Line 124 main(int argc, char *argv[]) |
|
struct mparse *mp; /* Opaque parser object. */ |
struct mparse *mp; /* Opaque parser object. */ |
const char *conf_file; /* -C: alternate config file. */ |
const char *conf_file; /* -C: alternate config file. */ |
const char *os_s; /* -I: Operating system for display. */ |
const char *os_s; /* -I: Operating system for display. */ |
const char *progname, *sec, *thisarg; |
const char *progname, *sec; |
char *defpaths; /* -M: override manpaths. */ |
char *defpaths; /* -M: override manpaths. */ |
char *auxpaths; /* -m: additional manpaths. */ |
char *auxpaths; /* -m: additional manpaths. */ |
char *oarg; /* -O: output option string. */ |
char *oarg; /* -O: output option string. */ |
Line 132 main(int argc, char *argv[]) |
|
Line 135 main(int argc, char *argv[]) |
|
int options; /* Parser options. */ |
int options; /* Parser options. */ |
int show_usage; /* Invalid argument: give up. */ |
int show_usage; /* Invalid argument: give up. */ |
int prio, best_prio; |
int prio, best_prio; |
int fd, startdir; |
int startdir; |
int c; |
int c; |
enum mandoc_os os_e; /* Check base system conventions. */ |
enum mandoc_os os_e; /* Check base system conventions. */ |
enum outmode outmode; /* According to command line. */ |
enum outmode outmode; /* According to command line. */ |
Line 528 main(int argc, char *argv[]) |
|
Line 531 main(int argc, char *argv[]) |
|
|
|
if (outmode == OUTMODE_FLN || outmode == OUTMODE_LST) |
if (outmode == OUTMODE_FLN || outmode == OUTMODE_LST) |
goto out; |
goto out; |
|
} else { |
|
sz = argc > 0 ? argc : 1; |
|
resp = res = mandoc_recallocarray(NULL, 0, sz, sizeof(*res)); |
|
for (i = 0; i < sz; i++) { |
|
if (argc > 0) |
|
res[i].file = mandoc_strdup(argv[i]); |
|
res[i].ipath = SIZE_MAX; |
|
res[i].form = FORM_SRC; |
|
} |
|
if (argc < 1) |
|
argc = 1; |
} |
} |
|
|
/* mandoc(1) */ |
/* mandoc(1) */ |
Line 558 main(int argc, char *argv[]) |
|
Line 572 main(int argc, char *argv[]) |
|
mchars_alloc(); |
mchars_alloc(); |
mp = mparse_alloc(options, os_e, os_s); |
mp = mparse_alloc(options, os_e, os_s); |
|
|
if (argc < 1) { |
|
if (outst.use_pager) |
|
outst.tag_files = tag_init(conf.output.tag); |
|
thisarg = "<stdin>"; |
|
mandoc_msg_setinfilename(thisarg); |
|
parse(mp, STDIN_FILENO, thisarg, &outst, &conf.output); |
|
mandoc_msg_setinfilename(NULL); |
|
} |
|
|
|
/* |
/* |
* Remember the original working directory, if possible. |
* Remember the original working directory, if possible. |
* This will be needed if some names on the command line |
* This will be needed if some names on the command line |
Line 576 main(int argc, char *argv[]) |
|
Line 581 main(int argc, char *argv[]) |
|
*/ |
*/ |
startdir = open(".", O_RDONLY | O_DIRECTORY); |
startdir = open(".", O_RDONLY | O_DIRECTORY); |
|
|
while (argc > 0) { |
while (argc-- > 0) { |
|
process_onefile(mp, resp++, startdir, &outst, &conf); |
/* |
|
* Changing directories is not needed in ARG_FILE mode. |
|
* Do it on a best-effort basis. Even in case of |
|
* failure, some functionality may still work. |
|
*/ |
|
if (resp != NULL) { |
|
if (resp->ipath != SIZE_MAX) |
|
(void)chdir(conf.manpath.paths[resp->ipath]); |
|
else if (startdir != -1) |
|
(void)fchdir(startdir); |
|
thisarg = resp->file; |
|
} else |
|
thisarg = *argv; |
|
|
|
mandoc_msg_setinfilename(thisarg); |
|
fd = mparse_open(mp, thisarg); |
|
if (fd != -1) { |
|
if (outst.use_pager) { |
|
outst.use_pager = 0; |
|
outst.tag_files = tag_init(conf.output.tag); |
|
} |
|
|
|
if (resp == NULL || resp->form == FORM_SRC) |
|
parse(mp, fd, thisarg, &outst, &conf.output); |
|
else |
|
passthrough(fd, conf.output.synopsisonly); |
|
|
|
if (ferror(stdout)) { |
|
if (outst.tag_files != NULL) { |
|
mandoc_msg(MANDOCERR_WRITE, 0, 0, |
|
"%s: %s", outst.tag_files->ofn, |
|
strerror(errno)); |
|
tag_unlink(); |
|
outst.tag_files = NULL; |
|
} else |
|
mandoc_msg(MANDOCERR_WRITE, 0, 0, |
|
"%s", strerror(errno)); |
|
break; |
|
} |
|
|
|
if (argc > 1 && outst.outtype <= OUTT_UTF8) { |
|
if (outst.outdata == NULL) |
|
outdata_alloc(&outst, &conf.output); |
|
terminal_sepline(outst.outdata); |
|
} |
|
} else |
|
mandoc_msg(resp == NULL ? MANDOCERR_BADARG_BAD : |
|
MANDOCERR_OPEN, 0, 0, "%s", strerror(errno)); |
|
|
|
mandoc_msg_setinfilename(NULL); |
|
|
|
if (outst.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK) |
if (outst.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK) |
break; |
break; |
|
|
if (resp != NULL) |
|
resp++; |
|
else |
|
argv++; |
|
if (--argc) |
|
mparse_reset(mp); |
|
} |
} |
if (startdir != -1) { |
if (startdir != -1) { |
(void)fchdir(startdir); |
(void)fchdir(startdir); |
Line 667 main(int argc, char *argv[]) |
|
Line 614 main(int argc, char *argv[]) |
|
mchars_free(); |
mchars_free(); |
|
|
out: |
out: |
if (search.argmode != ARG_FILE) { |
mansearch_free(res, sz); |
|
if (search.argmode != ARG_FILE) |
manconf_free(&conf); |
manconf_free(&conf); |
mansearch_free(res, sz); |
|
} |
|
|
|
if (outst.tag_files != NULL) { |
if (outst.tag_files != NULL) { |
fclose(stdout); |
fclose(stdout); |
tag_write(); |
tag_write(); |
run_pager(outst.tag_files); |
run_pager(outst.tag_files); |
tag_unlink(); |
tag_unlink(); |
} else if (outst.outtype != OUTT_LINT && |
} else if (outst.had_output && outst.outtype != OUTT_LINT) |
(search.argmode == ARG_FILE || sz > 0)) |
|
mandoc_msg_summary(); |
mandoc_msg_summary(); |
|
|
return (int)mandoc_msg_getrc(); |
return (int)mandoc_msg_getrc(); |
Line 838 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 783 fs_search(const struct mansearch *cfg, const struct ma |
|
} |
} |
|
|
static void |
static void |
|
process_onefile(struct mparse *mp, struct manpage *resp, int startdir, |
|
struct outstate *outst, struct manconf *conf) |
|
{ |
|
int fd; |
|
|
|
/* |
|
* Changing directories is not needed in ARG_FILE mode. |
|
* Do it on a best-effort basis. Even in case of |
|
* failure, some functionality may still work. |
|
*/ |
|
if (resp->ipath != SIZE_MAX) |
|
(void)chdir(conf->manpath.paths[resp->ipath]); |
|
else if (startdir != -1) |
|
(void)fchdir(startdir); |
|
|
|
mandoc_msg_setinfilename(resp->file); |
|
if (resp->file != NULL) { |
|
if ((fd = mparse_open(mp, resp->file)) == -1) { |
|
mandoc_msg(resp->ipath == SIZE_MAX ? |
|
MANDOCERR_BADARG_BAD : MANDOCERR_OPEN, |
|
0, 0, "%s", strerror(errno)); |
|
mandoc_msg_setinfilename(NULL); |
|
return; |
|
} |
|
} else |
|
fd = STDIN_FILENO; |
|
|
|
if (outst->use_pager) { |
|
outst->use_pager = 0; |
|
outst->tag_files = tag_init(conf->output.tag); |
|
} |
|
|
|
if (outst->had_output && outst->outtype <= OUTT_UTF8) { |
|
if (outst->outdata == NULL) |
|
outdata_alloc(outst, &conf->output); |
|
terminal_sepline(outst->outdata); |
|
} |
|
|
|
if (resp->form == FORM_SRC) |
|
parse(mp, fd, resp->file, outst, &conf->output); |
|
else { |
|
passthrough(fd, conf->output.synopsisonly); |
|
outst->had_output = 1; |
|
} |
|
|
|
if (ferror(stdout)) { |
|
if (outst->tag_files != NULL) { |
|
mandoc_msg(MANDOCERR_WRITE, 0, 0, "%s: %s", |
|
outst->tag_files->ofn, strerror(errno)); |
|
tag_unlink(); |
|
outst->tag_files = NULL; |
|
} else |
|
mandoc_msg(MANDOCERR_WRITE, 0, 0, "%s", |
|
strerror(errno)); |
|
} |
|
mandoc_msg_setinfilename(NULL); |
|
} |
|
|
|
static void |
parse(struct mparse *mp, int fd, const char *file, |
parse(struct mparse *mp, int fd, const char *file, |
struct outstate *outst, struct manoutput *outconf) |
struct outstate *outst, struct manoutput *outconf) |
{ |
{ |
struct roff_meta *meta; |
static int previous; |
|
struct roff_meta *meta; |
|
|
/* Begin by parsing the file itself. */ |
|
|
|
assert(file); |
|
assert(fd >= 0); |
assert(fd >= 0); |
|
if (file == NULL) |
|
file = "<stdin>"; |
|
|
|
if (previous) |
|
mparse_reset(mp); |
|
else |
|
previous = 1; |
|
|
mparse_readfd(mp, fd, file); |
mparse_readfd(mp, fd, file); |
if (fd != STDIN_FILENO) |
if (fd != STDIN_FILENO) |
close(fd); |
close(fd); |
Line 870 parse(struct mparse *mp, int fd, const char *file, |
|
Line 879 parse(struct mparse *mp, int fd, const char *file, |
|
|
|
/* Execute the out device, if it exists. */ |
/* Execute the out device, if it exists. */ |
|
|
|
outst->had_output = 1; |
if (meta->macroset == MACROSET_MDOC) { |
if (meta->macroset == MACROSET_MDOC) { |
switch (outst->outtype) { |
switch (outst->outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |