undns 0.4.0d → 0.4.0f

data/ext/undns/conventions.h

@@ -1,13 +1,14 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Bison interface for Yacc-like parsers in C
+/* Skeleton interface for Bison's Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
-   This program is free software: you can redistribute it and/or modify
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -30,26 +33,17 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_CONV_YY_CONVENTIONS_H_INCLUDED
-# define YY_CONV_YY_CONVENTIONS_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int conv_yydebug;
-#endif
-
-/* Token type.  */
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    TOK_QID = 258,
-    TOK_ID = 259,
-    TOK_NUMBER = 260,
-    TOK_REGEX = 261
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     TOK_QID = 258,
+     TOK_ID = 259,
+     TOK_NUMBER = 260,
+     TOK_REGEX = 261
+   };
 #endif
 /* Tokens.  */
 #define TOK_QID 258
@@ -57,13 +51,13 @@ extern int conv_yydebug;
 #define TOK_NUMBER 260
 #define TOK_REGEX 261
 
-/* Value type.  */
+
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
-union YYSTYPE
+typedef union YYSTYPE
+#line 27 "conventions.y"
 {
-#line 27 "conventions.y" /* yacc.c:1909  */
-
   struct asnc *asnc;
   int in;
   char *cp;
@@ -74,16 +68,14 @@ union YYSTYPE
   conv_queue cq;
   key_hashtable dict;
   boolean bool;
-
-#line 79 "conventions.h" /* yacc.c:1909  */
-};
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 1529 of yacc.c.  */
+#line 74 "conventions.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
-
 extern YYSTYPE conv_yylval;
 
-int conv_yyparse (void);
-
-#endif /* !YY_CONV_YY_CONVENTIONS_H_INCLUDED  */

data/ext/undns/conventlex.c

@@ -65,6 +65,7 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
+typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -72,6 +73,7 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -102,8 +104,6 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -160,15 +160,7 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -180,7 +172,12 @@ typedef unsigned int flex_uint32_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
-extern int conv_yyleng;
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t conv_yyleng;
 
 extern FILE *conv_yyin, *conv_yyout;
 
@@ -206,11 +203,6 @@ extern FILE *conv_yyin, *conv_yyout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
@@ -228,7 +220,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	int yy_n_chars;
+	yy_size_t yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -298,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when conv_yytext is formed. */
 static char yy_hold_char;
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int conv_yyleng;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t conv_yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
@@ -327,7 +319,7 @@ static void conv_yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
 YY_BUFFER_STATE conv_yy_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE conv_yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE conv_yy_scan_bytes (yyconst char *bytes,int len  );
+YY_BUFFER_STATE conv_yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
 
 void *conv_yyalloc (yy_size_t  );
 void *conv_yyrealloc (void *,yy_size_t  );
@@ -1253,7 +1245,7 @@ static void yy_fatal_error (yyconst char msg[]  );
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	conv_yyleng = (size_t) (yy_cp - yy_bp); \
+	conv_yyleng = (yy_size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
@@ -1349,7 +1341,7 @@ YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
 char *include_filename_stack[MAX_INCLUDE_DEPTH];
 int include_linenum_stack[MAX_INCLUDE_DEPTH];
 int include_stack_ptr = 0;
-#line 1353 "conventlex.c"
+#line 1345 "conventlex.c"
 
 #define INITIAL 0
 #define incl 1
@@ -1390,7 +1382,7 @@ FILE *conv_yyget_out (void );
 
 void conv_yyset_out  (FILE * out_str  );
 
-int conv_yyget_leng (void );
+yy_size_t conv_yyget_leng (void );
 
 char *conv_yyget_text (void );
 
@@ -1432,12 +1424,7 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -1445,7 +1432,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( conv_yytext, conv_yyleng, 1, conv_yyout )) {} } while (0)
+#define ECHO fwrite( conv_yytext, conv_yyleng, 1, conv_yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1456,7 +1443,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		yy_size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( conv_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1546,7 +1533,7 @@ YY_DECL
 #endif
 
 
