Reject the escape sequences \[uD800] to \[uDFFF] in the parser.

[mandoc.git] / tag.c

diff --git a/tag.c b/tag.c
index 0202066359148828f632dabb3f98a282a6b63972..5766d540d1f1d246dc97a7a61615f0199c835472 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,4 +1,4 @@
-/*      $Id: tag.c,v 1.5 2015/07/25 14:28:59 schwarze Exp $    */
+/*      $Id: tag.c,v 1.10 2015/10/13 15:53:05 schwarze Exp $    */
 /*
  * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -14,22 +14,20 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <signal.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#if HAVE_OHASH
-#include <ohash.h>
-#else
-#include "compat_ohash.h"
-#endif
-
 #include "mandoc_aux.h"
+#include "mandoc_ohash.h"
 #include "tag.h"
 
 struct tag_entry {
@@ -39,42 +37,67 @@ struct tag_entry {
 };
 
 static void     tag_signal(int);
-static void    *tag_alloc(size_t, void *);
-static void     tag_free(void *, void *);
-static void    *tag_calloc(size_t, size_t, void *);
 
 static struct ohash     tag_data;
-static char            *tag_fn = NULL;
-static int              tag_fd = -1;
+static struct tag_files         tag_files;
 
 
 /*
- * Set up the ohash table to collect output line numbers
- * where various marked-up terms are documented and create
- * the temporary tags file, saving the name for the pager.
+ * Prepare for using a pager.
+ * Not all pagers are capable of using a tag file,
+ * but for simplicity, create it anyway.
  */
-char *
+struct tag_files *
 tag_init(void)
 {
-       struct ohash_info        tag_info;
+       int                      ofd;
+
+       ofd = -1;
+       tag_files.tfd = -1;
+
+       /* Save the original standard output for use by the pager. */
+
+       if ((tag_files.ofd = dup(STDOUT_FILENO)) == -1)
+               goto fail;
+
+       /* Create both temporary output files. */
 
-       tag_fn = mandoc_strdup("/tmp/man.XXXXXXXXXX");
+       (void)strlcpy(tag_files.ofn, "/tmp/man.XXXXXXXXXX",
+           sizeof(tag_files.ofn));
+       (void)strlcpy(tag_files.tfn, "/tmp/man.XXXXXXXXXX",
+           sizeof(tag_files.tfn));
        signal(SIGHUP, tag_signal);
        signal(SIGINT, tag_signal);
        signal(SIGTERM, tag_signal);
-       if ((tag_fd = mkstemp(tag_fn)) == -1) {
-               free(tag_fn);
-               tag_fn = NULL;
-               return(NULL);
-       }
-
-       tag_info.alloc = tag_alloc;
-       tag_info.calloc = tag_calloc;
-       tag_info.free = tag_free;
-       tag_info.key_offset = offsetof(struct tag_entry, s);
-       tag_info.data = NULL;
-       ohash_init(&tag_data, 4, &tag_info);
-       return(tag_fn);
+       if ((ofd = mkstemp(tag_files.ofn)) == -1)
+               goto fail;
+       if ((tag_files.tfd = mkstemp(tag_files.tfn)) == -1)
+               goto fail;
+       if (dup2(ofd, STDOUT_FILENO) == -1)
+               goto fail;
+       close(ofd);
+
+       /*
+        * Set up the ohash table to collect output line numbers
+        * where various marked-up terms are documented.
+        */
+
+       mandoc_ohash_init(&tag_data, 4, offsetof(struct tag_entry, s));
+       return &tag_files;
+
+fail:
+       tag_unlink();
+       if (ofd != -1)
+               close(ofd);
+       if (tag_files.ofd != -1)
+               close(tag_files.ofd);
+       if (tag_files.tfd != -1)
+               close(tag_files.tfd);
+       *tag_files.ofn = '\0';
+       *tag_files.tfn = '\0';
+       tag_files.ofd = -1;
+       tag_files.tfd = -1;
+       return NULL;
 }
 
 /*
@@ -88,7 +111,7 @@ tag_put(const char *s, int prio, size_t line)
        size_t                   len;
        unsigned int             slot;
 
-       if (tag_fd == -1)
+       if (tag_files.tfd <= 0 || strchr(s, ' ') != NULL)
                return;
        slot = ohash_qlookup(&tag_data, s);
        entry = ohash_find(&tag_data, slot);
@@ -114,13 +137,14 @@ tag_write(void)
        struct tag_entry        *entry;
        unsigned int             slot;
 
-       if (tag_fd == -1)
+       if (tag_files.tfd <= 0)
                return;
-       stream = fdopen(tag_fd, "w");
+       stream = fdopen(tag_files.tfd, "w");
        entry = ohash_first(&tag_data, &slot);
        while (entry != NULL) {
                if (stream != NULL)
-                       fprintf(stream, "%s - %zu\n", entry->s, entry->line);
+                       fprintf(stream, "%s %s %zu\n",
+                           entry->s, tag_files.ofn, entry->line);
                free(entry);
                entry = ohash_next(&tag_data, &slot);
        }
@@ -133,8 +157,10 @@ void
 tag_unlink(void)
 {
 
-       if (tag_fn != NULL)
-               unlink(tag_fn);
+       if (*tag_files.ofn != '\0')
+               unlink(tag_files.ofn);
+       if (*tag_files.tfn != '\0')
+               unlink(tag_files.tfn);
 }
 
 static void
@@ -147,27 +173,3 @@ tag_signal(int signum)
        /* NOTREACHED */
        _exit(1);
 }
-
-/*
- * Memory management callback functions for ohash.
- */
-static void *
-tag_alloc(size_t sz, void *arg)
-{
-
-       return(mandoc_malloc(sz));
-}
-
-static void *
-tag_calloc(size_t nmemb, size_t sz, void *arg)
-{
-
-       return(mandoc_calloc(nmemb, sz));
-}
-
-static void
-tag_free(void *p, void *arg)
-{
-
-       free(p);
-}