1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
--- Svc_Conf_l.cpp.old Tue Mar 1 10:03:28 2005
+++ Svc_Conf_l.cpp Tue Mar 1 10:18:29 2005
@@ -625,9 +625,21 @@
ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
result = n; \
} \
- else if ( ((result = fread( buf, 1, max_size, ace_yyin )) == 0) \
+ else \
+ { \
+ errno = 0; \
+ while ( ((result = fread( buf, sizeof (ACE_TCHAR), max_size, ace_yyin )) == 0) \
&& ferror( ace_yyin ) ) \
- ACE_YY_FATAL_ERROR( "input in flex scanner failed" );
+ { \
+ if (errno != EINTR) \
+ { \
+ ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \
+ break; \
+ } \
+ errno = 0; \
+ clearerr(ace_yyin); \
+ } \
+ }
#endif
/* No semi-colon after return; correct usage is to write "ace_yyterminate();" -
@@ -679,8 +691,12 @@
register ACE_TCHAR *ace_yy_cp = 0, *ace_yy_bp = 0;
register int ace_yy_act;
+ ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
+ ace_mon,
+ *ACE_Static_Object_Lock::instance (),
+ -1));
-
+ ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM);
if ( ace_yy_init )
{
@@ -774,71 +790,71 @@
case 2:
ACE_YY_RULE_SETUP
{ return token (ACE_DYNAMIC); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 3:
ACE_YY_RULE_SETUP
{ return token (ACE_STATIC); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 4:
ACE_YY_RULE_SETUP
{ return token (ACE_SUSPEND); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 5:
ACE_YY_RULE_SETUP
{ return token (ACE_RESUME); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 6:
ACE_YY_RULE_SETUP
{ return token (ACE_REMOVE); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 7:
ACE_YY_RULE_SETUP
{ return token (ACE_USTREAM); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 8:
ACE_YY_RULE_SETUP
{ return token (ACE_MODULE_T); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 9:
ACE_YY_RULE_SETUP
{ return token (ACE_SVC_OBJ_T); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 10:
ACE_YY_RULE_SETUP
{ return token (ACE_STREAM_T); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 11:
ACE_YY_RULE_SETUP
{ return token (ACE_ACTIVE); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 12:
ACE_YY_RULE_SETUP
{ return token (ACE_INACTIVE); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 13:
ACE_YY_RULE_SETUP
{ return token (':'); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 14:
ACE_YY_RULE_SETUP
{ return token ('*'); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 15:
ACE_YY_RULE_SETUP
{ return token ('('); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 16:
ACE_YY_RULE_SETUP
{ return token (')'); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 17:
ACE_YY_RULE_SETUP
{ return token ('{'); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 18:
ACE_YY_RULE_SETUP
{ return token ('}'); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 19:
ACE_YY_RULE_SETUP
{
@@ -852,21 +868,21 @@
ace_yyleng -= 1;
ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext + 1, ace_yyleng);
return token (ACE_STRING); }
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 20:
ACE_YY_RULE_SETUP
{
ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
return token (ACE_IDENT);
}
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 21:
ACE_YY_RULE_SETUP
{
ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng);
return token (ACE_PATHNAME);
}
- ACE_YY_BREAK
+ //ACE_YY_BREAK
case 22:
ACE_YY_RULE_SETUP
; /* EMPTY */
|
