version 1.32, 2017/01/27 13:47:10 |
version 1.38, 2019/05/03 18:23:53 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 91 manconf_parse(struct manconf *conf, const char *file, |
|
Line 91 manconf_parse(struct manconf *conf, const char *file, |
|
manpath_parseline(&conf->manpath, defp, 0); |
manpath_parseline(&conf->manpath, defp, 0); |
} |
} |
|
|
|
void |
|
manpath_base(struct manpaths *dirs) |
|
{ |
|
char path_base[] = MANPATH_BASE; |
|
manpath_parseline(dirs, path_base, 0); |
|
} |
|
|
/* |
/* |
* Parse a FULL pathname from a colon-separated list of arrays. |
* Parse a FULL pathname from a colon-separated list of arrays. |
*/ |
*/ |
|
|
manconf_output(struct manoutput *conf, const char *cp, int fromfile) |
manconf_output(struct manoutput *conf, const char *cp, int fromfile) |
{ |
{ |
const char *const toks[] = { |
const char *const toks[] = { |
"includes", "man", "paper", "style", |
"includes", "man", "paper", "style", "indent", "width", |
"indent", "width", "fragment", "mdoc" |
"tag", "fragment", "mdoc", "noval", "toc" |
}; |
}; |
|
const size_t ntoks = sizeof(toks) / sizeof(toks[0]); |
|
|
const char *errstr; |
const char *errstr; |
char *oldval; |
char *oldval; |
size_t len, tok; |
size_t len, tok; |
|
|
for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) { |
for (tok = 0; tok < ntoks; tok++) { |
len = strlen(toks[tok]); |
len = strlen(toks[tok]); |
if ( ! strncmp(cp, toks[tok], len) && |
if ( ! strncmp(cp, toks[tok], len) && |
strchr(" = ", cp[len]) != NULL) { |
strchr(" = ", cp[len]) != NULL) { |
Line 250 manconf_output(struct manoutput *conf, const char *cp, |
|
Line 258 manconf_output(struct manoutput *conf, const char *cp, |
|
warnx("-O %s=?: Missing argument value", toks[tok]); |
warnx("-O %s=?: Missing argument value", toks[tok]); |
return -1; |
return -1; |
} |
} |
if ((tok == 6 || tok == 7) && *cp != '\0') { |
if (tok > 6 && tok < ntoks && *cp != '\0') { |
warnx("-O %s: Does not take a value: %s", toks[tok], cp); |
warnx("-O %s: Does not take a value: %s", toks[tok], cp); |
return -1; |
return -1; |
} |
} |
Line 299 manconf_output(struct manoutput *conf, const char *cp, |
|
Line 307 manconf_output(struct manoutput *conf, const char *cp, |
|
mandoc_asprintf(&oldval, "%zu", conf->width); |
mandoc_asprintf(&oldval, "%zu", conf->width); |
break; |
break; |
} |
} |
conf->width = strtonum(cp, 58, 1000, &errstr); |
conf->width = strtonum(cp, 1, 1000, &errstr); |
if (errstr == NULL) |
if (errstr == NULL) |
return 0; |
return 0; |
warnx("-O width=%s is %s", cp, errstr); |
warnx("-O width=%s is %s", cp, errstr); |
return -1; |
return -1; |
case 6: |
case 6: |
conf->fragment = 1; |
if (conf->tag != NULL) { |
|
oldval = mandoc_strdup(conf->tag); |
|
break; |
|
} |
|
conf->tag = mandoc_strdup(cp); |
return 0; |
return 0; |
case 7: |
case 7: |
|
conf->fragment = 1; |
|
return 0; |
|
case 8: |
conf->mdoc = 1; |
conf->mdoc = 1; |
|
return 0; |
|
case 9: |
|
conf->noval = 1; |
|
return 0; |
|
case 10: |
|
conf->toc = 1; |
return 0; |
return 0; |
default: |
default: |
if (fromfile) |
if (fromfile) |