summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-22 04:06:23 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-22 04:06:23 (GMT)
commit7fa932ece61667b193c08d035ce634d6dc4a4eaf (patch)
tree0ba2b9db328eff239db42c57910a1169f2c368fa /dir.c
parent6888d69747efd516e54e7e3381bc3a50fa39991e (diff)
dir.c: adjust indent [ci skip]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c89
1 files changed, 45 insertions, 44 deletions
diff --git a/dir.c b/dir.c
index 7bc51eb..9146b5c 100644
--- a/dir.c
+++ b/dir.c
@@ -355,55 +355,56 @@ fnmatch_helper(
goto failed;
}
- case '{': if (flags & FNM_EXTGLOB) {
- size_t len = pend - p;
- char *buf = FNMATCH_ALLOC_N(char, len);
- const char *rbrace = NULL;
- while (p < pend) {
- const char *t = ++p;
- int nest = 0;
- while (p < pend && !(*p == ',' && nest == 0)) {
- if (*p == '{') nest++;
- if (*p == '}') {
- if (nest == 0) {
- if (!rbrace) rbrace = p;
- goto rest;
- }
- nest--;
- }
- if (*p == '\\' && escape) {
- if (++p >= pend) break;
- }
- Inc(p, pend, enc);
- }
- if (!rbrace) {
- rbrace = p;
- while (rbrace < pend && !(*rbrace == '}' && nest == 0)) {
- if (*rbrace == '{') nest++;
- if (*rbrace == '}') nest--;
- if (*rbrace == '\\' && escape) {
- if (++p >= pend) break;
- }
- Inc(rbrace, pend, enc);
- }
- }
-rest:
- memcpy(buf, t, p-t);
- buf[p-t]=0;
- strlcpy(buf+(p-t), rbrace+1, len-(p-t));
- {
- const char *pp = buf, *ss = s;
- r = fnmatch_helper((const char **)&pp, &ss, flags|FNM_DOTMATCH, enc);
+ case '{':
+ if (flags & FNM_EXTGLOB) {
+ size_t len = pend - p;
+ char *buf = FNMATCH_ALLOC_N(char, len);
+ const char *rbrace = NULL;
+ while (p < pend) {
+ const char *t = ++p;
+ int nest = 0;
+ while (p < pend && !(*p == ',' && nest == 0)) {
+ if (*p == '{') nest++;
+ if (*p == '}') {
+ if (nest == 0) {
+ if (!rbrace) rbrace = p;
+ goto rest;
}
- if (r == 0) {
- p = buf;
- FNMATCH_FREE(buf);
- RETURN(0);
+ nest--;
+ }
+ if (*p == '\\' && escape) {
+ if (++p >= pend) break;
+ }
+ Inc(p, pend, enc);
+ }
+ if (!rbrace) {
+ rbrace = p;
+ while (rbrace < pend && !(*rbrace == '}' && nest == 0)) {
+ if (*rbrace == '{') nest++;
+ if (*rbrace == '}') nest--;
+ if (*rbrace == '\\' && escape) {
+ if (++p >= pend) break;
}
- if (p >= rbrace) break;
+ Inc(rbrace, pend, enc);
}
+ }
+ rest:
+ memcpy(buf, t, p-t);
+ buf[p-t]=0;
+ strlcpy(buf+(p-t), rbrace+1, len-(p-t));
+ {
+ const char *pp = buf, *ss = s;
+ r = fnmatch_helper((const char **)&pp, &ss, flags|FNM_DOTMATCH, enc);
+ }
+ if (r == 0) {
+ p = buf;
FNMATCH_FREE(buf);
+ RETURN(0);
}
+ if (p >= rbrace) break;
+ }
+ FNMATCH_FREE(buf);
+ }
}
/* ordinary */