From 8b83da2d55b2a61f22b8b330f966d06e3092b079 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 9 Feb 2016 15:00:30 +0100 Subject: cygwin_conv_path: Always preserve trailing backslashes in conversion to POSIX paths * include/sys/cygwin.h (CCP_CONVFLAGS_MASK): Define. * mount.h (__CCP_APP_SLASH): Define. * mount.cc (mount_info::conv_to_posix_path): Handle __CCP_APP_SLASH flag. * path.cc (cygwin_conv_path): Use CCP_CONVFLAGS_MASK to evaluate "how" flag values. Always add __CCP_APP_SLASH flag when calling mount_info::conv_to_posix_path. Signed-off-by: Corinna Vinschen --- winsup/cygwin/include/sys/cygwin.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'winsup/cygwin/include/sys/cygwin.h') diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h index 6c720e0dd..5b7da5897 100644 --- a/winsup/cygwin/include/sys/cygwin.h +++ b/winsup/cygwin/include/sys/cygwin.h @@ -59,8 +59,10 @@ enum /* Or these values to the above as needed. */ CCP_ABSOLUTE = 0, /* Request absolute path (default). */ CCP_RELATIVE = 0x100, /* Request to keep path relative. */ - CCP_PROC_CYGDRIVE = 0x200 /* Request to return /proc/cygdrive + CCP_PROC_CYGDRIVE = 0x200, /* Request to return /proc/cygdrive path (only with CCP_*_TO_POSIX). */ + + CCP_CONVFLAGS_MASK = 0x300, }; typedef unsigned int cygwin_conv_path_t; -- cgit v1.2.3