Add manual page for mandoc-db (mostly to document the file format of

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index aa6de429dd3f72cdbd683648fa13846283397c01..03e44910d898b411a74f442fccc35ed9d3a5d04c 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,6 +1,7 @@
-/*     $Id: chars.c,v 1.24 2010/07/26 13:59:00 kristaps Exp $ */
+/*     $Id: chars.c,v 1.34 2011/03/22 10:13:01 kristaps Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -24,7 +25,7 @@
 #include <string.h>
 
 #include "mandoc.h"
-#include "chars.h"
+#include "out.h"
 
 #define        PRINT_HI         126
 #define        PRINT_LO         32
@@ -40,7 +41,7 @@ struct        ln {
 #define CHARS_BOTH      (CHARS_CHAR | CHARS_STRING)
 };
 
-#define        LINES_MAX         370
+#define        LINES_MAX         351
 
 #define CHAR(in, ch, code) \
        { NULL, (in), (ch), (code), CHARS_CHAR },
@@ -54,22 +55,22 @@ struct      ln {
 
 #include "chars.in"
 
-struct tbl {
+struct ctab {
        enum chars        type;
        struct ln       **htab;
 };
 
 static inline int        match(const struct ln *,
                                const char *, size_t, int);
-static const struct ln  *find(struct tbl *, const char *, size_t, int);
+static const struct ln  *find(struct ctab *, const char *, size_t, int);
 
 
 void
 chars_free(void *arg)
 {
-       struct tbl      *tab;
+       struct ctab     *tab;
 
-       tab = (struct tbl *)arg;
+       tab = (struct ctab *)arg;
 
        free(tab->htab);
        free(tab);
@@ -79,7 +80,7 @@ chars_free(void *arg)
 void *
 chars_init(enum chars type)
 {
-       struct tbl       *tab;
+       struct ctab      *tab;
        struct ln       **htab;
        struct ln        *pp;
        int               i, hash;
@@ -91,17 +92,8 @@ chars_init(enum chars type)
         * (they're in-line re-ordered during lookup).
         */
 
-       tab = malloc(sizeof(struct tbl));
-       if (NULL == tab) {
-               perror(NULL);
-               exit(EXIT_FAILURE);
-       }
-
-       htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
-       if (NULL == htab) {
-               perror(NULL);
-               exit(EXIT_FAILURE);
-       }
+       tab = mandoc_malloc(sizeof(struct ctab));
+       htab = mandoc_calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
 
        for (i = 0; i < LINES_MAX; i++) {
                hash = (int)lines[i].code[0] - PRINT_LO;
@@ -130,7 +122,7 @@ chars_spec2cp(void *arg, const char *p, size_t sz)
 {
        const struct ln *ln;
 
-       ln = find((struct tbl *)arg, p, sz, CHARS_CHAR);
+       ln = find((struct ctab *)arg, p, sz, CHARS_CHAR);
        if (NULL == ln)
                return(-1);
        return(ln->unicode);
@@ -145,13 +137,34 @@ chars_res2cp(void *arg, const char *p, size_t sz)
 {
        const struct ln *ln;
 
-       ln = find((struct tbl *)arg, p, sz, CHARS_STRING);
+       ln = find((struct ctab *)arg, p, sz, CHARS_STRING);
        if (NULL == ln)
                return(-1);
        return(ln->unicode);
 }
 
 
+/*
+ * Numbered character to literal character,
+ * represented as a null-terminated string for additional safety.
+ */
+const char *
+chars_num2char(const char *p, size_t sz)
+{
+       int               i;
+       static char       c[2];
+
+       if (sz > 3)
+               return(NULL);
+       i = atoi(p);
+       if (i < 0 || i > 255)
+               return(NULL);
+       c[0] = (char)i;
+       c[1] = '\0';
+       return(c);
+}
+
+
 /* 
  * Special character to string array.
  */
@@ -160,7 +173,7 @@ chars_spec2str(void *arg, const char *p, size_t sz, size_t *rsz)
 {
        const struct ln *ln;
 
-       ln = find((struct tbl *)arg, p, sz, CHARS_CHAR);
+       ln = find((struct ctab *)arg, p, sz, CHARS_CHAR);
        if (NULL == ln)
                return(NULL);
 
@@ -177,7 +190,7 @@ chars_res2str(void *arg, const char *p, size_t sz, size_t *rsz)
 {
        const struct ln *ln;
 
-       ln = find((struct tbl *)arg, p, sz, CHARS_STRING);
+       ln = find((struct ctab *)arg, p, sz, CHARS_STRING);
        if (NULL == ln)
                return(NULL);
 
@@ -187,7 +200,7 @@ chars_res2str(void *arg, const char *p, size_t sz, size_t *rsz)
 
 
 static const struct ln *
-find(struct tbl *tab, const char *p, size_t sz, int type)
+find(struct ctab *tab, const char *p, size_t sz, int type)
 {
        struct ln        *pp, *prev;
        struct ln       **htab;