From 6a1d150bea49b4c279fd096d74c76fd1e1c1dfbc Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 26 Jul 2023 12:45:15 +0000 Subject: f3: define F3_NS in cflags rather than C code This enhances reusability in other projects which use the same C shim. The executable will also be `lei.fuse' rather than `leifs', because `leifs' is likely confused as `leafs' which makes no sense. --- lib/PublicInbox/LeiF3.pm | 5 +++-- lib/PublicInbox/f3.h | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/LeiF3.pm b/lib/PublicInbox/LeiF3.pm index 74ad135d..1121340a 100644 --- a/lib/PublicInbox/LeiF3.pm +++ b/lib/PublicInbox/LeiF3.pm @@ -13,11 +13,12 @@ use PublicInbox::Spawn; my $dir = ($ENV{PERL_INLINE_DIRECTORY} // die('BUG: PERL_INLINE_DIRECTORY unset')) . '/f3'; my $F3_NS = 'lei'; -my $bin = "$dir/${F3_NS}fs.fuse"; +my $bin = "$dir/${F3_NS}.fuse"; my ($srcpfx) = (__FILE__ =~ m!\A(.+/)[^/]+\z!); my @srcs = map { $srcpfx.$_ } qw(f3.h); my $xflags = ($ENV{CFLAGS} // '-Wall -ggdb3 -O0') . ' ' . - ($ENV{LDFLAGS} // '-Wl,-O1 -Wl,--compress-debug-sections=zlib'); + ($ENV{LDFLAGS} // '-Wl,-O1 -Wl,--compress-debug-sections=zlib') . + qq{ -DF3_NS='"$F3_NS"'}; sub xflags_chg () { open my $fh, '<', "$dir/XFLAGS" or return 1; diff --git a/lib/PublicInbox/f3.h b/lib/PublicInbox/f3.h index 4494e61b..4572f7f2 100644 --- a/lib/PublicInbox/f3.h +++ b/lib/PublicInbox/f3.h @@ -8,7 +8,9 @@ */ /* another project may use this: */ -#define F3_NS "lei" +#ifndef F3_NS +#error F3_NS not defined +#endif #define _GNU_SOURCE #define _FILE_OFFSET_BITS 64 @@ -126,7 +128,7 @@ static struct f3_data f3 = { }; static const struct fuse_opt f3_opt[] = { - /* *-fd and root-vid are internal knobs */ + /* *-fd and root-vid are internal knobs used by perl mount wrapper */ { "reader-fd=%d", offsetof(struct f3_data, rfd) }, { "worker-fd=%d", offsetof(struct f3_data, wfd) }, { "root-vid=%"PRId64, offsetof(struct f3_data, vroot.vid) }, -- cgit v1.2.3-24-ge0c7