From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 65896393BC2F; Tue, 25 May 2021 14:56:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 65896393BC2F Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: get_nt_native_path: allow to append suffix X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 4ea7c12a20b405e543f947623081696299844e38 X-Git-Newrev: 15c96f2b2660d7a7776c61c9dc78d64262918955 Message-Id: <20210525145615.65896393BC2F@sourceware.org> Date: Tue, 25 May 2021 14:56:15 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 14:56:15 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=15c96f2b2660d7a7776c61c9dc78d64262918955 commit 15c96f2b2660d7a7776c61c9dc78d64262918955 Author: Corinna Vinschen Date: Tue May 25 16:24:58 2021 +0200 Cygwin: get_nt_native_path: allow to append suffix POSIX message queues will be moved into NTFS streams. Extend get_nt_native_path to provide a filename suffix which is not subject to special character transposition, to allow specifying a colon. Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/path.cc | 8 +++++++- winsup/cygwin/path.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index b8850a11a..2b480131a 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -502,8 +502,10 @@ path_conv::set_nt_native_path (PUNICODE_STRING new_path) uni_path.Buffer = wide_path; } +/* If suffix is not NULL, append the suffix string verbatim. + This is used by fhandler_mqueue::mq_open to append an NTFS stream suffix. */ PUNICODE_STRING -path_conv::get_nt_native_path () +path_conv::get_nt_native_path (PUNICODE_STRING suffix) { PUNICODE_STRING res; if (wide_path) @@ -514,9 +516,13 @@ path_conv::get_nt_native_path () { uni_path.Length = 0; uni_path.MaximumLength = (strlen (path) + 10) * sizeof (WCHAR); + if (suffix) + uni_path.MaximumLength += suffix->Length; wide_path = (PWCHAR) cmalloc_abort (HEAP_STR, uni_path.MaximumLength); uni_path.Buffer = wide_path; ::get_nt_native_path (path, uni_path, has_dos_filenames_only ()); + if (suffix) + RtlAppendUnicodeStringToString (&uni_path, suffix); res = &uni_path; } return res; diff --git a/winsup/cygwin/path.h b/winsup/cygwin/path.h index fe4dd5478..adb0ca11f 100644 --- a/winsup/cygwin/path.h +++ b/winsup/cygwin/path.h @@ -282,7 +282,7 @@ class path_conv ~path_conv (); inline const char *get_win32 () const { return path; } void set_nt_native_path (PUNICODE_STRING); - PUNICODE_STRING get_nt_native_path (); + PUNICODE_STRING get_nt_native_path (PUNICODE_STRING = NULL); inline POBJECT_ATTRIBUTES get_object_attr (OBJECT_ATTRIBUTES &attr, SECURITY_ATTRIBUTES &sa) {