Add GLib/GIO dependency; replace several internal utility functions

andy5995 · claude · andy5995 · commit 3d0a4f50adac · 2026-04-28T13:25:51.000-05:00
- Add glib-2.0 and gio-2.0 as required dependencies (&gt;= 2.50)
- Use GLib equivalents for path handling, URL encoding, and directory
  creation; use FICLONE-based recursive directory move via GIO for
  moves across btrfs/bcachefs subvolumes
- Update CI configs, build-env Dockerfiles, Debian control, and
  AppImage script to include the new dependency

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.cirrus.yml b/.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
diff --git a/.github/workflows/c-cpp.yml b/.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
diff --git a/.github/workflows/coverity.yml b/.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:
diff --git a/ChangeLog b/ChangeLog
@@ -13,6 +13,9 @@ 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
 
 2026-04-07
 
diff --git a/README.md b/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)
 
diff --git a/docker/Dockerfile b/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 \
diff --git a/docker/Dockerfile-build-env_alpine b/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"]
diff --git a/docker/Dockerfile-build-env_bookworm b/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 \
diff --git a/docker/Dockerfile-build-env_tumbleweed b/docker/Dockerfile-build-env_tumbleweed
@@ -6,6 +6,7 @@ RUN zypper --non-interactive refresh && \
     gettext \
     gcc \
     git \
+    glib2-devel \
     ncurses-devel \
     meson \
     ninja && \
diff --git a/meson.build b/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)
diff --git a/packaging/appimage/pre-appimage.sh b/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"
diff --git a/packaging/debian/control b/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
diff --git a/src/config_rmw.c b/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__);
diff --git a/src/ficlone.c b/src/ficlone.c
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #ifdef HAVE_FICLONE
+#include <dirent.h>
 #include <fcntl.h>
 #include <linux/fs.h>
 #include <sys/ioctl.h>
@@ -122,3 +123,74 @@ do_ficlone(const char *source, const char *dest, int *save_errno)
   return 0;
 #endif
 }
+
+
+/* Recursively move a directory using FICLONE per file.
+   Returns 0 on success. On failure sets *save_errno and returns -1.
+   If FICLONE is not available, sets *save_errno = EXDEV (skip signal). */
+int
+do_ficlone_dir(const char *src, const char *dst, int *save_errno)
+{
+#ifdef HAVE_FICLONE
+  if (mkdir(dst, 0777) != 0)
+  {
+    *save_errno = errno;
+    return -1;
+  }
+
+  DIR *dir = opendir(src);
+  if (!dir)
+  {
+    *save_errno = errno;
+    rmdir(dst);
+    return -1;
+  }
+
+  int result = 0;
+  struct dirent *entry;
+  while ((entry = readdir(dir)) != NULL)
+  {
+    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
+      continue;
+
+    char src_child[PATH_MAX], dst_child[PATH_MAX];
+    snprintf(src_child, sizeof src_child, "%s/%s", src, entry->d_name);
+    snprintf(dst_child, sizeof dst_child, "%s/%s", dst, entry->d_name);
+
+    struct stat st;
+    if (lstat(src_child, &st) != 0)
+    {
+      *save_errno = errno;
+      result = -1;
+    }
+    else if (S_ISDIR(st.st_mode))
+    {
+      result = do_ficlone_dir(src_child, dst_child, save_errno);
+    }
+    else
+    {
+      result = do_ficlone(src_child, dst_child, save_errno);
+    }
+
+    if (result != 0)
+      break;
+  }
+
+  closedir(dir);
+
+  if (result != 0)
+    return -1;
+
+  if (rmdir(src) != 0)
+  {
+    *save_errno = errno;
+    return -1;
+  }
+  return 0;
+#else
+  (void) src;
+  (void) dst;
+  *save_errno = EXDEV;
+  return -1;
+#endif
+}
diff --git a/src/ficlone.h b/src/ficlone.h
@@ -29,4 +29,6 @@ bool is_ficlone_fs(const char *path);
 
 int do_ficlone(const char *source, const char *dest, int *save_errno);
 
