JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* spawn.cc (find_exec): Accept a PATH-like string in place of an environment

Browse Source 
variable.
* dlfcn.cc (get_full_path_of_dll): Search /usr/bin (for windows compatibility)
and /usr/lib (for UNIX compatibility) when looking for shared libraries.
* environ.cc (conv_envvars): Put back LD_LIBRARY_PATH since it is used by
get_full_path_of_dll().
* errno.cc (errmap): Map MOD_NOT_FOUND to ENOENT.
* cygmagic: Remove debugging cruft.
This commit is contained in:
Christopher Faylor 2005-05-22 03:54:29 +00:00
parent f609f58d32
commit f82ca06eda
6 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,16 @@
2005-05-21 Christopher Faylor <cgf@timesys.com>
* spawn.cc (find_exec): Accept a PATH-like string in place of an
environment variable.
* dlfcn.cc (get_full_path_of_dll): Search /usr/bin (for windows
compatibility) and /usr/lib (for UNIX compatibility) when looking for
shared libraries.
* environ.cc (conv_envvars): Put back LD_LIBRARY_PATH since it is used
by get_full_path_of_dll().
* errno.cc (errmap): Map MOD_NOT_FOUND to ENOENT.
* cygmagic: Remove debugging cruft.
2005-05-19 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/in.h: Add comment.

2
winsup/cygwin/cygmagic
View File

@ -24,7 +24,7 @@ sumit() {
while [ -n "$1" ]; do
define=$1; shift
struct=$1; shift
sum=`$gcc -E $file | tee /tmp/1 | sed -n "/^$struct/,/^};/p" | sed -e 's/[ ]//g' -e '/^$/d' | tee /tmp/2 | sumit | tee /tmp/3 | awk '{printf "0x%xU", $1}'`
sum=`$gcc -E $file | sed -n "/^$struct/,/^};/p" | sed -e 's/[ ]//g' -e '/^$/d' | sumit | tee /tmp/3 | awk '{printf "0x%xU", $1}'`
echo "#define $define $sum"
curr=`sed -n "s/^#[ ]*define CURR_$define[ ][ ]*\([^ ][^ ]*\)/\1/p" $file`
[ "$curr" != "$sum" ] && echo "*** WARNING WARNING WARNING WARNING WARNING ***

3
winsup/cygwin/dlfcn.cc
View File

@ -67,7 +67,8 @@ get_full_path_of_dll (const char* str, char *name)
path_conv real_filename;
if (isabspath (name) ||
(ret = check_path_access ("LD_LIBRARY_PATH=", name, real_filename)) == NULL)
(ret = check_path_access ("LD_LIBRARY_PATH=", name, real_filename)
?: check_path_access ("/usr/bin:/usr/lib", name, real_filename)) == NULL)
real_filename.check (name); /* Convert */
if (!real_filename.error)

4
winsup/cygwin/environ.cc
View File

@ -61,6 +61,10 @@ static win_env conv_envvars[] =
cygwin_posix_to_win32_path_list_buf_size, true},
{NL ("HOME="), NULL, NULL, cygwin_conv_to_full_posix_path,
cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH, false},
{NL ("LD_LIBRARY_PATH="), NULL, NULL, cygwin_win32_to_posix_path_list,
cygwin_posix_to_win32_path_list,
cygwin_win32_to_posix_path_list_buf_size,
cygwin_posix_to_win32_path_list_buf_size, true},
{NL ("TMPDIR="), NULL, NULL, cygwin_conv_to_full_posix_path,
cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH, false},
{NL ("TMP="), NULL, NULL, cygwin_conv_to_full_posix_path,

1
winsup/cygwin/errno.cc
View File

@ -86,6 +86,7 @@ static NO_COPY struct
X (LOCK_VIOLATION, EACCES),
X (MAX_THRDS_REACHED, EAGAIN),
X (META_EXPANSION_TOO_LONG, EINVAL),
X (MOD_NOT_FOUND, ENOENT),
X (MORE_DATA, EAGAIN),
X (NEGATIVE_SEEK, EINVAL),
X (NETNAME_DELETED, ENOSHARE),

23
winsup/cygwin/spawn.cc
View File

@ -111,17 +111,28 @@ find_exec (const char *name, path_conv& buf, const char *mywinenv,
const char *path;
const char *posix_path;
/* Return the error condition if this is an absolute path or if there
is no PATH to search. */
if (has_slash || strchr (name, '\\') || isdrive (name)
posix = (opt & FE_NATIVE) ? NULL : tmp;
if (strchr (mywinenv, '/'))
{
/* it's not really an environment variable at all */
int n = cygwin_posix_to_win32_path_list_buf_size (mywinenv);
char *s = (char *) alloca (n + 1);
if (cygwin_posix_to_win32_path_list (mywinenv, s))
goto errout;
path = s;
posix_path = mywinenv - 1;
}
else if (has_slash || strchr (name, '\\') || isdrive (name)
|| !(winpath = getwinenv (mywinenv))
|| !(path = winpath->get_native ()) || *path == '\0')
/* Return the error condition if this is an absolute path or if there
is no PATH to search. */
goto errout;
else
posix_path = winpath->get_posix () - 1;
debug_printf ("%s%s", mywinenv, path);
posix = (opt & FE_NATIVE) ? NULL : tmp;
posix_path = winpath->get_posix () - 1;
/* Iterate over the specified path, looking for the file with and
without executable extensions. */
do