summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/path.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2005-02-27 04:30:08 +0000
committerChristopher Faylor <me@cgf.cx>2005-02-27 04:30:08 +0000
commitd61925786a19f2ee513c969ad7cb421a7db762b7 (patch)
tree3ca1430f75e6982f822d708ca5f469f3a4950f73 /winsup/cygwin/path.cc
parent78d9eaa5eac0e037206b481c4c5512936d53524d (diff)
downloadcygnal-d61925786a19f2ee513c969ad7cb421a7db762b7.tar.gz
cygnal-d61925786a19f2ee513c969ad7cb421a7db762b7.tar.bz2
cygnal-d61925786a19f2ee513c969ad7cb421a7db762b7.zip
* sigproc.cc (_pinfo::set_ctty): Move function
* pinfo.cc (_pinfo::set_ctty): to here. * fhandler_mem.cc (fhandler_dev_mem::fstat): Don't fill out structure if this is an on-disk device rather than an "auto" device. * fhandler_raw.cc (fhandler_dev_raw::fstat): Ditto. * path.cc (normalize_posix_path): Don't treat a standalone '//' as introducing a UNC path. (normalize_win32_path): Ditto.
Diffstat (limited to 'winsup/cygwin/path.cc')
-rw-r--r--winsup/cygwin/path.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 0615077b8..10a174838 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -230,7 +230,7 @@ normalize_posix_path (const char *src, char *dst, char *&tail)
*tail++ = '/';
}
/* Two leading /'s? If so, preserve them. */
- else if (isslash (src[1]) && !isslash (src[2]))
+ else if (isslash (src[1]) && src[2] && !isslash (src[2]))
{
*tail++ = '/';
*tail++ = '/';
@@ -1023,7 +1023,7 @@ normalize_win32_path (const char *src, char *dst, char *&tail)
bool beg_src_slash = isdirsep (src[0]);
tail = dst;
- if (beg_src_slash && isdirsep (src[1]))
+ if (beg_src_slash && isdirsep (src[1]) && src[2])
{
*tail++ = '\\';
src++;