-#line 1550 "conventlex.c"
+#line 1537 "conventlex.c"
 
 	if ( !(yy_init) )
 		{
@@ -1689,14 +1676,15 @@ YY_RULE_SETUP
     exit( 1 );
   }
   
-  inclfile = fopen_path_r( filename );
+  const char *found;
+  inclfile = fopen_path_r( filename, &found );
   if ( inclfile == NULL ) { 
     char buf[512];
     sprintf(buf, "unable to open '%s' %s\n", filename, strerror(errno));
     conv_yyerror( buf );
   } else {
     conv_yyin = inclfile;
-    include_filename_stack[include_stack_ptr] = searchPath(ruleset_path, filename);
+    include_filename_stack[include_stack_ptr] = found;
     include_linenum_stack[include_stack_ptr] = linenum;
     include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
     include_stack_ptr++;
@@ -1713,7 +1701,7 @@ YY_RULE_SETUP
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(incl):
 case YY_STATE_EOF(comment):
-#line 127 "conventlex.l"
+#line 128 "conventlex.l"
 {
   if ( --include_stack_ptr < 0 ) {
     yyterminate();
@@ -1730,35 +1718,35 @@ case YY_STATE_EOF(comment):
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 141 "conventlex.l"
+#line 142 "conventlex.l"
 
 	YY_BREAK
 case 12:
 /* rule 12 can match eol */
 YY_RULE_SETUP
-#line 142 "conventlex.l"
+#line 143 "conventlex.l"
 ++linenum;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 143 "conventlex.l"
+#line 144 "conventlex.l"
 
 	YY_BREAK
 case 14:
 /* rule 14 can match eol */
 YY_RULE_SETUP
-#line 144 "conventlex.l"
+#line 145 "conventlex.l"
 ++linenum;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 145 "conventlex.l"
+#line 146 "conventlex.l"
 BEGIN(INITIAL);
 	YY_BREAK
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
-#line 147 "conventlex.l"
+#line 148 "conventlex.l"
 {
   linechars=0;
   linenum++;
@@ -1767,7 +1755,7 @@ YY_RULE_SETUP
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 151 "conventlex.l"
+#line 152 "conventlex.l"
 {
   linechars=0;
   linenum++;
@@ -1775,15 +1763,15 @@ YY_RULE_SETUP
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 155 "conventlex.l"
+#line 156 "conventlex.l"
 
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 157 "conventlex.l"
+#line 158 "conventlex.l"
 ECHO;
 	YY_BREAK
-#line 1787 "conventlex.c"
+#line 1775 "conventlex.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1967,7 +1955,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			int num_to_read =
+			yy_size_t num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1981,7 +1969,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				int new_size = b->yy_buf_size * 2;
+				yy_size_t new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -2012,7 +2000,7 @@ static int yy_get_next_buffer (void)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), (size_t) num_to_read );
+			(yy_n_chars), num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -2117,7 +2105,7 @@ static int yy_get_next_buffer (void)
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = (yy_n_chars) + 2;
+		register yy_size_t number_to_move = (yy_n_chars) + 2;
 		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
@@ -2166,7 +2154,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -2190,7 +2178,7 @@ static int yy_get_next_buffer (void)
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( conv_yywrap( ) )
-						return EOF;
+						return 0;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -2442,7 +2430,7 @@ void conv_yypop_buffer_state (void)
  */
 static void conv_yyensure_buffer_stack (void)
 {
-	int num_to_alloc;
+	yy_size_t num_to_alloc;
     
 	if (!(yy_buffer_stack)) {
 
@@ -2534,17 +2522,16 @@ YY_BUFFER_STATE conv_yy_scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to conv_yylex() will
  * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE conv_yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+YY_BUFFER_STATE conv_yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n;
-	int i;
+	yy_size_t n, i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -2626,7 +2613,7 @@ FILE *conv_yyget_out  (void)
 /** Get the length of the current token.
  * 
  */
-int conv_yyget_leng  (void)
+yy_size_t conv_yyget_leng  (void)
 {
         return conv_yyleng;
 }
@@ -2774,7 +2761,7 @@ void conv_yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 157 "conventlex.l"
+#line 158 "conventlex.l"
 
 
 const char *currentfilename(void) {