libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2021-05-25 16:24:58 +02:00
parent 4ea7c12a20
commit 15c96f2b26
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/path.cc
View File

@ -502,8 +502,10 @@ path_conv::set_nt_native_path (PUNICODE_STRING new_path)
uni_path.Buffer = wide_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 PUNICODE_STRING
path_conv::get_nt_native_path () path_conv::get_nt_native_path (PUNICODE_STRING suffix)
{ {
PUNICODE_STRING res; PUNICODE_STRING res;
if (wide_path) if (wide_path)
@ -514,9 +516,13 @@ path_conv::get_nt_native_path ()
{ {
uni_path.Length = 0; uni_path.Length = 0;
uni_path.MaximumLength = (strlen (path) + 10) * sizeof (WCHAR); 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); wide_path = (PWCHAR) cmalloc_abort (HEAP_STR, uni_path.MaximumLength);
uni_path.Buffer = wide_path; uni_path.Buffer = wide_path;
::get_nt_native_path (path, uni_path, has_dos_filenames_only ()); ::get_nt_native_path (path, uni_path, has_dos_filenames_only ());
if (suffix)
RtlAppendUnicodeStringToString (&uni_path, suffix);
res = &uni_path; res = &uni_path;
} }
return res; return res;

2
winsup/cygwin/path.h
View File

@ -282,7 +282,7 @@ class path_conv
~path_conv (); ~path_conv ();
inline const char *get_win32 () const { return path; } inline const char *get_win32 () const { return path; }
void set_nt_native_path (PUNICODE_STRING); 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, inline POBJECT_ATTRIBUTES get_object_attr (OBJECT_ATTRIBUTES &attr,
SECURITY_ATTRIBUTES &sa) SECURITY_ATTRIBUTES &sa)
{ {