mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* util.c (valid_filename): use O_EXCL to get rid of clobbering
existing files in race conditions. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
fa222ced64
commit
fe80dd73b9
3 changed files with 13 additions and 12 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sun Feb 24 03:52:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* util.c (valid_filename): use O_EXCL to get rid of clobbering
|
||||||
|
existing files in race conditions.
|
||||||
|
|
||||||
Sat Feb 23 21:36:13 2008 NAKAMURA Usaku <usa@ruby-lang.org>
|
Sat Feb 23 21:36:13 2008 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
* ext/win32ole/win32ole.c (ole_init_cp): should return value.
|
* ext/win32ole/win32ole.c (ole_init_cp): should return value.
|
||||||
|
|
14
util.c
14
util.c
|
@ -345,23 +345,19 @@ valid_filename(const char *s)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
/*
|
|
||||||
// if the file exists, then it's a valid filename!
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (_access(s, 0) == 0) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// It doesn't exist, so see if we can open it.
|
// It doesn't exist, so see if we can open it.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if ((fd = _open(s, O_CREAT, 0666)) >= 0) {
|
if ((fd = _open(s, O_CREAT|O_EXCL, 0666)) >= 0) {
|
||||||
_close(fd);
|
_close(fd);
|
||||||
_unlink(s); /* don't leave it laying around */
|
_unlink(s); /* don't leave it laying around */
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
else if (errno == EEXIST) {
|
||||||
|
/* if the file exists, then it's a valid filename! */
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#define RUBY_VERSION "1.9.0"
|
#define RUBY_VERSION "1.9.0"
|
||||||
#define RUBY_RELEASE_DATE "2008-02-23"
|
#define RUBY_RELEASE_DATE "2008-02-24"
|
||||||
#define RUBY_VERSION_CODE 190
|
#define RUBY_VERSION_CODE 190
|
||||||
#define RUBY_RELEASE_CODE 20080223
|
#define RUBY_RELEASE_CODE 20080224
|
||||||
#define RUBY_PATCHLEVEL 0
|
#define RUBY_PATCHLEVEL 0
|
||||||
|
|
||||||
#define RUBY_VERSION_MAJOR 1
|
#define RUBY_VERSION_MAJOR 1
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
#define RUBY_VERSION_TEENY 0
|
#define RUBY_VERSION_TEENY 0
|
||||||
#define RUBY_RELEASE_YEAR 2008
|
#define RUBY_RELEASE_YEAR 2008
|
||||||
#define RUBY_RELEASE_MONTH 2
|
#define RUBY_RELEASE_MONTH 2
|
||||||
#define RUBY_RELEASE_DAY 23
|
#define RUBY_RELEASE_DAY 24
|
||||||
|
|
||||||
#ifdef RUBY_EXTERN
|
#ifdef RUBY_EXTERN
|
||||||
RUBY_EXTERN const char ruby_version[];
|
RUBY_EXTERN const char ruby_version[];
|
||||||
|
|
Loading…
Reference in a new issue