[patch] fix _xstat

glibc_xstat.patch (text/plain), 1.26 KB, created by Pavol Cvengros on 2021-04-07 09:07:13 UTC

diff -urN umockdev-0.12.1/src/libumockdev-preload.c umockdev-0.12.1-fixed/src/libumockdev-preload.c
--- umockdev-0.12.1/src/libumockdev-preload.c	2018-11-18 21:19:33.394421043 +0100
+++ umockdev-0.12.1-fixed/src/libumockdev-preload.c	2021-04-07 10:46:49.724585961 +0200
@@ -1181,9 +1181,11 @@
 
 /* wrapper template for __xstat family; note that we abuse the sticky bit in
  * the emulated /dev to indicate a block device (the sticky bit has no
- * real functionality for device nodes) */
+ * real functionality for device nodes)
+ * This family got deprecated/dropped in glibc 2.32.9000, but we still need
+ * to keep it for a while for programs that were built against previous versions */
 #define WRAP_VERSTAT(prefix, suffix) \
-int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st) \
+int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st); \
 { \
     const char *p;								\
     libc_func(prefix ## stat ## suffix, int, int, const char*, struct stat ## suffix *); \
@@ -1317,7 +1319,7 @@
 WRAP_4ARGS(ssize_t, -1, getxattr, const char*, void*, size_t);
 WRAP_4ARGS(ssize_t, -1, lgetxattr, const char*, void*, size_t);
 
-#ifdef __GLIBC__
+#ifdef HAVE_XSTAT
 WRAP_VERSTAT(__x,);
 WRAP_VERSTAT(__x, 64);
 WRAP_VERSTAT(__lx,);