archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

* dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed

Browse source 
is not needed.  [ruby-dev:32640]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-03-19 12:01:10 +00:00
parent 9061c955a8
commit 5cce095f11
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Mar 19 21:01:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed
is not needed. [ruby-dev:32640]
Wed Mar 19 20:25:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Mar 19 20:25:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (Init_Dir): define inspect method. [ruby-core:15960] * dir.c (Init_Dir): define inspect method. [ruby-core:15960]

12
dir.c
View file

@ -268,7 +268,7 @@ fnmatch_helper(pcur, scur, flags)
const char *t; const char *t;
if (ISEND(s)) if (ISEND(s))
RETURN(FNM_NOMATCH); RETURN(FNM_NOMATCH);
if (t = bracket(p + 1, s, flags)) { if ((t = bracket(p + 1, s, flags)) != 0) {
p = t; p = t;
Inc(s); Inc(s);
continue; continue;
@ -473,7 +473,7 @@ dir_inspect(dir)
{ {
struct dir_data *dirp; struct dir_data *dirp;
GetDIR(dir, dirp); Data_Get_Struct(dir, struct dir_data, dirp);
if (dirp->path) { if (dirp->path) {
char *c = rb_obj_classname(dir); char *c = rb_obj_classname(dir);
int len = strlen(c) + strlen(dirp->path) + 4; int len = strlen(c) + strlen(dirp->path) + 4;
@ -499,7 +499,7 @@ dir_path(dir)
{ {
struct dir_data *dirp; struct dir_data *dirp;
GetDIR(dir, dirp); Data_Get_Struct(dir, struct dir_data, dirp);
if (!dirp->path) return Qnil; if (!dirp->path) return Qnil;
return rb_str_new2(dirp->path); return rb_str_new2(dirp->path);
} }
@ -592,7 +592,7 @@ dir_tell(dir)
struct dir_data *dirp; struct dir_data *dirp;
long pos; long pos;
GetDIR(dir, dirp); Data_Get_Struct(dir, struct dir_data, dirp);
pos = telldir(dirp->dir); pos = telldir(dirp->dir);
return rb_int2inum(pos); return rb_int2inum(pos);
#else #else
@ -1008,7 +1008,7 @@ has_magic(s, flags)
register const char *p = s; register const char *p = s;
register char c; register char c;
while (c = *p++) { while ((c = *p++) != 0) {
switch (c) { switch (c) {
case '*': case '*':
case '?': case '?':
@ -1041,7 +1041,7 @@ find_dirsep(const char *s, int flags)
register char c; register char c;
int open = 0; int open = 0;
while (c = *p++) { while ((c = *p++) != 0) {
switch (c) { switch (c) {
case '[': case '[':
open = 1; open = 1;