diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-27 00:15:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-27 00:15:31 +0000 |
commit | c30616378e04578a3bfe8650b3c98caf7968b458 (patch) | |
tree | 3871a01bca2261f74c4ae624b00889bd5d3a5c81 | |
parent | 92c2f654db6b522449700c3ddecbf786589ad1c2 (diff) | |
download | ruby-c30616378e04578a3bfe8650b3c98caf7968b458.tar.gz |
* dln.h (dln_find_exe, dln_find_file): deprecated, use reentrant
versions instead.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | dln.c | 4 | ||||
-rw-r--r-- | dln.h | 4 | ||||
-rw-r--r-- | win32/win32.c | 3 |
4 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Sun Jul 27 09:15:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * dln.h (dln_find_exe, dln_find_file): deprecated, use reentrant + versions instead. + Sun Jul 27 09:02:32 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> * lib/rinda/tuplespace.rb: merged from 1.8. @@ -348,14 +348,14 @@ sym_hash(struct exec *hdrp, struct nlist *syms) static int dln_init(const char *prog) { - char *file; + char *file, fbuf[MAXPATHLEN]; int fd; struct exec hdr; struct nlist *syms; if (dln_init_p == 1) return 0; - file = dln_find_exe(prog, NULL); + file = dln_find_exe_r(prog, NULL, fbuf, sizeof(fbuf)); if (file == NULL || (fd = open(file, O_RDONLY)) < 0) { dln_errno = errno; return -1; @@ -28,8 +28,8 @@ # define _(args) () #endif -char *dln_find_exe(const char*,const char*); -char *dln_find_file(const char*,const char*); +DEPRECATED(char *dln_find_exe(const char*,const char*)); +DEPRECATED(char *dln_find_file(const char*,const char*)); char *dln_find_exe_r(const char*,const char*,char*,int); char *dln_find_file_r(const char*,const char*,char*,int); diff --git a/win32/win32.c b/win32/win32.c index f6233e4bf3..5c525d574b 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -928,6 +928,7 @@ CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa, const char *shell; struct ChildRecord *child; char *p = NULL; + char fbuf[MAXPATHLEN]; if (!cmd && !prog) { errno = EFAULT; @@ -975,7 +976,7 @@ CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa, dwCreationFlags = (NORMAL_PRIORITY_CLASS); if (prog) { - if (!(p = dln_find_exe(prog, NULL))) { + if (!(p = dln_find_exe_r(prog, NULL, fbuf, sizeof(fbuf)))) { shell = prog; } } |