diff options
| author | midipix <writeonce@midipix.org> | 2024-02-21 05:52:28 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-02-21 05:57:22 +0000 |
| commit | 5b993e0818b603c1dec4126dfe45c617619eff93 (patch) | |
| tree | 88ead06eac5f530932c424e6da4347ea0e94ae28 | |
| parent | f3e7bb09f083de850269a6d0982ca4d839f4d1ba (diff) | |
| download | slibtool-5b993e0818b603c1dec4126dfe45c617619eff93.tar.bz2 slibtool-5b993e0818b603c1dec4126dfe45c617619eff93.tar.xz | |
slbt_util_import_archive_mri(): simplify fallback interface, ensure building.
| -rw-r--r-- | src/fallback/slbt_archive_import_mri.c | 13 | ||||
| -rw-r--r-- | src/util/slbt_archive_import.c | 6 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/fallback/slbt_archive_import_mri.c b/src/fallback/slbt_archive_import_mri.c index 705cb88..f5ff6f4 100644 --- a/src/fallback/slbt_archive_import_mri.c +++ b/src/fallback/slbt_archive_import_mri.c @@ -21,6 +21,7 @@ #include "slibtool_dprintf_impl.h" #include "slibtool_symlink_impl.h" #include "slibtool_readlink_impl.h" +#include "slibtool_realpath_impl.h" #include "slibtool_snprintf_impl.h" #include "slibtool_errinfo_impl.h" @@ -100,10 +101,9 @@ static void slbt_util_import_archive_child( } int slbt_util_import_archive_mri( - const struct slbt_driver_ctx * dctx, - struct slbt_exec_ctx * ectx, - char * dstarchive, - char * srcarchive) + struct slbt_exec_ctx * ectx, + char * dstarchive, + char * srcarchive) { int fdcwd; pid_t pid; @@ -116,6 +116,11 @@ int slbt_util_import_archive_mri( char mrisrc [96]; char program[PATH_MAX]; + const struct slbt_driver_ctx * dctx; + + /* driver context */ + dctx = (slbt_get_exec_ictx(ectx))->dctx; + /* fdcwd */ fdcwd = slbt_driver_fdcwd(dctx); diff --git a/src/util/slbt_archive_import.c b/src/util/slbt_archive_import.c index d2d72c5..bf0afe9 100644 --- a/src/util/slbt_archive_import.c +++ b/src/util/slbt_archive_import.c @@ -11,9 +11,9 @@ /* legacy fallback, no longer in use */ extern int slbt_util_import_archive_mri( - const struct slbt_exec_ctx * ectx, - char * dstarchive, - char * srcarchive); + struct slbt_exec_ctx * ectx, + char * dstarchive, + char * srcarchive); /* use slibtool's in-memory archive merging facility */ static int slbt_util_import_archive_impl( |