* [PATCH 2/2] f3: define F3_NS in cflags rather than C code
2023-07-26 12:45 6% [PATCH 0/2] fuse3 branch updates Eric Wong
@ 2023-07-26 12:45 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-07-26 12:45 UTC (permalink / raw)
To: meta
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) },
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] fuse3 branch updates
@ 2023-07-26 12:45 6% Eric Wong
2023-07-26 12:45 7% ` [PATCH 2/2] f3: define F3_NS in cflags rather than C code Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-07-26 12:45 UTC (permalink / raw)
To: meta
Brain is fried from coderepo <=> inbox joins, some FUSE3 stuff
from the other project using this shim...
Patch 2/2: naming things is hard :< I think `lei' is a
suitable FS name, since `leifs' is very confusing.
The mount executable can be `lei.fuse'...
Eric Wong (2):
f3: safer fixed buffer size for alternate F3_NS
f3: define F3_NS in cflags rather than C code
lib/PublicInbox/LeiF3.pm | 5 +++--
lib/PublicInbox/f3.h | 8 +++++---
2 files changed, 8 insertions(+), 5 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-07-26 12:45 6% [PATCH 0/2] fuse3 branch updates Eric Wong
2023-07-26 12:45 7% ` [PATCH 2/2] f3: define F3_NS in cflags rather than C code Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).