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

* spawn.cc (find_exec): Extend preceeding comment to explain more

Browse Source 
detailed what's going on in this function.  Overwrite potential symlink
	target with original path.
This commit is contained in:
Corinna Vinschen 2015-02-16 11:49:33 +00:00
parent 99a95d1df4
commit 46ada24209
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2015-02-16 Corinna Vinschen <corinna@vinschen.de>
* spawn.cc (find_exec): Extend preceeding comment to explain more
detailed what's going on in this function. Overwrite potential symlink
target with original path.
2015-02-15 Corinna Vinschen <corinna@vinschen.de> 2015-02-15 Corinna Vinschen <corinna@vinschen.de>
* i686.din (__mempcpy): Move symbol export from here... * i686.din (__mempcpy): Move symbol export from here...

18
winsup/cygwin/spawn.cc
View File

@ -77,7 +77,11 @@ perhaps_suffix (const char *prog, path_conv& buf, int& err, unsigned opt)
/* Find an executable name, possibly by appending known executable suffixes /* Find an executable name, possibly by appending known executable suffixes
to it. The path_conv struct 'buf' is filled and contains both, win32 and to it. The path_conv struct 'buf' is filled and contains both, win32 and
posix path of the file. Any found suffix is returned in known_suffix. posix path of the target file. Any found suffix is returned in known_suffix.
Eventually the posix path in buf is overwritten with the exact path as it
gets constructed for the path search. The reason is that the path is used
to create argv[0] in av::setup, and this requires that the filename stays
intact, instead of being resolved if the file is a symlink.
If the file is not found and !FE_NNF then the POSIX version of name is If the file is not found and !FE_NNF then the POSIX version of name is
placed in buf and returned. Otherwise the contents of buf is undefined placed in buf and returned. Otherwise the contents of buf is undefined
@ -100,6 +104,13 @@ find_exec (const char *name, path_conv& buf, const char *search,
if ((has_slash || opt & FE_CWD) if ((has_slash || opt & FE_CWD)
&& (suffix = perhaps_suffix (name, buf, err, opt)) != NULL) && (suffix = perhaps_suffix (name, buf, err, opt)) != NULL)
{ {
if (!has_slash)
{
/* Overwrite potential symlink target with original path.
See comment preceeding this method. */
stpcpy (stpcpy (tmp, "./"), name);
buf.set_posix (tmp);
}
retval = buf.get_posix (); retval = buf.get_posix ();
goto out; goto out;
} }
@ -128,7 +139,7 @@ find_exec (const char *name, path_conv& buf, const char *search,
continue; continue;
*eotmp++ = '/'; *eotmp++ = '/';
strcpy (eotmp, name); stpcpy (eotmp, name);
debug_printf ("trying %s", tmp_path); debug_printf ("trying %s", tmp_path);
@ -138,6 +149,9 @@ find_exec (const char *name, path_conv& buf, const char *search,
{ {
if (buf.has_acls () && check_file_access (buf, X_OK, true)) if (buf.has_acls () && check_file_access (buf, X_OK, true))
continue; continue;
/* Overwrite potential symlink target with original path.
See comment preceeding this method. */
buf.set_posix (tmp_path);
retval = buf.get_posix (); retval = buf.get_posix ();
goto out; goto out;
} }