|
48 | 48 |
|
49 | 49 | #define EOS '\0' |
50 | 50 |
|
51 | | -#define MATCH_CLASS6(p,a,b,c,d,e,f,g) \ |
52 | | - ((p)[0]==(a) && (p)[1]==(b) && (p)[2]==(c) && (p)[3]==(d) && (p)[4]==(e) && (p)[5]==(f) && (p)[6]==(g)) |
| 51 | +#define MATCH_CLASS6(p, a, b, c, d, e, f, g) \ |
| 52 | + ((p)[0] == (a) && (p)[1] == (b) && (p)[2] == (c) \ |
| 53 | + && (p)[3] == (d) && (p)[4] == (e) && (p)[5] == (f) && (p)[6] == (g)) |
53 | 54 |
|
54 | | -#define MATCH_CLASS7(p,a,b,c,d,e,f,g,h) \ |
55 | | - ((p)[0]==(a) && (p)[1]==(b) && (p)[2]==(c) && (p)[3]==(d) && (p)[4]==(e) && (p)[5]==(f) && (p)[6]==(g) && (p)[7]==(h)) |
| 55 | +#define MATCH_CLASS7(p, a, b, c, d, e, f, g, h) \ |
| 56 | + ((p)[0] == (a) && (p)[1] == (b) && (p)[2] == (c) && (p)[3] == (d) \ |
| 57 | + && (p)[4] == (e) && (p)[5] == (f) && (p)[6] == (g) && (p)[7] == (h)) |
56 | 58 |
|
57 | 59 | enum fnm_char_class { |
58 | 60 | FNM_CC_ALNUM, |
@@ -81,71 +83,71 @@ static bool fnm_cc_is_valid(const char *pattern, size_t psize, enum fnm_char_cla |
81 | 83 | /* Each class name ends with ":]" */ |
82 | 84 | switch (pattern[0]) { |
83 | 85 | case 'a': |
84 | | - if (MATCH_CLASS6(pattern,'a','l','n','u','m',':',']')) { |
| 86 | + if (MATCH_CLASS6(pattern, 'a', 'l', 'n', 'u', 'm', ':', ']')) { |
85 | 87 | *cc = FNM_CC_ALNUM; |
86 | 88 | return true; |
87 | 89 | } |
88 | | - if (MATCH_CLASS6(pattern,'a','l','p','h','a',':',']')) { |
| 90 | + if (MATCH_CLASS6(pattern, 'a', 'l', 'p', 'h', 'a', ':', ']')) { |
89 | 91 | *cc = FNM_CC_ALPHA; |
90 | 92 | return true; |
91 | 93 | } |
92 | 94 | break; |
93 | 95 |
|
94 | 96 | case 'c': |
95 | | - if (MATCH_CLASS6(pattern,'c','n','t','r','l',':',']')) { |
| 97 | + if (MATCH_CLASS6(pattern, 'c', 'n', 't', 'r', 'l', ':', ']')) { |
96 | 98 | *cc = FNM_CC_CNTRL; |
97 | 99 | return true; |
98 | 100 | } |
99 | 101 | break; |
100 | 102 |
|
101 | 103 | case 'd': |
102 | | - if (MATCH_CLASS6(pattern,'d','i','g','i','t',':',']')) { |
| 104 | + if (MATCH_CLASS6(pattern, 'd', 'i', 'g', 'i', 't', ':', ']')) { |
103 | 105 | *cc = FNM_CC_DIGIT; |
104 | 106 | return true; |
105 | 107 | } |
106 | 108 | break; |
107 | 109 |
|
108 | 110 | case 'g': |
109 | | - if (MATCH_CLASS6(pattern,'g','r','a','p','h',':',']')) { |
| 111 | + if (MATCH_CLASS6(pattern, 'g', 'r', 'a', 'p', 'h', ':', ']')) { |
110 | 112 | *cc = FNM_CC_GRAPH; |
111 | 113 | return true; |
112 | 114 | } |
113 | 115 | break; |
114 | 116 |
|
115 | 117 | case 'l': |
116 | | - if (MATCH_CLASS6(pattern,'l','o','w','e','r',':',']')) { |
| 118 | + if (MATCH_CLASS6(pattern, 'l', 'o', 'w', 'e', 'r', ':', ']')) { |
117 | 119 | *cc = FNM_CC_LOWER; |
118 | 120 | return true; |
119 | 121 | } |
120 | 122 | break; |
121 | 123 |
|
122 | 124 | case 'p': |
123 | | - if (MATCH_CLASS6(pattern,'p','r','i','n','t',':',']')) { |
| 125 | + if (MATCH_CLASS6(pattern, 'p', 'r', 'i', 'n', 't', ':', ']')) { |
124 | 126 | *cc = FNM_CC_PRINT; |
125 | 127 | return true; |
126 | 128 | } |
127 | | - if (MATCH_CLASS6(pattern,'p','u','n','c','t',':',']')) { |
| 129 | + if (MATCH_CLASS6(pattern, 'p', 'u', 'n', 'c', 't', ':', ']')) { |
128 | 130 | *cc = FNM_CC_PUNCT; |
129 | 131 | return true; |
130 | 132 | } |
131 | 133 | break; |
132 | 134 |
|
133 | 135 | case 's': |
134 | | - if (MATCH_CLASS6(pattern,'s','p','a','c','e',':',']')) { |
| 136 | + if (MATCH_CLASS6(pattern, 's', 'p', 'a', 'c', 'e', ':', ']')) { |
135 | 137 | *cc = FNM_CC_SPACE; |
136 | 138 | return true; |
137 | 139 | } |
138 | 140 | break; |
139 | 141 |
|
140 | 142 | case 'u': |
141 | | - if (MATCH_CLASS6(pattern,'u','p','p','e','r',':',']')) { |
| 143 | + if (MATCH_CLASS6(pattern, 'u', 'p', 'p', 'e', 'r', ':', ']')) { |
142 | 144 | *cc = FNM_CC_UPPER; |
143 | 145 | return true; |
144 | 146 | } |
145 | 147 | break; |
146 | 148 |
|
147 | 149 | case 'x': |
148 | | - if (MATCH_CLASS7(pattern,'x','d','i','g','i','t',':',']')) { |
| 150 | + if (MATCH_CLASS7(pattern, 'x', 'd', 'i', 'g', 'i', 't', ':', ']')) { |
149 | 151 | *cc = FNM_CC_XDIGIT; |
150 | 152 | return true; |
151 | 153 | } |
@@ -214,6 +216,7 @@ static bool match_posix_class(const char **pattern, int test) |
214 | 216 |
|
215 | 217 | /* move pattern pointer past ":]" */ |
216 | 218 | const char *end = strstr(p, ":]"); |
| 219 | + |
217 | 220 | if (end) { |
218 | 221 | *pattern = end + 2; |
219 | 222 | } |
|
0 commit comments