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

* path.cc (mount_info::conv_to_win32_path): Previous patch was too aggressive

Browse Source 
in adding a trailing slash.
This commit is contained in:
Christopher Faylor
2000-05-30 21:24:50 +00:00
parent d2dd57657c
commit ca8a0f8fb2
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,8 @@
Tue May 30 16:58:33 2000 Christopher Faylor <cgf@cygnus.com>
* path.cc (mount_info::conv_to_win32_path): Previous patch was too
aggressive in adding a trailing slash.
Mon May 29 20:31:01 2000 Christopher Faylor <cgf@cygnus.com> Mon May 29 20:31:01 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.in: Remove libadvapi32.a. * Makefile.in: Remove libadvapi32.a.

8
winsup/cygwin/path.cc
View File

@@ -1020,12 +1020,14 @@ mount_info::conv_to_win32_path (const char *src_path, char *win32_path,
else else
{ {
int n = mi->native_pathlen; int n = mi->native_pathlen;
memcpy (dst, mi->native_path, n); memcpy (dst, mi->native_path, n + 1);
char *p = pathbuf + mi->posix_pathlen; char *p = pathbuf + mi->posix_pathlen;
if (!trailing_slash_p && isdrive (mi->native_path) && !mi->native_path[2])
trailing_slash_p = 1;
if (!trailing_slash_p && !*p) if (!trailing_slash_p && !*p)
{
if (isdrive (dst) && !dst[2])
dst[n++] = '\\';
dst[n] = '\0'; dst[n] = '\0';
}
else else
{ {
/* Do not add trailing \ to UNC device names like \\.\a: */ /* Do not add trailing \ to UNC device names like \\.\a: */