* fhandler_disk_file.cc (fhandler_disk_file::readdir_helper): Don't

append slash if there is one already.
This commit is contained in:
Corinna Vinschen 2011-02-15 10:47:24 +00:00
parent ec58420870
commit c48947b454
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2011-02-15 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (fhandler_disk_file::readdir_helper): Don't
append slash if there is one already.
2011-02-15 Corinna Vinschen <corinna@vinschen.de> 2011-02-15 Corinna Vinschen <corinna@vinschen.de>
Revert change from 2010-08-31: Revert change from 2010-08-31:

View File

@ -1831,6 +1831,7 @@ fhandler_disk_file::readdir_helper (DIR *dir, dirent *de, DWORD w32_err,
tmp_pathbuf tp; tmp_pathbuf tp;
char *file = tp.c_get (); char *file = tp.c_get ();
char *p = stpcpy (file, pc.normalized_path); char *p = stpcpy (file, pc.normalized_path);
if (p[-1] != '/')
*p++ = '/'; *p++ = '/';
sys_wcstombs (p, NT_MAX_PATH - (p - file), sys_wcstombs (p, NT_MAX_PATH - (p - file),
fname->Buffer, fname->Length / sizeof (WCHAR)); fname->Buffer, fname->Length / sizeof (WCHAR));