From d4b2a5603d628ed00a764cb526df02e3a382a0c1 Mon Sep 17 00:00:00 2001 From: midipix Date: Mon, 19 Feb 2024 03:31:04 +0000 Subject: slbt_util_real_path(): rewrite as a wrapper around an internal slbt_realpath(). --- src/logic/linkcmd/slbt_linkcmd_dsolib.c | 3 ++- src/logic/linkcmd/slbt_linkcmd_executable.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/logic') diff --git a/src/logic/linkcmd/slbt_linkcmd_dsolib.c b/src/logic/linkcmd/slbt_linkcmd_dsolib.c index 2d68c32..938c0ef 100644 --- a/src/logic/linkcmd/slbt_linkcmd_dsolib.c +++ b/src/logic/linkcmd/slbt_linkcmd_dsolib.c @@ -17,6 +17,7 @@ #include "slibtool_linkcmd_impl.h" #include "slibtool_mapfile_impl.h" #include "slibtool_metafile_impl.h" +#include "slibtool_realpath_impl.h" #include "slibtool_snprintf_impl.h" #include "slibtool_symlink_impl.h" #include "slibtool_spawn_impl.h" @@ -243,7 +244,7 @@ slbt_hidden int slbt_exec_link_create_library( } /* cwd */ - if (slbt_util_real_path(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd))) + if (slbt_realpath(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd))) return SLBT_SYSTEM_ERROR(dctx,0); /* .libs/libfoo.so --> -L.libs -lfoo */ diff --git a/src/logic/linkcmd/slbt_linkcmd_executable.c b/src/logic/linkcmd/slbt_linkcmd_executable.c index eae0769..6ad6994 100644 --- a/src/logic/linkcmd/slbt_linkcmd_executable.c +++ b/src/logic/linkcmd/slbt_linkcmd_executable.c @@ -17,6 +17,7 @@ #include "slibtool_linkcmd_impl.h" #include "slibtool_mapfile_impl.h" #include "slibtool_metafile_impl.h" +#include "slibtool_realpath_impl.h" #include "slibtool_snprintf_impl.h" #include "slibtool_symlink_impl.h" #include "slibtool_spawn_impl.h" @@ -136,7 +137,7 @@ slbt_hidden int slbt_exec_link_create_executable( verinfo = slbt_api_source_version(); /* cwd, DL_PATH fixup */ - if (slbt_util_real_path(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd))) + if (slbt_realpath(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd))) return SLBT_SYSTEM_ERROR(dctx,0); slbt_emit_fdwrap_dl_path_fixup( -- cgit v1.2.3