Skip to content
Snippets Groups Projects
Commit 2e00d252 authored by Brad King's avatar Brad King
Browse files

SystemTools: Port cygwin path conversion to modern API

The cygwin_conv_to_win32_path function is deprecated in favor of
cygwin_conv_path.  Use the latter.

Change-Id: I416c3b3360cd5085ed51dd60375c7e0b3b9ca1cb
parent 6074f33f
No related branches found
No related tags found
No related merge requests found
...@@ -92,7 +92,7 @@ extern char **environ; ...@@ -92,7 +92,7 @@ extern char **environ;
#endif #endif
#ifdef __CYGWIN__ #ifdef __CYGWIN__
extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path); # include <sys/cygwin.h>
#endif #endif
// getpwnam doesn't exist on Windows and Cray Xt3/Catamount // getpwnam doesn't exist on Windows and Cray Xt3/Catamount
...@@ -1113,7 +1113,10 @@ bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path) ...@@ -1113,7 +1113,10 @@ bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path)
} }
else else
{ {
cygwin_conv_to_win32_path(path, win32_path); if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0)
{
win32_path[0] = 0;
}
SystemToolsTranslationMap::value_type entry(path, win32_path); SystemToolsTranslationMap::value_type entry(path, win32_path);
SystemTools::Cyg2Win32Map->insert(entry); SystemTools::Cyg2Win32Map->insert(entry);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment