Bugfix: When the invocation of a user-defined macro follows a roff

[mandoc.git] / manpage.c

diff --git a/manpage.c b/manpage.c
index 99824d1843296120f5c7e4763c7f2ebcb651ad1b..70eb06b69ceb6b6a9959577b35b56f7a09811352 100644 (file)
--- a/manpage.c
+++ b/manpage.c
@@ -1,4 +1,4 @@
-/*     $Id: manpage.c,v 1.6 2013/12/31 03:41:14 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>
@@ -15,9 +15,9 @@
  * 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>
@@ -87,10 +87,11 @@ main(int argc, char *argv[])
        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, NULL, &res, &sz);
+       ch = mansearch(&search, &paths, argc, argv, &res, &sz);
        manpath_free(&paths);
 
        if (0 == ch)
@@ -107,9 +108,8 @@ 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);
        }