Add same_file() and same_def_ino() convenience functions, plus minor cleanups.

1 files changed, 2 insertions, 4 deletions

diff --git a/toys/posix/cp.c b/toys/posix/cp.c
index 7b9889a2..a7359821 100644
--- a/toys/posix/cp.c
+++ b/toys/posix/cp.c
@@ -148,10 +148,8 @@ static int cp_node(struct dirtree *try)
 
     // Detect recursive copies via repeated top node (cp -R .. .) or
     // identical source/target (fun with hardlinks).
-    if ((TT.top.st_dev == try->st.st_dev && TT.top.st_ino == try->st.st_ino
-         && (catch = TT.destname))
-        || (!fstatat(cfd, catch, &cst, 0) && cst.st_dev == try->st.st_dev
-         && cst.st_ino == try->st.st_ino))
+    if ((same_file(&TT.top, &try->st) && (catch = TT.destname))
+        || (!fstatat(cfd, catch, &cst, 0) && same_file(&cst, &try->st)))
     {
       error_msg("'%s' is '%s'", catch, err = dirtree_path(try, 0));
       free(err);