mirrors/lpac
1
0
Fork 0
mirror of https://github.com/estkme-group/lpac synced 2024-07-07 01:07:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: $PWD independent executable file (#23)

Browse source 
* feat: $PWD independent executable file

- Use RPATH on Linux/macOS to ensure it will search directory that
  contains lpac executable file.
- Windows doesnn't has RPATH, but it will search executable file
  directory by default. And CMake will ignore BUILD_RPATH property on
  Windows safely.
- BUILD_RPATH doesn't affect files after cmake --install, but we doesn't
  declare install rule now (And we use RUNTIME_OUTPUT_DIRECTORY so we
  actually use non-install-style). If we need install-style in future,
  we can set INSTALL_RPATH_USE_LINK_PATH property so CMake will ensure
  it will work.

* fix(dlfcn-win32): remove LOAD_WITH_ALTERED_SEARCH_PATH to avoid UB and ensure PWD-independent-exe work

If use LOAD_WITH_ALTERED_SEARCH_PATH, relative path will lead to
undefined behavior. And it can't provide expected behavior because it
just change search order rather than remove binary directory.

See also: https://github.com/dlfcn-win32/dlfcn-win32/issues/104
This commit is contained in:
Coelacanthus 2023-12-16 20:24:19 +08:00 committed by GitHub
parent 3755b498ce
commit 2cd764e57f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -22,7 +22,7 @@ if(LINUX_MINGW32)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
endif()
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.8)
project (lpac)

5
dlfcn-win32/dlfcn.c
View file

@ -414,8 +414,11 @@ void *dlopen( const char *file, int mode )
* LOAD_WITH_ALTERED_SEARCH_PATH is used to make it behave more closely
* to UNIX's search paths (start with system folders instead of current
* folder).
* FIXME: Remove LOAD_WITH_ALTERED_SEARCH_PATH because it lead to Undefined
* Behavior and doesn't provide expected search paths.
* See also: https://github.com/dlfcn-win32/dlfcn-win32/issues/104
*/
hModule = LoadLibraryExA( lpFileName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
hModule = LoadLibraryExA( lpFileName, NULL, NULL );
if( !hModule )
{

2
interface/http/curl.c
View file

@ -146,7 +146,7 @@ EUICC_SHARED_EXPORT int libhttpinterface_init(struct euicc_http_interface *ifstr
if (!(libcurl_path = getenv("LIBCURL")))
{
#if defined(__MINGW32__)
libcurl_path = ".\\libcurl.dll";
libcurl_path = "libcurl.dll";
#elif defined(__APPLE__)
libcurl_path = "libcurl.4.dylib";
#else

5
src/CMakeLists.txt
View file

@ -7,7 +7,10 @@ aux_source_directory(applet/chip DIR_LPAC_SRCS)
aux_source_directory(applet/notification DIR_LPAC_SRCS)
aux_source_directory(applet/profile DIR_LPAC_SRCS)
add_executable(lpac ${DIR_LPAC_SRCS})
set_target_properties(lpac PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/output")
set_target_properties(lpac PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/output"
BUILD_RPATH "$ORIGIN"
)
target_link_libraries(lpac euicc)
if(LINUX_MINGW32)

7
src/dlsym_interface.c
View file

@ -12,13 +12,10 @@
#if defined(__MINGW32__)
#define INTERFACELIB_POSTFIX "dll"
#define DIRSEP "\\"
#elif defined(__APPLE__)
#define INTERFACELIB_POSTFIX "dylib"
#define DIRSEP "/"
#else
#define INTERFACELIB_POSTFIX "so"
#define DIRSEP "/"
#endif
static struct applet_entry applet_apdu = {
@ -53,12 +50,12 @@ static void dlsym_interfaces_get_path(void)
{
if (!(libapduinterface_path = getenv("APDU_INTERFACE")))
{
libapduinterface_path = "." DIRSEP "libapduinterface_pcsc." INTERFACELIB_POSTFIX;
libapduinterface_path = "libapduinterface_pcsc." INTERFACELIB_POSTFIX;
}
if (!(libhttpinterface_path = getenv("HTTP_INTERFACE")))
{
libhttpinterface_path = "." DIRSEP "libhttpinterface_curl." INTERFACELIB_POSTFIX;
libhttpinterface_path = "libhttpinterface_curl." INTERFACELIB_POSTFIX;
}
}