archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

991207

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 1999-12-07 09:25:55 +00:00
parent dee96209bf
commit c18d3740a9
15 changed files with 172 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

24
file.c
View file

@ -731,35 +731,35 @@ rb_file_s_size(obj, fname)
}
static VALUE
rb_file_ftype(mode)
mode_t mode;
rb_file_ftype(st)
struct stat *st;
{
char *t;
if (S_ISREG(mode)) {
if (S_ISREG(st->st_mode)) {
t = "file";
} else if (S_ISDIR(mode)) {
} else if (S_ISDIR(st->st_mode)) {
t = "directory";
} else if (S_ISCHR(mode)) {
} else if (S_ISCHR(st->st_mode)) {
t = "characterSpecial";
}
#ifdef S_ISBLK
else if (S_ISBLK(mode)) {
else if (S_ISBLK(st->st_mode)) {
t = "blockSpecial";
}
#endif
#ifdef S_ISFIFO
else if (S_ISFIFO(mode)) {
else if (S_ISFIFO(st->st_mode)) {
t = "fifo";
}
#endif
#ifdef S_ISLNK
else if (S_ISLNK(mode)) {
else if (S_ISLNK(st->st_mode)) {
t = "link";
}
#endif
#ifdef S_ISSOCK
else if (S_ISSOCK(mode)) {
else if (S_ISSOCK(st->st_mode)) {
t = "socket";
}
#endif
@ -786,7 +786,7 @@ rb_file_s_ftype(obj, fname)
}
#endif
return rb_file_ftype(st.st_mode);
return rb_file_ftype(&st);
}
static VALUE
@ -1183,7 +1183,6 @@ rb_file_s_expand_path(argc, argv)
s = STR2CSTR(fname);
p = buf;
if (s[0] == '~') {
tainted = 1;
if (isdirsep(s[1]) || s[1] == '\0') {
char *dir = getenv("HOME");
@ -1193,6 +1192,7 @@ rb_file_s_expand_path(argc, argv)
strcpy(buf, dir);
p = &buf[strlen(buf)];
s++;
tainted = 1;
}
else {
#ifdef HAVE_PWD_H
@ -1670,7 +1670,7 @@ static VALUE
rb_stat_ftype(obj)
VALUE obj;
{
return rb_file_ftype(get_stat(obj)->st_mode);
return rb_file_ftype(get_stat(obj));
}
static VALUE