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

Diff for /mandoc/mdoc_validate.c between version 1.2 and 1.5

version 1.2, 2009/03/31 13:50:19 version 1.5, 2009/04/12 19:45:26
Line 1 
Line 1 
 /* $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *   *
  * 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 51  enum merr {
Line 49  enum merr {
 };  };
   
 enum    mwarn {  enum    mwarn {
           WPRINT,
         WESCAPE,          WESCAPE,
         WWRONGMSEC,          WWRONGMSEC,
         WSECOOO,          WSECOOO,
Line 95  static int warn_child_gt(struct mdoc *, const char *, 
Line 94  static int warn_child_gt(struct mdoc *, const char *, 
 static  int     err_child_eq(struct mdoc *, const char *, int);  static  int     err_child_eq(struct mdoc *, const char *, int);
 static  int     warn_child_eq(struct mdoc *, const char *, int);  static  int     warn_child_eq(struct mdoc *, const char *, int);
 static  int     count_child(struct mdoc *);  static  int     count_child(struct mdoc *);
   static  int     warn_print(struct mdoc *, int, int);
 static  int     warn_count(struct mdoc *, const char *,  static  int     warn_count(struct mdoc *, const char *,
                         int, const char *, int);                          int, const char *, int);
 static  int     err_count(struct mdoc *, const char *,  static  int     err_count(struct mdoc *, const char *,
Line 311  const struct valids mdoc_valids[MDOC_MAX] = {
Line 311  const struct valids mdoc_valids[MDOC_MAX] = {
   
   
 #ifdef __linux__  #ifdef __linux__
 extern  size_t  strlcpy(char *, const char *, size_t);  
 extern  size_t  strlcat(char *, const char *, size_t);  extern  size_t  strlcat(char *, const char *, size_t);
 #endif  #endif
   
Line 461  pwarn(struct mdoc *m, int line, int pos, enum mwarn ty
Line 460  pwarn(struct mdoc *m, int line, int pos, enum mwarn ty
                 p = "prologue macros out-of-order";                  p = "prologue macros out-of-order";
                 c = WARN_COMPAT;                  c = WARN_COMPAT;
                 break;                  break;
           case (WPRINT):
                   p = "invalid character";
                   break;
         case (WESCAPE):          case (WESCAPE):
                 p = "invalid escape sequence";                  p = "invalid escape sequence";
                 break;                  break;
Line 498  pwarn(struct mdoc *m, int line, int pos, enum mwarn ty
Line 500  pwarn(struct mdoc *m, int line, int pos, enum mwarn ty
 }  }
   
   
   static int
   warn_print(struct mdoc *m, int ln, int pos)
   {
           if (MDOC_IGN_CHARS & m->pflags)
                   return(pwarn(m, ln, pos, WPRINT));
           return(perr(m, ln, pos, EPRINT));
   }
   
   
 static inline int  static inline int
 warn_count(struct mdoc *m, const char *k,  warn_count(struct mdoc *m, const char *k,
                 int want, const char *v, int has)                  int want, const char *v, int has)
Line 700  check_text(struct mdoc *mdoc, int line, int pos, const
Line 710  check_text(struct mdoc *mdoc, int line, int pos, const
         for ( ; *p; p++) {          for ( ; *p; p++) {
                 if ('\t' == *p) {                  if ('\t' == *p) {
                         if ( ! (MDOC_LITERAL & mdoc->flags))                          if ( ! (MDOC_LITERAL & mdoc->flags))
                                 return(perr(mdoc, line, pos, EPRINT));                                  if ( ! warn_print(mdoc, line, pos))
                                           return(0);
                 } else if ( ! isprint((u_char)*p))                  } else if ( ! isprint((u_char)*p))
                         return(perr(mdoc, line, pos, EPRINT));                          if ( ! warn_print(mdoc, line, pos))
                                   return(0);
   
                 if ('\\' != *p)                  if ('\\' != *p)
                         continue;                          continue;
Line 1352  post_sh_head(POST_ARGS)
Line 1364  post_sh_head(POST_ARGS)
   
         /* This is just concat() inlined, which is irritating. */          /* This is just concat() inlined, which is irritating. */
   
           buf[0] = 0;
         for (n = mdoc->last->child; n; n = n->next) {          for (n = mdoc->last->child; n; n = n->next) {
                 assert(MDOC_TEXT == n->type);                  assert(MDOC_TEXT == n->type);
                 if (strlcat(buf, n->string, 64) >= 64)                  if (strlcat(buf, n->string, 64) >= 64)
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.5
CVSweb