* spawn.cc (find_exec): Use has_slash to determine if path has a slash rather
than calculating this twice.
This commit is contained in:
parent
8b57e664af
commit
1a21f33188
|
@ -1,8 +1,13 @@
|
|||
2004-06-02 Christophe Jaillet <christophe.jaillet@wanadoo.fr>
|
||||
|
||||
* spawn.cc (find_exec): Use has_slash to determine if path has a slash
|
||||
rather than calculating this twice.
|
||||
|
||||
2004-05-30 Pierre Humblet <pierre.humblet@ieee.org>
|
||||
|
||||
* path.cc (mount_info::add_item): Make sure native path has drive
|
||||
* path.cc (mount_info::add_item): Make sure native path has drive
|
||||
or UNC form. Call normalize_xxx_path instead of [back]slashify.
|
||||
Remove test for double slashes. Reorganize to always debug_print.
|
||||
Remove test for double slashes. Reorganize to always debug_print.
|
||||
|
||||
2004-05-28 Pierre Humblet <Pierre.Humblet@ieee.org>
|
||||
|
||||
|
|
|
@ -369,7 +369,12 @@ cmalloc (cygheap_types x, DWORD n)
|
|||
MALLOC_CHECK;
|
||||
c = (cygheap_entry *) _cmalloc (sizeof_cygheap (n));
|
||||
if (!c)
|
||||
system_printf ("cmalloc returned NULL");
|
||||
{
|
||||
system_printf ("cmalloc returned NULL");
|
||||
#ifdef DEBUGGING
|
||||
try_to_debug ();
|
||||
#endif
|
||||
}
|
||||
return creturn (x, c, n);
|
||||
}
|
||||
|
||||
|
|
|
@ -2197,14 +2197,14 @@ mount_info::add_item (const char *native, const char *posix, unsigned mountflags
|
|||
posixerr = normalize_posix_path (posix, posixtmp, &posixtail);
|
||||
|
||||
debug_printf ("%s[%s], %s[%s], %p",
|
||||
native, nativeerr?error:nativetmp,
|
||||
posix, posixerr?error:posixtmp, mountflags);
|
||||
native, nativeerr ? error : nativetmp,
|
||||
posix, posixerr ? error : posixtmp, mountflags);
|
||||
|
||||
if (nativeerr || posixerr)
|
||||
if (nativeerr || posixerr)
|
||||
{
|
||||
set_errno (nativeerr?:posixerr);
|
||||
return -1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Make sure both paths do not end in /. */
|
||||
if (nativetail > nativetmp + 1 && nativetail[-1] == '\\')
|
||||
|
|
|
@ -114,11 +114,9 @@ find_exec (const char *name, path_conv& buf, const char *mywinenv,
|
|||
|
||||
/* Return the error condition if this is an absolute path or if there
|
||||
is no PATH to search. */
|
||||
if (strchr (name, '/') || strchr (name, '\\') ||
|
||||
isdrive (name) ||
|
||||
!(winpath = getwinenv (mywinenv)) ||
|
||||
!(path = winpath->get_native ()) ||
|
||||
*path == '\0')
|
||||
if (has_slash || strchr (name, '\\') || isdrive (name)
|
||||
|| !(winpath = getwinenv (mywinenv))
|
||||
|| !(path = winpath->get_native ()) || *path == '\0')
|
||||
goto errout;
|
||||
|
||||
debug_printf ("%s%s", mywinenv, path);
|
||||
|
|
Loading…
Reference in New Issue