refactor/test: bcachefs test improvements and ficlone rename

- test/COMMON: add SKIP=77 for Meson skip exit code
- test/test_bcachefs.sh: use pre-existing image from test dir instead of
  creating one; skip if kernel bcachefs support or image is absent; guard
  against stale mounts/loop devices and leftover files from previous runs
- .github/workflows/c-cpp.yml: add bcachefs image cache/download step
- test/rmw-bcachefs-test.img.sha256sum: add checksum file for CI caching
- man/rmw.1: add BTRFS AND BCACHEFS subsection under NOTES
- Rename want_btrfs_clone option to want_ficlone
- Rename HAVE_LINUX_BTRFS macro to HAVE_FICLONE
- Rename has_btrfs_header variable to has_linux_fs_header
- Rename src/btrfs.c and src/btrfs.h to src/ficlone.c and src/ficlone.h
- Rename is_btrfs() to is_ficlone_fs() and do_btrfs_clone() to do_ficlone()
- Rename is_btrfs struct field in st_waste to is_ficlone_fs

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: andy5995

.github/workflows/c-cpp.yml

@@ -189,6 +189,19 @@ jobs:
     - name: Test btrfs image existence
       run: test -f test/rmw-btrfs-test.img
 
+    - name: Cache bcachefs Image
+      uses: actions/cache@v5
+      id: bcachefs-img-cache
+      with:
+        path: test/rmw-bcachefs-test.img
+        key: ${{ hashFiles('test/rmw-bcachefs-test.img.sha256sum') }}
+
+    - if: ${{ steps.bcachefs-img-cache.outputs.cache-hit != 'true' }}
+      run: curl -L -o test/rmw-bcachefs-test.img '<BCACHEFS_IMAGE_URL>'
+
+    - name: Test bcachefs image existence
+      run: test -f test/rmw-bcachefs-test.img
+
     - name: Install Dependencies
       run: |
         sudo apt update

.gitignore

@@ -17,3 +17,4 @@ subprojects/**
 !subprojects/**/*.wrap
 /packaging/appimage/.env
 /test/rmw-btrfs-test.img
+/test/rmw-bcachefs-test.img

README.md

@@ -1,4 +1,4 @@
-# rmw-0.9.5
+# rmw-0.10.0-dev
 ## Description
 
 rmw (ReMove to Waste) is a trashcan/recycle bin utility for the command line.

man/rmw.1

@@ -192,6 +192,17 @@ directory will not be used for the current run of rmw.
 With the media mounted, once you manually create the waste directory
 for that device (e.g. "/mnt/flash/.Trash-$UID") and run rmw, it will
 automatically create the two required child directories "files" and "info".
+.SS BTRFS AND BCACHEFS
+rmw supports moving files across subvolumes on btrfs and bcachefs
+filesystems. Because the kernel treats subvolumes as separate
+filesystems, a cross-subvolume move would normally fail; rmw detects
+this case and performs a copy-then-delete instead, preserving the
+expected trash semantics.
+
+To use this feature, define a WASTE directory on the destination
+subvolume in your configuration file. For example, if your waste
+directory is on a different subvolume than the files you want to
+remove, rmw will handle the move transparently.
 .SH EXAMPLES
 .SS RESTORING
 rmw -z ~/.local/share/Waste/files/foo

meson.build

