From patchwork Wed Jun 21 13:00:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 111006 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4353444vqr; Wed, 21 Jun 2023 06:12:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7l0XG7ro/8x5ZsVbFTTvapnPjCwnfKVgKrVTMNuVsKwtKOIHRLm3vZytduAq1e5pnf2kK5 X-Received: by 2002:a05:6a20:8e17:b0:122:51a3:60e2 with SMTP id y23-20020a056a208e1700b0012251a360e2mr6058269pzj.35.1687353164447; Wed, 21 Jun 2023 06:12:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687353164; cv=none; d=google.com; s=arc-20160816; b=pHXvtgTv0tLuFW7dS2XpISO9XbH1IY3BtZHoxVOizjo9KxF+kT7JcvJIuCaSGBeAa9 F2sylTa88rfBbjJN1MZFPhdciDbRhY7ISAHhCj+nQUpf3BDmwyJJoG99J2ywXszQe7vA U5LlDzzzereMCEp/GRlLwHGIMpBN3DgCPeTKplyyjaMfLpYXQkCcVxSPX+ie3c3kogsK vZtPzD1rolHm019VnHYA8tC5tN2XnzljA+9c6r1gWzarBe43rD0XyPiOG9PlKpCvOWUR Mjn2ewe+29Yi4mnXEUwy7bbnkPBcsBam5oYVralrPhS69L9lirlYxl4eCNZ3wMDDNenq t4cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=I0nimrN0oFYhsfl80suGQ/B2DyRYOSix4wwSzCCPTTE=; b=hSSPRuWiWMMALTzJiwc32IsPtUaaa6RpwSI7cEjq22WJcX5EsCoJgYlXpjfSLkm7va eBpt3NGGIarg4LnAZFp2F7a517WXDSgrXr1yr35E5uoEjUIu9glRFKFSwSilBhanclUM fCMSjWyMx7WkPk5VP0ffgVefYRVOy2II89TI+bp0ZuUDMH1k1vGwalm9LUFx7lbUUjXx psDpyYKrFVuxpNOzdONYsX+iV/ATk85c5F2QyDWAvwG4NYUho8ViZuuNnTHzXnHvPDnr rWwXEq8IgujpJefi7GjZneYNs01erCzd52CQQiZvbWqIKxL05BN5L92rnMwjxfYFR1/z Pgrw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u143-20020a627995000000b00645edbb3911si1646816pfc.281.2023.06.21.06.12.30; Wed, 21 Jun 2023 06:12:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232119AbjFUNAy (ORCPT + 99 others); Wed, 21 Jun 2023 09:00:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230108AbjFUNAw (ORCPT ); Wed, 21 Jun 2023 09:00:52 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.65.254]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAD8D1AC; Wed, 21 Jun 2023 06:00:50 -0700 (PDT) X-QQ-mid: bizesmtp65t1687352442tow0k82a Received: from linux-lab-host.localdomain ( [116.30.126.60]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 21 Jun 2023 21:00:41 +0800 (CST) X-QQ-SSF: 01200000000000D0V000000A0000000 X-QQ-FEAT: ILHsT53NKPiClSNJokhMYDBCmPxungrT3Z+CWJDyQNX3zu4qzLWhjv7TO/3Hn /N8B9E8eDY8EdrjCc7Jz6dJyueSDRep5azdaqdVyMFQYVxpSnf2LAKXuXjHzvidF8+mX6EB e5Ue0qtvGuZjh5LBUoEPh7E2IgsmHEEuFmESuk8i9WjkzTOkHBqjqPI+YYdG1iXXX9J40L+ 7DwACtW3ZjrR9UZ+Lf+GstYy7tDM9GvhRTboSxBRXLJ5mcOxhJbzSHpBT55cL9u+uGY82KR S82+3tyMLY2Hso2Z7zujZN91pH8jGSe3J1BPNU2GhGS3LLvtIB4/8s7CgHaHN5y8JADXQ5X EbMUU5cUoLYGmVPgqQEo6uoNF3USYfnsNQc05e0VbrrQQP2djYU8t5+QvZsOg== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 18188769316264056375 From: Zhangjin Wu To: w@1wt.eu Cc: thomas@t-8ch.de, arnd@arndb.de, falcon@tinylab.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v1 06/17] tools/nolibc: add rmdir() support Date: Wed, 21 Jun 2023 21:00:33 +0800 Message-Id: <12a992919bea416bbc073d869c90d03c5ad1c7ac.1687344643.git.falcon@tinylab.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrsz:qybglogicsvrsz3a-3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769318031743721733?= X-GMAIL-MSGID: =?utf-8?q?1769318031743721733?= A reverse operation of mkdir is meaningful, add rmdir() here. This is required by nolibc-test to remove /proc if CONFIG_PROC_FS not enabled. Signed-off-by: Zhangjin Wu --- tools/include/nolibc/sys.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index 856249a11890..8ddfd9185da6 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -716,6 +716,34 @@ int mkdir(const char *path, mode_t mode) return ret; } +/* + * int rmdir(const char *path); + */ + +static __attribute__((unused)) +int sys_rmdir(const char *path) +{ +#ifdef __NR_rmdir + return my_syscall1(__NR_rmdir, path); +#elif defined(__NR_unlinkat) + return my_syscall3(__NR_unlinkat, AT_FDCWD, path, AT_REMOVEDIR); +#else + return -ENOSYS; +#endif +} + +static __attribute__((unused)) +int rmdir(const char *path) +{ + int ret = sys_rmdir(path); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + /* * int mknod(const char *path, mode_t mode, dev_t dev);