Partial cleanup of argument count validation in mdoc(7):

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index 72754ca96d1aa96628ef6d6bbefb5599cabcf1c6..5edf947ae1f885e293f64a1e5b232b34ce2283e2 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,6 +1,6 @@
-/*     $Id: chars.c,v 1.21 2010/07/16 22:33:30 kristaps Exp $ */
+/*     $Id: chars.c,v 1.31 2011/01/02 10:10:57 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010 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


@@ -32,9 +32,7 @@
 struct ln {
        struct ln        *next;
        const char       *code;
 struct ln {
        struct ln        *next;
        const char       *code;

-       size_t            codesz;

        const char       *ascii;
        const char       *ascii;

-       size_t            asciisz;

        int               unicode;
        int               type;
 #define        CHARS_CHAR       (1 << 0)
        int               unicode;
        int               type;
 #define        CHARS_CHAR       (1 << 0)


@@ -42,36 +40,36 @@ struct      ln {
 #define CHARS_BOTH      (CHARS_CHAR | CHARS_STRING)
 };
 
 #define CHARS_BOTH      (CHARS_CHAR | CHARS_STRING)
 };
 

-#define        LINES_MAX         370
+#define        LINES_MAX         351

 
 

-#define CHAR(in, insz, ch, chsz, code) \
-       { NULL, (in), (insz), (ch), (chsz), (code), CHARS_CHAR },
-#define STRING(in, insz, ch, chsz, code) \
-       { NULL, (in), (insz), (ch), (chsz), (code), CHARS_STRING },
-#define BOTH(in, insz, ch, chsz, code) \
-       { NULL, (in), (insz), (ch), (chsz), (code), CHARS_BOTH },
+#define CHAR(in, ch, code) \
+       { NULL, (in), (ch), (code), CHARS_CHAR },
+#define STRING(in, ch, code) \
+       { NULL, (in), (ch), (code), CHARS_STRING },
+#define BOTH(in, ch, code) \
+       { NULL, (in), (ch), (code), CHARS_BOTH },

 
 #define        CHAR_TBL_START    static struct ln lines[LINES_MAX] = {
 #define        CHAR_TBL_END      };
 
 #include "chars.in"
 
 
 #define        CHAR_TBL_START    static struct ln lines[LINES_MAX] = {
 #define        CHAR_TBL_END      };
 
 #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);
        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)
 {
 
 
 void
 chars_free(void *arg)
 {

-       struct tbl      *tab;
+       struct ctab     *tab;

 
 

-       tab = (struct tbl *)arg;
+       tab = (struct ctab *)arg;

 
        free(tab->htab);
        free(tab);
 
        free(tab->htab);
        free(tab);


@@ -81,7 +79,7 @@ chars_free(void *arg)
 void *
 chars_init(enum chars type)
 {
 void *
 chars_init(enum chars type)
 {

-       struct tbl       *tab;
+       struct ctab      *tab;

        struct ln       **htab;
        struct ln        *pp;
        int               i, hash;
        struct ln       **htab;
        struct ln        *pp;
        int               i, hash;


@@ -93,16 +91,16 @@ chars_init(enum chars type)
         * (they're in-line re-ordered during lookup).
         */
 
         * (they're in-line re-ordered during lookup).
         */
 

-       tab = malloc(sizeof(struct tbl));
+       tab = malloc(sizeof(struct ctab));

        if (NULL == tab) {
                perror(NULL);
        if (NULL == tab) {
                perror(NULL);

-               exit(EXIT_FAILURE);
+               exit((int)MANDOCLEVEL_SYSERR);

        }
 
        htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
        if (NULL == htab) {
                perror(NULL);
        }
 
        htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
        if (NULL == htab) {
                perror(NULL);

-               exit(EXIT_FAILURE);
+               exit((int)MANDOCLEVEL_SYSERR);

        }
 
        for (i = 0; i < LINES_MAX; i++) {
        }
 
        for (i = 0; i < LINES_MAX; i++) {


@@ -132,7 +130,7 @@ chars_spec2cp(void *arg, const char *p, size_t sz)
 {
        const struct ln *ln;
 
 {
        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);
        if (NULL == ln)
                return(-1);
        return(ln->unicode);


@@ -147,7 +145,7 @@ chars_res2cp(void *arg, const char *p, size_t sz)
 {
        const struct ln *ln;
 
 {
        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);
        if (NULL == ln)
                return(-1);
        return(ln->unicode);


@@ -162,11 +160,11 @@ chars_spec2str(void *arg, const char *p, size_t sz, size_t *rsz)
 {
        const struct ln *ln;
 
 {
        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);
 
        if (NULL == ln)
                return(NULL);
 

-       *rsz = ln->asciisz;
+       *rsz = strlen(ln->ascii);

        return(ln->ascii);
 }
 
        return(ln->ascii);
 }
 


@@ -179,24 +177,25 @@ chars_res2str(void *arg, const char *p, size_t sz, size_t *rsz)
 {
        const struct ln *ln;
 
 {
        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);
 
        if (NULL == ln)
                return(NULL);
 

-       *rsz = ln->asciisz;
+       *rsz = strlen(ln->ascii);

        return(ln->ascii);
 }
 
 
 static const struct ln *
        return(ln->ascii);
 }
 
 
 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;
        int               hash;
 
        assert(p);
 {
        struct ln        *pp, *prev;
        struct ln       **htab;
        int               hash;
 
        assert(p);

-       assert(sz > 0);
+       if (0 == sz)
+               return(NULL);

 
        if (p[0] < PRINT_LO || p[0] > PRINT_HI)
                return(NULL);
 
        if (p[0] < PRINT_LO || p[0] > PRINT_HI)
                return(NULL);


@@ -238,7 +237,7 @@ match(const struct ln *ln, const char *p, size_t sz, int type)
 
        if ( ! (ln->type & type))
                return(0);
 
        if ( ! (ln->type & type))
                return(0);

-       if (ln->codesz != sz)
+       if (strncmp(ln->code, p, sz))

                return(0);
                return(0);

-       return(0 == strncmp(ln->code, p, sz));
+       return('\0' == ln->code[(int)sz]);

 }
 }