diff options
| author | midipix <writeonce@midipix.org> | 2024-02-09 20:59:02 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-02-09 21:01:59 +0000 |
| commit | a05389c24a1156f461ba256a3073d08467d778ec (patch) | |
| tree | 7175fd859b7a4a0121e47c2972e88afeb66bd29e | |
| parent | ef2baa69376b8d2bbb016f2f8661c6147e89d420 (diff) | |
| download | slibtool-a05389c24a1156f461ba256a3073d08467d778ec.tar.bz2 slibtool-a05389c24a1156f461ba256a3073d08467d778ec.tar.xz | |
install mode: invoke the argv interfaces via the driver-provided wrappers.
| -rw-r--r-- | src/logic/slbt_exec_install.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/logic/slbt_exec_install.c b/src/logic/slbt_exec_install.c index 0f4f38e..909b28f 100644 --- a/src/logic/slbt_exec_install.c +++ b/src/logic/slbt_exec_install.c @@ -12,8 +12,6 @@ #include <errno.h> #include <sys/stat.h> -#define ARGV_DRIVER - #include <slibtool/slibtool.h> #include "slibtool_driver_impl.h" #include "slibtool_install_impl.h" @@ -41,15 +39,15 @@ static int slbt_install_usage( switch (noclr) { case 0: - argv_usage(fdout,header,optv,arg); + slbt_argv_usage(fdout,header,optv,arg); break; default: - argv_usage_plain(fdout,header,optv,arg); + slbt_argv_usage_plain(fdout,header,optv,arg); break; } - argv_free(meta); + slbt_argv_free(meta); return SLBT_USAGE; } @@ -59,7 +57,7 @@ static int slbt_exec_install_fail( struct argv_meta * meta, int ret) { - argv_free(meta); + slbt_argv_free(meta); slbt_free_exec_ctx(actx); return ret; } @@ -770,7 +768,7 @@ int slbt_exec_install( } /* missing arguments? */ - argv_optv_init(slbt_install_options,optv); + slbt_optv_init(slbt_install_options,optv); if (!iargv[1] && (dctx->cctx->drvflags & SLBT_DRIVER_VERBOSITY_USAGE)) return slbt_install_usage( @@ -780,7 +778,7 @@ int slbt_exec_install( dctx->cctx->drvflags & SLBT_DRIVER_ANNOTATE_NEVER); /* <install> argv meta */ - if (!(meta = argv_get( + if (!(meta = slbt_argv_get( iargv,optv, dctx->cctx->drvflags & SLBT_DRIVER_VERBOSITY_ERRORS ? ARGV_VERBOSITY_ERRORS @@ -916,7 +914,7 @@ int slbt_exec_install( } } - argv_free(meta); + slbt_argv_free(meta); slbt_free_exec_ctx(actx); return 0; |