fix: strip trailing slash in resolve_path to fix wrong restore destination

g_path_get_dirname("foo/") returns "foo" rather than "." (unlike POSIX
dirname), causing rmw dir/ to restore into dir/dir. Strip the trailing
slash from the input before calling g_path_get_dirname.

Add regression tests for both trailing-slash-on-directory (restore path)
and trailing-slash-on-regular-file (must be rejected without moving).

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

Author: andy5995

src/utils.c

@@ -227,6 +227,12 @@ resolve_path(const char *file, const char *b)
   char tmp[req_len];
   strcpy(tmp, file);
 
+  /* g_path_get_dirname("foo/") returns "foo", not "." — strip trailing slash
+     so it behaves like POSIX dirname */
+  size_t tlen = strlen(tmp);
+  if (tlen > 1 && tmp[tlen - 1] == '/')
+    tmp[tlen - 1] = '\0';
+
   gchar *dir = g_path_get_dirname(tmp);
   char *orig_dirname = realpath(dir, NULL);
   g_free(dir);

test/test_restore.sh

@@ -146,4 +146,26 @@ if [ -n "$(command -v Xvfb)" ] && ! grep -q "DISABLE_CURSES" "$MESON_BUILD_ROOT/
   fi
 fi
 
+# Regression test: rmw file/ (trailing slash on regular file) must not move it
+echo "$SEPARATOR"
+echo "Trailing slash on regular file: must be rejected cleanly"
+cd "${RMW_FAKE_HOME}"
+touch trailing_slash_file.txt
+${RMW_TEST_CMD_STRING} trailing_slash_file.txt/ || true
+test -f "${RMW_FAKE_HOME}/trailing_slash_file.txt"
+
+# Regression test: rmw dir/ (trailing slash) then restore must not create dir/dir
+echo "$SEPARATOR"
+echo "Trailing slash: rmw dir/ then restore"
+cd "${RMW_FAKE_HOME}"
+mkdir -p trailing_slash_test
+touch trailing_slash_test/canary
+${RMW_TEST_CMD_STRING} trailing_slash_test/
+test ! -d trailing_slash_test
+test -d "${PRIMARY_WASTE_DIR}/files/trailing_slash_test"
+${RMW_TEST_CMD_STRING} -u
+test -d "${RMW_FAKE_HOME}/trailing_slash_test"
+test -f "${RMW_FAKE_HOME}/trailing_slash_test/canary"
+test ! -d "${RMW_FAKE_HOME}/trailing_slash_test/trailing_slash_test"
+
 exit 0