summaryrefslogtreecommitdiffstats
path: root/apropos.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2011-11-14 10:07:06 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2011-11-14 10:07:06 +0000
commite9953015c778f622a13fba9e080726213b842410 (patch)
tree75829e98ca3c206a02f366e8b8adc6d8c985c6d9 /apropos.c
parent5ef01561d45c2fa2522c7bb1151fd40ac6e6de19 (diff)
downloadmandoc-e9953015c778f622a13fba9e080726213b842410.tar.gz
Have exprcomp() accept a string instead of an array-pointer. Also, collapse
the arguments in apropos(1) into a single string passed to exprcomp(). Ok schwarze@.
Diffstat (limited to 'apropos.c')
-rw-r--r--apropos.c29
1 files changed, 28 insertions, 1 deletions
diff --git a/apropos.c b/apropos.c
index 0e3ac42f..0af32992 100644
--- a/apropos.c
+++ b/apropos.c
@@ -14,6 +14,10 @@
* 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 <assert.h>
#include <getopt.h>
#include <limits.h>
@@ -34,6 +38,8 @@ int
main(int argc, char *argv[])
{
int ch;
+ size_t sz;
+ char *buf;
struct opts opts;
struct expr *e;
extern int optind;
@@ -66,11 +72,32 @@ main(int argc, char *argv[])
if (0 == argc)
return(EXIT_SUCCESS);
- if (NULL == (e = exprcomp(argc, argv))) {
+ /*
+ * Collapse expressions into a single string.
+ * First count up the contained strings, adding a space at the
+ * end of each (plus nil-terminator). Then merge.
+ */
+
+ for (sz = 0, ch = 0; ch < argc; ch++)
+ sz += strlen(argv[ch]) + 1;
+
+ buf = mandoc_malloc(++sz);
+
+ for (*buf = '\0', ch = 0; ch < argc; ch++) {
+ strlcat(buf, argv[ch], sz);
+ strlcat(buf, " ", sz);
+ }
+
+ buf[sz - 2] = '\0';
+
+ if (NULL == (e = exprcomp(buf))) {
fprintf(stderr, "Bad expression\n");
+ free(buf);
return(EXIT_FAILURE);
}
+ free(buf);
+
/*
* Configure databases.
* The keyword database is a btree that allows for duplicate