Don't let empty strings into the makewhatis keyword database.

diff --git a/Makefile b/Makefile
index c535f105b9fa148fad355f195c66cd531a6e8876..86399a5796b30db044f61252f413fbed5921bfed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -353,7 +353,7 @@ llib-lmandoc.ln: $(MANDOC_LNS)
 
 # You'll need -ldb for Linux.
 makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
-       $(CC) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a
+       $(CC) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a -ldb
 
 llib-lmakewhatis.ln: $(MAKEWHATIS_LNS)
        $(LINT) $(LINTFLAGS) -Cmakewhatis $(MAKEWHATIS_LNS)

diff --git a/makewhatis.c b/makewhatis.c
index ec7f667684e23e6835d8a6cc2fd6fdc47616c8f4..94202dd5045274d1c8f82960f439dd0ca7bda3e6 100644 (file)
--- a/makewhatis.c
+++ b/makewhatis.c
@@ -1,4 +1,4 @@
-/*     $Id: makewhatis.c,v 1.3 2011/06/21 13:05:14 kristaps Exp $ */
+/*     $Id: makewhatis.c,v 1.4 2011/06/21 13:13:15 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -792,7 +792,8 @@ hash_put(DB *db, const struct buf *buf, int mask)
        int              rc;
 
        key.data = buf->cp;
-       if (0 == (key.size = buf->len))
+
+       if ((key.size = buf->len) < 2)
                return;
 
        if ((rc = (*db->get)(db, &key, &val, 0)) < 0) {