Compare commits

..

4 commits

Author SHA1 Message Date
CismonX
f97e4b73c1
ci: tidy up config options
- No need to `--enable-bookmarkfs-util`, since it's implicitly done
  by enabling other components.
- No need to `--enable-xxhash-inline`, since it's now the default.
2025-06-29 12:24:04 +08:00
CismonX
65d29fd017
build: inline libxxhash by default 2025-06-29 12:19:11 +08:00
CismonX
30f82f5613
doc: update doc for the -h and -V options 2025-06-27 13:24:31 +08:00
CismonX
c90cb669f2
fsck: also print the version of the util library
This information is considered useful, since online fsck
requires the utility library (for its sandboxing feature).
2025-06-25 23:50:35 +08:00
8 changed files with 24 additions and 11 deletions

View file

@ -31,8 +31,7 @@ tasks:
cd bookmarkfs
autoreconf -i
./configure \
--enable-bookmarkfs-debug --enable-xxhash-inline \
--enable-bookmarkfs-util --enable-bookmarkfs-mount \
--enable-bookmarkfs-debug --enable-bookmarkfs-mount \
--enable-bookmarkfs-fsck --enable-bookmarkfs-mkfs \
--enable-bookmarkctl --enable-fsck-handler-tcl \
--enable-backend-firefox --enable-backend-chromium \

View file

@ -25,8 +25,7 @@ tasks:
mkdir bookmarkfs/build && cd bookmarkfs/build
autoreconf -i ..
../configure \
--enable-bookmarkfs-debug --enable-xxhash-inline \
--enable-bookmarkfs-util --enable-bookmarkfs-mount \
--enable-bookmarkfs-debug --enable-bookmarkfs-mount \
--enable-bookmarkfs-fsck --enable-bookmarkfs-mkfs \
--enable-bookmarkctl --enable-fsck-handler-tcl \
--enable-backend-firefox --enable-backend-chromium \

View file

@ -28,8 +28,7 @@ tasks:
mkdir bookmarkfs/build && cd bookmarkfs/build
autoreconf -i ..
../configure \
--enable-bookmarkfs-debug --enable-xxhash-inline \
--enable-bookmarkfs-util --enable-bookmarkfs-mount \
--enable-bookmarkfs-debug --enable-bookmarkfs-mount \
--enable-bookmarkfs-fsck --enable-bookmarkfs-mkfs \
--enable-bookmarkctl --enable-fsck-handler-tcl \
--enable-backend-firefox --enable-backend-chromium \

View file

@ -31,8 +31,7 @@ tasks:
mkdir bookmarkfs/build && cd bookmarkfs/build
autoreconf -i ..
../configure \
--enable-bookmarkfs-debug --enable-xxhash-inline \
--enable-bookmarkfs-util --enable-bookmarkfs-mount \
--enable-bookmarkfs-debug --enable-bookmarkfs-mount \
--enable-bookmarkfs-fsck --enable-bookmarkfs-mkfs \
--enable-bookmarkctl --enable-fsck-handler-tcl \
--enable-backend-firefox --enable-backend-chromium \

View file

@ -104,8 +104,8 @@ Installation
* No longer requires: libseccomp
- `--disable-sandbox-landlock` (Linux-only)
* Disable the [Landlock] feature in the sandbox implementation
- `--enable-xxhash-inline`
* Use xxHash as a header-only library
- `--disable-xxhash-inline`
* Do not use xxHash as a header-only library
- `--disable-backend-firefox-write`
* Build the Firefox backend without write features
* No longer requires: Nettle, uriparser

View file

@ -61,7 +61,7 @@ AS_VAR_IF([host_os_is_linux], [yes], [
EX_FEAT([sandbox-landlock], [yes], [Landlock features for sandboxing])
])
EX_FEAT([xxhash-inline], [no], [using xxhash as a header-only library])
EX_FEAT([xxhash-inline], [yes], [using xxhash as a header-only library])
EX_FEAT([bookmarkfs-debug], [no], [debugging features for BookmarkFS])

View file

@ -302,8 +302,16 @@ Stay in the foreground, do not daemonize.
@item -h
Print help text, and then exit.
If also given the @option{-o backend=@var{name}} option,
print help text of the corresponding backend.
This also applies to @command{fsck.bookmarkfs} and @command{mkfs.bookmarkfs}.
@item -V
Print version and feature information, and then exit.
If also given the @option{-o backend=@var{name}} option,
print version information of the corresponding backend.
This also applies to @command{fsck.bookmarkfs} and @command{mkfs.bookmarkfs}.
@end table
Unrecognized options specified with @option{-o} are passed to libfuse
@ -481,8 +489,14 @@ Also @pxref{Disabling Landlock}.
@item -h
Print help text, and then exit.
If also given the @option{-o handler=@var{name}} option,
print help text of the corresponding fsck handler.
@item -V
Print version and feature information, and then exit.
If also given the @option{-o handler=@var{name}} option,
print version information of the corresponding fsck handler.
@end table

View file

@ -35,6 +35,7 @@
#include "backend.h"
#include "fsck_ops.h"
#include "ioctl.h"
#include "lib.h"
#include "macros.h"
#include "sandbox.h"
#include "version.h"
@ -202,6 +203,8 @@ print_version (void)
BOOKMARKFS_VER_MAJOR, BOOKMARKFS_VER_MINOR, BOOKMARKFS_VER_PATCH);
puts(BOOKMARKFS_FEATURE_STRING(DEBUG, "debug"));
puts(BOOKMARKFS_FEATURE_STRING(INTERACTIVE_FSCK, "interactive"));
bookmarkfs_print_lib_version("\n");
}
static int