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

* path.cc: Revert patch from 2003-01-09 to normalize a windows path

Browse Source 
rather than converting to posix.
This commit is contained in:
Corinna Vinschen 2003-01-10 20:25:47 +00:00
parent dc8d11f52e
commit df2caa88ca
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-10 Corinna Vinschen <corinna@vinschen.de>
* path.cc: Revert patch from 2003-01-09 to normalize a windows path
rather than converting to posix.
2003-01-10 Corinna Vinschen <corinna@vinschen.de> 2003-01-10 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (gethostname): Make call optional, return 1 if function * autoload.cc (gethostname): Make call optional, return 1 if function

10
winsup/cygwin/path.cc
View File

@ -205,7 +205,10 @@ normalize_posix_path (const char *src, char *dst)
syscall_printf ("src %s", src); syscall_printf ("src %s", src);
if (isdrive (src) || strpbrk (src, "\\:")) if (isdrive (src) || strpbrk (src, "\\:"))
return normalize_win32_path (src, dst); {
cygwin_conv_to_full_posix_path (src, dst);
return 0;
}
if (!isslash (src[0])) if (!isslash (src[0]))
{ {
@ -1704,7 +1707,7 @@ mount_info::conv_to_posix_path (const char *src_path, char *posix_path,
if (!*p || !p[1]) if (!*p || !p[1])
nextchar = 0; nextchar = 0;
else if (*p == '/') else if (isdirsep (*p))
nextchar = -1; nextchar = -1;
else else
nextchar = 1; nextchar = 1;
@ -1755,8 +1758,7 @@ mount_info::conv_to_posix_path (const char *src_path, char *posix_path,
{ {
/* The use of src_path and not pathbuf here is intentional. /* The use of src_path and not pathbuf here is intentional.
We couldn't translate the path, so just ensure no \'s are present. */ We couldn't translate the path, so just ensure no \'s are present. */
strcpy (posix_path, src_path); slashify (src_path, posix_path, trailing_slash_p);
// slashify (src_path, posix_path, trailing_slash_p);
} }
out: out: