From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id 03C283857C7C for ; Wed, 19 Oct 2022 22:14:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 03C283857C7C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-ot1-x332.google.com with SMTP id cy15-20020a056830698f00b0065c530585afso10342777otb.2 for ; Wed, 19 Oct 2022 15:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Bih9yY++zgSpLIWlAUMkOi8pODkNH67u55D9a6Qv2Nw=; b=GiCe4NY500vPiCgvHCH089w4/Sv/fl8RclaxnyOGaa9rV/mRlVm6L3knzw/mkzUQ4b sMWTkdjmhv5aWQb1RxpINZ+282JGn8RwgXHZr9P+1/sieTJjDCfZSuQzNclGwpxaYiUL nZkU87/ZgndUpXpSLo1leddIaRme1ImQYBGNWbGmLDmRLHpYIQfYw6nP0BCZ2HuPJ070 JuJJjPrg6Mo9xUmX9SG0xppDWiW+nOVWhXqNB5KVHWtO0ZSKmpaoNC2U4o6AnMk7YNyf K0EgBp+O8t7u0RHuREoE+QFUZlBwAfhXeaLvzPpXbDkcZ+tleoqKmZCXsCykQqXj/4BQ KH1A== 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=Bih9yY++zgSpLIWlAUMkOi8pODkNH67u55D9a6Qv2Nw=; b=EBtqXJj4v4qV3qoLMHbad76PWXQEY44NN7FNuVKN4YQ+AtSe67wcOMd0b6IzbmeAYc d16XB25589UloC10gYSQJXeDe381sAWrnGl2rQCr1t/6PXAklGw/DCZ43gDdJ1KQ9uTR m/eaz1zbcEaVw25cEFt2v5MoYdsRcCBbZDYbuxaBz95WjF5m8VUhRytmgQoqtLUw8tta jbIU26+T7xFP1ynwf3JmBsKYWItksx9P2UFlPki2lEQ54YNeGgxc97ASRTxMHpKecIwg ztKRrf4IZUA2ZWJqBrcsYDRJhdIIQhQD11F/N3Wk1vQO75VA1hcv7lT72n/DumndP2PG U1Mw== X-Gm-Message-State: ACrzQf29nOFudbGyFK8LgydkWXwZZPQ9FxWtK0x+d7wkL3hd3Ux59Tcy CAbAymIxdUl85czvFN4vULFBhNUyxO7+y2mI X-Google-Smtp-Source: AMsMyM6yGlomMDU9Gn1hB1hWaKxzeYXkIdcuU+6u54lzuk2jb39HdB8cU6wHBJeGKEqgZo0k3urPZg== X-Received: by 2002:a05:6830:1cc2:b0:65c:73f:b37b with SMTP id p2-20020a0568301cc200b0065c073fb37bmr5091504otg.290.1666217694140; Wed, 19 Oct 2022 15:14:54 -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.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 15:14:53 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 12/30] Linux: consolidate rmdir implementation Date: Wed, 19 Oct 2022 19:14:15 -0300 Message-Id: <20221019221433.1082017-13-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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: Use rmdir syscall if defined, otherwise use unlinkat. Checked on x86_64-linux-gnu. --- sysdeps/unix/sysv/linux/{generic => }/rmdir.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) rename sysdeps/unix/sysv/linux/{generic => }/rmdir.c (78%) diff --git a/sysdeps/unix/sysv/linux/generic/rmdir.c b/sysdeps/unix/sysv/linux/rmdir.c similarity index 78% rename from sysdeps/unix/sysv/linux/generic/rmdir.c rename to sysdeps/unix/sysv/linux/rmdir.c index 214ddc711b..cd5674f07c 100644 --- a/sysdeps/unix/sysv/linux/generic/rmdir.c +++ b/sysdeps/unix/sysv/linux/rmdir.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2011-2022 Free Software Foundation, Inc. +/* Delete a directory. 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,6 +24,10 @@ int __rmdir (const char *path) { - return INLINE_SYSCALL (unlinkat, 3, AT_FDCWD, path, AT_REMOVEDIR); +#ifdef __NR_rmdir + return INLINE_SYSCALL_CALL (rmdir, path); +#else + return INLINE_SYSCALL_CALL (unlinkat, AT_FDCWD, path, AT_REMOVEDIR); +#endif } weak_alias (__rmdir, rmdir) -- 2.34.1