aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-20 02:49:22 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-20 02:49:22 +0000
commit6c77d5835604b672601ba9ce3a1716440b02de2f (patch)
tree00480b5ca489d88cba74d1d4e4d3fafd3f5ebf3b
parent5d5d0b5c38e0d4259f9c775d88dc2177f5e943ba (diff)
downloadruby-6c77d5835604b672601ba9ce3a1716440b02de2f.tar.gz
* 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
-rw-r--r--ChangeLog6
-rw-r--r--file.c15
-rw-r--r--version.h6
3 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 2aac89c3b7..36cf859c34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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".
diff --git a/file.c b/file.c
index 948fc139dd..903e744811 100644
--- a/file.c
+++ b/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);
diff --git a/version.h b/version.h
index 0b50f1dbc6..0e6e369f49 100644
--- a/version.h
+++ b/version.h
@@ -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[];