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

* path.cc (normalize_win32_path): Reorganize logic to accomodate chroot.

Browse Source 
Always check for MAX_PATH overrun.  Avoid adding one too many backslashes when
src path begins with a slash.  From Corinna Vinschen.
* winsup.h: Force demangling for dll_crt0 for newer compilers.
This commit is contained in:
Christopher Faylor
2000-12-09 03:29:33 +00:00
parent 2efbc2a7df
commit 82c8d7ef8c
3 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
winsup/cygwin/path.cc
View File

@ -712,32 +712,9 @@ normalize_win32_path (const char *src, char *dst)
const char *src_start = src;
char *dst_start = dst;
char *dst_root_start = dst;
bool beg_src_slash;
if (strchr (src, ':') == NULL && !slash_unc_prefix_p (src))
{
if (!cygcwd.get (dst, 0))
return get_errno ();
if (SLASH_P (src[0]))
if (dst[1] == ':')
dst[2] = '\0';
else if (slash_unc_prefix_p (dst))
{
char *p = strpbrk (dst + 2, "\\/");
if (p && (p = strpbrk (p + 1, "\\/")))
*p = '\0';
}
else if (strlen (dst) + 1 + strlen (src) >= MAX_PATH)
{
debug_printf ("ENAMETOOLONG = normalize_win32_path (%s)", src);
return ENAMETOOLONG;
}
dst += strlen (dst);
if (!SLASH_P (dst[-1]))
*dst++ = '\\';
}
/* Two leading \'s? If so, preserve them. */
else if (SLASH_P (src[0]) && SLASH_P (src[1]))
if (slash_unc_prefix_p (src))
{
if (cygheap->root.length ())
{
@ -748,7 +725,7 @@ normalize_win32_path (const char *src, char *dst)
++src;
}
/* If absolute path, care for chroot. */
else if (SLASH_P (src[0]) && !SLASH_P (src[1]) && cygheap->root.length ())
else if ((beg_src_slash = SLASH_P (src[0])) && cygheap->root.length ())
{
strcpy (dst, cygheap->root.path ());
char *c;
@ -758,6 +735,30 @@ normalize_win32_path (const char *src, char *dst)
dst_root_start = dst;
*dst++ = '\\';
}
else if (strchr (src, ':') == NULL)
{
if (!cygcwd.get (dst, 0))
return get_errno ();
if (beg_src_slash)
{
if (dst[1] == ':')
dst[2] = '\0';
else if (slash_unc_prefix_p (dst))
{
char *p = strpbrk (dst + 2, "\\/");
if (p && (p = strpbrk (p + 1, "\\/")))
*p = '\0';
}
}
if (strlen (dst) + 1 + strlen (src) >= MAX_PATH)
{
debug_printf ("ENAMETOOLONG = normalize_win32_path (%s)", src);
return ENAMETOOLONG;
}
dst += strlen (dst);
if (!beg_src_slash)
*dst++ = '\\';
}
while (*src)
{