diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-29 04:01:54 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-29 04:01:54 +0000 |
commit | da74bc75523ef4054030e5f3cf4aac3e9bfe8715 (patch) | |
tree | 3b197501d1fb7f83ebc91a060e00dfc1d531e62c /random.c | |
parent | 3ae3cd741d4ac85e2cd53c588318afb582412fd9 (diff) | |
download | ruby-da74bc75523ef4054030e5f3cf4aac3e9bfe8715.tar.gz |
* process.c (ruby_setsid): use rb_cloexec_open.
(rb_daemon): ditto.
* ruby.c (load_file_internal): ditto.
* file.c (rb_file_s_truncate): ditto.
(file_load_ok): ditto.
* random.c (fill_random_seed): ditto.
* ext/pty/pty.c (chfunc): ditto.
(get_device_once): ditto.
* ext/io/console/console.c (console_dev): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'random.c')
-rw-r--r-- | random.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -498,15 +498,15 @@ fill_random_seed(unsigned int seed[DEFAULT_SEED_CNT]) memset(seed, 0, DEFAULT_SEED_LEN); #if USE_DEV_URANDOM - if ((fd = open("/dev/urandom", O_RDONLY + if ((fd = rb_cloexec_open("/dev/urandom", O_RDONLY #ifdef O_NONBLOCK |O_NONBLOCK #endif #ifdef O_NOCTTY |O_NOCTTY #endif - )) >= 0) { - rb_fd_set_cloexec(fd); + , 0)) >= 0) { + rb_update_max_fd(fd); if (fstat(fd, &statbuf) == 0 && S_ISCHR(statbuf.st_mode)) { if (read(fd, seed, DEFAULT_SEED_LEN) < DEFAULT_SEED_LEN) { /* abandon */; |