Skip to content

Commit

Permalink
Export file_get_unicode_path() through omrportptb.h
Browse files Browse the repository at this point in the history 
1. Rename file_get_unicode_path() to port_file_get_unicode_path().
2. Similar to port_convertFromUTF8(), export
port_file_get_unicode_path() so
that it can be used if we need to know the file unicode path on Windows.

Related to eclipse-openj9/openj9#4351

Signed-off-by: hangshao <hangshao@ca.ibm.com>
  • Loading branch information
@hangshao0
hangshao0 committed Feb 11, 2019
1 parent 0fc0b09 commit b343645
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
34 changes: 16 additions & 18 deletions port/win32/omrfile.c
View file
Expand Up @@ -36,8 +36,6 @@
#include "ut_omrport.h"
#include "omrfilehelpers.h"

static wchar_t *file_get_unicode_path(OMRPortLibrary *portLibrary, const char *utf8Path, wchar_t *unicodeBuffer, uintptr_t unicodeBufferSize);

#define J9FILE_UNC_EXTENDED_LENGTH_PREFIX (L"\\\\?\\")
#define J9FILE_UNC_EXTENDED_LENGTH_PREFIX_NETWORK (L"\\\\?\\UNC")

Expand Down Expand Up @@ -98,11 +96,11 @@ fromHandle(OMRPortLibrary *portLibrary, HANDLE handle)
*
* @return NULL on failure
* otherwise the converted string.
* If the return value is not the same as @ref unicodeBuffer, file_get_unicode_path had to allocate memory to hold the
* If the return value is not the same as @ref unicodeBuffer, port_file_get_unicode_path had to allocate memory to hold the
* unicode path - the caller is responsible for freeing this memory by calling @ref omrmem_free_memory on the returned value.
*/
static wchar_t *
file_get_unicode_path(OMRPortLibrary *portLibrary, const char *utf8Path, wchar_t *unicodeBuffer, uintptr_t unicodeBufferSize)
wchar_t *
port_file_get_unicode_path(OMRPortLibrary *portLibrary, const char *utf8Path, wchar_t *unicodeBuffer, uintptr_t unicodeBufferSize)
{
wchar_t *unicodePath;
wchar_t *pathName;
Expand Down Expand Up @@ -205,7 +203,7 @@ omrfile_attr(struct OMRPortLibrary *portLibrary, const char *path)
Trc_PRT_file_attr_Entry(path);

/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL == unicodePath) {
return -1;
}
Expand Down Expand Up @@ -245,7 +243,7 @@ omrfile_chmod(struct OMRPortLibrary *portLibrary, const char *path, int32_t mode

Trc_PRT_file_chmod_Entry(path, mode);
/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL == unicodePath) {
Trc_PRT_file_chmod_Exit(-1);
return -1;
Expand Down Expand Up @@ -349,7 +347,7 @@ omrfile_findfirst(struct OMRPortLibrary *portLibrary, const char *path, char *re
strcat(newPath, "*");

/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, newPath, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, newPath, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL == unicodePath) {
Trc_PRT_file_findfirst_ExitFail(-1);
return (uintptr_t)-1;
Expand Down Expand Up @@ -399,7 +397,7 @@ omrfile_lastmod(struct OMRPortLibrary *portLibrary, const char *path)
Trc_PRT_file_lastmod_Entry(path);

/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL != unicodePath) {
WIN32_FILE_ATTRIBUTE_DATA myStat;
if (0 == GetFileAttributesExW(unicodePath, GetFileExInfoStandard, &myStat)) {
Expand Down Expand Up @@ -431,7 +429,7 @@ omrfile_length(struct OMRPortLibrary *portLibrary, const char *path)
Trc_PRT_file_length_Entry(path);

/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL != unicodePath) {
WIN32_FILE_ATTRIBUTE_DATA myStat;
if (0 == GetFileAttributesExW(unicodePath, GetFileExInfoStandard, &myStat)) {
Expand Down Expand Up @@ -478,7 +476,7 @@ omrfile_mkdir(struct OMRPortLibrary *portLibrary, const char *path)

Trc_PRT_file_mkdir_entry2(path);
/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL == unicodePath) {
result = -1;
} else {
Expand Down Expand Up @@ -506,11 +504,11 @@ omrfile_move(struct OMRPortLibrary *portLibrary, const char *pathExist, const ch
BOOL result;

/* Convert the filenames from UTF8 to Unicode */
unicodePathExist = file_get_unicode_path(portLibrary, pathExist, unicodeBufferExist, UNICODE_BUFFER_SIZE);
unicodePathExist = port_file_get_unicode_path(portLibrary, pathExist, unicodeBufferExist, UNICODE_BUFFER_SIZE);
if (NULL == unicodePathExist) {
return -1;
}
unicodePathNew = file_get_unicode_path(portLibrary, pathNew, unicodeBufferNew, UNICODE_BUFFER_SIZE);
unicodePathNew = port_file_get_unicode_path(portLibrary, pathNew, unicodeBufferNew, UNICODE_BUFFER_SIZE);
if (NULL == unicodePathNew) {
if (unicodeBufferExist != unicodePathExist) {
portLibrary->mem_free_memory(portLibrary, unicodePathExist);
Expand Down Expand Up @@ -546,7 +544,7 @@ omrfile_open(struct OMRPortLibrary *portLibrary, const char *path, int32_t flags
Trc_PRT_file_open_Entry(path, flags, mode);

/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL == unicodePath) {
return -1;
}
Expand Down Expand Up @@ -776,7 +774,7 @@ omrfile_unlink(struct OMRPortLibrary *portLibrary, const char *path)
BOOL result;

/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL == unicodePath) {
return -1;
}
Expand Down Expand Up @@ -807,7 +805,7 @@ omrfile_unlinkdir(struct OMRPortLibrary *portLibrary, const char *path)
BOOL result;

/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL == unicodePath) {
return -1;
}
Expand Down Expand Up @@ -995,7 +993,7 @@ omrfile_stat(struct OMRPortLibrary *portLibrary, const char *path, uint32_t flag
memset(buf, 0, sizeof(*buf));

/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL == unicodePath) {
return -1;
}
Expand Down Expand Up @@ -1067,7 +1065,7 @@ omrfile_stat_filesystem(struct OMRPortLibrary *portLibrary, const char *path, ui
}

/* Convert the filename from UTF8 to Unicode */
unicodePath = file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
unicodePath = port_file_get_unicode_path(portLibrary, path, unicodeBuffer, UNICODE_BUFFER_SIZE);
if (NULL == unicodePath) {
return -1;
}
Expand Down
3 changes: 2 additions & 1 deletion port/win32_include/omrportptb.h
View file
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 1991, 2017 IBM Corp. and others
* Copyright (c) 1991, 2019 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -74,6 +74,7 @@ typedef struct PortlibPTBuffers_struct *PortlibPTBuffers_t;
void omrport_free_ptBuffer(struct OMRPortLibrary *portLibrary, PortlibPTBuffers_t ptBuffer);
int32_t port_convertToUTF8(OMRPortLibrary *portLibrary, const wchar_t *unicodeString, char *utf8Buffer, uintptr_t size);
wchar_t *port_convertFromUTF8(OMRPortLibrary *portLibrary, const char *string, wchar_t *unicodeBuffer, uintptr_t unicodeBufferSize);
wchar_t *port_file_get_unicode_path(OMRPortLibrary *portLibrary, const char *utf8Path, wchar_t *unicodeBuffer, uintptr_t unicodeBufferSize);

#endif /* omrportptb_h */

Expand Down

0 comments on commit b343645

Please sign in to comment.