From patchwork Wed Oct 19 22:14:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 59092 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 35FBF3854175 for ; Wed, 19 Oct 2022 22:15:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 35FBF3854175 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666217756; bh=zIL07JOtAkTnCTYvSWDu8qKn1ZdmgMkCov51L5kJXDg=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=uC3E9yxw9u0GVQEOoCyX+KuNpniyIUvQc6stsYAifF2F9BOFSIc0Is4sLM1Ja4vdB 7lWCr+LcIiEj9wkzWU+JCJoffwcRJlLgNmUZU+dvccVj01cMP6T2WY9pQf3R34s4nn 7rfANLhP3OExyQEjTaa2z831HOxrcRK+D+52MBC8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id 809C73858C2D for ; Wed, 19 Oct 2022 22:14:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 809C73858C2D Received: by mail-oi1-x22d.google.com with SMTP id y72so20885071oia.3 for ; Wed, 19 Oct 2022 15:14:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zIL07JOtAkTnCTYvSWDu8qKn1ZdmgMkCov51L5kJXDg=; b=b1f2Kjowz0xvx13FM42k4m7DGad+KBDKEUfYvC2B/Y8h7N8MlZecJ+2I1/70nMMtl3 2S4mkTh1L2kosoHp6c+ANylZKanHZoLWt1EH3RWuWSthKG/FX6EpDVwIuVv/CqGyRI5M tcLeY52AXyLM222+epGeGGp84zpR7762/jkeaz1FF9LBrmjsZfJyN+bSW365WZbipdre Y9KKBaAm5ke7UpwGLE0+vUoxFqBEh7PM1BIsC6XebOnVDuZa1sztM4Ul9VaSSi2/ezrS dTETuSwTUfbqEi10gVT2GlWc1jqYaPgflOFzkL5AHEZuDzlmd6AAxakoakxs/+U9p6Mi Q09A== X-Gm-Message-State: ACrzQf1NuTKjkaopzhmINxHPJOebvMQKAICVY9eaIMJbJT1hJHyZbHNA 8qTBbb+RsULZs7Hxes2PdidgAGZj+f6roHDp X-Google-Smtp-Source: AMsMyM4fn4ChON60M2FdhsxlwUUkLrZOhteDa56BzS8j/Vy7CRWV7moS+mhsKae9MMxbR8cUUUSCMA== X-Received: by 2002:a05:6808:d53:b0:355:4c55:2384 with SMTP id w19-20020a0568080d5300b003554c552384mr6368566oik.190.1666217681611; Wed, 19 Oct 2022 15:14:41 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:7d19:f1c1:9fb4:472a:ab68]) by smtp.gmail.com with ESMTPSA id m9-20020aca5809000000b00353fe4fb4casm7137927oib.48.2022.10.19.15.14.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 15:14:41 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 03/30] Linux: consolidate chmod implementation Date: Wed, 19 Oct 2022 19:14:06 -0300 Message-Id: <20221019221433.1082017-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Use chmod syscall if defined, otherwise use fchmodat. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/{generic => }/chmod.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) rename sysdeps/unix/sysv/linux/{generic => }/chmod.c (78%) diff --git a/sysdeps/unix/sysv/linux/generic/chmod.c b/sysdeps/unix/sysv/linux/chmod.c similarity index 78% rename from sysdeps/unix/sysv/linux/generic/chmod.c rename to sysdeps/unix/sysv/linux/chmod.c index 98b72c0be1..aedd4c0aed 100644 --- a/sysdeps/unix/sysv/linux/generic/chmod.c +++ b/sysdeps/unix/sysv/linux/chmod.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2011-2022 Free Software Foundation, Inc. +/* Change permissions 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 @@ -16,14 +17,17 @@ . */ #include -#include #include /* Change the protections of FILE to MODE. */ int __chmod (const char *file, mode_t mode) { - return INLINE_SYSCALL (fchmodat, 3, AT_FDCWD, file, mode); +#ifdef __NR_chmod + return INLINE_SYSCALL_CALL (chmod, file, mode); +#else + return INLINE_SYSCALL_CALL (fchmodat, AT_FDCWD, file, mode); +#endif } libc_hidden_def (__chmod)