From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 8D4221F548 for ; Wed, 26 Jul 2023 12:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1690375515; bh=BM/SAiBVWRmrDakNDII5gDR4uHKbcBQXDETL/LGnmUQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZlU5dP0cXubjhO1Ir0aUbbydCMn+Y9RCBBK8A7HA2xwNV3ylv+BjcS8NxzfYJendu EVRncc/UESs7uCOYm0iXVA82B8JAEIimCpoBNgdfE/RzHs5r354YigUPbn9K/7Iej1 ZN9LvU1C0FdLElYk/mcfqop+xQ/SToq5N8bmNWX8= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/2] f3: define F3_NS in cflags rather than C code Date: Wed, 26 Jul 2023 12:45:15 +0000 Message-Id: <20230726124515.3639819-3-e@80x24.org> In-Reply-To: <20230726124515.3639819-1-e@80x24.org> References: <20230726124515.3639819-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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) },