Implement the roff(7) .rr (remove register) request.

[mandoc.git] / manpage.c

diff --git a/manpage.c b/manpage.c
index dadf98f1ca732fb2a4239c24eca5e95dd2354aaa..00793ccce48d68e5206cf0976ca70edad66b6ce5 100644 (file)
--- a/manpage.c
+++ b/manpage.c
@@ -1,6 +1,7 @@
-/*     $Id: manpage.c,v 1.4 2013/06/05 02:00:26 schwarze Exp $ */
+/*     $Id: manpage.c,v 1.7 2014/01/06 03:02:46 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
@@ -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,11 +107,14 @@ main(int argc, char *argv[])
 
        for (i = 0; i < sz; i++) {
                printf("%6zu  %s: %s\n", 
-                       i + 1, res[i].file, res[i].desc);
-               free(res[i].desc);
+                       i + 1, res[i].names, res[i].output);
+               free(res[i].names);
+               free(res[i].output);
        }
 
        if (0 == term) {
+               for (i = 0; i < sz; i++)
+                       free(res[i].file);
                free(res);
                return(EXIT_SUCCESS);
        }
@@ -127,12 +131,16 @@ main(int argc, char *argv[])
                }
 
        if (0 == i) {
+               for (i = 0; i < sz; i++)
+                       free(res[i].file);
                free(res);
                return(EXIT_SUCCESS);
        }
 show:
        cmd = res[i - 1].form ? "mandoc" : "cat";
        strlcpy(buf, res[i - 1].file, PATH_MAX);
+       for (i = 0; i < sz; i++)
+               free(res[i].file);
        free(res);
 
        show(cmd, buf);