In -Tman .Bl -compact, skip the blank line only before the first item

[mandoc.git] / apropos.c

diff --git a/apropos.c b/apropos.c
index f222f3562033c4d0ede5ba5a54d56f97576f4509..ac56a96109638400613d9c8f1b44dc7bb0c18f2d 100644 (file)
--- a/apropos.c
+++ b/apropos.c
@@ -1,7 +1,6 @@
-/*     $Id: apropos.c,v 1.26 2012/03/23 02:52:33 kristaps Exp $ */
+/*     $Id: apropos.c,v 1.33 2012/06/09 17:49:13 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -18,35 +17,31 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

+#include <sys/param.h>

 
 #include <assert.h>
 #include <getopt.h>
 
 #include <assert.h>
 #include <getopt.h>

+#include <stdint.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <unistd.h>

 
 

-#include "apropos_db.h"
-#include "mandoc.h"

 #include "manpath.h"
 #include "manpath.h"

-
-static int      cmp(const void *, const void *);
-static void     list(struct res *, size_t, void *);
-static void     usage(void);
-
-static char    *progname;
+#include "mansearch.h"

 
 int
 main(int argc, char *argv[])
 {
 
 int
 main(int argc, char *argv[])
 {

-       int              ch, rc, whatis;
+       int              ch, whatis;
+       struct mansearch search;
+       size_t           i, sz;
+       struct manpage  *res;
+       char            *conf_file, *defpaths, *auxpaths;

        struct manpaths  paths;
        struct manpaths  paths;

-       size_t           terms;
-       struct opts      opts;
-       struct expr     *e;
-       char            *defpaths, *auxpaths;
-       char            *conf_file;
-       extern int       optind;
+       char            *progname;

        extern char     *optarg;
        extern char     *optarg;

+       extern int       optind;

 
        progname = strrchr(argv[0], '/');
        if (progname == NULL)
 
        progname = strrchr(argv[0], '/');
        if (progname == NULL)


@@ -54,14 +49,10 @@ main(int argc, char *argv[])
        else
                ++progname;
 
        else
                ++progname;
 

-       whatis = 0 == strncmp(progname, "whatis", 6);
-
+       auxpaths = defpaths = conf_file = NULL;

        memset(&paths, 0, sizeof(struct manpaths));
        memset(&paths, 0, sizeof(struct manpaths));

-       memset(&opts, 0, sizeof(struct opts));
-
-       auxpaths = defpaths = NULL;
-       conf_file = NULL;
-       e = NULL;
+       memset(&search, 0, sizeof(struct mansearch));
+       whatis = (0 == strcmp(progname, "whatis"));

 
        while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
                switch (ch) {
 
        while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
                switch (ch) {


@@ -75,84 +66,45 @@ main(int argc, char *argv[])
                        auxpaths = optarg;
                        break;
                case ('S'):
                        auxpaths = optarg;
                        break;
                case ('S'):

-                       opts.arch = optarg;
+                       search.arch = optarg;

                        break;
                case ('s'):
                        break;
                case ('s'):

-                       opts.cat = optarg;
+                       search.sec = optarg;

                        break;
                default:
                        break;
                default:

-                       usage();
-                       return(EXIT_FAILURE);
+                       goto usage;

                }
 
        argc -= optind;
        argv += optind;
 
                }
 
        argc -= optind;
        argv += optind;
 

-       if (0 == argc) 
-               return(EXIT_SUCCESS);
+       if (0 == argc)
+               goto usage;

 
 

-       rc = 0;
+       search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
+       search.flags = whatis ? MANSEARCH_WHATIS : 0;

 
        manpath_parse(&paths, conf_file, defpaths, auxpaths);
 
        manpath_parse(&paths, conf_file, defpaths, auxpaths);

-
-       e = whatis ? termcomp(argc, argv, &terms) :
-                    exprcomp(argc, argv, &terms);
-               
-       if (NULL == e) {
-               fprintf(stderr, "%s: Bad expression\n", progname);
-               goto out;
-       }
-
-       rc = apropos_search
-               (paths.sz, paths.paths,
-                &opts, e, terms, NULL, list);
-
-       if (0 == rc)
-               fprintf(stderr, "%s: Error reading "
-                               "manual database\n", progname);
-
-out:
+       ch = mansearch(&search, &paths, argc, argv, &res, &sz);

        manpath_free(&paths);
        manpath_free(&paths);

-       exprfree(e);

 
 

-       return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
-}
+       if (0 == ch)
+               goto usage;

 
 

-/* ARGSUSED */
-static void
-list(struct res *res, size_t sz, void *arg)
-{
-       size_t           i;
-
-       qsort(res, sz, sizeof(struct res), cmp);
-
-       for (i = 0; i < sz; i++)
-               printf("%s(%s%s%s) - %.70s\n", 
-                               res[i].title,
-                               res[i].cat,
-                               *res[i].arch ? "/" : "",
-                               *res[i].arch ? res[i].arch : "",
-                               res[i].desc);
-}
-
-static int
-cmp(const void *p1, const void *p2)
-{
-
-       return(strcasecmp(((const struct res *)p1)->title,
-                               ((const struct res *)p2)->title));
-}
-
-static void
-usage(void)
-{
+       for (i = 0; i < sz; i++) {
+               printf("%s - %s\n", res[i].file, res[i].desc);
+               free(res[i].desc);
+       }

 
 

-       fprintf(stderr, "usage: %s "
-                       "[-C file] "
-                       "[-M manpath] "
-                       "[-m manpath] "
-                       "[-S arch] "
-                       "[-s section] "
-                       "expression ...\n",
-                       progname);
+       free(res);
+       return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
+usage:
+       fprintf(stderr, "usage: %s [-C conf] "
+                                 "[-M paths] "
+                                 "[-m paths] "
+                                 "[-S arch] "
+                                 "[-s section] "
+                                 "expr ...\n", 
+                                 progname);
+       return(EXIT_FAILURE);

 }
 }