The branch, master has been updated via 1820209 s3/rpc_server/mdssvc: Generate flex/bison files in build from 9a3b64a vfs_fruit: checks wrong AAPL config state and so always uses readdirattr
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1820209b9ec182ae53fd569239e9e16f090afa4a Author: Noel Power <noel.po...@suse.com> Date: Tue Jan 17 16:02:27 2017 +0000 s3/rpc_server/mdssvc: Generate flex/bison files in build Build the generated files at build time instead of using a committed version generated at some point in the past. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12528 Signed-off-by: Noel Power <noel.po...@suse.com> Reviewed-by: Ralph Boehme <s...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Sat Jan 28 13:26:01 CET 2017 on sn-devel-144 ----------------------------------------------------------------------- Summary of changes: source3/rpc_server/mdssvc/Makefile | 13 - source3/rpc_server/mdssvc/mdssvc.c | 2 +- source3/rpc_server/mdssvc/sparql_lexer.c | 1869 ---------------------- source3/rpc_server/mdssvc/sparql_lexer.l | 2 +- source3/rpc_server/mdssvc/sparql_parser.c | 1983 ------------------------ source3/rpc_server/mdssvc/sparql_parser.h | 100 -- source3/rpc_server/mdssvc/sparql_parser.y | 8 +- source3/rpc_server/mdssvc/sparql_parser_test.c | 2 +- source3/rpc_server/wscript_build | 4 +- source3/wscript | 12 + source3/wscript_build | 4 +- 11 files changed, 23 insertions(+), 3976 deletions(-) delete mode 100644 source3/rpc_server/mdssvc/Makefile delete mode 100644 source3/rpc_server/mdssvc/sparql_lexer.c delete mode 100644 source3/rpc_server/mdssvc/sparql_parser.c delete mode 100644 source3/rpc_server/mdssvc/sparql_parser.h Changeset truncated at 500 lines: diff --git a/source3/rpc_server/mdssvc/Makefile b/source3/rpc_server/mdssvc/Makefile deleted file mode 100644 index 3de4a46..0000000 --- a/source3/rpc_server/mdssvc/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -BISON=bison -FLEX=flex - -PARSER=sparql_parser -LEXER=sparql_lexer - -all: $(PARSER).c $(LEXER).c - -$(PARSER).c: $(PARSER).y - $(BISON) -d -o $@ $< - -$(LEXER).c: $(LEXER).l - $(FLEX) -o $@ $< diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c index 44d7703..c32ba0c 100644 --- a/source3/rpc_server/mdssvc/mdssvc.c +++ b/source3/rpc_server/mdssvc/mdssvc.c @@ -27,7 +27,7 @@ #include "lib/dbwrap/dbwrap_rbt.h" #include "libcli/security/dom_sid.h" #include "mdssvc.h" -#include "sparql_parser.h" +#include "rpc_server/mdssvc/sparql_parser.tab.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV diff --git a/source3/rpc_server/mdssvc/sparql_lexer.c b/source3/rpc_server/mdssvc/sparql_lexer.c deleted file mode 100644 index 39539c5..0000000 --- a/source3/rpc_server/mdssvc/sparql_lexer.c +++ /dev/null @@ -1,1869 +0,0 @@ -#line 2 "sparql_lexer.c" - -#line 4 "sparql_lexer.c" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define yy_create_buffer mdsyy_create_buffer -#define yy_delete_buffer mdsyy_delete_buffer -#define yy_flex_debug mdsyy_flex_debug -#define yy_init_buffer mdsyy_init_buffer -#define yy_flush_buffer mdsyy_flush_buffer -#define yy_load_buffer_state mdsyy_load_buffer_state -#define yy_switch_to_buffer mdsyy_switch_to_buffer -#define yyin mdsyyin -#define yyleng mdsyyleng -#define yylex mdsyylex -#define yylineno mdsyylineno -#define yyout mdsyyout -#define yyrestart mdsyyrestart -#define yytext mdsyytext -#define yywrap mdsyywrap -#define yyalloc mdsyyalloc -#define yyrealloc mdsyyrealloc -#define yyfree mdsyyfree - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 0 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include <stdlib.h> - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include <inttypes.h> -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! C99 */ - -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN (yy_start) = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START (((yy_start) - 1) / 2) -#define YYSTATE YY_START - -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE mdsyyrestart(mdsyyin ) - -#define YY_END_OF_BUFFER_CHAR 0 - -/* 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. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -extern yy_size_t mdsyyleng; - -extern FILE *mdsyyin, *mdsyyout; - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - - #define YY_LESS_LINENO(n) - #define YY_LINENO_REWIND_TO(ptr) - -/* Return all but the first "n" matched characters back to the input stream. */ -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up mdsyytext. */ \ - yy_size_t yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = (yy_hold_char); \ - YY_RESTORE_YY_MORE_OFFSET \ - (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up mdsyytext again */ \ - } \ - while ( 0 ) - -#define unput(c) yyunput( c, (yytext_ptr) ) - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - 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 - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via mdsyyrestart()), so that the user can continue scanning by - * just pointing mdsyyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -/* Stack of input buffers. */ -static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ -static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - * - * Returns the top of the stack, or NULL. - */ -#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ - ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ - : NULL) - -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] - -/* yy_hold_char holds the character lost when mdsyytext is formed. */ -static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t mdsyyleng; - -/* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; -static int yy_init = 0; /* whether we need to initialize */ -static int yy_start = 0; /* start state number */ - -/* Flag which is used to allow mdsyywrap()'s to do buffer switches - * instead of setting up a fresh mdsyyin. A bit of a hack ... - */ -static int yy_did_buffer_switch_on_eof; - -void mdsyyrestart (FILE *input_file ); -void mdsyy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE mdsyy_create_buffer (FILE *file,int size ); -void mdsyy_delete_buffer (YY_BUFFER_STATE b ); -void mdsyy_flush_buffer (YY_BUFFER_STATE b ); -void mdsyypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void mdsyypop_buffer_state (void ); - -static void mdsyyensure_buffer_stack (void ); -static void mdsyy_load_buffer_state (void ); -static void mdsyy_init_buffer (YY_BUFFER_STATE b,FILE *file ); - -#define YY_FLUSH_BUFFER mdsyy_flush_buffer(YY_CURRENT_BUFFER ) - -YY_BUFFER_STATE mdsyy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE mdsyy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE mdsyy_scan_bytes (yyconst char *bytes,yy_size_t len ); - -void *mdsyyalloc (yy_size_t ); -void *mdsyyrealloc (void *,yy_size_t ); -void mdsyyfree (void * ); - -#define yy_new_buffer mdsyy_create_buffer - -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - mdsyyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - mdsyy_create_buffer(mdsyyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } - -#define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - mdsyyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - mdsyy_create_buffer(mdsyyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } - -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) - -/* Begin user sect3 */ - -typedef unsigned char YY_CHAR; - -FILE *mdsyyin = (FILE *) 0, *mdsyyout = (FILE *) 0; - -typedef int yy_state_type; - -extern int mdsyylineno; - -int mdsyylineno = 1; - -extern char *mdsyytext; -#ifdef yytext_ptr -#undef yytext_ptr -#endif -#define yytext_ptr mdsyytext - -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -#if defined(__GNUC__) && __GNUC__ >= 3 -__attribute__((__noreturn__)) -#endif -static void yy_fatal_error (yyconst char msg[] ); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up mdsyytext. - */ -#define YY_DO_BEFORE_ACTION \ - (yytext_ptr) = yy_bp; \ - mdsyyleng = (size_t) (yy_cp - yy_bp); \ - (yy_hold_char) = *yy_cp; \ - *yy_cp = '\0'; \ - (yy_c_buf_p) = yy_cp; - -#define YY_NUM_RULES 18 -#define YY_END_OF_BUFFER 19 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[57] = - { 0, - 0, 0, 19, 18, 17, 18, 5, 18, 18, 6, - 7, 16, 15, 13, 12, 14, 16, 16, 16, 18, - 18, 18, 18, 11, 0, 8, 16, 0, 0, 0, - 10, 16, 16, 16, 9, 0, 0, 0, 16, 16, - 16, 0, 0, 16, 16, 4, 0, 16, 3, 0, - 16, 0, 1, 0, 2, 0 - } ; - -static yyconst YY_CHAR yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 3, 4, 1, 5, 1, 6, 1, 7, - 8, 9, 1, 10, 9, 11, 1, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 1, 12, - 13, 14, 1, 1, 9, 9, 9, 9, 9, 9, - 9, 9, 15, 9, 9, 9, 9, 9, 9, 9, - 9, 16, 9, 9, 9, 9, 9, 9, 9, 9, - 1, 1, 1, 1, 9, 1, 17, 9, 9, 9, - - 18, 19, 20, 9, 21, 9, 9, 22, 23, 24, - 25, 9, 9, 26, 27, 28, 29, 9, 9, 9, - 9, 9, 1, 30, 1, 1, 1, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 1, 1, 32, 32, 32, 32, 32, 32, 32, - - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, - 34, 34, 34, 34, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static yyconst YY_CHAR yy_meta[35] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, - 2, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, - 1, 2, 2, 2 - } ; - -static yyconst flex_uint16_t yy_base[58] = - { 0, - 0, 0, 91, 92, 92, 77, 92, 61, 82, 92, - 92, 3, 92, 92, 74, 92, 14, 25, 15, 56, - 54, 53, 52, 92, 61, 92, 57, 49, 48, 47, - 92, 27, 28, 16, 92, 46, 45, 52, 36, 30, -- Samba Shared Repository