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

Remove usage of cygwin_conv_path() under cygwin/msys #216

Merged
lazka merged 1 commits from remove-cygwin-path-conv into master 2021-03-20 14:58:54 +00:00
Conversation 0 Commits 1 Files Changed 6
6 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -22,7 +22,7 @@ AX_CHECK_COMPILE_FLAG([-std=gnu99], [CFLAGS="$CFLAGS -std=gnu99"], [
AX_CHECK_COMPILE_FLAG([-std=c99], [CFLAGS="$CFLAGS -std=c99"]) AX_CHECK_COMPILE_FLAG([-std=c99], [CFLAGS="$CFLAGS -std=c99"])
]) ])
AC_CONFIG_HEADERS([libpkgconf/config.h]) AC_CONFIG_HEADERS([libpkgconf/config.h])
AC_CHECK_FUNCS([strlcpy strlcat strndup cygwin_conv_path]) AC_CHECK_FUNCS([strlcpy strlcat strndup])
AC_CHECK_HEADERS([sys/stat.h]) AC_CHECK_HEADERS([sys/stat.h])
AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects]) AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])

2
doc/libpkgconf-path.rst
View File

@ -55,7 +55,7 @@ variables.
.. c:function:: bool pkgconf_path_relocate(char *buf, size_t buflen) .. c:function:: bool pkgconf_path_relocate(char *buf, size_t buflen)
Relocates a path, possibly calling normpath() or cygwin_conv_path() on it. Relocates a path, possibly calling normpath() on it.
:param char* buf: The path to relocate. :param char* buf: The path to relocate.
:param size_t buflen: The buffer length the path is contained in. :param size_t buflen: The buffer length the path is contained in.

3
libpkgconf/config.h.meson
View File

@ -1,8 +1,5 @@
/* libpkgconf/config.h.in. Generated from configure.ac by autoheader. */ /* libpkgconf/config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the `cygwin_conv_path' function. */
#mesondefine HAVE_CYGWIN_CONV_PATH
/* Define to 1 if you have the `strlcat' function. */ /* Define to 1 if you have the `strlcat' function. */
#mesondefine HAVE_STRLCAT #mesondefine HAVE_STRLCAT

26
libpkgconf/path.c
View File

@ -17,10 +17,6 @@
#include <libpkgconf/stdinc.h> #include <libpkgconf/stdinc.h>
#include <libpkgconf/libpkgconf.h> #include <libpkgconf/libpkgconf.h>
#ifdef HAVE_CYGWIN_CONV_PATH
# include <sys/cygwin.h>
#endif
#if defined(HAVE_SYS_STAT_H) && ! defined(_WIN32) #if defined(HAVE_SYS_STAT_H) && ! defined(_WIN32)
# include <sys/stat.h> # include <sys/stat.h>
# define PKGCONF_CACHE_INODES # define PKGCONF_CACHE_INODES
@ -306,7 +302,7 @@ normpath(const char *path)
* *
* .. c:function:: bool pkgconf_path_relocate(char *buf, size_t buflen) * .. c:function:: bool pkgconf_path_relocate(char *buf, size_t buflen)
* *
* Relocates a path, possibly calling normpath() or cygwin_conv_path() on it. * Relocates a path, possibly calling normpath() on it.
* *
* :param char* buf: The path to relocate. * :param char* buf: The path to relocate.
* :param size_t buflen: The buffer length the path is contained in. * :param size_t buflen: The buffer length the path is contained in.
@ -320,25 +316,6 @@ pkgconf_path_relocate(char *buf, size_t buflen)
char *ti; char *ti;
#endif #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;
char *tmpbuf;
size = cygwin_conv_path(CCP_POSIX_TO_WIN_A, buf, NULL, 0);
if (size < 0 || (size_t) size > buflen)
return false;
tmpbuf = malloc(size);
if (cygwin_conv_path(CCP_POSIX_TO_WIN_A, buf, tmpbuf, size))
return false;
pkgconf_strlcpy(buf, tmpbuf, buflen);
free(tmpbuf);
#else
char *tmpbuf; char *tmpbuf;
if ((tmpbuf = normpath(buf)) != NULL) if ((tmpbuf = normpath(buf)) != NULL)
@ -353,7 +330,6 @@ pkgconf_path_relocate(char *buf, size_t buflen)
pkgconf_strlcpy(buf, tmpbuf, buflen); pkgconf_strlcpy(buf, tmpbuf, buflen);
free(tmpbuf); free(tmpbuf);
} }
#endif
#ifdef _WIN32 #ifdef _WIN32
/* /*

1
meson.build
View File

@ -10,7 +10,6 @@ cc = meson.get_compiler('c')
cdata = configuration_data() cdata = configuration_data()
check_functions = [ check_functions = [
['HAVE_CYGWIN_CONV_PATH', 'cygwin_conv_path', 'sys/cygwin.h'],
['HAVE_STRLCAT', 'strlcat', 'string.h'], ['HAVE_STRLCAT', 'strlcat', 'string.h'],
['HAVE_STRLCPY', 'strlcpy', 'string.h'], ['HAVE_STRLCPY', 'strlcpy', 'string.h'],
['HAVE_STRNDUP', 'strndup', 'string.h'], ['HAVE_STRNDUP', 'strndup', 'string.h'],

1
tests/test_env.sh.in
View File

@ -26,7 +26,6 @@ LIBRARY_PATH_ENV="LIBRARY_PATH"
PATH_SEP=":" PATH_SEP=":"
SYSROOT_DIR="${selfdir}/test" SYSROOT_DIR="${selfdir}/test"
case "$(uname -s)" in case "$(uname -s)" in
Msys|CYGWIN*) PATH_SEP=";";;
Haiku) LIBRARY_PATH_ENV="BELIBRARIES";; Haiku) LIBRARY_PATH_ENV="BELIBRARIES";;
esac esac