summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2024-01-27 20:18:57 +0000
committermidipix <writeonce@midipix.org>2024-01-27 20:18:57 +0000
commit5d46be2ef1d419ac006be29bd894a30e2cf94ad9 (patch)
treeedf3b8aaec5e495b50bc26c0176f52175ec82a56
parent47341a61ee94ca64c96b781f8c987233a682d739 (diff)
downloadslibtool-5d46be2ef1d419ac006be29bd894a30e2cf94ad9.tar.bz2
slibtool-5d46be2ef1d419ac006be29bd894a30e2cf94ad9.tar.xz
archiver output api: added slbt_ar_output_arname().
-rw-r--r--include/slibtool/slibtool.h1
-rw-r--r--project/common.mk1
-rw-r--r--src/arbits/output/slbt_ar_output_arname.c72
-rw-r--r--src/internal/slibtool_driver_impl.h12
4 files changed, 86 insertions, 0 deletions
diff --git a/include/slibtool/slibtool.h b/include/slibtool/slibtool.h
index fe605d1..49e8dbf 100644
--- a/include/slibtool/slibtool.h
+++ b/include/slibtool/slibtool.h
@@ -394,6 +394,7 @@ slbt_api int slbt_output_error_record (const struct slbt_driver_ctx *, const s
slbt_api int slbt_output_error_vector (const struct slbt_driver_ctx *);
/* archiver utility api */
+slbt_api int slbt_ar_output_arname (const struct slbt_archive_ctx *);
slbt_api int slbt_ar_output_members (const struct slbt_archive_meta *);
/* package info */
diff --git a/project/common.mk b/project/common.mk
index 5465f72..3593203 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -1,6 +1,7 @@
API_SRCS = \
src/arbits/slbt_archive_ctx.c \
src/arbits/slbt_archive_meta.c \
+ src/arbits/output/slbt_ar_output_arname.c \
src/arbits/output/slbt_ar_output_members.c \
src/driver/slbt_amain.c \
src/driver/slbt_driver_ctx.c \
diff --git a/src/arbits/output/slbt_ar_output_arname.c b/src/arbits/output/slbt_ar_output_arname.c
new file mode 100644
index 0000000..94d3fa8
--- /dev/null
+++ b/src/arbits/output/slbt_ar_output_arname.c
@@ -0,0 +1,72 @@
+/*******************************************************************/
+/* slibtool: a skinny libtool implementation, written in C */
+/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
+/*******************************************************************/
+
+#include <slibtool/slibtool.h>
+#include <slibtool/slibtool_output.h>
+#include "slibtool_driver_impl.h"
+#include "slibtool_dprintf_impl.h"
+#include "slibtool_errinfo_impl.h"
+#include "slibtool_ar_impl.h"
+
+#define SLBT_PRETTY_FLAGS (SLBT_PRETTY_YAML \
+ | SLBT_PRETTY_POSIX \
+ | SLBT_PRETTY_HEXDATA)
+
+
+static int slbt_ar_output_arname_posix(
+ const struct slbt_driver_ctx * dctx,
+ const struct slbt_archive_ctx * actx,
+ const struct slbt_fd_ctx * fdctx)
+{
+ (void)dctx;
+ (void)actx;
+ (void)fdctx;
+
+ /* posix ar(1) does not print the <archive> file-name */
+
+ return 0;
+}
+
+static int slbt_ar_output_arname_yaml(
+ const struct slbt_driver_ctx * dctx,
+ const struct slbt_archive_ctx * actx,
+ const struct slbt_fd_ctx * fdctx)
+{
+ const char * path;
+ const char mema[] = "<memory_object>";
+
+ path = actx->path && *actx->path ? *actx->path : mema;
+
+ if (slbt_dprintf(fdctx->fdout,"Archive: %s\n",path) < 0)
+ return SLBT_SYSTEM_ERROR(dctx,0);
+
+ return 0;
+}
+
+int slbt_ar_output_arname(const struct slbt_archive_ctx * actx)
+{
+ const struct slbt_driver_ctx * dctx;
+ struct slbt_fd_ctx fdctx;
+
+ dctx = (slbt_get_archive_ictx(actx))->dctx;
+
+ if (slbt_get_driver_fdctx(dctx,&fdctx) < 0)
+ return SLBT_NESTED_ERROR(dctx);
+
+ switch (dctx->cctx->fmtflags & SLBT_PRETTY_FLAGS) {
+ case SLBT_PRETTY_YAML:
+ return slbt_ar_output_arname_yaml(
+ dctx,actx,&fdctx);
+
+ case SLBT_PRETTY_POSIX:
+ return slbt_ar_output_arname_posix(
+ dctx,actx,&fdctx);
+
+ default:
+ return slbt_ar_output_arname_yaml(
+ dctx,actx,&fdctx);
+ }
+}
diff --git a/src/internal/slibtool_driver_impl.h b/src/internal/slibtool_driver_impl.h
index b1a07f7..2008324 100644
--- a/src/internal/slibtool_driver_impl.h
+++ b/src/internal/slibtool_driver_impl.h
@@ -157,6 +157,18 @@ struct slbt_archive_ctx_impl {
struct slbt_archive_ctx actx;
};
+static inline struct slbt_archive_ctx_impl * slbt_get_archive_ictx(const struct slbt_archive_ctx * actx)
+{
+ uintptr_t addr;
+
+ if (actx) {
+ addr = (uintptr_t)actx - offsetof(struct slbt_archive_ctx_impl,actx);
+ return (struct slbt_archive_ctx_impl *)addr;
+ }
+
+ return 0;
+}
+
static inline struct slbt_driver_ctx_impl * slbt_get_driver_ictx(const struct slbt_driver_ctx * dctx)
{
uintptr_t addr;