summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--dln.c4
-rw-r--r--dln.h4
-rw-r--r--win32/win32.c3
4 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 29e34ce..bdf8e99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/dln.c b/dln.c
index 219a22d..c19c421 100644
--- a/dln.c
+++ b/dln.c
@@ -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;
diff --git a/dln.h b/dln.h
index aee4c8f..f70b0d4 100644
--- a/dln.h
+++ b/dln.h
@@ -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 f6233e4..5c525d5 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;
}
}