ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

libpkgconf: path: rewrite DOS paths in non-cygwin case too

pull/199/head
Ariadne Conill 2020-06-11 18:00:56 -06:00
parent 262a0c964f
commit 2a8bebf289
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libpkgconf/path.c
View File

@ -17,7 +17,7 @@
#include <libpkgconf/stdinc.h> #include <libpkgconf/stdinc.h>
#include <libpkgconf/libpkgconf.h> #include <libpkgconf/libpkgconf.h>
#if defined(HAVE_CYGWIN_CONV_PATH) && defined(__MSYS__) #ifdef HAVE_CYGWIN_CONV_PATH
# include <sys/cygwin.h> # include <sys/cygwin.h>
#endif #endif
@ -320,9 +320,17 @@ normpath(const char *path)
bool bool
pkgconf_path_relocate(char *buf, size_t buflen) pkgconf_path_relocate(char *buf, size_t buflen)
{ {
#if defined(HAVE_CYGWIN_CONV_PATH) && defined(__MSYS__) #ifdef _WIN32
char *ti;
#endif
#ifdef HAVE_CYGWIN_CONV_PATH
/*
* If we are on Cygwin or MSYS, then we want to convert the virtual path
* to a real DOS path, using cygwin_conv_path().
*/
ssize_t size; ssize_t size;
char *tmpbuf, *ti; char *tmpbuf;
size = cygwin_conv_path(CCP_POSIX_TO_WIN_A, buf, NULL, 0); size = cygwin_conv_path(CCP_POSIX_TO_WIN_A, buf, NULL, 0);
if (size < 0 || (size_t) size > buflen) if (size < 0 || (size_t) size > buflen)
@ -334,13 +342,6 @@ pkgconf_path_relocate(char *buf, size_t buflen)
pkgconf_strlcpy(buf, tmpbuf, buflen); pkgconf_strlcpy(buf, tmpbuf, buflen);
free(tmpbuf); free(tmpbuf);
/* rewrite any backslash arguments for best compatibility */
for (ti = buf; *ti != '\0'; ti++)
{
if (*ti == '\\')
*ti = '/';
}
#else #else
char *tmpbuf; char *tmpbuf;
@ -358,5 +359,18 @@ pkgconf_path_relocate(char *buf, size_t buflen)
} }
#endif #endif
#ifdef _WIN32
/*
* Rewrite any backslash path delimiters for best compatibility.
* Originally, we did this in cygwin/msys case, but now we build pkgconf
* natively on Windows without cygwin/msys, so do it in all cases.
*/
for (ti = buf; *ti != '\0'; ti++)
{
if (*ti == '\\')
*ti = '/';
}
#endif
return true; return true;
} }