@@ -1,7 +1,7 @@
 project(
   'rmw',
   'c',
-  version: '0.9.5',
+  version: '0.10.0-dev',
   meson_version: '>= 0.59.0',
   default_options: [
     'c_std=gnu99',

meson_options.txt

@@ -1,7 +1,7 @@
 option('build_tests', type : 'boolean', value : true,
        description : 'build tests')
 option(
-    'want_btrfs_clone',
+    'want_ficlone',
     type : 'boolean',
     value: 'true',
     description: 'Include support for cloning files between subvolumes using FICLONE (btrfs, bcachefs, xfs, etc.)')

src/config_rmw.c

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <unistd.h>
 
-#include "btrfs.h"
+#include "ficlone.h"
 #include "config_rmw.h"
 #include "utils.h"
 #include "main.h"
@@ -275,7 +275,7 @@ parse_line_waste(st_waste *waste_curr, struct Canfigger *node,
   else if (p_state == -1)
     exit(p_state);
 
-  waste_curr->is_btrfs = is_btrfs(waste_curr->parent);
+  waste_curr->is_ficlone_fs = is_ficlone_fs(waste_curr->parent);
 
   // get device number to use later for rename
   struct stat st, mp_st;

src/btrfs.c src/ficlone.csrc/btrfs.c renamed to src/ficlone.c

@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "globals.h"
 #endif
 
-#ifdef HAVE_LINUX_BTRFS
+#ifdef HAVE_FICLONE
 #include <fcntl.h>
 #include <linux/fs.h>
 #include <sys/ioctl.h>
@@ -32,13 +32,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <unistd.h>
 #endif
 
-#include "btrfs.h"
+#include "ficlone.h"
 #include "messages.h"
 
 bool
-is_btrfs(const char *path)
+is_ficlone_fs(const char *path)
 {
-#ifdef HAVE_LINUX_BTRFS
+#ifdef HAVE_FICLONE
   struct statfs buf;
 
   if (statfs(path, &buf) == -1)
@@ -57,9 +57,9 @@ is_btrfs(const char *path)
 
 
 int
-do_btrfs_clone(const char *source, const char *dest, int *save_errno)
+do_ficlone(const char *source, const char *dest, int *save_errno)
 {
-#ifdef HAVE_LINUX_BTRFS
+#ifdef HAVE_FICLONE
   int src_fd, dest_fd;
   struct stat src_stat;
 

src/btrfs.h src/ficlone.hsrc/btrfs.h renamed to src/ficlone.h

@@ -18,15 +18,15 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _INC_BTRFS_H
-#define _INC_BTRFS_H
+#ifndef _INC_FICLONE_H
+#define _INC_FICLONE_H
 
 #include <stdbool.h>
 
 #define BTRFS_SUPER_MAGIC 0x9123683E
 
-bool is_btrfs(const char *path);
+bool is_ficlone_fs(const char *path);
 
-int do_btrfs_clone(const char *source, const char *dest, int *save_errno);
+int do_ficlone(const char *source, const char *dest, int *save_errno);
 
 #endif

src/main.c

@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "purging.h"
 #include "strings_rmw.h"
 #include "messages.h"
-#include "btrfs.h"
+#include "ficlone.h"
 #include "trashinfo.h"
 
 
@@ -387,7 +387,7 @@ damage of 5000 hp. You feel satisfied.\n"));
     while (waste_curr != NULL)
     {
       if (waste_curr->dev_num == st_target.dev_num ||
-          (waste_curr->is_btrfs && is_btrfs(argv[file_arg])))
+          (waste_curr->is_ficlone_fs && is_ficlone_fs(argv[file_arg])))
       {
         char *tmp_str = join_paths(waste_curr->files, st_target.base_name);
         // *st_target.waste_dest_name = '\0';
@@ -421,7 +421,7 @@ damage of 5000 hp. You feel satisfied.\n"));
             if (!S_ISDIR(st_file_arg.st_mode))
             {
               /* attempt btrfs clone if not a directory */
-              r_result = do_btrfs_clone(src, dst, &save_errno);
+              r_result = do_ficlone(src, dst, &save_errno);
               errno = save_errno;
             }
             else
@@ -708,10 +708,10 @@ main(const int argc, char *const argv[])
     printf("PATH_MAX = %d\n", PATH_MAX);
 
   if (verbose > 0)
-#ifdef HAVE_LINUX_BTRFS
-    puts("btrfs_clone support: true");
+#ifdef HAVE_FICLONE
+    puts("ficlone support: true");
 #else
-    puts("btrfs_clone support: false");
+    puts("ficlone support: false");
 #endif
 
   const st_loc *st_location = get_locations(cli_user_options.alt_config_file);