mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* file.c (rb_get_path): returns frozen string.
* file.c (rb_file_s_chown, rb_file_s_lchown): use uid_t and gid_t. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
5d5d0b5c38
commit
6c77d58356
3 changed files with 17 additions and 10 deletions
|
@ -1,3 +1,9 @@
|
|||
Sat Oct 20 11:49:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* file.c (rb_get_path): returns frozen string.
|
||||
|
||||
* file.c (rb_file_s_chown, rb_file_s_lchown): use uid_t and gid_t.
|
||||
|
||||
Fri Oct 19 20:08:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* encoding.c (rb_id_encoding): returns ID "encoding".
|
||||
|
|
15
file.c
15
file.c
|
@ -118,14 +118,14 @@ rb_get_path(VALUE obj)
|
|||
if (obj != tmp) {
|
||||
rb_check_safe_obj(tmp);
|
||||
}
|
||||
return tmp;
|
||||
return rb_str_new4(tmp);
|
||||
}
|
||||
|
||||
static long
|
||||
apply2files(void (*func)(const char *, void *), VALUE vargs, void *arg)
|
||||
{
|
||||
long i;
|
||||
VALUE path;
|
||||
volatile VALUE path;
|
||||
|
||||
rb_secure(4);
|
||||
for (i=0; i<RARRAY_LEN(vargs); i++) {
|
||||
|
@ -1823,7 +1823,8 @@ rb_file_s_lchmod(int argc, VALUE *argv)
|
|||
#endif
|
||||
|
||||
struct chown_args {
|
||||
int owner, group;
|
||||
rb_uid_t owner;
|
||||
rb_gid_t group;
|
||||
};
|
||||
|
||||
static void
|
||||
|
@ -1862,13 +1863,13 @@ rb_file_s_chown(int argc, VALUE *argv)
|
|||
arg.owner = -1;
|
||||
}
|
||||
else {
|
||||
arg.owner = NUM2INT(o);
|
||||
arg.owner = NUM2UIDT(o);
|
||||
}
|
||||
if (NIL_P(g)) {
|
||||
arg.group = -1;
|
||||
}
|
||||
else {
|
||||
arg.group = NUM2INT(g);
|
||||
arg.group = NUM2GIDT(g);
|
||||
}
|
||||
|
||||
n = apply2files(chown_internal, rest, &arg);
|
||||
|
@ -1946,13 +1947,13 @@ rb_file_s_lchown(int argc, VALUE *argv)
|
|||
arg.owner = -1;
|
||||
}
|
||||
else {
|
||||
arg.owner = NUM2INT(o);
|
||||
arg.owner = NUM2UIDT(o);
|
||||
}
|
||||
if (NIL_P(g)) {
|
||||
arg.group = -1;
|
||||
}
|
||||
else {
|
||||
arg.group = NUM2INT(g);
|
||||
arg.group = NUM2GIDT(g);
|
||||
}
|
||||
|
||||
n = apply2files(lchown_internal, rest, &arg);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#define RUBY_VERSION "1.9.0"
|
||||
#define RUBY_RELEASE_DATE "2007-10-19"
|
||||
#define RUBY_RELEASE_DATE "2007-10-20"
|
||||
#define RUBY_VERSION_CODE 190
|
||||
#define RUBY_RELEASE_CODE 20071019
|
||||
#define RUBY_RELEASE_CODE 20071020
|
||||
#define RUBY_PATCHLEVEL 0
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
|
@ -9,7 +9,7 @@
|
|||
#define RUBY_VERSION_TEENY 0
|
||||
#define RUBY_RELEASE_YEAR 2007
|
||||
#define RUBY_RELEASE_MONTH 10
|
||||
#define RUBY_RELEASE_DAY 19
|
||||
#define RUBY_RELEASE_DAY 20
|
||||
|
||||
#ifdef RUBY_EXTERN
|
||||
RUBY_EXTERN const char ruby_version[];
|
||||
|
|
Loading…
Add table
Reference in a new issue