=================================================================== RCS file: /cvs/mandoc/Attic/manpage.c,v retrieving revision 1.5 retrieving revision 1.8 diff -u -p -r1.5 -r1.8 --- mandoc/Attic/manpage.c 2013/12/27 18:51:25 1.5 +++ mandoc/Attic/manpage.c 2014/08/10 23:54:41 1.8 @@ -1,6 +1,7 @@ -/* $Id: manpage.c,v 1.5 2013/12/27 18:51:25 schwarze Exp $ */ +/* $Id: manpage.c,v 1.8 2014/08/10 23:54:41 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons + * Copyright (c) 2013 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,10 +15,10 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif +#include + #include #include #include @@ -89,7 +90,7 @@ main(int argc, char *argv[]) search.deftype = TYPE_Nm | TYPE_Nd; manpath_parse(&paths, conf_file, defpaths, auxpaths); - ch = mansearch(&search, &paths, argc, argv, &res, &sz); + ch = mansearch(&search, &paths, argc, argv, "Nd", &res, &sz); manpath_free(&paths); if (0 == ch) @@ -106,9 +107,9 @@ main(int argc, char *argv[]) for (i = 0; i < sz; i++) { printf("%6zu %s: %s\n", - i + 1, res[i].names, res[i].desc); + i + 1, res[i].names, res[i].output); free(res[i].names); - free(res[i].desc); + free(res[i].output); } if (0 == term) {