ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/conf_lexer.l
(Generate patch)

Comparing ircd-hybrid-7.2/src/ircd_lexer.l (file contents):
Revision 966 by stu, Sun Nov 4 23:21:51 2007 UTC vs.
Revision 967 by michael, Sun Aug 2 18:05:28 2009 UTC

# Line 42 | Line 42
42   #undef YY_INPUT
43   #define YY_FATAL_ERROR(msg) conf_yy_fatal_error(msg)
44   #define YY_INPUT(buf,result,max_size) \
45 <  if (!(result = conf_fbgets(buf, max_size, conf_fbfile_in))) \
45 >  if (!(result = conf_fbgets(buf, max_size, conf_parser_ctx.conf_file))) \
46      YY_FATAL_ERROR("input in flex scanner failed");
47   #define MAX_INCLUDE_DEPTH 10
48  
# Line 286 | Line 286 | rsa_private_key_file           { return RSA_PRIVA
286   rsa_public_key_file             { return RSA_PUBLIC_KEY_FILE; }
287   ssl                             { return T_SSL; }
288   ssl_certificate_file        { return SSL_CERTIFICATE_FILE; }
289 + ssl_server_protocol       { return T_SSL_CONNECTION_METHOD; }
290 + sslv3           { return T_SSLV3; }
291 + tlsv1           { return T_TLSV1; }
292   send_password   { return SEND_PASSWORD; }
293   sendq           { return SENDQ; }
294   server          { return T_SERVER; }
# Line 491 | Line 494 | cinclude(void)
494  
495      lineno_stack[include_stack_ptr] = lineno;
496      lineno = 1;
497 <    inc_fbfile_in[include_stack_ptr] = conf_fbfile_in;
497 >    inc_fbfile_in[include_stack_ptr] = conf_parser_ctx.conf_file;
498      strlcpy(conffile_stack[include_stack_ptr], conffilebuf, IRCD_BUFSIZE);
499      include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
500 <    conf_fbfile_in = tmp_fbfile_in;
500 >    conf_parser_ctx.conf_file = tmp_fbfile_in;
501      snprintf(conffilebuf, sizeof(conffilebuf), "%s", filenamebuf);
502      yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
503    }
# Line 508 | Line 511 | ieof(void)
511   {
512    /* log(L_NOTICE, "return from include stack!"); */
513    if (include_stack_ptr)
514 <    fbclose(conf_fbfile_in);
514 >    fbclose(conf_parser_ctx.conf_file);
515    if (--include_stack_ptr < 0)
516    {
517      /* log(L_NOTICE, "terminating lexer"); */
# Line 523 | Line 526 | ieof(void)
526    /* log(L_NOTICE, "deleting include_stack_ptr=%d", include_stack_ptr); */
527    yy_delete_buffer(YY_CURRENT_BUFFER);
528    lineno = lineno_stack[include_stack_ptr];
529 <  conf_fbfile_in = inc_fbfile_in[include_stack_ptr];
529 >  conf_parser_ctx.conf_file = inc_fbfile_in[include_stack_ptr];
530    strlcpy(conffilebuf, conffile_stack[include_stack_ptr], sizeof(conffilebuf));
531    yy_switch_to_buffer(include_stack[include_stack_ptr]);
532  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)