From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 2E391389838F; Wed, 7 Dec 2022 19:14:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E391389838F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670440489; bh=5jinZX37k1I1UsA54m/7AhPeHDLWQt+RuWZBRSWAqcE=; h=From:To:Subject:Date:From; b=jfg65t+ysz8Rst6dV8jyZCtGnQ/uxauGxZy/7IfdFobivrQizqvqHGO0SFCUvpKQ8 gIZNQz4I9xypzHDAuYPeM453ut31MEkZjHc960wuTN4xy2EMcpWvRn262OruTBlTYx l1FGx+1d7G4uKDGH66/t74XCHw6oDOkKHqqJ9jYA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] Linux: consolidate chown implementation X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella Netto X-Git-Refname: refs/heads/master X-Git-Oldrev: f0fa84d31fac30ce0f5cba715751478253f4ba8c X-Git-Newrev: 1001abfa14d5289236dcca740ab72ec4d1fa5352 Message-Id: <20221207191449.2E391389838F@sourceware.org> Date: Wed, 7 Dec 2022 19:14:49 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1001abfa14d5289236dcca740ab72ec4d1fa5352 commit 1001abfa14d5289236dcca740ab72ec4d1fa5352 Author: Adhemerval Zanella Netto Date: Wed Oct 19 19:14:07 2022 -0300 Linux: consolidate chown implementation Use chown syscall if defined, otherwise use fchownat. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell Diff: --- sysdeps/unix/sysv/linux/{generic => }/chown.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/generic/chown.c b/sysdeps/unix/sysv/linux/chown.c similarity index 77% rename from sysdeps/unix/sysv/linux/generic/chown.c rename to sysdeps/unix/sysv/linux/chown.c index 53997a1127..c1cd4d6c3d 100644 --- a/sysdeps/unix/sysv/linux/generic/chown.c +++ b/sysdeps/unix/sysv/linux/chown.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2011-2022 Free Software Foundation, Inc. +/* Change ownership of a file. Linux version. + Copyright (C) 2011-2022 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,7 +24,11 @@ int __chown (const char *file, uid_t owner, gid_t group) { - return INLINE_SYSCALL (fchownat, 5, AT_FDCWD, file, owner, group, 0); +#ifdef __NR_chown + return INLINE_SYSCALL_CALL (chown, file, owner, groups); +#else + return INLINE_SYSCALL_CALL (fchownat, AT_FDCWD, file, owner, group, 0); +#endif } libc_hidden_def (__chown) weak_alias (__chown, chown)