version 1.244, 2015/07/28 18:38:55 |
version 1.246, 2015/10/10 13:21:18 |
Line 148 main(int argc, char *argv[]) |
|
Line 148 main(int argc, char *argv[]) |
|
|
|
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |
if (strcmp(progname, BINM_MAKEWHATIS) == 0) |
if (strcmp(progname, BINM_MAKEWHATIS) == 0) |
return(mandocdb(argc, argv)); |
return mandocdb(argc, argv); |
#endif |
#endif |
|
|
/* Search options. */ |
/* Search options. */ |
Line 210 main(int argc, char *argv[]) |
|
Line 210 main(int argc, char *argv[]) |
|
fprintf(stderr, |
fprintf(stderr, |
"%s: -I %s: Bad argument\n", |
"%s: -I %s: Bad argument\n", |
progname, optarg); |
progname, optarg); |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
} |
} |
if (defos) { |
if (defos) { |
fprintf(stderr, |
fprintf(stderr, |
"%s: -I %s: Duplicate argument\n", |
"%s: -I %s: Duplicate argument\n", |
progname, optarg); |
progname, optarg); |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
} |
} |
defos = mandoc_strdup(optarg + 3); |
defos = mandoc_strdup(optarg + 3); |
break; |
break; |
Line 225 main(int argc, char *argv[]) |
|
Line 225 main(int argc, char *argv[]) |
|
break; |
break; |
case 'K': |
case 'K': |
if ( ! koptions(&options, optarg)) |
if ( ! koptions(&options, optarg)) |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
break; |
break; |
case 'k': |
case 'k': |
search.argmode = ARG_EXPR; |
search.argmode = ARG_EXPR; |
Line 254 main(int argc, char *argv[]) |
|
Line 254 main(int argc, char *argv[]) |
|
break; |
break; |
case 'T': |
case 'T': |
if ( ! toptions(&curp, optarg)) |
if ( ! toptions(&curp, optarg)) |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
break; |
break; |
case 'W': |
case 'W': |
if ( ! woptions(&curp, optarg)) |
if ( ! woptions(&curp, optarg)) |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
break; |
break; |
case 'w': |
case 'w': |
outmode = OUTMODE_FLN; |
outmode = OUTMODE_FLN; |
Line 289 main(int argc, char *argv[]) |
|
Line 289 main(int argc, char *argv[]) |
|
} |
} |
} |
} |
|
|
|
if (outmode == OUTMODE_FLN || |
|
outmode == OUTMODE_LST || |
|
!isatty(STDOUT_FILENO)) |
|
use_pager = 0; |
|
|
/* Parse arguments. */ |
/* Parse arguments. */ |
|
|
if (argc > 0) { |
if (argc > 0) { |
Line 349 main(int argc, char *argv[]) |
|
Line 354 main(int argc, char *argv[]) |
|
if (search.argmode != ARG_NAME) { |
if (search.argmode != ARG_NAME) { |
fputs("mandoc: database support not compiled in\n", |
fputs("mandoc: database support not compiled in\n", |
stderr); |
stderr); |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
} |
} |
sz = 0; |
sz = 0; |
#endif |
#endif |
Line 418 main(int argc, char *argv[]) |
|
Line 423 main(int argc, char *argv[]) |
|
/* mandoc(1) */ |
/* mandoc(1) */ |
|
|
if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) |
if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
|
|
if (use_pager && ! isatty(STDOUT_FILENO)) |
|
use_pager = 0; |
|
|
|
curp.mchars = mchars_alloc(); |
curp.mchars = mchars_alloc(); |
curp.mp = mparse_alloc(options, curp.wlevel, mmsg, |
curp.mp = mparse_alloc(options, curp.wlevel, mmsg, |
curp.mchars, defos); |
curp.mchars, defos); |
|
|
tag_unlink(); |
tag_unlink(); |
} |
} |
|
|
return((int)rc); |
return (int)rc; |
} |
} |
|
|
static void |
static void |
Line 582 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 584 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
file = mandoc_strdup(*globinfo.gl_pathv); |
file = mandoc_strdup(*globinfo.gl_pathv); |
globfree(&globinfo); |
globfree(&globinfo); |
if (globres != 0) |
if (globres != 0) |
return(0); |
return 0; |
|
|
found: |
found: |
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |
|
|
page->bits = NAME_FILE & NAME_MASK; |
page->bits = NAME_FILE & NAME_MASK; |
page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10; |
page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10; |
page->form = form; |
page->form = form; |
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
Line 823 koptions(int *options, char *arg) |
|
Line 825 koptions(int *options, char *arg) |
|
} else { |
} else { |
fprintf(stderr, "%s: -K %s: Bad argument\n", |
fprintf(stderr, "%s: -K %s: Bad argument\n", |
progname, arg); |
progname, arg); |
return(0); |
return 0; |
} |
} |
return(1); |
return 1; |
} |
} |
|
|
static int |
static int |
Line 843 moptions(int *options, char *arg) |
|
Line 845 moptions(int *options, char *arg) |
|
else { |
else { |
fprintf(stderr, "%s: -m %s: Bad argument\n", |
fprintf(stderr, "%s: -m %s: Bad argument\n", |
progname, arg); |
progname, arg); |
return(0); |
return 0; |
} |
} |
|
|
return(1); |
return 1; |
} |
} |
|
|
static int |
static int |
Line 877 toptions(struct curparse *curp, char *arg) |
|
Line 879 toptions(struct curparse *curp, char *arg) |
|
else { |
else { |
fprintf(stderr, "%s: -T %s: Bad argument\n", |
fprintf(stderr, "%s: -T %s: Bad argument\n", |
progname, arg); |
progname, arg); |
return(0); |
return 0; |
} |
} |
|
|
return(1); |
return 1; |
} |
} |
|
|
static int |
static int |
Line 920 woptions(struct curparse *curp, char *arg) |
|
Line 922 woptions(struct curparse *curp, char *arg) |
|
default: |
default: |
fprintf(stderr, "%s: -W %s: Bad argument\n", |
fprintf(stderr, "%s: -W %s: Bad argument\n", |
progname, o); |
progname, o); |
return(0); |
return 0; |
} |
} |
} |
} |
|
|
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
Line 1005 spawn_pager(struct tag_files *tag_files) |
|
Line 1007 spawn_pager(struct tag_files *tag_files) |
|
case 0: |
case 0: |
break; |
break; |
default: |
default: |
return(pager_pid); |
return pager_pid; |
} |
} |
|
|
/* The child process becomes the pager. */ |
/* The child process becomes the pager. */ |