+int do_ficlone_dir(const char *src, const char *dst, int *save_errno);
+
 #endif
diff --git a/src/main.c b/src/main.c
@@ -426,9 +426,10 @@ damage of 5000 hp. You feel satisfied.\n"));
             }
             else
             {
-              /* directory on different device: call /bin/mv safely */
-              r_result = safe_mv_via_exec(src, dst, &save_errno);
-              errno = save_errno;
+              /* directory on different device: try FICLONE-based recursive move;
+                 returns EXDEV (via errno) if filesystem doesn't support clone */
+              r_result = rmw_move(src, dst);
+              save_errno = errno;
             }
 
             if (r_result != 0)
@@ -451,9 +452,8 @@ damage of 5000 hp. You feel satisfied.\n"));
             if (r_result != 0 && errno == EXDEV)
             {
               /* rename failed with EXDEV even though st_dev matched (e.g.,
-                 bcachefs cross-subvolume). Fall back to copy+delete. */
-              r_result = safe_mv_via_exec(src, dst, &save_errno);
-              errno = save_errno;
+                 bcachefs cross-subvolume). Fall back to g_file_move. */
+              r_result = rmw_move(src, dst);
             }
           }
         }
diff --git a/src/meson.build b/src/meson.build
@@ -62,7 +62,7 @@ endif
 
 config_h = configure_file(output: 'config.h', configuration: conf)
 
-deps_librmw = [dep_intl, canfigger_dep, dep_menu, dep_curses]
+deps_librmw = [dep_intl, canfigger_dep, dep_menu, dep_curses, glib_dep, gio_dep]
 
 lib_rmw = static_library(
   'rmw',
diff --git a/src/restore.c b/src/restore.c
@@ -41,12 +41,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 static void
 get_waste_parent(char *waste_parent, const char *src)
 {
-  char src_copy[strlen(src) + 1];
-  strcpy(src_copy, src);
-  char *src_dirname = rmw_dirname(src_copy);
-
+  gchar *src_dirname = g_path_get_dirname(src);
   char *one_dir_level = "/..";
   char *waste_parent_rel_path = join_paths(src_dirname, one_dir_level);
+  g_free(src_dirname);
   char *tmp = realpath(waste_parent_rel_path, NULL);
   free(waste_parent_rel_path);
 
@@ -95,14 +93,13 @@ move_back(const char *src, const char *dest, bool want_dry_run)
 
     if (S_ISDIR(st_src.st_mode))
     {
-      /* directory on different device -> execv mv */
-      int mv_ret = safe_mv_via_exec(src, dest, &clone_errno);
-      if (mv_ret == 0)
+      /* directory on different device: g_file_move handles cross-device natively */
+      if (rmw_move(src, dest) == 0)
       {
         errno = 0;
         return 0;
       }
-      errno = clone_errno ? clone_errno : save_errno;
+      errno = save_errno;
       return -1;
     }
     else
@@ -185,8 +182,9 @@ restore(const char *src, st_time *st_time_var,
     strcpy(dest, _dest);
     if (*_dest != '/')
     {
-      char *media_root = rmw_dirname(waste_parent);
+      gchar *media_root = g_path_get_dirname(waste_parent);
       char *_tmp_str = join_paths(media_root, _dest);
+      g_free(media_root);
       sn_check(snprintf(dest, sizeof dest, "%s", _tmp_str), sizeof dest);
       free(_tmp_str);
     }
diff --git a/src/utils.c b/src/utils.c
diff --git a/src/utils.h b/src/utils.h

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,9 @@ canfigger_dep = dependency(`
`72`	`72`	`default_options: 'default_library=static',`
`73`	`73`	`)`
`74`	`74`
	`75`	`+glib_dep = dependency('glib-2.0', version: '>=2.50')`
	`76`	`+gio_dep = dependency('gio-2.0', version: '>=2.50')`
	`77`	`+`
`75`	`78`	`subdir('src')`
`76`	`79`
`77`	`80`	`main_bin = executable('rmw', 'src/main.c', dependencies: rmw_dep, install: true)`