From 04986243d1af37ac0177ed2f9db0a066ebd2b212 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 15 Jul 2020 19:35:58 +0000 Subject: Remove internal usage of extensible stat functions It replaces the internal usage of __{f,l}xstat{at}{64} with the __{f,l}stat{at}{64}. It should not change the generate code since sys/stat.h explicit defines redirections to internal calls back to xstat* symbols. Checked with a build for all affected ABIs. I also check on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Lukasz Majewski --- inet/rcmd.c | 4 ++-- inet/ruserpass.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'inet') diff --git a/inet/rcmd.c b/inet/rcmd.c index 8a9616f847..452ff7d099 100644 --- a/inet/rcmd.c +++ b/inet/rcmd.c @@ -474,7 +474,7 @@ iruserfopen (const char *file, uid_t okuser) /* If not a regular file, if owned by someone other than user or root, if writeable by anyone but the owner, or if hardlinked anywhere, quit. */ - if (__lxstat64 (_STAT_VER, file, &st)) + if (__lstat64 (file, &st)) cp = _("lstat failed"); else if (!S_ISREG (st.st_mode)) cp = _("not regular file"); @@ -483,7 +483,7 @@ iruserfopen (const char *file, uid_t okuser) res = fopen (file, "rce"); if (!res) cp = _("cannot open"); - else if (__fxstat64 (_STAT_VER, fileno (res), &st) < 0) + else if (__fstat64 (fileno (res), &st) < 0) cp = _("fstat failed"); else if (st.st_uid && st.st_uid != okuser) cp = _("bad owner"); diff --git a/inet/ruserpass.c b/inet/ruserpass.c index 4fa6520c1a..d61a72877d 100644 --- a/inet/ruserpass.c +++ b/inet/ruserpass.c @@ -174,7 +174,7 @@ next: break; case PASSWD: if (strcmp(*aname, "anonymous") && - fstat64(fileno(cfile), &stb) >= 0 && + __fstat64(fileno(cfile), &stb) >= 0 && (stb.st_mode & 077) != 0) { warnx(_("Error: .netrc file is readable by others.")); warnx(_("Remove 'password' line or make file unreadable by others.")); -- cgit 1.4.1