# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1712438939 -7200
# Node ID 85f618e23ccb2b86a1d2a90c576728add4bbc4a3
# Parent  ad0e663b28e08421b4a9719b2552c131c5494106# Parent  455188e322a0c3000faa8570c57d6db13e952d6a
Merged changes from the default branch.

diff -r ad0e663b28e0 -r 85f618e23ccb libsystypes/include/systypes/stat.h
--- a/libsystypes/include/systypes/stat.h	Sat Apr 06 21:57:01 2024 +0200
+++ b/libsystypes/include/systypes/stat.h	Sat Apr 06 23:28:59 2024 +0200
@@ -51,22 +51,24 @@
 /* Macros to be used in different C library environments. */
 
 #define COPY_STAT(s1, s2) \
-  s1->st_dev = s2->st_dev; \
-  s1->st_ino = s2->st_ino; \
-  s1->st_mode = s2->st_mode; \
-  s1->st_nlink = s2->st_nlink; \
-  s1->st_uid = s2->st_uid; \
-  s1->st_gid = s2->st_gid; \
-  s1->st_rdev = s2->st_rdev; \
-  s1->st_size = s2->st_size; \
-  s1->st_atim.tv_sec = s2->st_atim.tv_sec; \
-  s1->st_atim.tv_nsec = s2->st_atim.tv_nsec; \
-  s1->st_mtim.tv_sec = s2->st_mtim.tv_sec; \
-  s1->st_mtim.tv_nsec = s2->st_mtim.tv_nsec; \
-  s1->st_ctim.tv_sec = s2->st_ctim.tv_sec; \
-  s1->st_ctim.tv_nsec = s2->st_ctim.tv_nsec; \
-  s1->st_blksize = s2->st_blksize; \
-  s1->st_blocks = s2->st_blocks;
+( \
+  s1->st_dev = s2->st_dev, \
+  s1->st_ino = s2->st_ino, \
+  s1->st_mode = s2->st_mode, \
+  s1->st_nlink = s2->st_nlink, \
+  s1->st_uid = s2->st_uid, \
+  s1->st_gid = s2->st_gid, \
+  s1->st_rdev = s2->st_rdev, \
+  s1->st_size = s2->st_size, \
+  s1->st_atim.tv_sec = s2->st_atim.tv_sec, \
+  s1->st_atim.tv_nsec = s2->st_atim.tv_nsec, \
+  s1->st_mtim.tv_sec = s2->st_mtim.tv_sec, \
+  s1->st_mtim.tv_nsec = s2->st_mtim.tv_nsec, \
+  s1->st_ctim.tv_sec = s2->st_ctim.tv_sec, \
+  s1->st_ctim.tv_nsec = s2->st_ctim.tv_nsec, \
+  s1->st_blksize = s2->st_blksize, \
+  s1->st_blocks = s2->st_blocks \
+);
 
 /* Functions to be implemented in different C library environments. */
 
diff -r ad0e663b28e0 -r 85f618e23ccb libsystypes/lib/src/stat.c
--- a/libsystypes/lib/src/stat.c	Sat Apr 06 21:57:01 2024 +0200
+++ b/libsystypes/lib/src/stat.c	Sat Apr 06 23:28:59 2024 +0200
@@ -34,7 +34,7 @@
 
 void systypes_copy_to_sys_stat(struct stat *st, sys_stat_t *sst)
 {
-  if (systypes_copy_from_sys_stat_override != NULL)
+  if (systypes_copy_to_sys_stat_override != NULL)
     systypes_copy_to_sys_stat_override(st, sst);
   else
     COPY_STAT(sst, st)