summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorYukihiro Matsumoto <matz@ruby-lang.org>1997-11-18 13:59:59 +0900
committerTakashi Kokubun <takashikkbn@gmail.com>2019-08-17 22:09:33 +0900
commitcfd31fa21b67c4992a0360d7c605de1c6add874e (patch)
treed34f234a51909b313ba3f1e7e4829caa65f1fca6 /dir.c
parent9b01ce69546380c57cb602e045be4fc012cd81b7 (diff)
version 1.0-971118v1_0_971118
https://cache.ruby-lang.org/pub/ruby/1.0/ruby-1.0-971118.tar.gz Tue Nov 18 13:59:59 1997 Yukihiro Matsumoto <matz@netlab.co.jp> * version 1.0-971118 Tue Nov 18 10:13:08 1997 Yukihiro Matsumoto <matz@netlab.co.jp> * regex.c (re_compile_pattern): insert initialize code for jump_n, before entering loops. Sat Nov 15 00:11:36 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> * io.c (io_s_popen): "rb" detection Wed Nov 12 13:44:47 1997 Yukihiro Matsumoto <matz@netlab.co.jp> * time.c: remove coerce from Time class. Wed Nov 2 16:00:00 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> * string.c (str_sub_s): "".sub! "", "" => "\000" Thu Oct 30 16:54:01 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> * string.c (str_chop_bang): "".chop caused SEGV. * string.c (str_chomp_bang): method to chop out last newline. Mon Oct 27 13:49:13 1997 Yukihiro Matsumoto <matz@netlab.co.jp> * ext/extmk.rb.in: library may have pathname contains `.' * eval.c (rb_rescue): should not protect SystemError. Thu Oct 23 11:17:44 1997 Yukihiro Matsumoto <matz@netlab.co.jp> * range.c (range_eqq): fixnum check for last needed too. Wed Oct 22 12:52:30 1997 Yukihiro Matsumoto <matz@netlab.co.jp> * array.c (ary_join): call ary_join() recursively for the 1st array element. Co-authored-by: WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/dir.c b/dir.c
index a099d5e595..ca2ca2101a 100644
--- a/dir.c
+++ b/dir.c
@@ -307,8 +307,17 @@ push_braces(ary, s)
p = s;
lbrace = rbrace = 0;
while (*p) {
- if (*p == '{' && !lbrace) lbrace = p;
- if (*p == '}' && lbrace) rbrace = p;
+ if (*p == '{') {
+ lbrace = p;
+ break;
+ }
+ p++;
+ }
+ while (*p) {
+ if (*p == '}' && lbrace) {
+ rbrace = p;
+ break;
+ }
p++;
}