Add GLib/GIO dependency; replace several internal utility functions

.cirrus.yml

@@ -16,7 +16,7 @@ common_meson_steps: &common_meson_steps
 common_freebsd_steps: &common_freebsd_steps
   pkginstall_script:
     - pkg update -f
-    - pkg install -y git meson ninja gettext pkgconf
+    - pkg install -y git meson ninja gettext pkgconf glib
 
 freebsd_task:
   <<: *filter_template
@@ -46,7 +46,7 @@ macos_task:
   env:
     CIRRUS_CLONE_SUBMODULES: true
   pkginstall_script:
-    - brew install meson ninja ncurses
+    - brew install meson ninja ncurses glib
   setup_script:
     - meson setup builddir
   <<: *common_meson_steps

.github/workflows/c-cpp.yml

@@ -87,6 +87,7 @@ jobs:
         sudo apt upgrade -y
         sudo apt-get install -y \
           gettext \
+          libglib2.0-dev \
           meson \
           ninja-build
 
@@ -123,7 +124,7 @@ jobs:
       with:
         usesh: true
         prepare: |
-          pkg_add gettext-tools git meson ninja
+          pkg_add gettext-tools git glib2 meson ninja
 
         run: |
           meson setup builddir -Db_sanitize=none -Dnls=false ${SETUP_OPTIONS:-} || cat builddir/meson-logs/meson-log.txt
@@ -156,6 +157,7 @@ jobs:
         brew update
         brew install \
           gettext \
+          glib \
           meson \
           ninja \
           ncurses \
@@ -212,6 +214,7 @@ jobs:
         sudo apt-get install -y \
           faketime \
           gettext \
+          libglib2.0-dev \
           meson \
           ninja-build \
           xvfb

.github/workflows/coverity.yml

@@ -14,7 +14,9 @@ jobs:
       with:
         submodules: false
     - name: Install Dependencies
-      run: sudo -H python3 -m pip install meson ninja
+      run: |
+        sudo -H python3 -m pip install meson ninja
+        sudo apt-get install -y libglib2.0-dev
     - run: meson setup builddir
     - uses: vapier/coverity-scan-action@v1
       with:

ChangeLog

@@ -13,6 +13,13 @@ rmw (in-progress):
     waste folder are on separate subvolumes (#526); use generic FICLONE ioctl
     (linux/fs.h) instead of BTRFS_IOC_CLONE, and fall back to 'mv' when
     rename() returns EXDEV on a same-device move
+  * Add GLib/GIO as a dependency; use GLib for directory moves across btrfs
+    and bcachefs subvolumes (requires glib2 >= 2.50); replace several
+    internal utility functions with GLib equivalents
+  * ficlone: Add bcachefs filesystem detection; directories containing
+    special files (FIFOs, sockets, devices) now fail gracefully instead
+    of hanging; fix missing errno propagation on early failures; preserve
+    timestamps and ownership after clone
 
 2026-04-07
 

README.md

@@ -58,6 +58,7 @@ the [releases section][releases-url].
 
 ### Dependencies
 
+* glib2
 * libncursesw (ncurses-devel on some systems, such as CentOS)
 * gettext (or use '-Dnls=false' when configuring with meson if you only need English language support)
 

docker/Dockerfile

@@ -11,6 +11,7 @@ RUN git clone --depth 1 https://github.com/theimpossibleastronaut/rmw \
 FROM alpine
 COPY --from=0 /tmp/rmw/ /
 RUN apk add \
+      glib \
       libmenuw \
       mandoc \
       musl-fts \

docker/Dockerfile-build-env_alpine

@@ -5,11 +5,11 @@ RUN apk update && apk upgrade && \
       gcc \
       gettext \
       git \
+      glib-dev \
       linux-headers \
       meson \
       musl-dev \
       musl-fts-dev \
-      musl-libintl \
       ncurses-dev
 
 CMD ["/bin/sh","-l"]

docker/Dockerfile-build-env_bookworm

@@ -4,6 +4,7 @@ RUN apt-get update \
   && apt-get install -y \
     gettext \
     git \
+    libglib2.0-dev \
     libncurses-dev \
     meson \
     ninja-build \

docker/Dockerfile-build-env_tumbleweed

@@ -6,6 +6,7 @@ RUN zypper --non-interactive refresh && \
     gettext \
     gcc \
     git \
+    glib2-devel \
     ncurses-devel \
     meson \
     ninja && \

meson.build

@@ -72,6 +72,9 @@ canfigger_dep = dependency(
   default_options: 'default_library=static',
 )
 
+glib_dep = dependency('glib-2.0', version: '>=2.50')
+gio_dep  = dependency('gio-2.0',  version: '>=2.50')
+
 subdir('src')
 
 main_bin = executable('rmw', 'src/main.c', dependencies: rmw_dep, install: true)

packaging/appimage/pre-appimage.sh

@@ -38,7 +38,7 @@ fi
 
 # Install necessary dependencies
 sudo apt update && sudo apt upgrade -y
-sudo apt install -y libncursesw5-dev
+sudo apt install -y libglib2.0-dev libncursesw5-dev
 
 # Set up build directory
 BUILD_DIR="$SOURCE_ROOT/appimage_build"

packaging/debian/control

@@ -3,6 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Andy Alt <arch_stanton5995@proton.me>
 Build-Depends:  debhelper (>= 12~),
+                libglib2.0-dev,
                 libncurses-dev,
                 meson (>= 0.59.0)
 Standards-Version: 4.6.2

po/POTFILES

@@ -2,6 +2,7 @@
 
 src/parse_cli_options.c
 src/main.c
+src/ficlone.c
 src/config_rmw.c
 src/messages.c
 src/restore.c

src/config_rmw.c

@@ -284,22 +284,20 @@ parse_line_waste(st_waste *waste_curr, struct Canfigger *node,
     waste_curr->dev_num = st.st_dev;
 
     // printf("actual: %ld |major: %d | minor: %d\n", st.st_dev, major(st.st_dev), minor(st.st_dev));
-    char tmp[PATH_MAX];
-    strcpy(tmp, waste_curr->parent);
-    char *media_root_ptr = rmw_dirname(tmp);
+    gchar *media_root_ptr = g_path_get_dirname(waste_curr->parent);
     if (!media_root_ptr)
     {
-      fputs("Error getting media root pointer.\n\
-  char *media_root_ptr = rmw_dirname(tmp)\n", stderr);
+      fputs("Error getting media root pointer.\n", stderr);
       exit(EXIT_FAILURE);
     }
 
     if (!(waste_curr->media_root = malloc(strlen(media_root_ptr) + 1)))
       fatal_malloc();
     strcpy(waste_curr->media_root, media_root_ptr);
-    sn_check(snprintf(tmp, sizeof tmp, "%s", waste_curr->media_root),
-             sizeof tmp);
-    if (!lstat(rmw_dirname(tmp), &mp_st))
+    g_free(media_root_ptr);
+
+    gchar *media_root_parent = g_path_get_dirname(waste_curr->media_root);
+    if (!lstat(media_root_parent, &mp_st))
     {
       if (mp_st.st_dev == waste_curr->dev_num)
       {
@@ -309,6 +307,7 @@ parse_line_waste(st_waste *waste_curr, struct Canfigger *node,
     }
     else
       msg_err_lstat(waste_curr->parent, __func__, __LINE__);
+    g_free(media_root_parent);
   }
   else
     msg_err_lstat(waste_curr->parent, __func__, __LINE__);