Integrate the makewhatis binary into the mandoc binary

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index d758d0ccbd1bd6d0a219b635ffc9e53f2a35e3dc..fe0b17dea8239449aedcf6608065e4c40c110d56 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,7 +1,7 @@
-/*     $Id: chars.c,v 1.58 2014/07/23 15:00:08 schwarze Exp $ */
+/*     $Id: chars.c,v 1.65 2014/10/29 00:17:43 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -15,9 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>


@@ -104,20 +104,16 @@ mchars_spec2cp(const struct mchars *arg, const char *p, size_t sz)
        const struct ln *ln;
 
        ln = find(arg, p, sz);
        const struct ln *ln;
 
        ln = find(arg, p, sz);

-       if (NULL == ln)
-               return(-1);
-       return(ln->unicode);
+       return(ln != NULL ? ln->unicode : sz == 1 ? (unsigned char)*p : -1);

 }
 
 }
 

-char
+int

 mchars_num2char(const char *p, size_t sz)
 {
        int       i;
 
 mchars_num2char(const char *p, size_t sz)
 {
        int       i;
 

-       if ((i = mandoc_strntoi(p, sz, 10)) < 0)
-               return('\0');
-
-       return(i > 0 && i < 256 && isprint(i) ? i : '\0');
+       i = mandoc_strntoi(p, sz, 10);
+       return(i >= 0 && i < 256 ? i : -1);

 }
 
 int
 }
 
 int


@@ -125,21 +121,9 @@ mchars_num2uc(const char *p, size_t sz)
 {
        int      i;
 
 {
        int      i;
 

-       if ((i = mandoc_strntoi(p, sz, 16)) < 0)
-               return('\0');
-
-       /*
-        * Security warning:
-        * Never extend the range of accepted characters
-        * to overlap with the ASCII range, 0x00-0x7F
-        * without re-auditing the callers of this function.
-        * Some callers might relay on the fact that we never
-        * return ASCII characters for their escaping decisions.
-        *
-        * XXX Code is missing here to exclude bogus ranges.
-        */
-
-       return(i > 0x80 && i <= 0x10FFFF ? i : '\0');
+       i = mandoc_strntoi(p, sz, 16);
+       assert(i >= 0 && i <= 0x10FFFF);
+       return(i);

 }
 
 const char *
 }
 
 const char *


@@ -149,15 +133,26 @@ mchars_spec2str(const struct mchars *arg,
        const struct ln *ln;
 
        ln = find(arg, p, sz);
        const struct ln *ln;
 
        ln = find(arg, p, sz);

-       if (NULL == ln) {
+       if (ln == NULL) {

                *rsz = 1;
                *rsz = 1;

-               return(NULL);
+               return(sz == 1 ? p : NULL);

        }
 
        *rsz = strlen(ln->ascii);
        return(ln->ascii);
 }
 
        }
 
        *rsz = strlen(ln->ascii);
        return(ln->ascii);
 }
 

+const char *
+mchars_uc2str(int uc)
+{
+       int      i;
+
+       for (i = 0; i < LINES_MAX; i++)
+               if (uc == lines[i].unicode)
+                       return(lines[i].ascii);
+       return("<?>");
+}
+

 static const struct ln *
 find(const struct mchars *tab, const char *p, size_t sz)
 {
 static const struct ln *
 find(const struct mchars *tab, const char *p, size_t sz)
 {