version 1.228, 2015/03/27 16:36:31 |
version 1.229, 2015/03/27 17:37:25 |
|
|
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
* copyright notice and this permission notice appear in all copies. |
* copyright notice and this permission notice appear in all copies. |
* |
* |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
|
|
#include "main.h" |
#include "main.h" |
#include "mdoc.h" |
#include "mdoc.h" |
#include "man.h" |
#include "man.h" |
#include "manpath.h" |
#include "manconf.h" |
#include "mansearch.h" |
#include "mansearch.h" |
|
|
#if !defined(__GNUC__) || (__GNUC__ < 2) |
#if !defined(__GNUC__) || (__GNUC__ < 2) |
Line 118 static enum mandoclevel rc; |
|
Line 118 static enum mandoclevel rc; |
|
int |
int |
main(int argc, char *argv[]) |
main(int argc, char *argv[]) |
{ |
{ |
|
struct manconf conf; |
struct curparse curp; |
struct curparse curp; |
struct mansearch search; |
struct mansearch search; |
struct manpaths paths; |
|
char *auxpaths; |
char *auxpaths; |
char *defos; |
char *defos; |
unsigned char *uc; |
unsigned char *uc; |
Line 151 main(int argc, char *argv[]) |
|
Line 151 main(int argc, char *argv[]) |
|
|
|
/* Search options. */ |
/* Search options. */ |
|
|
memset(&paths, 0, sizeof(struct manpaths)); |
memset(&conf, 0, sizeof(conf)); |
conf_file = defpaths = NULL; |
conf_file = defpaths = NULL; |
auxpaths = NULL; |
auxpaths = NULL; |
|
|
Line 336 main(int argc, char *argv[]) |
|
Line 336 main(int argc, char *argv[]) |
|
|
|
/* Access the mandoc database. */ |
/* Access the mandoc database. */ |
|
|
manpath_parse(&paths, conf_file, defpaths, auxpaths); |
manconf_parse(&conf, conf_file, defpaths, auxpaths); |
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |
mansearch_setup(1); |
mansearch_setup(1); |
if( ! mansearch(&search, &paths, argc, argv, &res, &sz)) |
if ( ! mansearch(&search, &conf.manpath, |
|
argc, argv, &res, &sz)) |
usage(search.argmode); |
usage(search.argmode); |
#else |
#else |
if (search.argmode != ARG_NAME) { |
if (search.argmode != ARG_NAME) { |
Line 351 main(int argc, char *argv[]) |
|
Line 352 main(int argc, char *argv[]) |
|
#endif |
#endif |
|
|
if (sz == 0 && search.argmode == ARG_NAME) |
if (sz == 0 && search.argmode == ARG_NAME) |
fs_search(&search, &paths, argc, argv, &res, &sz); |
fs_search(&search, &conf.manpath, |
|
argc, argv, &res, &sz); |
|
|
if (sz == 0) { |
if (sz == 0) { |
rc = MANDOCLEVEL_BADARG; |
rc = MANDOCLEVEL_BADARG; |
Line 439 main(int argc, char *argv[]) |
|
Line 441 main(int argc, char *argv[]) |
|
parse(&curp, fd, *argv); |
parse(&curp, fd, *argv); |
else if (resp->form & FORM_SRC) { |
else if (resp->form & FORM_SRC) { |
/* For .so only; ignore failure. */ |
/* For .so only; ignore failure. */ |
chdir(paths.paths[resp->ipath]); |
chdir(conf.manpath.paths[resp->ipath]); |
parse(&curp, fd, resp->file); |
parse(&curp, fd, resp->file); |
} else |
} else |
passthrough(resp->file, fd, synopsis_only); |
passthrough(resp->file, fd, synopsis_only); |
Line 470 main(int argc, char *argv[]) |
|
Line 472 main(int argc, char *argv[]) |
|
|
|
out: |
out: |
if (search.argmode != ARG_FILE) { |
if (search.argmode != ARG_FILE) { |
manpath_free(&paths); |
manconf_free(&conf); |
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |
mansearch_free(res, sz); |
mansearch_free(res, sz); |
mansearch_setup(0); |
mansearch_setup(0); |