Move __*xstat* and __xmknod functions to new subport 'old__x'
PATCH 1/1 Move __*xstat* and __xmknod functions to new subport 'old__x'
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64
Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architecture
This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86, x86_64 and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.
---
ports/linux/guts/fopen64.c | 4 +-
ports/linux/guts/freopen64.c | 4 +-
ports/linux/guts/fstat.c | 8 ++-
ports/linux/guts/fstat64.c | 14 +++-
ports/linux/guts/fstatat.c | 9 ++-
ports/linux/guts/fstatat64.c | 42 +++++++++++-
ports/linux/guts/lstat.c | 2 +-
ports/linux/guts/lstat64.c | 2 +-
ports/linux/guts/mknod.c | 2 +-
ports/linux/guts/mknodat.c | 71 +++++++++++++++++++-
ports/linux/guts/mkostemp64.c | 2 +-
ports/linux/guts/openat.c | 18 ++---
ports/linux/guts/stat.c | 2 +-
ports/linux/guts/stat64.c | 2 +-
ports/linux/old__x/README | 28 ++++++++
ports/linux/{ => old__x}/guts/__fxstat.c | 0
ports/linux/{ => old__x}/guts/__fxstat64.c | 0
ports/linux/{ => old__x}/guts/__fxstatat.c | 0
ports/linux/{ => old__x}/guts/__fxstatat64.c | 0
ports/linux/{ => old__x}/guts/__lxstat.c | 0
ports/linux/{ => old__x}/guts/__lxstat64.c | 0
ports/linux/{ => old__x}/guts/__xmknod.c | 0
ports/linux/{ => old__x}/guts/__xmknodat.c | 0
ports/linux/{ => old__x}/guts/__xstat.c | 0
ports/linux/{ => old__x}/guts/__xstat64.c | 0
ports/linux/old__x/guts/fstat.c | 15 +++++
ports/linux/old__x/guts/fstat64.c | 15 +++++
ports/linux/old__x/guts/fstatat.c | 15 +++++
ports/linux/old__x/guts/fstatat64.c | 15 +++++
ports/linux/old__x/guts/lstat.c | 15 +++++
ports/linux/old__x/guts/lstat64.c | 15 +++++
ports/linux/old__x/guts/mknod.c | 15 +++++
ports/linux/old__x/guts/mknodat.c | 15 +++++
ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++
ports/linux/old__x/portdefs.h | 40 +++++++++++
ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++
ports/linux/old__x/wrapfuncs.in | 18 +++++
ports/linux/portdefs.h | 19 ------
ports/linux/pseudo_wrappers.c | 43 ------------
ports/linux/subports | 15 +++++
ports/linux/wrapfuncs.in | 26 +++----
pseudo_client.h | 38 +++++++++--
42 files changed, 520 insertions(+), 110 deletions(-)
create mode 100644 ports/linux/old__x/README
rename ports/linux/{ => old__x}/guts/__fxstat.c (100%)
rename ports/linux/{ => old__x}/guts/__fxstat64.c (100%)
rename ports/linux/{ => old__x}/guts/__fxstatat.c (100%)
rename ports/linux/{ => old__x}/guts/__fxstatat64.c (100%)
rename ports/linux/{ => old__x}/guts/__lxstat.c (100%)
rename ports/linux/{ => old__x}/guts/__lxstat64.c (100%)
rename ports/linux/{ => old__x}/guts/__xmknod.c (100%)
rename ports/linux/{ => old__x}/guts/__xmknodat.c (100%)
rename ports/linux/{ => old__x}/guts/__xstat.c (100%)
rename ports/linux/{ => old__x}/guts/__xstat64.c (100%)
create mode 100644 ports/linux/old__x/guts/fstat.c
create mode 100644 ports/linux/old__x/guts/fstat64.c
create mode 100644 ports/linux/old__x/guts/fstatat.c
create mode 100644 ports/linux/old__x/guts/fstatat64.c
create mode 100644 ports/linux/old__x/guts/lstat.c
create mode 100644 ports/linux/old__x/guts/lstat64.c
create mode 100644 ports/linux/old__x/guts/mknod.c
create mode 100644 ports/linux/old__x/guts/mknodat.c
create mode 100644 ports/linux/old__x/guts/mkostemp64.c
create mode 100644 ports/linux/old__x/portdefs.h
create mode 100644 ports/linux/old__x/pseudo_wrappers.c
create mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2 -2
@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;
@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);
ports/linux/guts/freopen64.c +2 -2
@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;
@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);
ports/linux/guts/fstat.c +7 -1
@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * }
ports/linux/guts/fstat64.c +13 -1
@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */
ports/linux/guts/fstatat.c +8 -1
@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. *
@@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * }
ports/linux/guts/fstatat64.c +41 -1
52 lines not on this page · raw message
ports/linux/guts/lstat.c +1 -1
@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * }
ports/linux/guts/lstat64.c +1 -1
@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * }
ports/linux/guts/mknod.c +1 -1
@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * }
ports/linux/guts/mknodat.c +70 -1
81 lines not on this page · raw message
ports/linux/guts/mkostemp64.c +1 -1
@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);
ports/linux/guts/openat.c +9 -9
@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)
@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;
@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",
ports/linux/guts/stat.c +1 -1
@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * }
ports/linux/guts/stat64.c +1 -1
@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * }
ports/linux/old__x/README new file +28 -0
@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.
ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0 -0
ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0 -0
ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0 -0
ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0 -0
ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0 -0
ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0 -0
ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0 -0
ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0 -0
ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0 -0
ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0 -0
ports/linux/old__x/guts/fstat.c new file +15 -0
@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/
ports/linux/old__x/guts/fstat64.c new file +15 -0
@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/
ports/linux/old__x/guts/fstatat.c new file +15 -0
@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/
ports/linux/old__x/guts/fstatat64.c new file +15 -0
@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/
ports/linux/old__x/guts/lstat.c new file +15 -0
@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/
ports/linux/old__x/guts/lstat64.c new file +15 -0
@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/
ports/linux/old__x/guts/mknod.c new file +15 -0
@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/
ports/linux/old__x/guts/mknodat.c new file +15 -0
@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/
ports/linux/old__x/guts/mkostemp64.c new file +53 -0
53 lines not on this page · raw message
ports/linux/old__x/portdefs.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif
ports/linux/old__x/pseudo_wrappers.c new file +48 -0
48 lines not on this page · raw message
ports/linux/old__x/wrapfuncs.in new file +18 -0
@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */
ports/linux/portdefs.h +0 -19
@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif
ports/linux/pseudo_wrappers.c +0 -43
50 lines not on this page · raw message
ports/linux/subports +15 -0
@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.o
ports/linux/wrapfuncs.in +8 -18
@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks
@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */
pseudo_client.h +32 -6
@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void );
Signature · 1 line
2.17.1
This code only switched the usage of the removed __ functions based on availability of _STAT_VER and _MKNOD_VER in the ports/linux/subport file. If you change the conditional to 'if true ; then' the system will enable the older style code unconditionally. I did verify that appears to be working for me.
If anyone has a good idea how to adjust the configure script to pass the data to the subport file, that would be ideal. Default behavior of checking the system, optional behaving of an --enable-compat-xfunctions -- or something like that.
As for the loongarch64, this code should work there as it's now written. I do not have a way to test this, so I'm hoping JiaLing Zhang will be able to build and test this.
All of my testing was accomplished using the 'make test' target. More extensive testing will be needed before we can trust this for OE, but it's probably closer to something that does what we need.
(There is still more duplication then I would like.. hopefully reviewers will be able to suggest something.)
--Mark
Quoted 90 lines · Mark Hatle via lists.openembedded.org
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-)create mode 100644 ports/linux/old__x/README rename ports/linux/{ =>
old__x}/guts/__fxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat64.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknod.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknodat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat64.c(100%) create mode 100644ports/linux/old__x/guts/fstat.ccreate mode 100644ports/linux/old__x/guts/fstat64.ccreate mode 100644ports/linux/old__x/guts/fstatat.ccreate mode 100644ports/linux/old__x/guts/fstatat64.ccreate mode 100644ports/linux/old__x/guts/lstat.ccreate mode 100644ports/linux/old__x/guts/lstat64.ccreate mode 100644ports/linux/old__x/guts/mknod.ccreate mode 100644ports/linux/old__x/guts/mknodat.ccreate mode 100644ports/linux/old__x/guts/mkostemp64.ccreate mode 100644ports/linux/old__x/portdefs.hcreate mode 100644ports/linux/old__x/pseudo_wrappers.ccreate mode 100644 ports/linux/old__x/wrapfuncs.in
Hi, Mark
This looks more reasonable, and I'd like to test the code.
Quoted 104 lines · Mark Hatle
This code only switched the usage of the removed __ functions based on availability of
_STAT_VERand_MKNOD_VERin the ports/linux/subport file. If you change the conditional to 'if true ; then' the system will enable the older style code unconditionally. I did verify that appears to be working for me.If anyone has a good idea how to adjust the configure script to pass the data to the subport file, that would be ideal. Default behavior of checking the system, optional behaving of an --enable-compat-xfunctions -- or something like that.
As for the loongarch64, this code should work there as it's now written. I do not have a way to test this, so I'm hoping JiaLing Zhang will be able to build and test this.
All of my testing was accomplished using the 'make test' target. More extensive testing will be needed before we can trust this for OE, but it's probably closer to something that does what we need.
(There is still more duplication then I would like.. hopefully reviewers will be able to suggest something.)
--Mark
Quoted 90 lines · Mark Hatle via lists.openembedded.org
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>---
ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ =>old__x}/guts/__fxstatat64.c| 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++--42 files changed, 520 insertions(+), 110 deletions(-)create mode 100644 ports/linux/old__x/README rename ports/linux/{ =>
old__x}/guts/__fxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat64.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknod.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknodat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat64.c(100%) create mode 100644ports/linux/old__x/guts/fstat.ccreate mode 100644ports/linux/old__x/guts/fstat64.ccreate mode 100644ports/linux/old__x/guts/fstatat.ccreate mode 100644ports/linux/old__x/guts/fstatat64.ccreate mode 100644ports/linux/old__x/guts/lstat.ccreate mode 100644ports/linux/old__x/guts/lstat64.ccreate mode 100644ports/linux/old__x/guts/mknod.ccreate mode 100644ports/linux/old__x/guts/mknodat.ccreate mode 100644ports/linux/old__x/guts/mkostemp64.ccreate mode 100644ports/linux/old__x/portdefs.hcreate mode 100644ports/linux/old__x/pseudo_wrappers.ccreate mode 100644 ports/linux/old__x/wrapfuncs.in
Hi mark
I have build and make test this code on loongarch64 machine . It can work and the make test is passed
``` [zhang@localhost pseudo]$ make test ./run_tests.sh -v test-acl: Passed. test-chroot: Passed. test-chroot-symlink: Passed. test-cp-setuid: Passed. test-dir-move: Passed. test-env_i: Passed. test-execl: Passed. test-fcntl: Passed. test-fstat: Passed. test-openat: Passed. test-pseudo_disable-fork-env_i: Passed. test-pseudo_disable-fork: Passed. test-pseudo_unload-fork-env_i: Passed. test-pseudo_unload-fork: Passed. test-reexec-chroot: Passed. test-relative-from-root: Passed. test-rename-fstat: Passed. couldn't allocate absolute path for 'null'. test-statx: Passed. test-tclsh-fork: Passed. test-umask: Passed. test-xattr: Passed. 21/21 test(s) passed. ```
Quoted 1 line · 张家岭
build and test this.
Hello Mark,
This causes failures on opensuse154 and debian11 workers. I've tried to get pseudo.log for the failures but they are not present on debian11 and are not interesting for opensuse154.
debian11 failures look like that:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/13/logs/stdio
opensuse:
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/2819/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/7597/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/7211/steps/13/logs/stdio
stream8 is similar:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2939/steps/13/logs/stdio
I also suspect this causes:
ERROR: cmdline-shebang-wrapper-test-1.0-r0 do_install: Wrapper permissions for /home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.real not preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0 do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.322689', 1, None, None)
ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.322689
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: task do_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'
Quoted 1,124 lines · Mark Hatle via lists.openembedded.org
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-) create mode 100644 ports/linux/old__x/README rename ports/linux/{ => old__x}/guts/__fxstat.c (100%) rename ports/linux/{ => old__x}/guts/__fxstat64.c (100%) rename ports/linux/{ => old__x}/guts/__fxstatat.c (100%) rename ports/linux/{ => old__x}/guts/__fxstatat64.c (100%) rename ports/linux/{ => old__x}/guts/__lxstat.c (100%) rename ports/linux/{ => old__x}/guts/__lxstat64.c (100%) rename ports/linux/{ => old__x}/guts/__xmknod.c (100%) rename ports/linux/{ => old__x}/guts/__xmknodat.c (100%) rename ports/linux/{ => old__x}/guts/__xstat.c (100%) rename ports/linux/{ => old__x}/guts/__xstat64.c (100%) create mode 100644 ports/linux/old__x/guts/fstat.c create mode 100644 ports/linux/old__x/guts/fstat64.c create mode 100644 ports/linux/old__x/guts/fstatat.c create mode 100644 ports/linux/old__x/guts/fstatat64.c create mode 100644 ports/linux/old__x/guts/lstat.c create mode 100644 ports/linux/old__x/guts/lstat64.c create mode 100644 ports/linux/old__x/guts/mknod.c create mode 100644 ports/linux/old__x/guts/mknodat.c create mode 100644 ports/linux/old__x/guts/mkostemp64.c create mode 100644 ports/linux/old__x/portdefs.h create mode 100644 ports/linux/old__x/pseudo_wrappers.c create mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2
-2@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/freopen64.c +2
-2@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/fstat.c +7
-1@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstat64.c +13
-1@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */ ports/linux/guts/fstatat.c +8
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstatat64.c +41
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,46 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); +pseudo_msg_t *msg; +int save_errno; + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } +#endif +if (flags &AT_SYMLINK_NOFOLLOW ) { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_lstat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + }else { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_stat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + } + save_errno = errno; + +/* query database +* note that symlink canonicalizing is now automatic, so we +* don't need to check for a symlink on this end +*/ + msg =pseudo_client_op (OP_STAT ,0 ,-1 , dirfd, path, buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } ports/linux/guts/lstat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/lstat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/mknod.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * } ports/linux/guts/mknodat.c +70
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2016 Wind River Systems; see * guts/COPYRIGHT for information. * @@ -8,7 +9,75 @@* int rc = -1; */ - rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +pseudo_msg_t *msg; +struct stat64 buf; + +/* mask out mode bits appropriately */ + mode = mode & ~pseudo_umask; +/* if you don't specify a type, assume regular file */ +if (!(mode &S_IFMT )) { + mode |=S_IFREG ; + } +pseudo_debug (PDBGF_FILE ,"mknodat creating '%s', mode 0%o\n" , + path ? path :"<no name>" , (int ) mode); + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } + rc =real_stat64 (path, &buf); +#else + rc =real_fstatat64 (dirfd, path, &buf,AT_SYMLINK_NOFOLLOW ); +#endif +if (rc !=-1 ) { +/* if we can stat the file, you can't mknod it */ + errno =EEXIST ; +return -1 ; + } +if (!dev) { + errno =EINVAL ; +return -1 ; + } +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_open (path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#else + rc =real_openat (dirfd, path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#endif +if (rc ==-1 ) { +return -1 ; + } +real_fchmod (rc,PSEUDO_FS_MODE (mode,0 )); +real_fstat64 (rc, &buf); +/* mknod does not really open the file. We don't have +* to use wrap_close because we've never exposed this file +* descriptor to the client code. +*/ +real_close (rc); + +/* mask in the mode type bits again */ + buf.st_mode = (PSEUDO_DB_MODE (buf.st_mode, mode) &07777 ) | + (mode & ~07777 ); + buf.st_rdev = dev; + msg =pseudo_client_op (OP_MKNOD ,0 ,-1 , dirfd, path, &buf); +if (msg && msg->result !=RESULT_SUCCEED ) { + errno =EPERM ; + rc =-1 ; + }else { +/* just pretend we worked */ + rc =0 ; + } +if (rc ==-1 ) { +int save_errno = errno; +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +real_unlink (path); +#else +real_unlinkat (dirfd, path,AT_SYMLINK_NOFOLLOW ); +#endif + errno = save_errno; + }/* return rc; * } ports/linux/guts/mkostemp64.c +1
-1@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);ports/linux/guts/openat.c +9
-9@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",ports/linux/guts/stat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/guts/stat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/old__x/README new file +28
-0@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0
-0ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0
-0ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0
-0ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0
-0ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0
-0ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0
-0ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0
-0ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0
-0ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0
-0ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0
-0ports/linux/old__x/guts/fstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknod.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknodat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mkostemp64.c new file +53
-0@@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* static int +* wrap_mkstemp64(char *template, int oflags) { +* int rc = -1; +*/ +struct stat64 buf; +int save_errno; +size_t len; +char *tmp_template; + +if (!template) { + errno =EFAULT ; +return 0 ; + } + + len =strlen (template); + tmp_template =PSEUDO_ROOT_PATH (AT_FDCWD , template,AT_SYMLINK_NOFOLLOW ); + +if (!tmp_template) { + errno =ENOENT ; +return -1 ; + } + +/* mkstemp64 wrapper uses this code and mkostemp64 not present in some glibc versions */ +if (oflags ==0 ) + rc =real_mkstemp64 (tmp_template); +else + rc =real_mkostemp64 (tmp_template, oflags); + +if (rc !=-1 ) { + save_errno = errno; + +if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 )); +pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf); + }else { +pseudo_debug (PDBGF_CONSISTENCY ,"mkstemp (fd %d) succeeded, but fstat failed (%s).\n" , + rc,strerror (errno)); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template,0 ); + } + errno = save_errno; + } +/* mkstemp only changes the XXXXXX at the end. */ +memcpy (template + len -6 , tmp_template +strlen (tmp_template) -6 ,6 ); +/* return rc; +* } +*/ ports/linux/old__x/portdefs.h new file +40
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif ports/linux/old__x/pseudo_wrappers.c new file +48
-0@@ -0,0 +1,48 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ +/* the unix port wants to know that real_stat() and +* friends exist. So they do. And because the Linux +* port really uses stat64 for those... +*/ +int +pseudo_stat (const char *path,struct stat *buf) { +return real___xstat (_STAT_VER, path, buf); +} + +int +pseudo_lstat (const char *path,struct stat *buf) { +return real___lxstat (_STAT_VER, path, buf); +} + +int +pseudo_fstat (int fd,struct stat *buf) { +return real___fxstat (_STAT_VER, fd, buf); +} + +int +pseudo_stat64 (const char *path,struct stat64 *buf) { +return real___xstat64 (_STAT_VER, path, buf); +} + +int +pseudo_lstat64 (const char *path,struct stat64 *buf) { +return real___lxstat64 (_STAT_VER, path, buf); +} + +int +pseudo_fstat64 (int fd,struct stat64 *buf) { +return real___fxstat64 (_STAT_VER, fd, buf); +} + +/* similar thing happens with mknod */ +int +pseudo_mknod (const char *path,mode_t mode,dev_t dev) { +return real___xmknod (_MKNOD_VER, path, mode, &dev); +} + +int +pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { +return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +}ports/linux/old__x/wrapfuncs.in new file +18
-0@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ports/linux/portdefs.h +0
-19@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif ports/linux/pseudo_wrappers.c +0
-43@@ -2,50 +2,7 @@* SPDX-License-Identifier: LGPL-2.1-only * */ -/* the unix port wants to know that real_stat() and -* friends exist. So they do. And because the Linux -* port really uses stat64 for those... -*/ -int -pseudo_stat (const char *path,struct stat *buf) { -return real___xstat (_STAT_VER, path, buf); -} - -int -pseudo_lstat (const char *path,struct stat *buf) { -return real___lxstat (_STAT_VER, path, buf); -} - -int -pseudo_fstat (int fd,struct stat *buf) { -return real___fxstat (_STAT_VER, fd, buf); -} - -int -pseudo_stat64 (const char *path,struct stat64 *buf) { -return real___xstat64 (_STAT_VER, path, buf); -} - -int -pseudo_lstat64 (const char *path,struct stat64 *buf) { -return real___lxstat64 (_STAT_VER, path, buf); -} - -int -pseudo_fstat64 (int fd,struct stat64 *buf) { -return real___fxstat64 (_STAT_VER, fd, buf); -} -/* similar thing happens with mknod */ -int -pseudo_mknod (const char *path,mode_t mode,dev_t dev) { -return real___xmknod (_MKNOD_VER, path, mode, &dev); -} - -int -pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { -return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); -}int pseudo_capset (cap_user_header_t hdrp,const cap_user_data_t datap) { (void )hdrp;ports/linux/subports +15
-0@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.oports/linux/wrapfuncs.in +8
-18@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */pseudo_client.h +32
-6@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void );Signature · 11 lines
2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181983): https://lists.openembedded.org/g/openembedded-core/message/181983 Mute This Topic: https://lists.openembedded.org/mt/99234918/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Did you or someone else manually add this patch for testing? I wasn't aware that it had gone in for any sort of testing eyt.
I'd like to see the integration used so I can understand how the test was performed.
--Mark
Quoted 1,161 lines · Alexandre Belloni
Hello Mark,
This causes failures on opensuse154 and debian11 workers. I've tried to get pseudo.log for the failures but they are not present on debian11 and are not interesting for opensuse154.
debian11 failures look like that:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/13/logs/stdioopensuse:
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/2819/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/7597/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/7211/steps/13/logs/stdiostream8 is similar:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2939/steps/13/logs/stdio
I also suspect this causes:
ERROR: cmdline-shebang-wrapper-test-1.0-r0
do_install: Wrapper permissions for/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.realnot preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.322689', 1, None, None)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.322689
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: taskdo_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'Quoted 1,124 lines · Mark Hatle via lists.openembedded.org
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-)create mode 100644 ports/linux/old__x/README rename ports/linux/{ =>
old__x}/guts/__fxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat64.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknod.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknodat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat64.c(100%) create mode 100644ports/linux/old__x/guts/fstat.ccreate mode 100644ports/linux/old__x/guts/fstat64.ccreate mode 100644ports/linux/old__x/guts/fstatat.ccreate mode 100644ports/linux/old__x/guts/fstatat64.ccreate mode 100644ports/linux/old__x/guts/lstat.ccreate mode 100644ports/linux/old__x/guts/lstat64.ccreate mode 100644ports/linux/old__x/guts/mknod.ccreate mode 100644ports/linux/old__x/guts/mknodat.ccreate mode 100644ports/linux/old__x/guts/mkostemp64.ccreate mode 100644ports/linux/old__x/portdefs.hcreate mode 100644ports/linux/old__x/pseudo_wrappers.ccreate mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2
-2@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/freopen64.c +2
-2@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/fstat.c +7
-1@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstat64.c +13
-1@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */ ports/linux/guts/fstatat.c +8
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstatat64.c +41
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,46 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); +pseudo_msg_t *msg; +int save_errno; + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } +#endif +if (flags &AT_SYMLINK_NOFOLLOW ) { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_lstat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + }else { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_stat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + } + save_errno = errno; + +/* query database +* note that symlink canonicalizing is now automatic, so we +* don't need to check for a symlink on this end +*/ + msg =pseudo_client_op (OP_STAT ,0 ,-1 , dirfd, path, buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } ports/linux/guts/lstat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/lstat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/mknod.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * } ports/linux/guts/mknodat.c +70
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2016 Wind River Systems; see * guts/COPYRIGHT for information. * @@ -8,7 +9,75 @@* int rc = -1; */ - rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +pseudo_msg_t *msg; +struct stat64 buf; + +/* mask out mode bits appropriately */ + mode = mode & ~pseudo_umask; +/* if you don't specify a type, assume regular file */ +if (!(mode &S_IFMT )) { + mode |=S_IFREG ; + } +pseudo_debug (PDBGF_FILE ,"mknodat creating '%s', mode 0%o\n" , + path ? path :"<no name>" , (int ) mode); + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } + rc =real_stat64 (path, &buf); +#else + rc =real_fstatat64 (dirfd, path, &buf,AT_SYMLINK_NOFOLLOW ); +#endif +if (rc !=-1 ) { +/* if we can stat the file, you can't mknod it */ + errno =EEXIST ; +return -1 ; + } +if (!dev) { + errno =EINVAL ; +return -1 ; + } +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_open (path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#else + rc =real_openat (dirfd, path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#endif +if (rc ==-1 ) { +return -1 ; + } +real_fchmod (rc,PSEUDO_FS_MODE (mode,0 )); +real_fstat64 (rc, &buf); +/* mknod does not really open the file. We don't have +* to use wrap_close because we've never exposed this file +* descriptor to the client code. +*/ +real_close (rc); + +/* mask in the mode type bits again */ + buf.st_mode = (PSEUDO_DB_MODE (buf.st_mode, mode) &07777 ) | + (mode & ~07777 ); + buf.st_rdev = dev; + msg =pseudo_client_op (OP_MKNOD ,0 ,-1 , dirfd, path, &buf); +if (msg && msg->result !=RESULT_SUCCEED ) { + errno =EPERM ; + rc =-1 ; + }else { +/* just pretend we worked */ + rc =0 ; + } +if (rc ==-1 ) { +int save_errno = errno; +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +real_unlink (path); +#else +real_unlinkat (dirfd, path,AT_SYMLINK_NOFOLLOW ); +#endif + errno = save_errno; + }/* return rc; * } ports/linux/guts/mkostemp64.c +1
-1@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);ports/linux/guts/openat.c +9
-9@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",ports/linux/guts/stat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/guts/stat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/old__x/README new file +28
-0@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0
-0ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0
-0ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0
-0ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0
-0ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0
-0ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0
-0ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0
-0ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0
-0ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0
-0ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0
-0ports/linux/old__x/guts/fstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknod.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknodat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mkostemp64.c new file +53
-0@@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* static int +* wrap_mkstemp64(char *template, int oflags) { +* int rc = -1; +*/ +struct stat64 buf; +int save_errno; +size_t len; +char *tmp_template; + +if (!template) { + errno =EFAULT ; +return 0 ; + } + + len =strlen (template); + tmp_template =PSEUDO_ROOT_PATH (AT_FDCWD , template,AT_SYMLINK_NOFOLLOW ); + +if (!tmp_template) { + errno =ENOENT ; +return -1 ; + } + +/* mkstemp64 wrapper uses this code and mkostemp64 not present in some glibc versions */ +if (oflags ==0 ) + rc =real_mkstemp64 (tmp_template); +else + rc =real_mkostemp64 (tmp_template, oflags); + +if (rc !=-1 ) { + save_errno = errno; + +if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 )); +pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf); + }else { +pseudo_debug (PDBGF_CONSISTENCY ,"mkstemp (fd %d) succeeded, but fstat failed (%s).\n" , + rc,strerror (errno)); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template,0 ); + } + errno = save_errno; + } +/* mkstemp only changes the XXXXXX at the end. */ +memcpy (template + len -6 , tmp_template +strlen (tmp_template) -6 ,6 ); +/* return rc; +* } +*/ ports/linux/old__x/portdefs.h new file +40
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif ports/linux/old__x/pseudo_wrappers.c new file +48
-0@@ -0,0 +1,48 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ +/* the unix port wants to know that real_stat() and +* friends exist. So they do. And because the Linux +* port really uses stat64 for those... +*/ +int +pseudo_stat (const char *path,struct stat *buf) { +return real___xstat (_STAT_VER, path, buf); +} + +int +pseudo_lstat (const char *path,struct stat *buf) { +return real___lxstat (_STAT_VER, path, buf); +} + +int +pseudo_fstat (int fd,struct stat *buf) { +return real___fxstat (_STAT_VER, fd, buf); +} + +int +pseudo_stat64 (const char *path,struct stat64 *buf) { +return real___xstat64 (_STAT_VER, path, buf); +} + +int +pseudo_lstat64 (const char *path,struct stat64 *buf) { +return real___lxstat64 (_STAT_VER, path, buf); +} + +int +pseudo_fstat64 (int fd,struct stat64 *buf) { +return real___fxstat64 (_STAT_VER, fd, buf); +} + +/* similar thing happens with mknod */ +int +pseudo_mknod (const char *path,mode_t mode,dev_t dev) { +return real___xmknod (_MKNOD_VER, path, mode, &dev); +} + +int +pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { +return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +}ports/linux/old__x/wrapfuncs.in new file +18
-0@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ports/linux/portdefs.h +0
-19@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif ports/linux/pseudo_wrappers.c +0
-43@@ -2,50 +2,7 @@* SPDX-License-Identifier: LGPL-2.1-only * */ -/* the unix port wants to know that real_stat() and -* friends exist. So they do. And because the Linux -* port really uses stat64 for those... -*/ -int -pseudo_stat (const char *path,struct stat *buf) { -return real___xstat (_STAT_VER, path, buf); -} - -int -pseudo_lstat (const char *path,struct stat *buf) { -return real___lxstat (_STAT_VER, path, buf); -} - -int -pseudo_fstat (int fd,struct stat *buf) { -return real___fxstat (_STAT_VER, fd, buf); -} - -int -pseudo_stat64 (const char *path,struct stat64 *buf) { -return real___xstat64 (_STAT_VER, path, buf); -} - -int -pseudo_lstat64 (const char *path,struct stat64 *buf) { -return real___lxstat64 (_STAT_VER, path, buf); -} - -int -pseudo_fstat64 (int fd,struct stat64 *buf) { -return real___fxstat64 (_STAT_VER, fd, buf); -} -/* similar thing happens with mknod */ -int -pseudo_mknod (const char *path,mode_t mode,dev_t dev) { -return real___xmknod (_MKNOD_VER, path, mode, &dev); -} - -int -pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { -return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); -}int pseudo_capset (cap_user_header_t hdrp,const cap_user_data_t datap) { (void )hdrp;ports/linux/subports +15
-0@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.oports/linux/wrapfuncs.in +8
-18@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */pseudo_client.h +32
-6@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void );Signature · 11 lines
2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181983): https://lists.openembedded.org/g/openembedded-core/message/181983 Mute This Topic: https://lists.openembedded.org/mt/99234918/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Quoted 3 lines · Mark Hatle
Did you or someone else manually add this patch for testing? I wasn't aware that it had gone in for any sort of testing eyt.
I'd like to see the integration used so I can understand how the test was performed.
Sure, I added the patch, here:
https://git.yoctoproject.org/poky-contrib/commit/?h=abelloni/master-next&id=9b8298bf6dc6
Quoted 1,136 lines
--Mark
Quoted 1,132 lines · Alexandre Belloni
Hello Mark,
This causes failures on opensuse154 and debian11 workers. I've tried to get pseudo.log for the failures but they are not present on debian11 and are not interesting for opensuse154.
debian11 failures look like that:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/13/logs/stdioopensuse:
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/2819/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/7597/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/7211/steps/13/logs/stdiostream8 is similar:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2939/steps/13/logs/stdio
I also suspect this causes:
ERROR: cmdline-shebang-wrapper-test-1.0-r0
do_install: Wrapper permissions for/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.realnot preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.322689', 1, None, None)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.322689
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: taskdo_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'Quoted 1,095 lines · Mark Hatle via lists.openembedded.org
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-)create mode 100644 ports/linux/old__x/README rename ports/linux/{ =>
old__x}/guts/__fxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat64.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknod.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknodat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat64.c(100%) create mode 100644ports/linux/old__x/guts/fstat.ccreate mode 100644ports/linux/old__x/guts/fstat64.ccreate mode 100644ports/linux/old__x/guts/fstatat.ccreate mode 100644ports/linux/old__x/guts/fstatat64.ccreate mode 100644ports/linux/old__x/guts/lstat.ccreate mode 100644ports/linux/old__x/guts/lstat64.ccreate mode 100644ports/linux/old__x/guts/mknod.ccreate mode 100644ports/linux/old__x/guts/mknodat.ccreate mode 100644ports/linux/old__x/guts/mkostemp64.ccreate mode 100644ports/linux/old__x/portdefs.hcreate mode 100644ports/linux/old__x/pseudo_wrappers.ccreate mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2
-2@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/freopen64.c +2
-2@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/fstat.c +7
-1@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstat64.c +13
-1@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */ ports/linux/guts/fstatat.c +8
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstatat64.c +41
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,46 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); +pseudo_msg_t *msg; +int save_errno; + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } +#endif +if (flags &AT_SYMLINK_NOFOLLOW ) { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_lstat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + }else { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_stat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + } + save_errno = errno; + +/* query database +* note that symlink canonicalizing is now automatic, so we +* don't need to check for a symlink on this end +*/ + msg =pseudo_client_op (OP_STAT ,0 ,-1 , dirfd, path, buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } ports/linux/guts/lstat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/lstat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/mknod.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * } ports/linux/guts/mknodat.c +70
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2016 Wind River Systems; see * guts/COPYRIGHT for information. * @@ -8,7 +9,75 @@* int rc = -1; */ - rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +pseudo_msg_t *msg; +struct stat64 buf; + +/* mask out mode bits appropriately */ + mode = mode & ~pseudo_umask; +/* if you don't specify a type, assume regular file */ +if (!(mode &S_IFMT )) { + mode |=S_IFREG ; + } +pseudo_debug (PDBGF_FILE ,"mknodat creating '%s', mode 0%o\n" , + path ? path :"<no name>" , (int ) mode); + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } + rc =real_stat64 (path, &buf); +#else + rc =real_fstatat64 (dirfd, path, &buf,AT_SYMLINK_NOFOLLOW ); +#endif +if (rc !=-1 ) { +/* if we can stat the file, you can't mknod it */ + errno =EEXIST ; +return -1 ; + } +if (!dev) { + errno =EINVAL ; +return -1 ; + } +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_open (path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#else + rc =real_openat (dirfd, path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#endif +if (rc ==-1 ) { +return -1 ; + } +real_fchmod (rc,PSEUDO_FS_MODE (mode,0 )); +real_fstat64 (rc, &buf); +/* mknod does not really open the file. We don't have +* to use wrap_close because we've never exposed this file +* descriptor to the client code. +*/ +real_close (rc); + +/* mask in the mode type bits again */ + buf.st_mode = (PSEUDO_DB_MODE (buf.st_mode, mode) &07777 ) | + (mode & ~07777 ); + buf.st_rdev = dev; + msg =pseudo_client_op (OP_MKNOD ,0 ,-1 , dirfd, path, &buf); +if (msg && msg->result !=RESULT_SUCCEED ) { + errno =EPERM ; + rc =-1 ; + }else { +/* just pretend we worked */ + rc =0 ; + } +if (rc ==-1 ) { +int save_errno = errno; +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +real_unlink (path); +#else +real_unlinkat (dirfd, path,AT_SYMLINK_NOFOLLOW ); +#endif + errno = save_errno; + }/* return rc; * } ports/linux/guts/mkostemp64.c +1
-1@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);ports/linux/guts/openat.c +9
-9@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",ports/linux/guts/stat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/guts/stat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/old__x/README new file +28
-0@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0
-0ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0
-0ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0
-0ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0
-0ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0
-0ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0
-0ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0
-0ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0
-0ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0
-0ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0
-0ports/linux/old__x/guts/fstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknod.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknodat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mkostemp64.c new file +53
-0@@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* static int +* wrap_mkstemp64(char *template, int oflags) { +* int rc = -1; +*/ +struct stat64 buf; +int save_errno; +size_t len; +char *tmp_template; + +if (!template) { + errno =EFAULT ; +return 0 ; + } + + len =strlen (template); + tmp_template =PSEUDO_ROOT_PATH (AT_FDCWD , template,AT_SYMLINK_NOFOLLOW ); + +if (!tmp_template) { + errno =ENOENT ; +return -1 ; + } + +/* mkstemp64 wrapper uses this code and mkostemp64 not present in some glibc versions */ +if (oflags ==0 ) + rc =real_mkstemp64 (tmp_template); +else + rc =real_mkostemp64 (tmp_template, oflags); + +if (rc !=-1 ) { + save_errno = errno; + +if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 )); +pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf); + }else { +pseudo_debug (PDBGF_CONSISTENCY ,"mkstemp (fd %d) succeeded, but fstat failed (%s).\n" , + rc,strerror (errno)); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template,0 ); + } + errno = save_errno; + } +/* mkstemp only changes the XXXXXX at the end. */ +memcpy (template + len -6 , tmp_template +strlen (tmp_template) -6 ,6 ); +/* return rc; +* } +*/ ports/linux/old__x/portdefs.h new file +40
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif ports/linux/old__x/pseudo_wrappers.c new file +48
-0@@ -0,0 +1,48 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ +/* the unix port wants to know that real_stat() and +* friends exist. So they do. And because the Linux +* port really uses stat64 for those... +*/ +int +pseudo_stat (const char *path,struct stat *buf) { +return real___xstat (_STAT_VER, path, buf); +} + +int +pseudo_lstat (const char *path,struct stat *buf) { +return real___lxstat (_STAT_VER, path, buf); +} + +int +pseudo_fstat (int fd,struct stat *buf) { +return real___fxstat (_STAT_VER, fd, buf); +} + +int +pseudo_stat64 (const char *path,struct stat64 *buf) { +return real___xstat64 (_STAT_VER, path, buf); +} + +int +pseudo_lstat64 (const char *path,struct stat64 *buf) { +return real___lxstat64 (_STAT_VER, path, buf); +} + +int +pseudo_fstat64 (int fd,struct stat64 *buf) { +return real___fxstat64 (_STAT_VER, fd, buf); +} + +/* similar thing happens with mknod */ +int +pseudo_mknod (const char *path,mode_t mode,dev_t dev) { +return real___xmknod (_MKNOD_VER, path, mode, &dev); +} + +int +pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { +return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +}ports/linux/old__x/wrapfuncs.in new file +18
-0@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ports/linux/portdefs.h +0
-19@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif ports/linux/pseudo_wrappers.c +0
-43@@ -2,50 +2,7 @@* SPDX-License-Identifier: LGPL-2.1-only * */ -/* the unix port wants to know that real_stat() and -* friends exist. So they do. And because the Linux -* port really uses stat64 for those... -*/ -int -pseudo_stat (const char *path,struct stat *buf) { -return real___xstat (_STAT_VER, path, buf); -} - -int -pseudo_lstat (const char *path,struct stat *buf) { -return real___lxstat (_STAT_VER, path, buf); -} - -int -pseudo_fstat (int fd,struct stat *buf) { -return real___fxstat (_STAT_VER, fd, buf); -} - -int -pseudo_stat64 (const char *path,struct stat64 *buf) { -return real___xstat64 (_STAT_VER, path, buf); -} - -int -pseudo_lstat64 (const char *path,struct stat64 *buf) { -return real___lxstat64 (_STAT_VER, path, buf); -} - -int -pseudo_fstat64 (int fd,struct stat64 *buf) { -return real___fxstat64 (_STAT_VER, fd, buf); -} -/* similar thing happens with mknod */ -int -pseudo_mknod (const char *path,mode_t mode,dev_t dev) { -return real___xmknod (_MKNOD_VER, path, mode, &dev); -} - -int -pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { -return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); -}int pseudo_capset (cap_user_header_t hdrp,const cap_user_data_t datap) { (void )hdrp;ports/linux/subports +15
-0@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.oports/linux/wrapfuncs.in +8
-18@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */pseudo_client.h +32
-6@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void );Signature · 11 lines
2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181983): https://lists.openembedded.org/g/openembedded-core/message/181983 Mute This Topic: https://lists.openembedded.org/mt/99234918/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Ok, so adding this patch will move from the legacy behavior to the new behavior (not using the legacy stat interfaces). This will only work on machines where the software has been built for only the newer exposed interfaces.
I am surprised Debian 11 failed, as it should have been new enough the old interfaces don't exist. I don't know about debian11 or stream8.
Can you modify the patch you applied and re-run your tests? Try this change:
In the patch: meta/recipes-devtools/pseudo/files/new_glibc.patch, go down to the patch chunk for ports/linux/subports and then change:
++if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then
++ echo "linux/old__x"
++fi
to
++if true; then
++ echo "linux/old__x"
++fi
The change above SHOULD restore the old compatible interface behavior to pseudo.
This will verify that the other changes did not introduce this fault.
Assuming this works, the intergration patch that I'll work on will be different.
The code check-in will be similar to the original path proposed (with the
README updated). A local patch to the integration will exist to make the change listed above for x86, x86_64 and aarch64. This will restore legacy behavior on those architectures until we get to a point where the suspect interfaces are no longer being used.
I will also be adding a second commit that defines wrappers for the obsolete interfaces, so if they ARE used they will trigger an abort, so we can more quickly detect the machines. Ultimately we want to stop wrapping the obsolete interfaces once the distributions are no longer using them, but we need a way to detect this.
(I would like a switch to configure to enable the obsolete interfaces, but I've not figured out how to pass configure options into the subports function call. I'll continue to look into that, but it really shouldn't be necessary outside of the YP use-case where we want one pseudo to run across a variety of hosts.)
--Mark
Quoted 1,151 lines · Alexandre Belloni via lists.openembedded.org
Quoted 3 lines · Mark Hatle
Did you or someone else manually add this patch for testing? I wasn't aware that it had gone in for any sort of testing eyt.
I'd like to see the integration used so I can understand how the test was performed.
Sure, I added the patch, here:
https://git.yoctoproject.org/poky-contrib/commit/?h=abelloni/master-next&id=9b8298bf6dc6
Quoted 1,130 lines
--Mark
Quoted 1,126 lines · Alexandre Belloni
Hello Mark,
This causes failures on opensuse154 and debian11 workers. I've tried to get pseudo.log for the failures but they are not present on debian11 and are not interesting for opensuse154.
debian11 failures look like that:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/13/logs/stdioopensuse:
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/2819/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/7597/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/7211/steps/13/logs/stdiostream8 is similar:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2939/steps/13/logs/stdio
I also suspect this causes:
ERROR: cmdline-shebang-wrapper-test-1.0-r0
do_install: Wrapper permissions for/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.realnot preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.322689', 1, None, None)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.322689
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: taskdo_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'Quoted 1,089 lines · Mark Hatle via lists.openembedded.org
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-)create mode 100644 ports/linux/old__x/README rename ports/linux/{ =>
old__x}/guts/__fxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat64.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknod.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknodat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat64.c(100%) create mode 100644ports/linux/old__x/guts/fstat.ccreate mode 100644ports/linux/old__x/guts/fstat64.ccreate mode 100644ports/linux/old__x/guts/fstatat.ccreate mode 100644ports/linux/old__x/guts/fstatat64.ccreate mode 100644ports/linux/old__x/guts/lstat.ccreate mode 100644ports/linux/old__x/guts/lstat64.ccreate mode 100644ports/linux/old__x/guts/mknod.ccreate mode 100644ports/linux/old__x/guts/mknodat.ccreate mode 100644ports/linux/old__x/guts/mkostemp64.ccreate mode 100644ports/linux/old__x/portdefs.hcreate mode 100644ports/linux/old__x/pseudo_wrappers.ccreate mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2
-2@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/freopen64.c +2
-2@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/fstat.c +7
-1@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstat64.c +13
-1@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */ ports/linux/guts/fstatat.c +8
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstatat64.c +41
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,46 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); +pseudo_msg_t *msg; +int save_errno; + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } +#endif +if (flags &AT_SYMLINK_NOFOLLOW ) { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_lstat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + }else { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_stat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + } + save_errno = errno; + +/* query database +* note that symlink canonicalizing is now automatic, so we +* don't need to check for a symlink on this end +*/ + msg =pseudo_client_op (OP_STAT ,0 ,-1 , dirfd, path, buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } ports/linux/guts/lstat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/lstat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/mknod.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * } ports/linux/guts/mknodat.c +70
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2016 Wind River Systems; see * guts/COPYRIGHT for information. * @@ -8,7 +9,75 @@* int rc = -1; */ - rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +pseudo_msg_t *msg; +struct stat64 buf; + +/* mask out mode bits appropriately */ + mode = mode & ~pseudo_umask; +/* if you don't specify a type, assume regular file */ +if (!(mode &S_IFMT )) { + mode |=S_IFREG ; + } +pseudo_debug (PDBGF_FILE ,"mknodat creating '%s', mode 0%o\n" , + path ? path :"<no name>" , (int ) mode); + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } + rc =real_stat64 (path, &buf); +#else + rc =real_fstatat64 (dirfd, path, &buf,AT_SYMLINK_NOFOLLOW ); +#endif +if (rc !=-1 ) { +/* if we can stat the file, you can't mknod it */ + errno =EEXIST ; +return -1 ; + } +if (!dev) { + errno =EINVAL ; +return -1 ; + } +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_open (path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#else + rc =real_openat (dirfd, path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#endif +if (rc ==-1 ) { +return -1 ; + } +real_fchmod (rc,PSEUDO_FS_MODE (mode,0 )); +real_fstat64 (rc, &buf); +/* mknod does not really open the file. We don't have +* to use wrap_close because we've never exposed this file +* descriptor to the client code. +*/ +real_close (rc); + +/* mask in the mode type bits again */ + buf.st_mode = (PSEUDO_DB_MODE (buf.st_mode, mode) &07777 ) | + (mode & ~07777 ); + buf.st_rdev = dev; + msg =pseudo_client_op (OP_MKNOD ,0 ,-1 , dirfd, path, &buf); +if (msg && msg->result !=RESULT_SUCCEED ) { + errno =EPERM ; + rc =-1 ; + }else { +/* just pretend we worked */ + rc =0 ; + } +if (rc ==-1 ) { +int save_errno = errno; +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +real_unlink (path); +#else +real_unlinkat (dirfd, path,AT_SYMLINK_NOFOLLOW ); +#endif + errno = save_errno; + }/* return rc; * } ports/linux/guts/mkostemp64.c +1
-1@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);ports/linux/guts/openat.c +9
-9@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",ports/linux/guts/stat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/guts/stat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/old__x/README new file +28
-0@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0
-0ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0
-0ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0
-0ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0
-0ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0
-0ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0
-0ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0
-0ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0
-0ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0
-0ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0
-0ports/linux/old__x/guts/fstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknod.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknodat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mkostemp64.c new file +53
-0@@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* static int +* wrap_mkstemp64(char *template, int oflags) { +* int rc = -1; +*/ +struct stat64 buf; +int save_errno; +size_t len; +char *tmp_template; + +if (!template) { + errno =EFAULT ; +return 0 ; + } + + len =strlen (template); + tmp_template =PSEUDO_ROOT_PATH (AT_FDCWD , template,AT_SYMLINK_NOFOLLOW ); + +if (!tmp_template) { + errno =ENOENT ; +return -1 ; + } + +/* mkstemp64 wrapper uses this code and mkostemp64 not present in some glibc versions */ +if (oflags ==0 ) + rc =real_mkstemp64 (tmp_template); +else + rc =real_mkostemp64 (tmp_template, oflags); + +if (rc !=-1 ) { + save_errno = errno; + +if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 )); +pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf); + }else { +pseudo_debug (PDBGF_CONSISTENCY ,"mkstemp (fd %d) succeeded, but fstat failed (%s).\n" , + rc,strerror (errno)); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template,0 ); + } + errno = save_errno; + } +/* mkstemp only changes the XXXXXX at the end. */ +memcpy (template + len -6 , tmp_template +strlen (tmp_template) -6 ,6 ); +/* return rc; +* } +*/ ports/linux/old__x/portdefs.h new file +40
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif ports/linux/old__x/pseudo_wrappers.c new file +48
-0@@ -0,0 +1,48 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ +/* the unix port wants to know that real_stat() and +* friends exist. So they do. And because the Linux +* port really uses stat64 for those... +*/ +int +pseudo_stat (const char *path,struct stat *buf) { +return real___xstat (_STAT_VER, path, buf); +} + +int +pseudo_lstat (const char *path,struct stat *buf) { +return real___lxstat (_STAT_VER, path, buf); +} + +int +pseudo_fstat (int fd,struct stat *buf) { +return real___fxstat (_STAT_VER, fd, buf); +} + +int +pseudo_stat64 (const char *path,struct stat64 *buf) { +return real___xstat64 (_STAT_VER, path, buf); +} + +int +pseudo_lstat64 (const char *path,struct stat64 *buf) { +return real___lxstat64 (_STAT_VER, path, buf); +} + +int +pseudo_fstat64 (int fd,struct stat64 *buf) { +return real___fxstat64 (_STAT_VER, fd, buf); +} + +/* similar thing happens with mknod */ +int +pseudo_mknod (const char *path,mode_t mode,dev_t dev) { +return real___xmknod (_MKNOD_VER, path, mode, &dev); +} + +int +pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { +return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +}ports/linux/old__x/wrapfuncs.in new file +18
-0@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ports/linux/portdefs.h +0
-19@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif ports/linux/pseudo_wrappers.c +0
-43@@ -2,50 +2,7 @@* SPDX-License-Identifier: LGPL-2.1-only * */ -/* the unix port wants to know that real_stat() and -* friends exist. So they do. And because the Linux -* port really uses stat64 for those... -*/ -int -pseudo_stat (const char *path,struct stat *buf) { -return real___xstat (_STAT_VER, path, buf); -} - -int -pseudo_lstat (const char *path,struct stat *buf) { -return real___lxstat (_STAT_VER, path, buf); -} - -int -pseudo_fstat (int fd,struct stat *buf) { -return real___fxstat (_STAT_VER, fd, buf); -} - -int -pseudo_stat64 (const char *path,struct stat64 *buf) { -return real___xstat64 (_STAT_VER, path, buf); -} - -int -pseudo_lstat64 (const char *path,struct stat64 *buf) { -return real___lxstat64 (_STAT_VER, path, buf); -} - -int -pseudo_fstat64 (int fd,struct stat64 *buf) { -return real___fxstat64 (_STAT_VER, fd, buf); -} -/* similar thing happens with mknod */ -int -pseudo_mknod (const char *path,mode_t mode,dev_t dev) { -return real___xmknod (_MKNOD_VER, path, mode, &dev); -} - -int -pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { -return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); -}int pseudo_capset (cap_user_header_t hdrp,const cap_user_data_t datap) { (void )hdrp;ports/linux/subports +15
-0@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.oports/linux/wrapfuncs.in +8
-18@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */pseudo_client.h +32
-6@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void );Signature · 1 line
2.17.1-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#182113): https://lists.openembedded.org/g/openembedded-core/message/182113
Mute This Topic: https://lists.openembedded.org/mt/99234918/3616948
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 24 lines · Alexandre Belloni via lists.openembedded.org
Hello Mark,
This causes failures on opensuse154 and debian11 workers. I've tried to get pseudo.log for the failures but they are not present on debian11 and are not interesting for opensuse154.
debian11 failures look like that:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/13/logs/stdioopensuse:
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/2819/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/7597/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/7211/steps/13/logs/stdiostream8 is similar:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2939/steps/13/logs/stdio
Quoted 8 lines
I also suspect this causes:
ERROR: cmdline-shebang-wrapper-test-1.0-r0
do_install: Wrapper permissions for/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.realnot preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.322689', 1, None, None)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.322689
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: taskdo_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'
For the record, it also broke systemd on the target with ubuntu or fedora workers:
https://autobuilder.yoctoproject.org/typhoon/#/builders/131/builds/2576/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/110/builds/6085/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/4661/steps/13/logs/stdio
Quoted 1,138 lines · Mark Hatle via lists.openembedded.org
Quoted 1,118 lines
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-) create mode 100644 ports/linux/old__x/README rename ports/linux/{ => old__x}/guts/__fxstat.c (100%) rename ports/linux/{ => old__x}/guts/__fxstat64.c (100%) rename ports/linux/{ => old__x}/guts/__fxstatat.c (100%) rename ports/linux/{ => old__x}/guts/__fxstatat64.c (100%) rename ports/linux/{ => old__x}/guts/__lxstat.c (100%) rename ports/linux/{ => old__x}/guts/__lxstat64.c (100%) rename ports/linux/{ => old__x}/guts/__xmknod.c (100%) rename ports/linux/{ => old__x}/guts/__xmknodat.c (100%) rename ports/linux/{ => old__x}/guts/__xstat.c (100%) rename ports/linux/{ => old__x}/guts/__xstat64.c (100%) create mode 100644 ports/linux/old__x/guts/fstat.c create mode 100644 ports/linux/old__x/guts/fstat64.c create mode 100644 ports/linux/old__x/guts/fstatat.c create mode 100644 ports/linux/old__x/guts/fstatat64.c create mode 100644 ports/linux/old__x/guts/lstat.c create mode 100644 ports/linux/old__x/guts/lstat64.c create mode 100644 ports/linux/old__x/guts/mknod.c create mode 100644 ports/linux/old__x/guts/mknodat.c create mode 100644 ports/linux/old__x/guts/mkostemp64.c create mode 100644 ports/linux/old__x/portdefs.h create mode 100644 ports/linux/old__x/pseudo_wrappers.c create mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2
-2@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/freopen64.c +2
-2@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/fstat.c +7
-1@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstat64.c +13
-1@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */ ports/linux/guts/fstatat.c +8
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstatat64.c +41
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,46 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); +pseudo_msg_t *msg; +int save_errno; + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } +#endif +if (flags &AT_SYMLINK_NOFOLLOW ) { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_lstat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + }else { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_stat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + } + save_errno = errno; + +/* query database +* note that symlink canonicalizing is now automatic, so we +* don't need to check for a symlink on this end +*/ + msg =pseudo_client_op (OP_STAT ,0 ,-1 , dirfd, path, buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } ports/linux/guts/lstat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/lstat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/mknod.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * } ports/linux/guts/mknodat.c +70
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2016 Wind River Systems; see * guts/COPYRIGHT for information. * @@ -8,7 +9,75 @@* int rc = -1; */ - rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +pseudo_msg_t *msg; +struct stat64 buf; + +/* mask out mode bits appropriately */ + mode = mode & ~pseudo_umask; +/* if you don't specify a type, assume regular file */ +if (!(mode &S_IFMT )) { + mode |=S_IFREG ; + } +pseudo_debug (PDBGF_FILE ,"mknodat creating '%s', mode 0%o\n" , + path ? path :"<no name>" , (int ) mode); + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } + rc =real_stat64 (path, &buf); +#else + rc =real_fstatat64 (dirfd, path, &buf,AT_SYMLINK_NOFOLLOW ); +#endif +if (rc !=-1 ) { +/* if we can stat the file, you can't mknod it */ + errno =EEXIST ; +return -1 ; + } +if (!dev) { + errno =EINVAL ; +return -1 ; + } +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_open (path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#else + rc =real_openat (dirfd, path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#endif +if (rc ==-1 ) { +return -1 ; + } +real_fchmod (rc,PSEUDO_FS_MODE (mode,0 )); +real_fstat64 (rc, &buf); +/* mknod does not really open the file. We don't have +* to use wrap_close because we've never exposed this file +* descriptor to the client code. +*/ +real_close (rc); + +/* mask in the mode type bits again */ + buf.st_mode = (PSEUDO_DB_MODE (buf.st_mode, mode) &07777 ) | + (mode & ~07777 ); + buf.st_rdev = dev; + msg =pseudo_client_op (OP_MKNOD ,0 ,-1 , dirfd, path, &buf); +if (msg && msg->result !=RESULT_SUCCEED ) { + errno =EPERM ; + rc =-1 ; + }else { +/* just pretend we worked */ + rc =0 ; + } +if (rc ==-1 ) { +int save_errno = errno; +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +real_unlink (path); +#else +real_unlinkat (dirfd, path,AT_SYMLINK_NOFOLLOW ); +#endif + errno = save_errno; + }/* return rc; * } ports/linux/guts/mkostemp64.c +1
-1@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);ports/linux/guts/openat.c +9
-9@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",ports/linux/guts/stat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/guts/stat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/old__x/README new file +28
-0@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0
-0ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0
-0ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0
-0ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0
-0ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0
-0ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0
-0ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0
-0ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0
-0ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0
-0ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0
-0ports/linux/old__x/guts/fstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknod.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknodat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mkostemp64.c new file +53
-0@@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* static int +* wrap_mkstemp64(char *template, int oflags) { +* int rc = -1; +*/ +struct stat64 buf; +int save_errno; +size_t len; +char *tmp_template; + +if (!template) { + errno =EFAULT ; +return 0 ; + } + + len =strlen (template); + tmp_template =PSEUDO_ROOT_PATH (AT_FDCWD , template,AT_SYMLINK_NOFOLLOW ); + +if (!tmp_template) { + errno =ENOENT ; +return -1 ; + } + +/* mkstemp64 wrapper uses this code and mkostemp64 not present in some glibc versions */ +if (oflags ==0 ) + rc =real_mkstemp64 (tmp_template); +else + rc =real_mkostemp64 (tmp_template, oflags); + +if (rc !=-1 ) { + save_errno = errno; + +if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 )); +pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf); + }else { +pseudo_debug (PDBGF_CONSISTENCY ,"mkstemp (fd %d) succeeded, but fstat failed (%s).\n" , + rc,strerror (errno)); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template,0 ); + } + errno = save_errno; + } +/* mkstemp only changes the XXXXXX at the end. */ +memcpy (template + len -6 , tmp_template +strlen (tmp_template) -6 ,6 ); +/* return rc; +* } +*/ ports/linux/old__x/portdefs.h new file +40
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif ports/linux/old__x/pseudo_wrappers.c new file +48
-0@@ -0,0 +1,48 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ +/* the unix port wants to know that real_stat() and +* friends exist. So they do. And because the Linux +* port really uses stat64 for those... +*/ +int +pseudo_stat (const char *path,struct stat *buf) { +return real___xstat (_STAT_VER, path, buf); +} + +int +pseudo_lstat (const char *path,struct stat *buf) { +return real___lxstat (_STAT_VER, path, buf); +} + +int +pseudo_fstat (int fd,struct stat *buf) { +return real___fxstat (_STAT_VER, fd, buf); +} + +int +pseudo_stat64 (const char *path,struct stat64 *buf) { +return real___xstat64 (_STAT_VER, path, buf); +} + +int +pseudo_lstat64 (const char *path,struct stat64 *buf) { +return real___lxstat64 (_STAT_VER, path, buf); +} + +int +pseudo_fstat64 (int fd,struct stat64 *buf) { +return real___fxstat64 (_STAT_VER, fd, buf); +} + +/* similar thing happens with mknod */ +int +pseudo_mknod (const char *path,mode_t mode,dev_t dev) { +return real___xmknod (_MKNOD_VER, path, mode, &dev); +} + +int +pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { +return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +}ports/linux/old__x/wrapfuncs.in new file +18
-0@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ports/linux/portdefs.h +0
-19@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif ports/linux/pseudo_wrappers.c +0
-43@@ -2,50 +2,7 @@* SPDX-License-Identifier: LGPL-2.1-only * */ -/* the unix port wants to know that real_stat() and -* friends exist. So they do. And because the Linux -* port really uses stat64 for those... -*/ -int -pseudo_stat (const char *path,struct stat *buf) { -return real___xstat (_STAT_VER, path, buf); -} - -int -pseudo_lstat (const char *path,struct stat *buf) { -return real___lxstat (_STAT_VER, path, buf); -} - -int -pseudo_fstat (int fd,struct stat *buf) { -return real___fxstat (_STAT_VER, fd, buf); -} - -int -pseudo_stat64 (const char *path,struct stat64 *buf) { -return real___xstat64 (_STAT_VER, path, buf); -} - -int -pseudo_lstat64 (const char *path,struct stat64 *buf) { -return real___lxstat64 (_STAT_VER, path, buf); -} - -int -pseudo_fstat64 (int fd,struct stat64 *buf) { -return real___fxstat64 (_STAT_VER, fd, buf); -} -/* similar thing happens with mknod */ -int -pseudo_mknod (const char *path,mode_t mode,dev_t dev) { -return real___xmknod (_MKNOD_VER, path, mode, &dev); -} - -int -pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { -return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); -}int pseudo_capset (cap_user_header_t hdrp,const cap_user_data_t datap) { (void )hdrp;ports/linux/subports +15
-0@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.oports/linux/wrapfuncs.in +8
-18@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */pseudo_client.h +32
-6@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void );Signature · 1 line
2.17.1Signature · 13 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182097): https://lists.openembedded.org/g/openembedded-core/message/182097 Mute This Topic: https://lists.openembedded.org/mt/99234918/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
I see another issue with libcxx when using meta-clang
The error is here
Quoted 1,190 lines · Alexandre Belloni via lists.openembedded.org
Quoted 24 lines · Alexandre Belloni via lists.openembedded.org
Hello Mark,
This causes failures on opensuse154 and debian11 workers. I've tried to get pseudo.log for the failures but they are not present on debian11 and are not interesting for opensuse154.
debian11 failures look like that:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/13/logs/stdioopensuse:
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/2819/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/7597/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/7211/steps/13/logs/stdiostream8 is similar:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2939/steps/13/logs/stdio
Quoted 8 lines
I also suspect this causes:
ERROR: cmdline-shebang-wrapper-test-1.0-r0
do_install: Wrapper permissions for/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.realnot preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.322689', 1, None, None)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.322689
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: taskdo_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'For the record, it also broke systemd on the target with ubuntu or fedora workers:
https://autobuilder.yoctoproject.org/typhoon/#/builders/131/builds/2576/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/110/builds/6085/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/4661/steps/13/logs/stdioQuoted 1,123 lines · Mark Hatle via lists.openembedded.org
Quoted 1,112 lines
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-) create mode 100644 ports/linux/old__x/README rename ports/linux/{ => old__x}/guts/__fxstat.c (100%) rename ports/linux/{ => old__x}/guts/__fxstat64.c (100%) rename ports/linux/{ => old__x}/guts/__fxstatat.c (100%) rename ports/linux/{ => old__x}/guts/__fxstatat64.c (100%) rename ports/linux/{ => old__x}/guts/__lxstat.c (100%) rename ports/linux/{ => old__x}/guts/__lxstat64.c (100%) rename ports/linux/{ => old__x}/guts/__xmknod.c (100%) rename ports/linux/{ => old__x}/guts/__xmknodat.c (100%) rename ports/linux/{ => old__x}/guts/__xstat.c (100%) rename ports/linux/{ => old__x}/guts/__xstat64.c (100%) create mode 100644 ports/linux/old__x/guts/fstat.c create mode 100644 ports/linux/old__x/guts/fstat64.c create mode 100644 ports/linux/old__x/guts/fstatat.c create mode 100644 ports/linux/old__x/guts/fstatat64.c create mode 100644 ports/linux/old__x/guts/lstat.c create mode 100644 ports/linux/old__x/guts/lstat64.c create mode 100644 ports/linux/old__x/guts/mknod.c create mode 100644 ports/linux/old__x/guts/mknodat.c create mode 100644 ports/linux/old__x/guts/mkostemp64.c create mode 100644 ports/linux/old__x/portdefs.h create mode 100644 ports/linux/old__x/pseudo_wrappers.c create mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2
-2@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/freopen64.c +2
-2@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/fstat.c +7
-1@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstat64.c +13
-1@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */ ports/linux/guts/fstatat.c +8
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstatat64.c +41
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,46 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); +pseudo_msg_t *msg; +int save_errno; + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } +#endif +if (flags &AT_SYMLINK_NOFOLLOW ) { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_lstat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + }else { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_stat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + } + save_errno = errno; + +/* query database +* note that symlink canonicalizing is now automatic, so we +* don't need to check for a symlink on this end +*/ + msg =pseudo_client_op (OP_STAT ,0 ,-1 , dirfd, path, buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } ports/linux/guts/lstat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/lstat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/mknod.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * } ports/linux/guts/mknodat.c +70
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2016 Wind River Systems; see * guts/COPYRIGHT for information. * @@ -8,7 +9,75 @@* int rc = -1; */ - rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +pseudo_msg_t *msg; +struct stat64 buf; + +/* mask out mode bits appropriately */ + mode = mode & ~pseudo_umask; +/* if you don't specify a type, assume regular file */ +if (!(mode &S_IFMT )) { + mode |=S_IFREG ; + } +pseudo_debug (PDBGF_FILE ,"mknodat creating '%s', mode 0%o\n" , + path ? path :"<no name>" , (int ) mode); + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } + rc =real_stat64 (path, &buf); +#else + rc =real_fstatat64 (dirfd, path, &buf,AT_SYMLINK_NOFOLLOW ); +#endif +if (rc !=-1 ) { +/* if we can stat the file, you can't mknod it */ + errno =EEXIST ; +return -1 ; + } +if (!dev) { + errno =EINVAL ; +return -1 ; + } +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_open (path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#else + rc =real_openat (dirfd, path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#endif +if (rc ==-1 ) { +return -1 ; + } +real_fchmod (rc,PSEUDO_FS_MODE (mode,0 )); +real_fstat64 (rc, &buf); +/* mknod does not really open the file. We don't have +* to use wrap_close because we've never exposed this file +* descriptor to the client code. +*/ +real_close (rc); + +/* mask in the mode type bits again */ + buf.st_mode = (PSEUDO_DB_MODE (buf.st_mode, mode) &07777 ) | + (mode & ~07777 ); + buf.st_rdev = dev; + msg =pseudo_client_op (OP_MKNOD ,0 ,-1 , dirfd, path, &buf); +if (msg && msg->result !=RESULT_SUCCEED ) { + errno =EPERM ; + rc =-1 ; + }else { +/* just pretend we worked */ + rc =0 ; + } +if (rc ==-1 ) { +int save_errno = errno; +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +real_unlink (path); +#else +real_unlinkat (dirfd, path,AT_SYMLINK_NOFOLLOW ); +#endif + errno = save_errno; + }/* return rc; * } ports/linux/guts/mkostemp64.c +1
-1@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);ports/linux/guts/openat.c +9
-9@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",ports/linux/guts/stat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/guts/stat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/old__x/README new file +28
-0@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0
-0ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0
-0ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0
-0ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0
-0ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0
-0ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0
-0ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0
-0ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0
-0ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0
-0ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0
-0ports/linux/old__x/guts/fstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknod.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknodat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mkostemp64.c new file +53
-0@@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* static int +* wrap_mkstemp64(char *template, int oflags) { +* int rc = -1; +*/ +struct stat64 buf; +int save_errno; +size_t len; +char *tmp_template; + +if (!template) { + errno =EFAULT ; +return 0 ; + } + + len =strlen (template); + tmp_template =PSEUDO_ROOT_PATH (AT_FDCWD , template,AT_SYMLINK_NOFOLLOW ); + +if (!tmp_template) { + errno =ENOENT ; +return -1 ; + } + +/* mkstemp64 wrapper uses this code and mkostemp64 not present in some glibc versions */ +if (oflags ==0 ) + rc =real_mkstemp64 (tmp_template); +else + rc =real_mkostemp64 (tmp_template, oflags); + +if (rc !=-1 ) { + save_errno = errno; + +if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 )); +pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf); + }else { +pseudo_debug (PDBGF_CONSISTENCY ,"mkstemp (fd %d) succeeded, but fstat failed (%s).\n" , + rc,strerror (errno)); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template,0 ); + } + errno = save_errno; + } +/* mkstemp only changes the XXXXXX at the end. */ +memcpy (template + len -6 , tmp_template +strlen (tmp_template) -6 ,6 ); +/* return rc; +* } +*/ ports/linux/old__x/portdefs.h new file +40
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif ports/linux/old__x/pseudo_wrappers.c new file +48
-0@@ -0,0 +1,48 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ +/* the unix port wants to know that real_stat() and +* friends exist. So they do. And because the Linux +* port really uses stat64 for those... +*/ +int +pseudo_stat (const char *path,struct stat *buf) { +return real___xstat (_STAT_VER, path, buf); +} + +int +pseudo_lstat (const char *path,struct stat *buf) { +return real___lxstat (_STAT_VER, path, buf); +} + +int +pseudo_fstat (int fd,struct stat *buf) { +return real___fxstat (_STAT_VER, fd, buf); +} + +int +pseudo_stat64 (const char *path,struct stat64 *buf) { +return real___xstat64 (_STAT_VER, path, buf); +} + +int +pseudo_lstat64 (const char *path,struct stat64 *buf) { +return real___lxstat64 (_STAT_VER, path, buf); +} + +int +pseudo_fstat64 (int fd,struct stat64 *buf) { +return real___fxstat64 (_STAT_VER, fd, buf); +} + +/* similar thing happens with mknod */ +int +pseudo_mknod (const char *path,mode_t mode,dev_t dev) { +return real___xmknod (_MKNOD_VER, path, mode, &dev); +} + +int +pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { +return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +}ports/linux/old__x/wrapfuncs.in new file +18
-0@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ports/linux/portdefs.h +0
-19@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif ports/linux/pseudo_wrappers.c +0
-43@@ -2,50 +2,7 @@* SPDX-License-Identifier: LGPL-2.1-only * */ -/* the unix port wants to know that real_stat() and -* friends exist. So they do. And because the Linux -* port really uses stat64 for those... -*/ -int -pseudo_stat (const char *path,struct stat *buf) { -return real___xstat (_STAT_VER, path, buf); -} - -int -pseudo_lstat (const char *path,struct stat *buf) { -return real___lxstat (_STAT_VER, path, buf); -} - -int -pseudo_fstat (int fd,struct stat *buf) { -return real___fxstat (_STAT_VER, fd, buf); -} - -int -pseudo_stat64 (const char *path,struct stat64 *buf) { -return real___xstat64 (_STAT_VER, path, buf); -} - -int -pseudo_lstat64 (const char *path,struct stat64 *buf) { -return real___lxstat64 (_STAT_VER, path, buf); -} - -int -pseudo_fstat64 (int fd,struct stat64 *buf) { -return real___fxstat64 (_STAT_VER, fd, buf); -} -/* similar thing happens with mknod */ -int -pseudo_mknod (const char *path,mode_t mode,dev_t dev) { -return real___xmknod (_MKNOD_VER, path, mode, &dev); -} - -int -pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { -return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); -}int pseudo_capset (cap_user_header_t hdrp,const cap_user_data_t datap) { (void )hdrp;ports/linux/subports +15
-0@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.oports/linux/wrapfuncs.in +8
-18@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */pseudo_client.h +32
-7@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void ); --Quoted 6 lines
2.17.1
Quoted 9 lines
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#182117): https://lists.openembedded.org/g/openembedded-core/message/182117
Mute This Topic: https://lists.openembedded.org/mt/99234918/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Hello,
I did the change and it still causes:
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/5316/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/5308/steps/14/logs/stdio
2023-06-10 14:47:31,962 - oe-selftest - INFO - ======================================================================
2023-06-10 14:47:31,981 - oe-selftest - INFO - FAIL: wrapper.WrapperTests.test_shebang_wrapper (subunit.RemotedTestCase)
2023-06-10 14:47:31,981 - oe-selftest - INFO - ----------------------------------------------------------------------
2023-06-10 14:47:31,985 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/wrapper.py", line 16, in test_shebang_wrapper
res = bitbake("cmdline-shebang-wrapper-test -c install", ignore_status=False)
File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/utils/commands.py", line 234, in bitbake
return runCmd(cmd, ignore_status, timeout, output_log=output_log, **options)
File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/utils/commands.py", line 212, in runCmd
raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, exc_output))AssertionError: Command 'bitbake cmdline-shebang-wrapper-test -c install' returned non-zero exit status 1:
ERROR: cmdline-shebang-wrapper-test-1.0-r0 do_install: Wrapper permissions for /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-1349741/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.real not preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0 do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-1349741/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.2376340', 1, None, None)
ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-1349741/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.2376340
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: task do_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-1349741/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'
Quoted 1,207 lines · Mark Hatle
Ok, so adding this patch will move from the legacy behavior to the new behavior (not using the legacy stat interfaces). This will only work on machines where the software has been built for only the newer exposed interfaces.
I am surprised Debian 11 failed, as it should have been new enough the old interfaces don't exist. I don't know about debian11 or stream8.
Can you modify the patch you applied and re-run your tests? Try this change:
In the patch:
meta/recipes-devtools/pseudo/files/new_glibc.patch, go down to the patch chunk for ports/linux/subports and then change:++if ${CC} -c -o dummy.o
dummy.c>/dev/null 2>&1; then
++ echo "linux/old__x"
++fito
++if true; then
++ echo "linux/old__x"
++fiThe change above SHOULD restore the old compatible interface behavior to pseudo. This will verify that the other changes did not introduce this fault.
Assuming this works, the intergration patch that I'll work on will be different. The code check-in will be similar to the original path proposed (with the README updated). A local patch to the integration will exist to make the change listed above for x86,
x86_64and aarch64. This will restore legacy behavior on those architectures until we get to a point where the suspect interfaces are no longer being used.I will also be adding a second commit that defines wrappers for the obsolete interfaces, so if they ARE used they will trigger an abort, so we can more quickly detect the machines. Ultimately we want to stop wrapping the obsolete interfaces once the distributions are no longer using them, but we need a way to detect this.
(I would like a switch to configure to enable the obsolete interfaces, but I've not figured out how to pass configure options into the subports function call. I'll continue to look into that, but it really shouldn't be necessary outside of the YP use-case where we want one pseudo to run across a variety of hosts.)
--Mark
Quoted 1,145 lines · Alexandre Belloni via lists.openembedded.org
Quoted 3 lines · Mark Hatle
Did you or someone else manually add this patch for testing? I wasn't aware that it had gone in for any sort of testing eyt.
I'd like to see the integration used so I can understand how the test was performed.
Sure, I added the patch, here:
https://git.yoctoproject.org/poky-contrib/commit/?h=abelloni/master-next&id=9b8298bf6dc6
Quoted 1,130 lines
--Mark
Quoted 1,126 lines · Alexandre Belloni
Hello Mark,
This causes failures on opensuse154 and debian11 workers. I've tried to get pseudo.log for the failures but they are not present on debian11 and are not interesting for opensuse154.
debian11 failures look like that:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/13/logs/stdioopensuse:
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/2819/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/7597/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/7211/steps/13/logs/stdiostream8 is similar:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2939/steps/13/logs/stdio
I also suspect this causes:
ERROR: cmdline-shebang-wrapper-test-1.0-r0
do_install: Wrapper permissions for/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.realnot preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.322689', 1, None, None)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.322689
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: taskdo_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'Quoted 1,089 lines · Mark Hatle via lists.openembedded.org
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-)create mode 100644 ports/linux/old__x/README rename ports/linux/{ =>
old__x}/guts/__fxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat64.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknod.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknodat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat64.c(100%) create mode 100644ports/linux/old__x/guts/fstat.ccreate mode 100644ports/linux/old__x/guts/fstat64.ccreate mode 100644ports/linux/old__x/guts/fstatat.ccreate mode 100644ports/linux/old__x/guts/fstatat64.ccreate mode 100644ports/linux/old__x/guts/lstat.ccreate mode 100644ports/linux/old__x/guts/lstat64.ccreate mode 100644ports/linux/old__x/guts/mknod.ccreate mode 100644ports/linux/old__x/guts/mknodat.ccreate mode 100644ports/linux/old__x/guts/mkostemp64.ccreate mode 100644ports/linux/old__x/portdefs.hcreate mode 100644ports/linux/old__x/pseudo_wrappers.ccreate mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2
-2@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/freopen64.c +2
-2@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/fstat.c +7
-1@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstat64.c +13
-1@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */ ports/linux/guts/fstatat.c +8
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstatat64.c +41
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,46 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); +pseudo_msg_t *msg; +int save_errno; + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } +#endif +if (flags &AT_SYMLINK_NOFOLLOW ) { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_lstat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + }else { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_stat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + } + save_errno = errno; + +/* query database +* note that symlink canonicalizing is now automatic, so we +* don't need to check for a symlink on this end +*/ + msg =pseudo_client_op (OP_STAT ,0 ,-1 , dirfd, path, buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } ports/linux/guts/lstat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/lstat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/mknod.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * } ports/linux/guts/mknodat.c +70
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2016 Wind River Systems; see * guts/COPYRIGHT for information. * @@ -8,7 +9,75 @@* int rc = -1; */ - rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +pseudo_msg_t *msg; +struct stat64 buf; + +/* mask out mode bits appropriately */ + mode = mode & ~pseudo_umask; +/* if you don't specify a type, assume regular file */ +if (!(mode &S_IFMT )) { + mode |=S_IFREG ; + } +pseudo_debug (PDBGF_FILE ,"mknodat creating '%s', mode 0%o\n" , + path ? path :"<no name>" , (int ) mode); + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } + rc =real_stat64 (path, &buf); +#else + rc =real_fstatat64 (dirfd, path, &buf,AT_SYMLINK_NOFOLLOW ); +#endif +if (rc !=-1 ) { +/* if we can stat the file, you can't mknod it */ + errno =EEXIST ; +return -1 ; + } +if (!dev) { + errno =EINVAL ; +return -1 ; + } +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_open (path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#else + rc =real_openat (dirfd, path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#endif +if (rc ==-1 ) { +return -1 ; + } +real_fchmod (rc,PSEUDO_FS_MODE (mode,0 )); +real_fstat64 (rc, &buf); +/* mknod does not really open the file. We don't have +* to use wrap_close because we've never exposed this file +* descriptor to the client code. +*/ +real_close (rc); + +/* mask in the mode type bits again */ + buf.st_mode = (PSEUDO_DB_MODE (buf.st_mode, mode) &07777 ) | + (mode & ~07777 ); + buf.st_rdev = dev; + msg =pseudo_client_op (OP_MKNOD ,0 ,-1 , dirfd, path, &buf); +if (msg && msg->result !=RESULT_SUCCEED ) { + errno =EPERM ; + rc =-1 ; + }else { +/* just pretend we worked */ + rc =0 ; + } +if (rc ==-1 ) { +int save_errno = errno; +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +real_unlink (path); +#else +real_unlinkat (dirfd, path,AT_SYMLINK_NOFOLLOW ); +#endif + errno = save_errno; + }/* return rc; * } ports/linux/guts/mkostemp64.c +1
-1@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);ports/linux/guts/openat.c +9
-9@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",ports/linux/guts/stat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/guts/stat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/old__x/README new file +28
-0@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0
-0ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0
-0ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0
-0ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0
-0ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0
-0ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0
-0ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0
-0ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0
-0ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0
-0ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0
-0ports/linux/old__x/guts/fstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknod.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknodat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mkostemp64.c new file +53
-0@@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* static int +* wrap_mkstemp64(char *template, int oflags) { +* int rc = -1; +*/ +struct stat64 buf; +int save_errno; +size_t len; +char *tmp_template; + +if (!template) { + errno =EFAULT ; +return 0 ; + } + + len =strlen (template); + tmp_template =PSEUDO_ROOT_PATH (AT_FDCWD , template,AT_SYMLINK_NOFOLLOW ); + +if (!tmp_template) { + errno =ENOENT ; +return -1 ; + } + +/* mkstemp64 wrapper uses this code and mkostemp64 not present in some glibc versions */ +if (oflags ==0 ) + rc =real_mkstemp64 (tmp_template); +else + rc =real_mkostemp64 (tmp_template, oflags); + +if (rc !=-1 ) { + save_errno = errno; + +if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 )); +pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf); + }else { +pseudo_debug (PDBGF_CONSISTENCY ,"mkstemp (fd %d) succeeded, but fstat failed (%s).\n" , + rc,strerror (errno)); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template,0 ); + } + errno = save_errno; + } +/* mkstemp only changes the XXXXXX at the end. */ +memcpy (template + len -6 , tmp_template +strlen (tmp_template) -6 ,6 ); +/* return rc; +* } +*/ ports/linux/old__x/portdefs.h new file +40
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif ports/linux/old__x/pseudo_wrappers.c new file +48
-0@@ -0,0 +1,48 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ +/* the unix port wants to know that real_stat() and +* friends exist. So they do. And because the Linux +* port really uses stat64 for those... +*/ +int +pseudo_stat (const char *path,struct stat *buf) { +return real___xstat (_STAT_VER, path, buf); +} + +int +pseudo_lstat (const char *path,struct stat *buf) { +return real___lxstat (_STAT_VER, path, buf); +} + +int +pseudo_fstat (int fd,struct stat *buf) { +return real___fxstat (_STAT_VER, fd, buf); +} + +int +pseudo_stat64 (const char *path,struct stat64 *buf) { +return real___xstat64 (_STAT_VER, path, buf); +} + +int +pseudo_lstat64 (const char *path,struct stat64 *buf) { +return real___lxstat64 (_STAT_VER, path, buf); +} + +int +pseudo_fstat64 (int fd,struct stat64 *buf) { +return real___fxstat64 (_STAT_VER, fd, buf); +} + +/* similar thing happens with mknod */ +int +pseudo_mknod (const char *path,mode_t mode,dev_t dev) { +return real___xmknod (_MKNOD_VER, path, mode, &dev); +} + +int +pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { +return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +}ports/linux/old__x/wrapfuncs.in new file +18
-0@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ports/linux/portdefs.h +0
-19@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif ports/linux/pseudo_wrappers.c +0
-43@@ -2,50 +2,7 @@* SPDX-License-Identifier: LGPL-2.1-only * */ -/* the unix port wants to know that real_stat() and -* friends exist. So they do. And because the Linux -* port really uses stat64 for those... -*/ -int -pseudo_stat (const char *path,struct stat *buf) { -return real___xstat (_STAT_VER, path, buf); -} - -int -pseudo_lstat (const char *path,struct stat *buf) { -return real___lxstat (_STAT_VER, path, buf); -} - -int -pseudo_fstat (int fd,struct stat *buf) { -return real___fxstat (_STAT_VER, fd, buf); -} - -int -pseudo_stat64 (const char *path,struct stat64 *buf) { -return real___xstat64 (_STAT_VER, path, buf); -} - -int -pseudo_lstat64 (const char *path,struct stat64 *buf) { -return real___lxstat64 (_STAT_VER, path, buf); -} - -int -pseudo_fstat64 (int fd,struct stat64 *buf) { -return real___fxstat64 (_STAT_VER, fd, buf); -} -/* similar thing happens with mknod */ -int -pseudo_mknod (const char *path,mode_t mode,dev_t dev) { -return real___xmknod (_MKNOD_VER, path, mode, &dev); -} - -int -pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { -return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); -}int pseudo_capset (cap_user_header_t hdrp,const cap_user_data_t datap) { (void )hdrp;ports/linux/subports +15
-0@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.oports/linux/wrapfuncs.in +8
-18@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */pseudo_client.h +32
-6@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void );Signature · 1 line
2.17.1-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#182114): https://lists.openembedded.org/g/openembedded-core/message/182114
Mute This Topic: https://lists.openembedded.org/mt/99234918/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi Khem,
I noticed the issue you mentioned, I want to fix it , but I'm not sure how to reproduce it on my build machine .Please how can I debug this issue use the autobuilder.yoctoproject.org builders .
Quoted 1,190 lines · Khem Raj
I see another issue with libcxx when using meta-clang
The error is here
Quoted 1,181 lines · Alexandre Belloni via lists.openembedded.org
Quoted 24 lines · Alexandre Belloni via lists.openembedded.org
Hello Mark,
This causes failures on opensuse154 and debian11 workers. I've tried to get pseudo.log for the failures but they are not present on debian11 and are not interesting for opensuse154.
debian11 failures look like that:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/13/logs/stdioopensuse:
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/2819/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/7597/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/7211/steps/13/logs/stdiostream8 is similar:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2939/steps/13/logs/stdio
Quoted 8 lines
I also suspect this causes:
ERROR: cmdline-shebang-wrapper-test-1.0-r0
do_install: Wrapper permissions for/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.realnot preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.322689', 1, None, None)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.322689
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: taskdo_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'For the record, it also broke systemd on the target with ubuntu or fedora workers:
https://autobuilder.yoctoproject.org/typhoon/#/builders/131/builds/2576/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/110/builds/6085/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/4661/steps/13/logs/stdioQuoted 1,115 lines · Mark Hatle via lists.openembedded.org
Quoted 1,113 lines
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-)create mode 100644 ports/linux/old__x/README rename ports/linux/{ =>
old__x}/guts/__fxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat64.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknod.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknodat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat64.c(100%) create mode 100644ports/linux/old__x/guts/fstat.ccreate mode 100644ports/linux/old__x/guts/fstat64.ccreate mode 100644ports/linux/old__x/guts/fstatat.ccreate mode 100644ports/linux/old__x/guts/fstatat64.ccreate mode 100644ports/linux/old__x/guts/lstat.ccreate mode 100644ports/linux/old__x/guts/lstat64.ccreate mode 100644ports/linux/old__x/guts/mknod.ccreate mode 100644ports/linux/old__x/guts/mknodat.ccreate mode 100644ports/linux/old__x/guts/mkostemp64.ccreate mode 100644ports/linux/old__x/portdefs.hcreate mode 100644ports/linux/old__x/pseudo_wrappers.ccreate mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2
-2@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/freopen64.c +2
-2@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/fstat.c +7
-1@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstat64.c +13
-1@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */ ports/linux/guts/fstatat.c +8
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstatat64.c +41
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,46 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); +pseudo_msg_t *msg; +int save_errno; + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } +#endif +if (flags &AT_SYMLINK_NOFOLLOW ) { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_lstat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + }else { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_stat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + } + save_errno = errno; + +/* query database +* note that symlink canonicalizing is now automatic, so we +* don't need to check for a symlink on this end +*/ + msg =pseudo_client_op (OP_STAT ,0 ,-1 , dirfd, path, buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } ports/linux/guts/lstat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/lstat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/mknod.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * } ports/linux/guts/mknodat.c +70
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2016 Wind River Systems; see * guts/COPYRIGHT for information. * @@ -8,7 +9,75 @@* int rc = -1; */ - rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +pseudo_msg_t *msg; +struct stat64 buf; + +/* mask out mode bits appropriately */ + mode = mode & ~pseudo_umask; +/* if you don't specify a type, assume regular file */ +if (!(mode &S_IFMT )) { + mode |=S_IFREG ; + } +pseudo_debug (PDBGF_FILE ,"mknodat creating '%s', mode 0%o\n" , + path ? path :"<no name>" , (int ) mode); + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } + rc =real_stat64 (path, &buf); +#else + rc =real_fstatat64 (dirfd, path, &buf,AT_SYMLINK_NOFOLLOW ); +#endif +if (rc !=-1 ) { +/* if we can stat the file, you can't mknod it */ + errno =EEXIST ; +return -1 ; + } +if (!dev) { + errno =EINVAL ; +return -1 ; + } +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_open (path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#else + rc =real_openat (dirfd, path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#endif +if (rc ==-1 ) { +return -1 ; + } +real_fchmod (rc,PSEUDO_FS_MODE (mode,0 )); +real_fstat64 (rc, &buf); +/* mknod does not really open the file. We don't have +* to use wrap_close because we've never exposed this file +* descriptor to the client code. +*/ +real_close (rc); + +/* mask in the mode type bits again */ + buf.st_mode = (PSEUDO_DB_MODE (buf.st_mode, mode) &07777 ) | + (mode & ~07777 ); + buf.st_rdev = dev; + msg =pseudo_client_op (OP_MKNOD ,0 ,-1 , dirfd, path, &buf); +if (msg && msg->result !=RESULT_SUCCEED ) { + errno =EPERM ; + rc =-1 ; + }else { +/* just pretend we worked */ + rc =0 ; + } +if (rc ==-1 ) { +int save_errno = errno; +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +real_unlink (path); +#else +real_unlinkat (dirfd, path,AT_SYMLINK_NOFOLLOW ); +#endif + errno = save_errno; + }/* return rc; * } ports/linux/guts/mkostemp64.c +1
-1@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);ports/linux/guts/openat.c +9
-9@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",ports/linux/guts/stat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/guts/stat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/old__x/README new file +28
-0@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0
-0ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0
-0ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0
-0ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0
-0ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0
-0ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0
-0ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0
-0ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0
-0ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0
-0ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0
-0ports/linux/old__x/guts/fstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknod.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknodat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mkostemp64.c new file +53
-0@@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* static int +* wrap_mkstemp64(char *template, int oflags) { +* int rc = -1; +*/ +struct stat64 buf; +int save_errno; +size_t len; +char *tmp_template; + +if (!template) { + errno =EFAULT ; +return 0 ; + } + + len =strlen (template); + tmp_template =PSEUDO_ROOT_PATH (AT_FDCWD , template,AT_SYMLINK_NOFOLLOW ); + +if (!tmp_template) { + errno =ENOENT ; +return -1 ; + } + +/* mkstemp64 wrapper uses this code and mkostemp64 not present in some glibc versions */ +if (oflags ==0 ) + rc =real_mkstemp64 (tmp_template); +else + rc =real_mkostemp64 (tmp_template, oflags); + +if (rc !=-1 ) { + save_errno = errno; + +if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 )); +pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf); + }else { +pseudo_debug (PDBGF_CONSISTENCY ,"mkstemp (fd %d) succeeded, but fstat failed (%s).\n" , + rc,strerror (errno)); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template,0 ); + } + errno = save_errno; + } +/* mkstemp only changes the XXXXXX at the end. */ +memcpy (template + len -6 , tmp_template +strlen (tmp_template) -6 ,6 ); +/* return rc; +* } +*/ ports/linux/old__x/portdefs.h new file +40
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif ports/linux/old__x/pseudo_wrappers.c new file +48
-0@@ -0,0 +1,48 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ +/* the unix port wants to know that real_stat() and +* friends exist. So they do. And because the Linux +* port really uses stat64 for those... +*/ +int +pseudo_stat (const char *path,struct stat *buf) { +return real___xstat (_STAT_VER, path, buf); +} + +int +pseudo_lstat (const char *path,struct stat *buf) { +return real___lxstat (_STAT_VER, path, buf); +} + +int +pseudo_fstat (int fd,struct stat *buf) { +return real___fxstat (_STAT_VER, fd, buf); +} + +int +pseudo_stat64 (const char *path,struct stat64 *buf) { +return real___xstat64 (_STAT_VER, path, buf); +} + +int +pseudo_lstat64 (const char *path,struct stat64 *buf) { +return real___lxstat64 (_STAT_VER, path, buf); +} + +int +pseudo_fstat64 (int fd,struct stat64 *buf) { +return real___fxstat64 (_STAT_VER, fd, buf); +} + +/* similar thing happens with mknod */ +int +pseudo_mknod (const char *path,mode_t mode,dev_t dev) { +return real___xmknod (_MKNOD_VER, path, mode, &dev); +} + +int +pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { +return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +}ports/linux/old__x/wrapfuncs.in new file +18
-0@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ports/linux/portdefs.h +0
-19@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif ports/linux/pseudo_wrappers.c +0
-43@@ -2,50 +2,7 @@* SPDX-License-Identifier: LGPL-2.1-only * */ -/* the unix port wants to know that real_stat() and -* friends exist. So they do. And because the Linux -* port really uses stat64 for those... -*/ -int -pseudo_stat (const char *path,struct stat *buf) { -return real___xstat (_STAT_VER, path, buf); -} - -int -pseudo_lstat (const char *path,struct stat *buf) { -return real___lxstat (_STAT_VER, path, buf); -} - -int -pseudo_fstat (int fd,struct stat *buf) { -return real___fxstat (_STAT_VER, fd, buf); -} - -int -pseudo_stat64 (const char *path,struct stat64 *buf) { -return real___xstat64 (_STAT_VER, path, buf); -} - -int -pseudo_lstat64 (const char *path,struct stat64 *buf) { -return real___lxstat64 (_STAT_VER, path, buf); -} - -int -pseudo_fstat64 (int fd,struct stat64 *buf) { -return real___fxstat64 (_STAT_VER, fd, buf); -} -/* similar thing happens with mknod */ -int -pseudo_mknod (const char *path,mode_t mode,dev_t dev) { -return real___xmknod (_MKNOD_VER, path, mode, &dev); -} - -int -pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { -return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); -}int pseudo_capset (cap_user_header_t hdrp,const cap_user_data_t datap) { (void )hdrp;ports/linux/subports +15
-0@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.oports/linux/wrapfuncs.in +8
-18@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */pseudo_client.h +32
-7@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void ); --2.17.1
Quoted 11 lines
Quoted 3 lines
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#182117): https://lists.openembedded.org/g/openembedded-core/message/182117
Mute This Topic: https://lists.openembedded.org/mt/99234918/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 7 lines · 张家岭
Hi Khem,
I noticed the issue you mentioned, I want to fix it , but I'm not
sure how to reproduce it on my build machine .Please how can I debug this issue use the autobuilder.yoctoproject.org builders .
add meta-clang to your layers and then
bitbake libcxx
Quoted 1,195 lines · Khem Raj
Quoted 1,190 lines
I see another issue with libcxx when using meta-clang
The error is here
Quoted 1,181 lines · Alexandre Belloni via lists.openembedded.org
Quoted 24 lines · Alexandre Belloni via lists.openembedded.org
Hello Mark,
This causes failures on opensuse154 and debian11 workers. I've tried to get pseudo.log for the failures but they are not present on debian11 and are not interesting for opensuse154.
debian11 failures look like that:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/13/logs/stdioopensuse:
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/2819/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/7597/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/7211/steps/13/logs/stdiostream8 is similar:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2939/steps/13/logs/stdio
Quoted 8 lines
I also suspect this causes:
ERROR: cmdline-shebang-wrapper-test-1.0-r0
do_install: Wrapper permissions for/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.realnot preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.322689', 1, None, None)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.322689
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: taskdo_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'For the record, it also broke systemd on the target with ubuntu or fedora workers:
https://autobuilder.yoctoproject.org/typhoon/#/builders/131/builds/2576/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/110/builds/6085/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/4661/steps/13/logs/stdioQuoted 1,115 lines · Mark Hatle via lists.openembedded.org
Quoted 1,113 lines
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-)create mode 100644 ports/linux/old__x/README rename ports/linux/{ =>
old__x}/guts/__fxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat64.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknod.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknodat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat64.c(100%) create mode 100644ports/linux/old__x/guts/fstat.ccreate mode 100644ports/linux/old__x/guts/fstat64.ccreate mode 100644ports/linux/old__x/guts/fstatat.ccreate mode 100644ports/linux/old__x/guts/fstatat64.ccreate mode 100644ports/linux/old__x/guts/lstat.ccreate mode 100644ports/linux/old__x/guts/lstat64.ccreate mode 100644ports/linux/old__x/guts/mknod.ccreate mode 100644ports/linux/old__x/guts/mknodat.ccreate mode 100644ports/linux/old__x/guts/mkostemp64.ccreate mode 100644ports/linux/old__x/portdefs.hcreate mode 100644ports/linux/old__x/pseudo_wrappers.ccreate mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2
-2@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/freopen64.c +2
-2@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/fstat.c +7
-1@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstat64.c +13
-1@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */ ports/linux/guts/fstatat.c +8
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstatat64.c +41
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,46 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); +pseudo_msg_t *msg; +int save_errno; + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } +#endif +if (flags &AT_SYMLINK_NOFOLLOW ) { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_lstat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + }else { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_stat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + } + save_errno = errno; + +/* query database +* note that symlink canonicalizing is now automatic, so we +* don't need to check for a symlink on this end +*/ + msg =pseudo_client_op (OP_STAT ,0 ,-1 , dirfd, path, buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } ports/linux/guts/lstat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/lstat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/mknod.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * } ports/linux/guts/mknodat.c +70
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2016 Wind River Systems; see * guts/COPYRIGHT for information. * @@ -8,7 +9,75 @@* int rc = -1; */ - rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +pseudo_msg_t *msg; +struct stat64 buf; + +/* mask out mode bits appropriately */ + mode = mode & ~pseudo_umask; +/* if you don't specify a type, assume regular file */ +if (!(mode &S_IFMT )) { + mode |=S_IFREG ; + } +pseudo_debug (PDBGF_FILE ,"mknodat creating '%s', mode 0%o\n" , + path ? path :"<no name>" , (int ) mode); + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } + rc =real_stat64 (path, &buf); +#else + rc =real_fstatat64 (dirfd, path, &buf,AT_SYMLINK_NOFOLLOW ); +#endif +if (rc !=-1 ) { +/* if we can stat the file, you can't mknod it */ + errno =EEXIST ; +return -1 ; + } +if (!dev) { + errno =EINVAL ; +return -1 ; + } +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_open (path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#else + rc =real_openat (dirfd, path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#endif +if (rc ==-1 ) { +return -1 ; + } +real_fchmod (rc,PSEUDO_FS_MODE (mode,0 )); +real_fstat64 (rc, &buf); +/* mknod does not really open the file. We don't have +* to use wrap_close because we've never exposed this file +* descriptor to the client code. +*/ +real_close (rc); + +/* mask in the mode type bits again */ + buf.st_mode = (PSEUDO_DB_MODE (buf.st_mode, mode) &07777 ) | + (mode & ~07777 ); + buf.st_rdev = dev; + msg =pseudo_client_op (OP_MKNOD ,0 ,-1 , dirfd, path, &buf); +if (msg && msg->result !=RESULT_SUCCEED ) { + errno =EPERM ; + rc =-1 ; + }else { +/* just pretend we worked */ + rc =0 ; + } +if (rc ==-1 ) { +int save_errno = errno; +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +real_unlink (path); +#else +real_unlinkat (dirfd, path,AT_SYMLINK_NOFOLLOW ); +#endif + errno = save_errno; + }/* return rc; * } ports/linux/guts/mkostemp64.c +1
-1@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);ports/linux/guts/openat.c +9
-9@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",ports/linux/guts/stat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/guts/stat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/old__x/README new file +28
-0@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0
-0ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0
-0ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0
-0ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0
-0ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0
-0ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0
-0ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0
-0ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0
-0ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0
-0ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0
-0ports/linux/old__x/guts/fstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknod.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknodat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mkostemp64.c new file +53
-0@@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* static int +* wrap_mkstemp64(char *template, int oflags) { +* int rc = -1; +*/ +struct stat64 buf; +int save_errno; +size_t len; +char *tmp_template; + +if (!template) { + errno =EFAULT ; +return 0 ; + } + + len =strlen (template); + tmp_template =PSEUDO_ROOT_PATH (AT_FDCWD , template,AT_SYMLINK_NOFOLLOW ); + +if (!tmp_template) { + errno =ENOENT ; +return -1 ; + } + +/* mkstemp64 wrapper uses this code and mkostemp64 not present in some glibc versions */ +if (oflags ==0 ) + rc =real_mkstemp64 (tmp_template); +else + rc =real_mkostemp64 (tmp_template, oflags); + +if (rc !=-1 ) { + save_errno = errno; + +if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 )); +pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf); + }else { +pseudo_debug (PDBGF_CONSISTENCY ,"mkstemp (fd %d) succeeded, but fstat failed (%s).\n" , + rc,strerror (errno)); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template,0 ); + } + errno = save_errno; + } +/* mkstemp only changes the XXXXXX at the end. */ +memcpy (template + len -6 , tmp_template +strlen (tmp_template) -6 ,6 ); +/* return rc; +* } +*/ ports/linux/old__x/portdefs.h new file +40
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif ports/linux/old__x/pseudo_wrappers.c new file +48
-0@@ -0,0 +1,48 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ +/* the unix port wants to know that real_stat() and +* friends exist. So they do. And because the Linux +* port really uses stat64 for those... +*/ +int +pseudo_stat (const char *path,struct stat *buf) { +return real___xstat (_STAT_VER, path, buf); +} + +int +pseudo_lstat (const char *path,struct stat *buf) { +return real___lxstat (_STAT_VER, path, buf); +} + +int +pseudo_fstat (int fd,struct stat *buf) { +return real___fxstat (_STAT_VER, fd, buf); +} + +int +pseudo_stat64 (const char *path,struct stat64 *buf) { +return real___xstat64 (_STAT_VER, path, buf); +} + +int +pseudo_lstat64 (const char *path,struct stat64 *buf) { +return real___lxstat64 (_STAT_VER, path, buf); +} + +int +pseudo_fstat64 (int fd,struct stat64 *buf) { +return real___fxstat64 (_STAT_VER, fd, buf); +} + +/* similar thing happens with mknod */ +int +pseudo_mknod (const char *path,mode_t mode,dev_t dev) { +return real___xmknod (_MKNOD_VER, path, mode, &dev); +} + +int +pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { +return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +}ports/linux/old__x/wrapfuncs.in new file +18
-0@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ports/linux/portdefs.h +0
-19@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif ports/linux/pseudo_wrappers.c +0
-43@@ -2,50 +2,7 @@* SPDX-License-Identifier: LGPL-2.1-only * */ -/* the unix port wants to know that real_stat() and -* friends exist. So they do. And because the Linux -* port really uses stat64 for those... -*/ -int -pseudo_stat (const char *path,struct stat *buf) { -return real___xstat (_STAT_VER, path, buf); -} - -int -pseudo_lstat (const char *path,struct stat *buf) { -return real___lxstat (_STAT_VER, path, buf); -} - -int -pseudo_fstat (int fd,struct stat *buf) { -return real___fxstat (_STAT_VER, fd, buf); -} - -int -pseudo_stat64 (const char *path,struct stat64 *buf) { -return real___xstat64 (_STAT_VER, path, buf); -} - -int -pseudo_lstat64 (const char *path,struct stat64 *buf) { -return real___lxstat64 (_STAT_VER, path, buf); -} - -int -pseudo_fstat64 (int fd,struct stat64 *buf) { -return real___fxstat64 (_STAT_VER, fd, buf); -} -/* similar thing happens with mknod */ -int -pseudo_mknod (const char *path,mode_t mode,dev_t dev) { -return real___xmknod (_MKNOD_VER, path, mode, &dev); -} - -int -pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { -return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); -}int pseudo_capset (cap_user_header_t hdrp,const cap_user_data_t datap) { (void )hdrp;ports/linux/subports +15
-0@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.oports/linux/wrapfuncs.in +8
-18@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */pseudo_client.h +32
-7@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void ); --2.17.1
Quoted 11 lines
Quoted 3 lines
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#182117): https://lists.openembedded.org/g/openembedded-core/message/182117
Mute This Topic: https://lists.openembedded.org/mt/99234918/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Hello, Mark
what is the current status of this patch?
Is there anything I can do to help?
-----原始邮件-----
发件人:"Alexandre Belloni via lists.openembedded.org" <[email protected]> 发送时间:2023-06-11 05:51:33 (星期日)
收件人: "Mark Hatle" <[email protected]>
抄送: [email protected]
主题: Re: [OE-core] [PATCH][pseudo] Move __*xstat* and __xmknod functions to new subport 'old__x'
Hello,
I did the change and it still causes:
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/5316/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/5308/steps/14/logs/stdio
2023-06-10 14:47:31,962 - oe-selftest - INFO - ======================================================================
2023-06-10 14:47:31,981 - oe-selftest - INFO - FAIL: wrapper.WrapperTests.test_shebang_wrapper (subunit.RemotedTestCase)
2023-06-10 14:47:31,981 - oe-selftest - INFO - ----------------------------------------------------------------------
2023-06-10 14:47:31,985 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/wrapper.py", line 16, in test_shebang_wrapper
res = bitbake("cmdline-shebang-wrapper-test -c install", ignore_status=False)
File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/utils/commands.py", line 234, in bitbake
return runCmd(cmd, ignore_status, timeout, output_log=output_log, **options)
File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/utils/commands.py", line 212, in runCmd
raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, exc_output))AssertionError: Command 'bitbake cmdline-shebang-wrapper-test -c install' returned non-zero exit status 1:
ERROR: cmdline-shebang-wrapper-test-1.0-r0 do_install: Wrapper permissions for /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-1349741/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.real not preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0 do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-1349741/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.2376340', 1, None, None)
ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-1349741/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.2376340
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: task do_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-1349741/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'
Quoted 1,201 lines · Mark Hatle
Ok, so adding this patch will move from the legacy behavior to the new behavior (not using the legacy stat interfaces). This will only work on machines where the software has been built for only the newer exposed interfaces.
I am surprised Debian 11 failed, as it should have been new enough the old interfaces don't exist. I don't know about debian11 or stream8.
Can you modify the patch you applied and re-run your tests? Try this change:
In the patch:
meta/recipes-devtools/pseudo/files/new_glibc.patch, go down to the patch chunk for ports/linux/subports and then change:++if ${CC} -c -o dummy.o
dummy.c>/dev/null 2>&1; then
++ echo "linux/old__x"
++fito
++if true; then
++ echo "linux/old__x"
++fiThe change above SHOULD restore the old compatible interface behavior to pseudo. This will verify that the other changes did not introduce this fault.
Assuming this works, the intergration patch that I'll work on will be different. The code check-in will be similar to the original path proposed (with the README updated). A local patch to the integration will exist to make the change listed above for x86,
x86_64and aarch64. This will restore legacy behavior on those architectures until we get to a point where the suspect interfaces are no longer being used.I will also be adding a second commit that defines wrappers for the obsolete interfaces, so if they ARE used they will trigger an abort, so we can more quickly detect the machines. Ultimately we want to stop wrapping the obsolete interfaces once the distributions are no longer using them, but we need a way to detect this.
(I would like a switch to configure to enable the obsolete interfaces, but I've not figured out how to pass configure options into the subports function call. I'll continue to look into that, but it really shouldn't be necessary outside of the YP use-case where we want one pseudo to run across a variety of hosts.)
--Mark
Quoted 1,145 lines · Alexandre Belloni via lists.openembedded.org
Quoted 3 lines · Mark Hatle
Did you or someone else manually add this patch for testing? I wasn't aware that it had gone in for any sort of testing eyt.
I'd like to see the integration used so I can understand how the test was performed.
Sure, I added the patch, here:
https://git.yoctoproject.org/poky-contrib/commit/?h=abelloni/master-next&id=9b8298bf6dc6
Quoted 1,130 lines
--Mark
Quoted 1,126 lines · Alexandre Belloni
Hello Mark,
This causes failures on opensuse154 and debian11 workers. I've tried to get pseudo.log for the failures but they are not present on debian11 and are not interesting for opensuse154.
debian11 failures look like that:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/7184/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/7152/steps/13/logs/stdioopensuse:
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/2819/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/20/builds/7597/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/7211/steps/13/logs/stdiostream8 is similar:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2939/steps/13/logs/stdio
I also suspect this causes:
ERROR: cmdline-shebang-wrapper-test-1.0-r0
do_install: Wrapper permissions for/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/image/usr/bin/test.realnot preserved. Found 600 but expected 400
ERROR: cmdline-shebang-wrapper-test-1.0-r0do_install: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/run.do_install.322689', 1, None, None)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/tmp/work/core2-64-poky-linux/cmdline-shebang-wrapper-test/1.0-r0/temp/log.do_install.322689
NOTE: recipe cmdline-shebang-wrapper-test-1.0-r0: taskdo_install: Failed
ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1782300/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb:do_install) failed with exit code '1'Quoted 1,089 lines · Mark Hatle via lists.openembedded.org
Changes to eliminate __*.c function usage were based on the patch:
From: JiaLing Zhang <[email protected]>
Subject: [OE-core] [PATCH v4] Fixes pseudo build in loongarch64Fixes [YOCTO #15110]
Some functions used in the project have been removed from glibc. After the removal of these functions, the architecture in glibc will not include the removed functions.
This patch resolves the usage and compilation issues on the loongarch64 architectureSigned-off-by JiaLing Zhang <[email protected]>This code is NOT loongarch64 specific, but implements support for newer glibc where the __*x*stat and __xmknod* functions are no longer present in headers as of roughly glibc 2.33.
The functions, on x86,
x86_64and aarch64 may still be present for compatibility but new software should no longer be using it. Pseudo can likely change it's default behavior unless support for really old hosts is still desired.Signed-off-by Mark Hatle <[email protected]>--- ports/linux/guts/fopen64.c | 4 +- ports/linux/guts/freopen64.c | 4 +- ports/linux/guts/fstat.c | 8 ++- ports/linux/guts/fstat64.c | 14 +++- ports/linux/guts/fstatat.c | 9 ++- ports/linux/guts/fstatat64.c | 42 +++++++++++- ports/linux/guts/lstat.c | 2 +- ports/linux/guts/lstat64.c | 2 +- ports/linux/guts/mknod.c | 2 +- ports/linux/guts/mknodat.c | 71 +++++++++++++++++++- ports/linux/guts/mkostemp64.c | 2 +- ports/linux/guts/openat.c | 18 ++--- ports/linux/guts/stat.c | 2 +- ports/linux/guts/stat64.c | 2 +- ports/linux/old__x/README | 28 ++++++++ ports/linux/{ => old__x}/guts/__fxstat.c | 0 ports/linux/{ => old__x}/guts/__fxstat64.c | 0 ports/linux/{ => old__x}/guts/__fxstatat.c | 0 ports/linux/{ => old__x}/guts/__fxstatat64.c | 0 ports/linux/{ => old__x}/guts/__lxstat.c | 0 ports/linux/{ => old__x}/guts/__lxstat64.c | 0 ports/linux/{ => old__x}/guts/__xmknod.c | 0 ports/linux/{ => old__x}/guts/__xmknodat.c | 0 ports/linux/{ => old__x}/guts/__xstat.c | 0 ports/linux/{ => old__x}/guts/__xstat64.c | 0 ports/linux/old__x/guts/fstat.c | 15 +++++ ports/linux/old__x/guts/fstat64.c | 15 +++++ ports/linux/old__x/guts/fstatat.c | 15 +++++ ports/linux/old__x/guts/fstatat64.c | 15 +++++ ports/linux/old__x/guts/lstat.c | 15 +++++ ports/linux/old__x/guts/lstat64.c | 15 +++++ ports/linux/old__x/guts/mknod.c | 15 +++++ ports/linux/old__x/guts/mknodat.c | 15 +++++ ports/linux/old__x/guts/mkostemp64.c | 53 +++++++++++++++ ports/linux/old__x/portdefs.h | 40 +++++++++++ ports/linux/old__x/pseudo_wrappers.c | 48 +++++++++++++ ports/linux/old__x/wrapfuncs.in | 18 +++++ ports/linux/portdefs.h | 19 ------ ports/linux/pseudo_wrappers.c | 43 ------------ ports/linux/subports | 15 +++++ ports/linux/wrapfuncs.in | 26 +++---- pseudo_client.h | 38 +++++++++-- 42 files changed, 520 insertions(+), 110 deletions(-)create mode 100644 ports/linux/old__x/README rename ports/linux/{ =>
old__x}/guts/__fxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat.c(100%) rename ports/linux/{ =>old__x}/guts/__fxstatat64.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat.c(100%) rename ports/linux/{ =>old__x}/guts/__lxstat64.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknod.c(100%) rename ports/linux/{ =>old__x}/guts/__xmknodat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat.c(100%) rename ports/linux/{ =>old__x}/guts/__xstat64.c(100%) create mode 100644ports/linux/old__x/guts/fstat.ccreate mode 100644ports/linux/old__x/guts/fstat64.ccreate mode 100644ports/linux/old__x/guts/fstatat.ccreate mode 100644ports/linux/old__x/guts/fstatat64.ccreate mode 100644ports/linux/old__x/guts/lstat.ccreate mode 100644ports/linux/old__x/guts/lstat64.ccreate mode 100644ports/linux/old__x/guts/mknod.ccreate mode 100644ports/linux/old__x/guts/mknodat.ccreate mode 100644ports/linux/old__x/guts/mkostemp64.ccreate mode 100644ports/linux/old__x/portdefs.hcreate mode 100644ports/linux/old__x/pseudo_wrappers.ccreate mode 100644 ports/linux/old__x/wrapfuncs.inports/linux/guts/fopen64.c +2
-2@@ -11,7 +11,7 @@struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_fopen64 (path, mode); save_errno = errno;@@ -20,7 +20,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"fopen64 '%s': fd %d <FILE %p>\n" , path, fd, (void *) rc); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/freopen64.c +2
-2@@ -10,7 +10,7 @@*/ struct stat64 buf;int save_errno; -int existed = (real___xstat64 (_STAT_VER, path, &buf) !=-1 ); +int existed = (base_stat64 (path, &buf) !=-1 ); rc =real_freopen64 (path, mode, stream); save_errno = errno;@@ -19,7 +19,7 @@int fd =fileno (rc);pseudo_debug (PDBGF_FILE ,"freopen64 '%s': fd %d\n" , path, fd); -if (real___fxstat64 (_STAT_VER, fd, &buf) !=-1 ) { +if (base_fstat64 (fd, &buf) !=-1 ) {if (!existed) {real_fchmod (fd,PSEUDO_FS_MODE (0666 & ~pseudo_umask,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , path, &buf);ports/linux/guts/fstat.c +7
-1@@ -8,7 +8,13 @@* int rc = -1; */ - rc =wrap___fxstat (_STAT_VER, fd, buf); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstat (fd, buf); +/* obtain fake data */ + rc =wrap_fstat64 (fd, &buf64); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstat64.c +13
-1@@ -8,8 +8,20 @@* int rc = -1; */ - rc =wrap___fxstat64 (_STAT_VER, fd, buf); +pseudo_msg_t *msg; +int save_errno; + rc =real_fstat64 (fd, buf); + save_errno = errno; +if (rc ==-1 ) { +return rc; + } + msg =pseudo_client_op (OP_FSTAT ,0 , fd,-1 ,0 , buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } */ ports/linux/guts/fstatat.c +8
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,13 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); +struct stat64 buf64; +/* populate buffer with complete data */ +real_fstatat (dirfd, path, buf, flags); +/* obtain fake data */ + rc =wrap_fstatat64 (dirfd, path, &buf64, flags); +/* overwrite */ +pseudo_stat32_from64 (buf, &buf64);/* return rc; * } ports/linux/guts/fstatat64.c +41
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; * Copyright (c) 2021 Linux Foundation; see * guts/COPYRIGHT for information. * @@ -8,7 +9,46 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); +pseudo_msg_t *msg; +int save_errno; + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } +#endif +if (flags &AT_SYMLINK_NOFOLLOW ) { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_lstat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + }else { +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_stat64 (path, buf); +#else + rc =real_fstatat64 (dirfd, path, buf, flags); +#endif +if (rc ==-1 ) { +return rc; + } + } + save_errno = errno; + +/* query database +* note that symlink canonicalizing is now automatic, so we +* don't need to check for a symlink on this end +*/ + msg =pseudo_client_op (OP_STAT ,0 ,-1 , dirfd, path, buf); +if (msg && msg->result ==RESULT_SUCCEED ) { +pseudo_stat_msg (buf, msg); + } + + errno = save_errno;/* return rc; * } ports/linux/guts/lstat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/lstat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW );/* return rc; * } ports/linux/guts/mknod.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + rc =wrap_mknodat (AT_FDCWD , path, mode, dev);/* return rc; * } ports/linux/guts/mknodat.c +70
-1@@ -1,4 +1,5 @@/* +* Copyright (c) 2008-2010 Wind River Systems; see * Copyright (c) 2016 Wind River Systems; see * guts/COPYRIGHT for information. * @@ -8,7 +9,75 @@* int rc = -1; */ - rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +pseudo_msg_t *msg; +struct stat64 buf; + +/* mask out mode bits appropriately */ + mode = mode & ~pseudo_umask; +/* if you don't specify a type, assume regular file */ +if (!(mode &S_IFMT )) { + mode |=S_IFREG ; + } +pseudo_debug (PDBGF_FILE ,"mknodat creating '%s', mode 0%o\n" , + path ? path :"<no name>" , (int ) mode); + +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +if (dirfd !=AT_FDCWD ) { + errno =ENOSYS ; +return -1 ; + } + rc =real_stat64 (path, &buf); +#else + rc =real_fstatat64 (dirfd, path, &buf,AT_SYMLINK_NOFOLLOW ); +#endif +if (rc !=-1 ) { +/* if we can stat the file, you can't mknod it */ + errno =EEXIST ; +return -1 ; + } +if (!dev) { + errno =EINVAL ; +return -1 ; + } +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS + rc =real_open (path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#else + rc =real_openat (dirfd, path,O_CREAT |O_WRONLY |O_EXCL , +PSEUDO_FS_MODE (mode,0 )); +#endif +if (rc ==-1 ) { +return -1 ; + } +real_fchmod (rc,PSEUDO_FS_MODE (mode,0 )); +real_fstat64 (rc, &buf); +/* mknod does not really open the file. We don't have +* to use wrap_close because we've never exposed this file +* descriptor to the client code. +*/ +real_close (rc); + +/* mask in the mode type bits again */ + buf.st_mode = (PSEUDO_DB_MODE (buf.st_mode, mode) &07777 ) | + (mode & ~07777 ); + buf.st_rdev = dev; + msg =pseudo_client_op (OP_MKNOD ,0 ,-1 , dirfd, path, &buf); +if (msg && msg->result !=RESULT_SUCCEED ) { + errno =EPERM ; + rc =-1 ; + }else { +/* just pretend we worked */ + rc =0 ; + } +if (rc ==-1 ) { +int save_errno = errno; +#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS +real_unlink (path); +#else +real_unlinkat (dirfd, path,AT_SYMLINK_NOFOLLOW ); +#endif + errno = save_errno; + }/* return rc; * } ports/linux/guts/mkostemp64.c +1
-1@@ -35,7 +35,7 @@if (rc !=-1 ) { save_errno = errno; -if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +if (base_fstat64 (rc, &buf) !=-1 ) {real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 ));pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf);pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf);ports/linux/guts/openat.c +9
-9@@ -56,12 +56,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif existed = (rc !=-1 );if (!existed)@@ -77,12 +77,12 @@ save_errno = errno;#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - rc =real___lxstat64 (_STAT_VER, path, &buf); + rc =base_lstat64 (path, &buf); }else { - rc =real___xstat64 (_STAT_VER, path, &buf); + rc =base_stat64 (path, &buf); }#else - rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif if (rc !=-1 &&S_ISFIFO (buf.st_mode)) { overly_magic_nonblocking =1 ;@@ -135,12 +135,12 @@#endif #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS if (flags &O_NOFOLLOW ) { - stat_rc =real___lxstat64 (_STAT_VER, path, &buf); + stat_rc =base_lstat64 (path, &buf); }else { - stat_rc =real___xstat64 (_STAT_VER, path, &buf); + stat_rc =base_xstat64 (path, &buf); }#else - stat_rc =real___fxstatat64 (_STAT_VER, dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 ); + stat_rc =base_fstatat64 (dirfd, path, &buf, (flags &O_NOFOLLOW ) ?AT_SYMLINK_NOFOLLOW :0 );#endif pseudo_debug(PDBGF_FILE, "openat(path %s), flags %o, stat rc %d, stat mode %o\n",ports/linux/guts/stat.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/guts/stat64.c +1
-1@@ -8,7 +8,7 @@* int rc = -1; */ - rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,0 ); + rc =wrap_fstatat64 (AT_FDCWD , path, buf,0 );/* return rc; * } ports/linux/old__x/README new file +28
-0@@ -0,0 +1,28 @@ +Older glibcs contain stat functions such as: + +__fxstat +__fxstatat +__lxstat +__xstat + +__fxstat64 +__fxstatat64 +__lxstat64 +__xstat64 + +The format of these functions use the _STAT_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _STAT_VER. + +Older glibcs also contain mknod functions such as: + +__xmknod +__xmknodat + +The format of these functions use the _MKNOD_VER defintion. New glibc no +longer define or utilize these functions, so neither can we. + +We only use this subport when the functions are present, this is checked +by with the existence of _MKNOD_VER.ports/linux/old__x/guts/__fxstat.c renamed from ports/linux/guts/__fxstat.c +0
-0ports/linux/old__x/guts/__fxstat64.c renamed from ports/linux/guts/__fxstat64.c +0
-0ports/linux/old__x/guts/__fxstatat.c renamed from ports/linux/guts/__fxstatat.c +0
-0ports/linux/old__x/guts/__fxstatat64.c renamed from ports/linux/guts/__fxstatat64.c +0
-0ports/linux/old__x/guts/__lxstat.c renamed from ports/linux/guts/__lxstat.c +0
-0ports/linux/old__x/guts/__lxstat64.c renamed from ports/linux/guts/__lxstat64.c +0
-0ports/linux/old__x/guts/__xmknod.c renamed from ports/linux/guts/__xmknod.c +0
-0ports/linux/old__x/guts/__xmknodat.c renamed from ports/linux/guts/__xmknodat.c +0
-0ports/linux/old__x/guts/__xstat.c renamed from ports/linux/guts/__xstat.c +0
-0ports/linux/old__x/guts/__xstat64.c renamed from ports/linux/guts/__xstat64.c +0
-0ports/linux/old__x/guts/fstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstat64(int fd, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstat64 (_STAT_VER, fd, buf); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat(int dirfd, const char *path, struct stat *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/fstatat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2021 Linux Foundation; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER, dirfd, path, buf, flags); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2011 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/lstat64.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2012 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int lstat64(const char *path, struct stat *buf) +* int rc = -1; +*/ + + rc =wrap___fxstatat64 (_STAT_VER,AT_FDCWD , path, buf,AT_SYMLINK_NOFOLLOW ); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknod.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknod(const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknod (_MKNOD_VER, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mknodat.c new file +15
-0@@ -0,0 +1,15 @@ +/* +* Copyright (c) 2016 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev) +* int rc = -1; +*/ + + rc =wrap___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); + +/* return rc; +* } +*/ ports/linux/old__x/guts/mkostemp64.c new file +53
-0@@ -0,0 +1,53 @@ +/* +* Copyright (c) 2010 Wind River Systems; see +* guts/COPYRIGHT for information. +* +* SPDX-License-Identifier: LGPL-2.1-only +* +* static int +* wrap_mkstemp64(char *template, int oflags) { +* int rc = -1; +*/ +struct stat64 buf; +int save_errno; +size_t len; +char *tmp_template; + +if (!template) { + errno =EFAULT ; +return 0 ; + } + + len =strlen (template); + tmp_template =PSEUDO_ROOT_PATH (AT_FDCWD , template,AT_SYMLINK_NOFOLLOW ); + +if (!tmp_template) { + errno =ENOENT ; +return -1 ; + } + +/* mkstemp64 wrapper uses this code and mkostemp64 not present in some glibc versions */ +if (oflags ==0 ) + rc =real_mkstemp64 (tmp_template); +else + rc =real_mkostemp64 (tmp_template, oflags); + +if (rc !=-1 ) { + save_errno = errno; + +if (real___fxstat64 (_STAT_VER, rc, &buf) !=-1 ) { +real_fchmod (rc,PSEUDO_FS_MODE (0600 ,0 )); +pseudo_client_op (OP_CREAT ,0 ,-1 ,-1 , tmp_template, &buf); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template, &buf); + }else { +pseudo_debug (PDBGF_CONSISTENCY ,"mkstemp (fd %d) succeeded, but fstat failed (%s).\n" , + rc,strerror (errno)); +pseudo_client_op (OP_OPEN ,PSA_READ |PSA_WRITE , rc,-1 , tmp_template,0 ); + } + errno = save_errno; + } +/* mkstemp only changes the XXXXXX at the end. */ +memcpy (template + len -6 , tmp_template +strlen (tmp_template) -6 ,6 ); +/* return rc; +* } +*/ ports/linux/old__x/portdefs.h new file +40
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _STAT_VER +#if defined (__aarch64__) +#define _STAT_VER 0 +#elif defined (__x86_64__) +#define _STAT_VER 1 +#else +#define _STAT_VER 3 +#endif +#endif + +#if PSEUDO_STATBUF_64 +#define base_fstat (fd, buf) real___fxstat64(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#else +#define base_fstat (fd, buf) real___fxstat(_STAT_VER, fd, buf) +#define base_stat (path, buf) real___xstat(_STAT_VER, path, buf) +#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#endif + +#define base_fstat64 (path, buf) real___fxstat64(_STAT_VER, path, buf) +#define base_stat64 (path, buf) real___xstat64(_STAT_VER, path, buf) +#define base_fstatat64 (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) + +/* If the subport was enabled, and these are not defined provide a default */ +#ifndef _MKNOD_VER +#if defined (__aarch64__) +#define _MKNOD_VER 0 +#elif defined (__x86_64__) +#define _MKNOD_VER 0 +#else +#define _MKNOD_VER 1 +#endif +#endif ports/linux/old__x/pseudo_wrappers.c new file +48
-0@@ -0,0 +1,48 @@ +/* +* SPDX-License-Identifier: LGPL-2.1-only +* +*/ +/* the unix port wants to know that real_stat() and +* friends exist. So they do. And because the Linux +* port really uses stat64 for those... +*/ +int +pseudo_stat (const char *path,struct stat *buf) { +return real___xstat (_STAT_VER, path, buf); +} + +int +pseudo_lstat (const char *path,struct stat *buf) { +return real___lxstat (_STAT_VER, path, buf); +} + +int +pseudo_fstat (int fd,struct stat *buf) { +return real___fxstat (_STAT_VER, fd, buf); +} + +int +pseudo_stat64 (const char *path,struct stat64 *buf) { +return real___xstat64 (_STAT_VER, path, buf); +} + +int +pseudo_lstat64 (const char *path,struct stat64 *buf) { +return real___lxstat64 (_STAT_VER, path, buf); +} + +int +pseudo_fstat64 (int fd,struct stat64 *buf) { +return real___fxstat64 (_STAT_VER, fd, buf); +} + +/* similar thing happens with mknod */ +int +pseudo_mknod (const char *path,mode_t mode,dev_t dev) { +return real___xmknod (_MKNOD_VER, path, mode, &dev); +} + +int +pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { +return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); +}ports/linux/old__x/wrapfuncs.in new file +18
-0@@ -0,0 +1,18 @@ +int __xstat(int ver, const char *path, struct stat *buf); +int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat(int ver, int fd, struct stat *buf); +int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); +int __xstat64(int ver, const char *path, struct stat64 *buf); +int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int __fxstat64(int ver, int fd, struct stat64 *buf); +int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); + +int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ +int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ +int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ + +int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ports/linux/portdefs.h +0
-19@@ -34,22 +34,3 @@ GLIBC_COMPAT_SYMBOL(memcpy,2.0);#include <sys/syscall.h> #include <sys/prctl.h> #include <linux/seccomp.h> - -#ifndef _STAT_VER -#if defined (__aarch64__) -#define _STAT_VER 0 -#elif defined (__x86_64__) -#define _STAT_VER 1 -#else -#define _STAT_VER 3 -#endif -#endif -#ifndef _MKNOD_VER -#if defined (__aarch64__) -#define _MKNOD_VER 0 -#elif defined (__x86_64__) -#define _MKNOD_VER 0 -#else -#define _MKNOD_VER 1 -#endif -#endif ports/linux/pseudo_wrappers.c +0
-43@@ -2,50 +2,7 @@* SPDX-License-Identifier: LGPL-2.1-only * */ -/* the unix port wants to know that real_stat() and -* friends exist. So they do. And because the Linux -* port really uses stat64 for those... -*/ -int -pseudo_stat (const char *path,struct stat *buf) { -return real___xstat (_STAT_VER, path, buf); -} - -int -pseudo_lstat (const char *path,struct stat *buf) { -return real___lxstat (_STAT_VER, path, buf); -} - -int -pseudo_fstat (int fd,struct stat *buf) { -return real___fxstat (_STAT_VER, fd, buf); -} - -int -pseudo_stat64 (const char *path,struct stat64 *buf) { -return real___xstat64 (_STAT_VER, path, buf); -} - -int -pseudo_lstat64 (const char *path,struct stat64 *buf) { -return real___lxstat64 (_STAT_VER, path, buf); -} - -int -pseudo_fstat64 (int fd,struct stat64 *buf) { -return real___fxstat64 (_STAT_VER, fd, buf); -} -/* similar thing happens with mknod */ -int -pseudo_mknod (const char *path,mode_t mode,dev_t dev) { -return real___xmknod (_MKNOD_VER, path, mode, &dev); -} - -int -pseudo_mknodat (int dirfd,const char *path,mode_t mode,dev_t dev) { -return real___xmknodat (_MKNOD_VER, dirfd, path, mode, &dev); -}int pseudo_capset (cap_user_header_t hdrp,const cap_user_data_t datap) { (void )hdrp;ports/linux/subports +15
-0@@ -70,3 +70,18 @@ else fi rm -f dummy.c dummy.o +# Check if _STAT_VER is defined. This is an indication that the old internal __*xstat* functions are available +# Check if _MKNOD_VER is defined. This is an indication that the old internal __xmknod* functions are available +cat > dummy.c <<EOF +#include <sys/stat.h> +#ifndef _STAT_VER +#error _STAT_VER not defined +#endif +#ifndef _MKNOD_VER +#error _MKNOD_VER not defined +#endif +EOF +if ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then + echo "linux/old__x" +fi +rm -f dummy.c dummy.oports/linux/wrapfuncs.in +8
-18@@ -1,17 +1,11 @@ int open(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ char *get_current_dir_name(void); -int __xstat(int ver, const char *path, struct stat *buf); -int __lxstat(int ver, const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat(int ver, int fd, struct stat *buf); int lchmod(const char *path, mode_t mode); /* flags=AT_SYMLINK_NOFOLLOW */ int lchown(const char *path, uid_t owner, gid_t group); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstatat(int ver, int dirfd, const char *path, struct stat *buf, int flags); int openat(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ -int mknod(const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknod */ -int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); /* real_func=pseudo_mknodat */ -int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ -int __xmknodat(int ver, int dirfd, const char *path, mode_t mode, dev_t *dev); /* flags=AT_SYMLINK_NOFOLLOW */ +int mknod(const char *path, mode_t mode, dev_t dev); +int mknodat(int dirfd, const char *path, mode_t mode, dev_t dev); int fcntl(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ int fcntl64(int fd, int cmd, ...{struct flock *lock}); /* noignore_path=1 */ # just so we know the inums of symlinks@@ -21,18 +15,14 @@ int open64(const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFO int openat64(int dirfd, const char *path, int flags, ...{mode_t mode}); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int __openat64_2(int dirfd, const char *path, int flags); /* flags=flags&O_NOFOLLOW, noignore_path=1 */ int creat64(const char *path, mode_t mode); -int stat(const char *path, struct stat *buf); /* real_func=pseudo_stat */ -int lstat(const char *path, struct stat *buf); /* real_func=pseudo_lstat, flags=AT_SYMLINK_NOFOLLOW */ -int fstat(int fd, struct stat *buf); /* real_func=pseudo_fstat */ +int stat(const char *path, struct stat *buf); +int lstat(const char *path, struct stat *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat(int fd, struct stat *buf); int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -int stat64(const char *path, struct stat64 *buf); /* real_func=pseudo_stat64 */ -int lstat64(const char *path, struct stat64 *buf); /* real_func=pseudo_lstat64, flags=AT_SYMLINK_NOFOLLOW */ -int fstat64(int fd, struct stat64 *buf); /* real_func=pseudo_fstat64 */ +int stat64(const char *path, struct stat64 *buf); +int lstat64(const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ +int fstat64(int fd, struct stat64 *buf); int fstatat64(int dirfd, const char *path, struct stat64 *buf, int flags); -int __xstat64(int ver, const char *path, struct stat64 *buf); -int __lxstat64(int ver, const char *path, struct stat64 *buf); /* flags=AT_SYMLINK_NOFOLLOW */ -int __fxstat64(int ver, int fd, struct stat64 *buf); -int __fxstatat64(int ver, int dirfd, const char *path, struct stat64 *buf, int flags); FILE *fopen64(const char *path, const char *mode); /* noignore_path=1 */ int nftw64(const char *path, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int nopenfd, int flag); /* noignore_path=1 */ FILE *freopen64(const char *path, const char *mode, FILE *stream); /* noignore_path=1 */pseudo_client.h +32
-6@@ -12,15 +12,41 @@ extern int pseudo_client_ignore_fd(int fd);extern void pseudo_client_linked_paths (const char *oldpath,const char *newpath);#if PSEUDO_STATBUF_64 #define base_lstat real_lstat64 -#define base_fstat real_fstat64 -#define base_stat real_stat64 -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat64(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat64 +#endif +#ifndef base_stat +#define base_stat real_stat64 +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat64 +#endif #else #define base_lstat real_lstat -#define base_fstat real_fstat -#define base_stat real_stat -#define base_fstatat (dirfd, path, buf, flags) real___fxstatat(_STAT_VER, dirfd, path, buf, flags) +#ifndef base_fstat +#define base_fstat real_fstat +#endif +#ifndef base_stat +#define base_stat real_stat +#endif +#ifndef base_fstatat +#define base_fstatat real_fstatat +#endif #endif + +#ifndef base_lstat64 +#define base_lstat64 real_lstat64 +#endif +#ifndef base_fstat64 +#define base_fstat64 real_fstat64 +#endif +#ifndef base_stat64 +#define base_stat64 real_stat64 +#endif +#ifndef base_fstatat64 +#define base_fstatat64 real_fstatat64 +#endif +extern void pseudo_antimagic (void );extern void pseudo_magic (void );extern void pseudo_client_touchuid (void );Signature · 1 line
2.17.1
Signature · 11 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182613): https://lists.openembedded.org/g/openembedded-core/message/182613 Mute This Topic: https://lists.openembedded.org/mt/99234918/7449467 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-