ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/hopm/trunk/src/config-lexer.l

Comparing hopm/trunk/src/config-lexer.l (file contents):
Revision 6046 by michael, Thu Jun 4 11:09:23 2015 UTC vs.
Revision 7729 by michael, Mon Sep 26 15:53:23 2016 UTC

#	Line 1 | Line 1
1		/*
2		*  Copyright (c) 2002 Erik Fears
3	<	*  Copyright (c) 2014-2015 ircd-hybrid development team
3	>	*  Copyright (c) 2014-2016 ircd-hybrid development team
4		*
5		*  This program is free software; you can redistribute it and/or modify
6		*  it under the terms of the GNU General Public License as published by
#	Line 29 | Line 29
29
30		#include "compat.h"
31		#include "config.h"
32	<	#include "config-parser.h"
32	>	#include "config-parser.h"  /* autogenerated header file */
33	>	#include "log.h"
34
35	+	#undef YY_FATAL_ERROR
36	+	#define YY_FATAL_ERROR(msg) conf_yy_fatal_error(msg)
37	+
38	+	#undef YY_INPUT
39	+	#define YY_INPUT(buf,result,max_size) \
40	+	if (!(result = conf_yy_input(buf, max_size))) \
41	+	YY_FATAL_ERROR("input in flex scanner failed");
42	+	#define MAX_INCLUDE_DEPTH 10
43
35	–	static void ccomment(void);
44
45	<	unsigned int linenum = 1;
45	>	unsigned int lineno = 1;
46		char linebuf[512];
47	+	char conffilebuf[512];
48
49	<	%}
49	>	static struct included_file
50	>	{
51	>	YY_BUFFER_STATE state;
52	>	unsigned int lineno;
53	>	FILE *file;
54	>	char conffile[512];
55	>	} include_stack[MAX_INCLUDE_DEPTH];
56
57	<	string                 \"[^\"\n]*[\"\n]
43	<	comment                ("//"|"#").*
44	<	whitespace             [ \t\r]*
57	>	static unsigned int include_stack_ptr;
58
46	–	%%
59
60	<	"/*"                    { ccomment(); }
60	>	static void ccomment(void);
61	>	static void conf_include(void);
62	>	static int conf_eof(void);
63
64	<	{comment}               ;
64	>	static int
65	>	conf_yy_input(char *lbuf, unsigned int max_size)
66	>	{
67	>	return fgets(lbuf, max_size, conf_file) == NULL ? 0 : strlen(lbuf);
68	>	}
69
70	<	{string}                {
71	<	/* QSTRING from Hybrid7. Why re-invent the wheel? */
70	>	static int
71	>	conf_yy_fatal_error(const char *msg)
72	>	{
73	>	return 0;
74	>	}
75	>	%}
76	>
77	>	WS        [[:blank:]]*
78	>	DIGIT     [[:digit:]]+
79	>	COMMENT   ("//"|"#").*
80	>	qstring   \"[^\"\n]*[\"\n]
81	>	include   \.include{WS}(\<.*\>|\".*\")
82
83	<	if(yytext[yyleng-2] == '\\')
84	<	{
85	<	yyless(yyleng-1); /* return last quote */
86	<	yymore();         /* append next string */
87	<	}
88	<	else
89	<	{
90	<	yylval.string = yytext+1;
91	<	if(yylval.string[yyleng-2] != '"') ; /* log error */
92	<	else
93	<	{
94	<	int i,j;
95	<
96	<	yylval.string[yyleng-2] = '\0'; /* remove close
97	<	*  quote
98	<	*/
99	<
100	<	for (j=i=0 ;yylval.string[i] != '\0'; i++,j++)
101	<	{
102	<	if (yylval.string[i] != '\\')
103	<	{
104	<	yylval.string[j] = yylval.string[i];
105	<	}
106	<	else
107	<	{
108	<	i++;
109	<	yylval.string[j] = yylval.string[i];
110	<	}
111	<	}
112	<	yylval.string[j] = '\0';
113	<	return STRING;
114	<	}
115	<	}
83	>	%%
84	>	{include}       { conf_include(); }
85	>	"/*"            { ccomment(); }
86	>	\n.*            { strlcpy(linebuf, yytext + 1, sizeof(linebuf)); ++lineno; yyless(1); }
87	>	{WS}            ;
88	>	{COMMENT}       ;
89	>	{DIGIT}         { yylval.number = atoi(yytext); return NUMBER; }
90	>	{qstring}       { if (yytext[yyleng - 2] == '\\')
91	>	{
92	>	yyless(yyleng - 1);  /* Return last quote */
93	>	yymore();  /* Append next string */
94	>	}
95	>	else
96	>	{
97	>	yylval.string = yytext + 1;
98	>
99	>	if (yylval.string[yyleng - 2] != '"')
100	>	log_printf("CONFIG ->Unterminated character string");
101	>	else
102	>	{
103	>	unsigned int i = 0, j = 0;
104	>
105	>	yylval.string[yyleng - 2] = '\0';  /* Remove close quote */
106	>
107	>	for (; yylval.string[i] != '\0'; ++i, ++j)
108	>	{
109	>	if (yylval.string[i] != '\\')
110	>	yylval.string[j] = yylval.string[i];
111	>	else
112	>	{
113	>	++i;
114	>
115	>	if (yylval.string[i] == '\0')  /* XXX: should not happen */
116	>	{
117	>	log_printf("CONFIG -> Unterminated character string");
118	>	break;
119	>	}
120	>
121	>	yylval.string[j] = yylval.string[i];
122		}
123	+	}
124	+
125	+	yylval.string[j] = '\0';
126	+	return STRING;
127	+	}
128	+	}
129	+	}
130
131		AWAY                    { return AWAY;         }
132		BAN_UNKNOWN             { return BAN_UNKNOWN;  }
133		BLACKLIST               { return BLACKLIST;    }
134		CHANNEL                 { return CHANNEL;      }
135	+	COMMAND_INTERVAL        { return COMMAND_INTERVAL; }
136	+	COMMAND_QUEUE_SIZE      { return COMMAND_QUEUE_SIZE; }
137	+	COMMAND_TIMEOUT         { return COMMAND_TIMEOUT; }
138		CONNREGEX               { return CONNREGEX;    }
139		DNS_FDLIMIT             { return DNS_FDLIMIT;  }
140	+	DNS_TIMEOUT             { return DNS_TIMEOUT;  }
141		DNSBL_FROM              { return DNSBL_FROM;   }
142		DNSBL_TO                { return DNSBL_TO;     }
143		EXEMPT                  { return EXEMPT;       }
#	Line 120 | Line 165 | PORT                    { return PORT;
165		PROTOCOL                { return PROTOCOL;     }
166		READTIMEOUT             { return READTIMEOUT;  }
167		REALNAME                { return REALNAME;     }
168	+	RECONNECTINTERVAL       { return RECONNECTINTERVAL; }
169		REPLY                   { return REPLY;        }
170		SCANLOG                 { return SCANLOG;      }
171		SCANNER                 { return SCANNER;      }
#	Line 172 | Line 218 | HTTPPOST                {
218		return PROTOCOLTYPE;
219		}
220
221	+	HTTPS                   {
222	+	yylval.number = OPM_TYPE_HTTPS;
223	+	return PROTOCOLTYPE;
224	+	}
225	+
226	+	HTTPSPOST               {
227	+	yylval.number = OPM_TYPE_HTTPSPOST;
228	+	return PROTOCOLTYPE;
229	+	}
230	+
231		SOCKS4                  {
232		yylval.number = OPM_TYPE_SOCKS4;
233		return PROTOCOLTYPE;
#	Line 198 | Line 254 | DREAMBOX                {
254		}
255
256
201	–
202	–	[0-9]+                  {
203	–	yylval.number=atoi(yytext);
204	–	return NUMBER;
205	–	}
206	–
207	–
208	–
209	–
210	–
257		TRUE                     {
258		yylval.number=1;
259		return NUMBER;
#	Line 238 | Line 284 | OFF                      {
284		return NUMBER;
285		}
286
287	<
288	<	\n.*                     {
243	<	strlcpy(linebuf, yytext + 1, sizeof(linebuf));
244	<	++linenum;
245	<	yyless(1);
246	<	}
247	<
248	<	{whitespace}            /* ignore whitespace */;
249	<
250	<	.                       return yytext[0];
287	>	.                       { return yytext[0]; }
288	>	<<EOF>>                 { if (conf_eof()) yyterminate(); }
289
290		%%
291
#	Line 263 | Line 301 | ccomment(void)
301		{
302		while ((c = input()) != '*' && c != EOF)
303		if (c == '\n')
304	<	++linenum;
304	>	++lineno;
305
306		if (c == '*')
307		{
#	Line 272 | Line 310 | ccomment(void)
310		if (c == '/')
311		break;
312		else if (c == '\n')
313	<	++linenum;
313	>	++lineno;
314		}
315
316		if (c == EOF)
#	Line 289 | Line 327 | ccomment(void)
327		}
328		}
329		}
330	+
331	+	static void
332	+	conf_include(void)
333	+	{
334	+	char *p = NULL;
335	+	char filenamebuf[512];
336	+
337	+	if ((p = strchr(yytext, '<')) == NULL)
338	+	*strchr(p = strchr(yytext, '"') + 1, '"') = '\0';
339	+	else
340	+	*strchr(++p, '>') = '\0';
341	+
342	+	/* do stacking and co. */
343	+	if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
344	+	{
345	+	log_printf("CONFIG -> Includes nested too deep in %s", p);
346	+	return;
347	+	}
348	+
349	+	if (*p == '/')  /* if it is an absolute path */
350	+	snprintf(filenamebuf, sizeof(filenamebuf), "%s", p);
351	+	else
352	+	snprintf(filenamebuf, sizeof(filenamebuf), "%s/%s", HOPM_ETCDIR, p);
353	+
354	+	FILE *tmp_fbfile_in = fopen(filenamebuf, "r");
355	+	if (!tmp_fbfile_in)
356	+	{
357	+	log_printf("CONFIG -> Unable to read configuration file '%s': %s",
358	+	filenamebuf, strerror(errno));
359	+	return;
360	+	}
361	+
362	+	struct included_file *file = &include_stack[include_stack_ptr++];
363	+	file->lineno = lineno;
364	+	file->file = conf_file;
365	+	file->state = YY_CURRENT_BUFFER;
366	+	strlcpy(file->conffile, conffilebuf, sizeof(file->conffile));
367	+
368	+	lineno = 1;
369	+	conf_file = tmp_fbfile_in;
370	+
371	+	snprintf(conffilebuf, sizeof(conffilebuf), "%s", filenamebuf);
372	+	yy_switch_to_buffer(yy_create_buffer(NULL, YY_BUF_SIZE));
373	+	}
374	+
375	+	static int
376	+	conf_eof(void)
377	+	{
378	+	if (include_stack_ptr == 0)
379	+	{
380	+	lineno = 1;
381	+	return 1;
382	+	}
383	+
384	+	/* switch buffer */
385	+	struct included_file *file = &include_stack[--include_stack_ptr];
386	+
387	+	/* close current file */
388	+	fclose(conf_file);
389	+
390	+	/* switch buffers */
391	+	yy_delete_buffer(YY_CURRENT_BUFFER);
392	+	yy_switch_to_buffer(file->state);
393	+
394	+	/* switch lineno */
395	+	lineno = file->lineno;
396	+
397	+	/* switch file */
398	+	conf_file = file->file;
399	+
400	+	strlcpy(conffilebuf, file->conffile, sizeof(conffilebuf));
401	+	return 0;
402	+	}

Diff Legend

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