1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merges r28158 from trunk into ruby_1_9_2.

--
Clarification of what '*' matches.  Patch by John Wells <john.wells at greatworx.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-06-11 04:21:07 +00:00
parent 234358faf8
commit 33e861ba39
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,8 @@
Sat Jun 5 06:20:57 2010 Eric Hodel <drbrain@segment7.net>
* dir.c: Clarification of what '*' matches. Patch by John Wells
<john.wells at greatworx.com>
Thu Jun 3 00:58:45 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/dl/lib/dl/cparser.rb (parse_ctype): add backwards compatibility

5
dir.c
View file

@ -1741,7 +1741,10 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
* <code>\*c\*</code> will match all files that
* have <code>c</code> in them (including at
* the beginning or end). Equivalent to
* <code>/ .* /x</code> in regexp.
* <code>/ .* /x</code> in regexp. Note, this
* will not match Unix-like hidden files (dotfiles).
* In order to include those in the match results,
* you must use something like "{*,.*}".
* <code>**</code>:: Matches directories recursively.
* <code>?</code>:: Matches any one character. Equivalent to
* <code>/.{1}/</code> in regexp.