Added search for `Ev' environment variables in ENVIRONMENT section.

diff --git a/makewhatis.1 b/makewhatis.1
index 56bd995845a17b7018c2ec1c8bac6c1fbee8bb9d..c78027850e7317846e8a03a49fce452ad1d19ef3 100644 (file)
--- a/makewhatis.1
+++ b/makewhatis.1
@@ -1,4 +1,4 @@
-.\"    $Id: makewhatis.1,v 1.8 2011/07/01 09:11:35 kristaps Exp $
+.\"    $Id: makewhatis.1,v 1.9 2011/07/01 12:02:44 kristaps Exp $
 .\"
 .\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -120,6 +120,8 @@ Listed as the link name, then a period, then the link section.
 If the link has no section, the period terminates the string.
 .It Li 0x400
 Path reference as given in the FILES section.
+.It Li 0x800
+Environment variable as given in the ENVIRONMENT section.
 .El
 .Pp
 The last four bytes are a host-ordered record number within the

diff --git a/makewhatis.c b/makewhatis.c
index 7ceeaa9aaca382740501fc857e19720a430804e9..19cec4861d97cebb00d0352f674915ccf3ac5299 100644 (file)
--- a/makewhatis.c
+++ b/makewhatis.c
@@ -1,4 +1,4 @@
-/*     $Id: makewhatis.c,v 1.14 2011/07/01 10:46:32 kristaps Exp $ */
+/*     $Id: makewhatis.c,v 1.15 2011/07/01 12:02:44 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -56,6 +56,7 @@
 #define TYPE_DESC        0x100
 #define TYPE_XREF        0x200
 #define TYPE_PATH        0x400
+#define TYPE_ENV         0x800
 
 /* Buffer for storing growable data. */
 
@@ -86,6 +87,7 @@ static        int               pman_node(MAN_ARGS);
 static void              pmdoc_node(MDOC_ARGS);
 static void              pmdoc_An(MDOC_ARGS);
 static void              pmdoc_Cd(MDOC_ARGS);
+static void              pmdoc_Ev(MDOC_ARGS);
 static void              pmdoc_Fd(MDOC_ARGS);
 static void              pmdoc_In(MDOC_ARGS);
 static void              pmdoc_Fn(MDOC_ARGS);
@@ -122,7 +124,7 @@ static      const pmdoc_nf    mdocs[MDOC_MAX] = {
        NULL, /* Cm */
        NULL, /* Dv */ 
        NULL, /* Er */ 
-       NULL, /* Ev */ 
+       pmdoc_Ev, /* Ev */ 
        NULL, /* Ex */ 
        NULL, /* Fa */ 
        pmdoc_Fd, /* Fd */
@@ -762,6 +764,18 @@ pmdoc_Nd(MDOC_ARGS)
        hash_put(hash, buf, TYPE_DESC);
 }
 
+/* ARGSUSED */
+static void
+pmdoc_Ev(MDOC_ARGS)
+{
+
+       if (SEC_ENVIRONMENT != n->sec)
+               return;
+       
+       buf_appendmdoc(buf, n->child, 0);
+       hash_put(hash, buf, TYPE_ENV);
+}
+
 /* ARGSUSED */
 static void
 pmdoc_Pa(MDOC_ARGS)