diff options
| -rw-r--r-- | include/slibtool/slibtool.h | 2 | ||||
| -rw-r--r-- | src/fallback/slbt_archive_import_mri.c | 2 | ||||
| -rw-r--r-- | src/internal/slibtool_lconf_impl.c | 4 | ||||
| -rw-r--r-- | src/logic/linkcmd/slbt_linkcmd_dsolib.c | 2 | ||||
| -rw-r--r-- | src/logic/linkcmd/slbt_linkcmd_executable.c | 2 | ||||
| -rw-r--r-- | src/output/slbt_output_fdcwd.c | 4 | ||||
| -rw-r--r-- | src/util/slbt_realpath.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/include/slibtool/slibtool.h b/include/slibtool/slibtool.h index ce051fa..89cbe8b 100644 --- a/include/slibtool/slibtool.h +++ b/include/slibtool/slibtool.h @@ -380,7 +380,7 @@ slbt_api int slbt_util_import_archive (const struct slbt_driver_ctx *, struct slbt_api int slbt_util_copy_file (const struct slbt_driver_ctx *, struct slbt_exec_ctx *, char * src, char * dst); slbt_api int slbt_util_dump_machine (const char * compiler, char * machine, size_t bufsize); -slbt_api int slbt_util_realpath (int, const char *, int, char *, size_t); +slbt_api int slbt_util_real_path (int, const char *, int, char *, size_t); /* archiver api */ slbt_api int slbt_ar_get_archive_ctx (const struct slbt_driver_ctx *, const char * path, diff --git a/src/fallback/slbt_archive_import_mri.c b/src/fallback/slbt_archive_import_mri.c index a65578c..6217859 100644 --- a/src/fallback/slbt_archive_import_mri.c +++ b/src/fallback/slbt_archive_import_mri.c @@ -42,7 +42,7 @@ static char * slbt_mri_argument( if (arg[0] == '/') { target = arg; } else { - if (slbt_util_realpath( + if (slbt_util_real_path( fdat,".",O_DIRECTORY, mricwd,sizeof(mricwd)) < 0) return 0; diff --git a/src/internal/slibtool_lconf_impl.c b/src/internal/slibtool_lconf_impl.c index dc73bc3..82904d2 100644 --- a/src/internal/slibtool_lconf_impl.c +++ b/src/internal/slibtool_lconf_impl.c @@ -387,7 +387,7 @@ static int slbt_lconf_trace_result_plain( fderr = slbt_driver_fderr(dctx); - cpath = !(slbt_util_realpath(fdat,lconf,0,path,sizeof(path))) + cpath = !(slbt_util_real_path(fdat,lconf,0,path,sizeof(path))) ? path : lconf; switch (err) { @@ -435,7 +435,7 @@ static int slbt_lconf_trace_result_annotated( fderr = slbt_driver_fderr(dctx); - cpath = !(slbt_util_realpath(fdat,lconf,0,path,sizeof(path))) + cpath = !(slbt_util_real_path(fdat,lconf,0,path,sizeof(path))) ? path : lconf; switch (err) { diff --git a/src/logic/linkcmd/slbt_linkcmd_dsolib.c b/src/logic/linkcmd/slbt_linkcmd_dsolib.c index b3ff844..2d68c32 100644 --- a/src/logic/linkcmd/slbt_linkcmd_dsolib.c +++ b/src/logic/linkcmd/slbt_linkcmd_dsolib.c @@ -243,7 +243,7 @@ slbt_hidden int slbt_exec_link_create_library( } /* cwd */ - if (slbt_util_realpath(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd))) + if (slbt_util_real_path(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 f8833a2..eae0769 100644 --- a/src/logic/linkcmd/slbt_linkcmd_executable.c +++ b/src/logic/linkcmd/slbt_linkcmd_executable.c @@ -136,7 +136,7 @@ slbt_hidden int slbt_exec_link_create_executable( verinfo = slbt_api_source_version(); /* cwd, DL_PATH fixup */ - if (slbt_util_realpath(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd))) + if (slbt_util_real_path(fdcwd,".",O_DIRECTORY,cwd,sizeof(cwd))) return SLBT_SYSTEM_ERROR(dctx,0); slbt_emit_fdwrap_dl_path_fixup( diff --git a/src/output/slbt_output_fdcwd.c b/src/output/slbt_output_fdcwd.c index fa7e8a7..1d07892 100644 --- a/src/output/slbt_output_fdcwd.c +++ b/src/output/slbt_output_fdcwd.c @@ -36,7 +36,7 @@ static int slbt_output_fdcwd_plain(const struct slbt_driver_ctx * dctx) sprintf(scwd,"%d",fdcwd); } - if (slbt_util_realpath(fdcwd,".",0,path,sizeof(path)) < 0) { + if (slbt_util_real_path(fdcwd,".",0,path,sizeof(path)) < 0) { ferror = 1; memset(path,0,sizeof(path)); strerror_r(errno,path,sizeof(path)); @@ -72,7 +72,7 @@ static int slbt_output_fdcwd_annotated(const struct slbt_driver_ctx * dctx) sprintf(scwd,"%d",fdcwd); } - if (slbt_util_realpath(fdcwd,".",0,path,sizeof(path)) < 0) { + if (slbt_util_real_path(fdcwd,".",0,path,sizeof(path)) < 0) { ferror = 1; memset(path,0,sizeof(path)); strerror_r(errno,path,sizeof(path)); diff --git a/src/util/slbt_realpath.c b/src/util/slbt_realpath.c index 3929e04..9e97427 100644 --- a/src/util/slbt_realpath.c +++ b/src/util/slbt_realpath.c @@ -30,7 +30,7 @@ extern long syscall(int, ...); #endif -int slbt_util_realpath( +int slbt_util_real_path( int fdat, const char * path, int options, |