diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-02-15 08:59:55 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-02-15 08:59:55 +0000 |
| commit | d2bd82aa921c109853b80adde21f40ba95bbfd32 (patch) | |
| tree | 0bf2ad636a9cec62d6457e0306c9eed8b688d296 /winsup/cygwin/fhandler_disk_file.cc | |
| parent | 6b14f3988c52874a01845d49e03486cc3336bd4f (diff) | |
| download | cygnal-d2bd82aa921c109853b80adde21f40ba95bbfd32.tar.gz cygnal-d2bd82aa921c109853b80adde21f40ba95bbfd32.tar.bz2 cygnal-d2bd82aa921c109853b80adde21f40ba95bbfd32.zip | |
* path.h (path_conv): Make path_flags private. Rename known_suffix to
suffix and make private. Rename normalized_path to posix_path and
make privtae. Accommodate name changes throughout in path_conv
methods.
(path_conv::known_suffix): New method. Use throughout instead of
accessing suffix directly.
(path_conv::get_win32): Constify.
(path_conv::get_posix): New method to read posix_path. Use throughout
instead of accessing normalized_path directly.
(path_conv::set_posix): Rename from set_normalized_path. Accommodate
name change throughout.
* spawn.cc (find_exec): Return POSIX path, not Win32 path.
Diffstat (limited to 'winsup/cygwin/fhandler_disk_file.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index ba615c26f..6a425674a 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1,7 +1,7 @@ /* fhandler_disk_file.cc Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Red Hat, Inc. + 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Red Hat, Inc. This file is part of Cygwin. @@ -258,7 +258,7 @@ path_conv::ndisk_links (DWORD nNumberOfLinks) bool first = true; PFILE_BOTH_DIR_INFORMATION fdibuf = (PFILE_BOTH_DIR_INFORMATION) alloca (65536); - __DIR_mounts *dir = new __DIR_mounts (normalized_path); + __DIR_mounts *dir = new __DIR_mounts (get_posix ()); while (NT_SUCCESS (NtQueryDirectoryFile (fh, NULL, NULL, NULL, &io, fdibuf, 65536, FileBothDirectoryInformation, FALSE, NULL, first))) @@ -2110,7 +2110,7 @@ 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); + char *p = stpcpy (file, pc.get_posix ()); if (p[-1] != '/') *p++ = '/'; sys_wcstombs (p, NT_MAX_PATH - (p - file), |