summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/path.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2015-11-18 19:12:37 +0100
committerCorinna Vinschen <corinna@vinschen.de>2015-11-18 19:12:37 +0100
commit8cdd7bad219ba2657e381bd0d716594c50a6ef62 (patch)
tree844fe5ed16333d2901e290d65265f7480dbf44ea /winsup/cygwin/path.cc
parent21608fa57d8c440a1e2bc975f1ec36dab62da20d (diff)
downloadcygnal-8cdd7bad219ba2657e381bd0d716594c50a6ef62.tar.gz
cygnal-8cdd7bad219ba2657e381bd0d716594c50a6ef62.tar.bz2
cygnal-8cdd7bad219ba2657e381bd0d716594c50a6ef62.zip
Don't generate Windows native symlinks targeting Cygwin-only targets
* path.cc (symlink_native): Don't generate native symlink targeting Cygwin special file. Inform the caller. (symlink_worker): Don;t bail out in WSYM_nativestrict case if the target is a Cygwin special file. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/path.cc')
-rw-r--r--winsup/cygwin/path.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 035872d37..88080e176 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -1700,6 +1700,11 @@ symlink_native (const char *oldpath, path_conv &win32_newpath)
SetLastError (ERROR_FILE_NOT_FOUND);
return -1;
}
+ /* Don't allow native symlinks to Cygwin special files. However, the
+ caller shoud know because this case shouldn't be covered by the
+ default "nativestrict" behaviour, so we use a special return code. */
+ if (win32_oldpath.isspecial ())
+ return -2;
/* Convert native paths to Win32 UNC paths. */
final_newpath = win32_newpath.get_nt_native_path ();
final_newpath->Buffer[1] = L'\\';
@@ -1843,8 +1848,9 @@ symlink_worker (const char *oldpath, const char *newpath, bool isdevice)
res = symlink_native (oldpath, win32_newpath);
if (!res)
__leave;
- /* Strictly native? Too bad. */
- if (wsym_type == WSYM_nativestrict)
+ /* Strictly native? Too bad, unless the target is a Cygwin
+ special file. */
+ if (res == -1 && wsym_type == WSYM_nativestrict)
{
__seterrno ();
__leave;