-/* $Id: manpage.c,v 1.5 2013/12/27 18:51:25 schwarze Exp $ */
+/* $Id: manpage.c,v 1.9 2014/08/17 03:24:47 schwarze Exp $ */
/*
* Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* 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 <sys/types.h>
#include <assert.h>
#include <getopt.h>
if (0 == argc)
goto usage;
- search.deftype = TYPE_Nm | TYPE_Nd;
+ search.outkey = "Nd";
+ search.argmode = ARG_EXPR;
manpath_parse(&paths, conf_file, defpaths, auxpaths);
ch = mansearch(&search, &paths, argc, argv, &res, &sz);
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) {