[BACK]Return to man_validate.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/man_validate.c between version 1.5 and 1.14

version 1.5, 2009/03/27 14:56:15 version 1.14, 2009/06/22 13:09:17
Line 1 
Line 1 
 /* $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the   * purpose with or without fee is hereby granted, provided that the above
  * above copyright notice and this permission notice appear in all   * copyright notice and this permission notice appear in all copies.
  * copies.  
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * PERFORMANCE OF THIS SOFTWARE.  
  */   */
 #include <sys/types.h>  #include <sys/types.h>
   
Line 25 
Line 23 
   
 #include "libman.h"  #include "libman.h"
   
 /* FIXME: validate text. */  
   
 #define POSTARGS  struct man *m, const struct man_node *n  #define POSTARGS  struct man *m, const struct man_node *n
   
 typedef int     (*v_post)(POSTARGS);  typedef int     (*v_post)(POSTARGS);
Line 35  struct man_valid {
Line 31  struct man_valid {
         v_post   *posts;          v_post   *posts;
 };  };
   
 static  int       count(const struct man_node *);  
 static  int       check_eq0(POSTARGS);  static  int       check_eq0(POSTARGS);
 static  int       check_ge1(POSTARGS);  static  int       check_ge1(POSTARGS);
 static  int       check_ge2(POSTARGS);  static  int       check_ge2(POSTARGS);
 static  int       check_le1(POSTARGS);  static  int       check_le1(POSTARGS);
 static  int       check_le2(POSTARGS);  static  int       check_le2(POSTARGS);
 static  int       check_le5(POSTARGS);  static  int       check_le5(POSTARGS);
   static  int       check_text(POSTARGS);
   static  int       check_root(POSTARGS);
   
 static  v_post    posts_le1[] = { check_le1, NULL };  static  v_post    posts_le1[] = { check_le1, NULL };
 static  v_post    posts_le2[] = { check_le2, NULL };  static  v_post    posts_le2[] = { check_le2, NULL };
Line 50  static v_post   posts_eq0[] = { check_eq0, NULL };
Line 47  static v_post   posts_eq0[] = { check_eq0, NULL };
 static  v_post    posts_ge2_le5[] = { check_ge2, check_le5, NULL };  static  v_post    posts_ge2_le5[] = { check_ge2, check_le5, NULL };
   
 static  const struct man_valid man_valids[MAN_MAX] = {  static  const struct man_valid man_valids[MAN_MAX] = {
         { NULL }, /* __ */          { posts_eq0 }, /* br */
         { posts_ge2_le5 }, /* TH */          { posts_ge2_le5 }, /* TH */
         { posts_ge1 }, /* SH */          { posts_ge1 }, /* SH */
         { posts_ge1 }, /* SS */          { posts_ge1 }, /* SS */
Line 71  static const struct man_valid man_valids[MAN_MAX] = {
Line 68  static const struct man_valid man_valids[MAN_MAX] = {
         { NULL }, /* I */          { NULL }, /* I */
         { NULL }, /* IR */          { NULL }, /* IR */
         { NULL }, /* RI */          { NULL }, /* RI */
         { posts_eq0 }, /* br */          { posts_eq0 }, /* na */
           { NULL }, /* i */
 };  };
   
   
Line 86  man_valid_post(struct man *m)
Line 84  man_valid_post(struct man *m)
   
         switch (m->last->type) {          switch (m->last->type) {
         case (MAN_TEXT):          case (MAN_TEXT):
                 /* FALLTHROUGH */                  return(check_text(m, m->last));
         case (MAN_ROOT):          case (MAN_ROOT):
                 return(1);                  return(check_root(m, m->last));
         default:          default:
                 break;                  break;
         }          }
Line 103  man_valid_post(struct man *m)
Line 101  man_valid_post(struct man *m)
 }  }
   
   
 static inline int  static int
 count(const struct man_node *n)  check_root(POSTARGS)
 {  {
         int              i;  
           if (NULL == m->first->child)
                   return(man_nerr(m, n, WNODATA));
           if (NULL == m->meta.title)
                   return(man_nerr(m, n, WNOTITLE));
   
         for (i = 0; n; n = n->next, i++)          return(1);
                 /* Loop. */ ;  
         return(i);  
 }  }
   
   
   static int
   check_text(POSTARGS)
   {
           const char      *p;
           int              pos;
   
           assert(n->string);
   
           for (p = n->string, pos = n->pos + 1; *p; p++, pos++) {
                   if ('\t' == *p || isprint((u_char)*p))
                           continue;
   
                   if (MAN_IGN_CHARS & m->pflags)
                           return(man_pwarn(m, n->line, pos, WNPRINT));
                   return(man_perr(m, n->line, pos, WNPRINT));
           }
   
           return(1);
   }
   
   
 #define INEQ_DEFINE(x, ineq, name) \  #define INEQ_DEFINE(x, ineq, name) \
 static int \  static int \
 check_##name(POSTARGS) \  check_##name(POSTARGS) \
 { \  { \
         int              c; \          if (n->nchild ineq (x)) \
         if ((c = count(n->child)) ineq (x)) \  
                 return(1); \                  return(1); \
         return(man_verr(m, n->line, n->pos, \          return(man_verr(m, n->line, n->pos, \
                         "expected line arguments %s %d, have %d", \                          "expected line arguments %s %d, have %d", \
                         #ineq, (x), c)); \                          #ineq, (x), n->nchild)); \
 }  }
   
 INEQ_DEFINE(0, ==, eq0)  INEQ_DEFINE(0, ==, eq0)
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.14
CVSweb