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

	append slash if there is one already.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 35b1c9d..4efbd22 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 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>
+
        Revert change from 2010-08-31:
        * path.cc (normalize_posix_path): Drop support for //./ and //?/
        prefixes.

diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index a1ae8c1..115b746 100644 (file)
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1831,7 +1831,8 @@ fhandler_disk_file::readdir_helper (DIR *dir, dirent *de, DWORD w32_err,
          tmp_pathbuf tp;
          char *file = tp.c_get ();
          char *p = stpcpy (file, pc.normalized_path);
-         *p++ = '/';
+         if (p[-1] != '/')
+           *p++ = '/';
          sys_wcstombs (p, NT_MAX_PATH - (p - file),
                        fname->Buffer, fname->Length / sizeof (WCHAR));
          path_conv fpath (file, PC_SYM_NOFOLLOW);