summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile22
-rw-r--r--index.sgml25
-rw-r--r--makewhatis.1 (renamed from mandoc-db.1)2
-rw-r--r--makewhatis.c (renamed from mandoc-db.c)22
4 files changed, 41 insertions, 30 deletions
diff --git a/Makefile b/Makefile
index a46818d9..1e6336ab 100644
--- a/Makefile
+++ b/Makefile
@@ -67,8 +67,8 @@ SRCS = Makefile \
mandoc.3 \
mandoc.c \
mandoc.h \
- mandoc-db.1 \
- mandoc-db.c \
+ makewhatis.1 \
+ makewhatis.c \
mandoc_char.7 \
mdoc.h \
mdoc.7 \
@@ -216,10 +216,10 @@ $(MANDOC_OBJS) $(MANDOC_LNS): main.h mandoc.h mdoc.h man.h config.h out.h
compat.o compat.ln: config.h
-MANDOCDB_OBJS = mandoc-db.o
-MANDOCDB_LNS = mandoc-db.ln
+MAKEWHATIS_OBJS = makewhatis.o
+MAKEWHATIS_LNS = makewhatis.ln
-$(MANDOCDB_OBJS) $(MANDOCDB_LNS): mandoc.h mdoc.h man.h config.h
+$(MAKEWHATIS_OBJS) $(MAKEWHATIS_LNS): mandoc.h mdoc.h man.h config.h
INDEX_MANS = mandoc.1.html \
mandoc.1.xhtml \
@@ -278,8 +278,8 @@ lint: llib-llibmandoc.ln llib-lmandoc.ln
clean:
rm -f libmandoc.a $(LIBMANDOC_OBJS)
rm -f llib-llibmandoc.ln $(LIBMANDOC_LNS)
- rm -f mandoc-db $(MANDOCDB_OBJS)
- rm -f llib-lmandoc-db.ln $(MANDOCDB_LNS)
+ rm -f makewhatis $(MAKEWHATIS_OBJS)
+ rm -f llib-lmakewhatis.ln $(MAKEWHATIS_LNS)
rm -f mandoc $(MANDOC_OBJS)
rm -f llib-lmandoc.ln $(MANDOC_LNS)
rm -f config.h config.log compat.o compat.ln
@@ -322,14 +322,14 @@ mandoc: $(MANDOC_OBJS) libmandoc.a
$(CC) -o $@ $(MANDOC_OBJS) libmandoc.a
# You'll need -ldb for Linux.
-mandoc-db: $(MANDOCDB_OBJS) libmandoc.a
- $(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a
+makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
+ $(CC) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a
llib-lmandoc.ln: $(MANDOC_LNS)
$(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
-llib-lmandoc-db.ln: $(MANDOCDB_LNS)
- $(LINT) $(LINTFLAGS) -Cmandoc-db $(MANDOCDB_LNS)
+llib-lmakewhatis.ln: $(MAKEWHATIS_LNS)
+ $(LINT) $(LINTFLAGS) -Cmakewhatis $(MAKEWHATIS_LNS)
mdocml.md5: mdocml.tar.gz
md5 mdocml.tar.gz >$@
diff --git a/index.sgml b/index.sgml
index b2eda4e1..02a87325 100644
--- a/index.sgml
+++ b/index.sgml
@@ -49,8 +49,8 @@
install</CODE> to install into <I>/usr/local</I>.
</P>
<P>
- Note that <A HREF="mandoc-db.1.html">mandoc-db</A> is not yet linked to the build. You must run <CODE>make
- mandoc-db</CODE> to build it.
+ Note that <A HREF="makewhatis.1.html">makewhatis</A> is not yet linked to the build. You must run <CODE>make
+ makewhatis</CODE> to build it.
</P>
<H2>
@@ -158,14 +158,14 @@
</TD>
</TR>
<TR>
- <TD VALIGN="top"><A HREF="mandoc.1.html">mandoc-db(1)</A></TD>
+ <TD VALIGN="top"><A HREF="mandoc.1.html">makewhatis(1)</A></TD>
<TD VALIGN="top">
index UNIX manuals
<SMALL>
- (<A HREF="mandoc-db.1.txt">text</A> |
- <A HREF="mandoc-db.1.xhtml">xhtml</A> |
- <A HREF="mandoc-db.1.pdf">pdf</A> |
- <A HREF="mandoc-db.1.ps">postscript</A>)
+ (<A HREF="makewhatis.1.txt">text</A> |
+ <A HREF="makewhatis.1.xhtml">xhtml</A> |
+ <A HREF="makewhatis.1.pdf">pdf</A> |
+ <A HREF="makewhatis.1.ps">postscript</A>)
</SMALL>
</TD>
</TR>
@@ -310,6 +310,17 @@
</H1>
<P CLASS="news">
+ 12-05-2011: version 1.11.2
+ </P>
+ <P>
+ Corrected some installation issues in version 1.11.1.
+ Initial public release (this utility is very much under development) of <A HREF="makewhatis.1.html">makewhatis</A>,
+ initially named mandoc-db.
+ This utility produces keyword databases of manual content
+ <A HREF="http://mdocml.bsd.lv/mandoc-cgi/index.html">mandoc-cgi</A>, which features semantic querying of manual content.
+ </P>
+
+ <P CLASS="news">
04-04-2011: version 1.11.1
</P>
<P>
diff --git a/mandoc-db.1 b/makewhatis.1
index d68f65a1..94592f04 100644
--- a/mandoc-db.1
+++ b/makewhatis.1
@@ -18,7 +18,7 @@
.Dt MANDOC-DB 1
.Os
.Sh NAME
-.Nm mandoc-db
+.Nm makewhatis
.Nd index UNIX manuals
.Sh SYNOPSIS
.Nm
diff --git a/mandoc-db.c b/makewhatis.c
index c7128af5..3ff8118e 100644
--- a/mandoc-db.c
+++ b/makewhatis.c
@@ -548,7 +548,7 @@ pmdoc_An(MDOC_ARGS)
if (MDOC_TEXT == n->type)
dbt_append(key, ksz, n->string);
- fl = MANDOC_AUTHOR;
+ fl = (uint32_t)MANDOC_AUTHOR;
memcpy(val->data, &fl, 4);
}
@@ -595,7 +595,7 @@ pmdoc_Fd(MDOC_ARGS)
dbt_appendb(key, ksz, start, (size_t)(end - start + 1));
dbt_appendb(key, ksz, "", 1);
- fl = MANDOC_INCLUDES;
+ fl = (uint32_t)MANDOC_INCLUDES;
memcpy(val->data, &fl, 4);
}
@@ -612,7 +612,7 @@ pmdoc_Cd(MDOC_ARGS)
if (MDOC_TEXT == n->type)
dbt_append(key, ksz, n->string);
- fl = MANDOC_CONFIG;
+ fl = (uint32_t)MANDOC_CONFIG;
memcpy(val->data, &fl, 4);
}
@@ -628,7 +628,7 @@ pmdoc_In(MDOC_ARGS)
return;
dbt_append(key, ksz, n->child->string);
- fl = MANDOC_INCLUDES;
+ fl = (uint32_t)MANDOC_INCLUDES;
memcpy(val->data, &fl, 4);
}
@@ -656,7 +656,7 @@ pmdoc_Fn(MDOC_ARGS)
cp++;
dbt_append(key, ksz, cp);
- fl = MANDOC_FUNCTION;
+ fl = (uint32_t)MANDOC_FUNCTION;
memcpy(val->data, &fl, 4);
}
@@ -672,7 +672,7 @@ pmdoc_St(MDOC_ARGS)
return;
dbt_append(key, ksz, n->child->string);
- fl = MANDOC_STANDARD;
+ fl = (uint32_t)MANDOC_STANDARD;
memcpy(val->data, &fl, 4);
}
@@ -712,7 +712,7 @@ pmdoc_Vt(MDOC_ARGS)
dbt_appendb(key, ksz, start, sz);
dbt_appendb(key, ksz, "", 1);
- fl = MANDOC_VARIABLE;
+ fl = (uint32_t)MANDOC_VARIABLE;
memcpy(val->data, &fl, 4);
}
@@ -728,7 +728,7 @@ pmdoc_Fo(MDOC_ARGS)
return;
dbt_append(key, ksz, n->child->string);
- fl = MANDOC_FUNCTION;
+ fl = (uint32_t)MANDOC_FUNCTION;
memcpy(val->data, &fl, 4);
}
@@ -762,7 +762,7 @@ pmdoc_Nm(MDOC_ARGS)
continue;
dbt_append(key, ksz, n->string);
}
- fl = MANDOC_NAME;
+ fl = (uint32_t)MANDOC_NAME;
memcpy(val->data, &fl, 4);
return;
} else if (SEC_SYNOPSIS != n->sec || MDOC_HEAD != n->type)
@@ -774,7 +774,7 @@ pmdoc_Nm(MDOC_ARGS)
dbt_append(key, ksz, n->string);
}
- fl = MANDOC_UTILITY;
+ fl = (uint32_t)MANDOC_UTILITY;
memcpy(val->data, &fl, 4);
}
@@ -863,7 +863,7 @@ pman_node(MAN_ARGS)
NULL != (body = body->child) &&
MAN_TEXT == body->type) {
- fl = MANDOC_NAME;
+ fl = (uint32_t)MANDOC_NAME;
memcpy(val->data, &fl, 4);
assert(body->string);
generated by cgit (git 2.34.1) at 2024-09-20 19:20:24 +0000