From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 11759 invoked from network); 25 Sep 2020 09:58:31 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 25 Sep 2020 09:58:31 -0000 Received: (qmail 7403 invoked by uid 550); 25 Sep 2020 09:58:26 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 9307 invoked from network); 25 Sep 2020 09:18:50 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Sgc0G8FuB+RpI5BNsrwnpKePp+ljs/1vb7DJ6gyCtvM=; b=mz3ddIhN1PtvWVN0H633Tgy6URsfXXS7zcfYRabZiGxOTaMjtsIUD2yEHwPXwxfhxA sawcyivtCSnx0AFPtS1/yS0xOttr3aPA0idI1J3XGWS5HKS5ojbk962QfSr+v2xLyxq9 344a0hi5wstqHqQyqz90esDq/ls2DgGau8HXvEvmyL3eqqVR1FXW2hFANIYGD4RIP+mI knZBZmuMBOd7Hjek/v5EdAAwg6ButeVUnnjL2aHuueNLWP4Iw0lzH6zA/8G08ql0dqq9 mALweJO05TnmvL7q9NEVVFIXQf3l6G9gREuFouXQFTbiyU4RLgY7Yt071s2cuWzyM5xQ 7rAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Sgc0G8FuB+RpI5BNsrwnpKePp+ljs/1vb7DJ6gyCtvM=; b=MfSJPPfs89RdwKsA5g0pUaYjK5xghoOam5CQnOQjwmc+JfDxJb1WMWIdoRJ+Xo8BJq TtLYXbPuQCWNMwTwOfxiePU+B1y1aBtddmRpEVfTzwKOfNkSYg/VJjkoWjAgm/lmBQgx toKJtY2GR5FLjPVzGuTLprCQJm+sEAQJPNzOcb4x1m/XqQ2wr6lglnJx5c9JYjqAjU7X /KwRL/PRAChmv6qcDcTxdj4S7MDY9OCTV/VDl71mCG774DM0/V92JSkm6j+igqxTMvgm NLK7mzrCqCJJyDgHayCB+N/WzNd+IKA3M8JaHU2lGTXQ4lnCTyeNlMm1160mapgHq0ml iaCg== X-Gm-Message-State: AOAM532zL68BG+uAIwE2/gleHCb7mOvxTRskosuRcXSa5Ec5M9ZByiq0 3yai6v+7KSzuev0SbZ2LXHsfBxZx8JX2DQ== X-Google-Smtp-Source: ABdhPJy38RKnQy5ZLYCVVzZTMS1fUhuXGurTAYWhb+9oOCXb8pMTyYefwBeMuDFfLJYbpH2Tjfv9mg== X-Received: by 2002:a63:de56:: with SMTP id y22mr2781150pgi.166.1601025518513; Fri, 25 Sep 2020 02:18:38 -0700 (PDT) From: Tony Ambardar X-Google-Original-From: Tony Ambardar To: musl@lists.openwall.com Cc: Tony Ambardar Date: Fri, 25 Sep 2020 02:18:28 -0700 Message-Id: <20200925091828.306644-1-Tony.Ambardar@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [musl] [PATCH v1] nftw: support FTW_ACTIONRETVAL extension Add the FTW_ACTIONRETVAL mode for walking file trees, a commonly used glibc extension. This updates the existing musl nftw/ftw code to support the new mode and include options e.g. to prune trees and skip tree siblings. This patch is based on one originally submitted to musl's mailing list [1], which was reviewed with interest but received no follow-up. It has since been cleaned up, and tested on OpenWRT for building Linux's 'bpftool' utility (the primary tool for BPF introspection and manipulation). Including this extension should also further reduce any need for fts(3) support. [1] https://www.openwall.com/lists/musl/2018/12/16/1 Signed-off-by: Tony Ambardar --- include/ftw.h | 8 ++++++++ src/misc/nftw.c | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/include/ftw.h b/include/ftw.h index b15c062a..ce85deac 100644 --- a/include/ftw.h +++ b/include/ftw.h @@ -21,6 +21,14 @@ extern "C" { #define FTW_CHDIR 4 #define FTW_DEPTH 8 +#ifdef _GNU_SOURCE +#define FTW_ACTIONRETVAL 16 +#define FTW_CONTINUE 0 +#define FTW_STOP 1 +#define FTW_SKIP_SUBTREE 2 +#define FTW_SKIP_SIBLINGS 3 +#endif + struct FTW { int base; int level; diff --git a/src/misc/nftw.c b/src/misc/nftw.c index 8dcff7fe..0bb7b601 100644 --- a/src/misc/nftw.c +++ b/src/misc/nftw.c @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include #include #include @@ -72,8 +73,20 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int, if (!fd_limit) close(dfd); } - if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev))) - return r; + if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev))) { + if (flags & FTW_ACTIONRETVAL) + switch (r) { + case FTW_SKIP_SUBTREE: + h = NULL; + case FTW_CONTINUE: + break; + case FTW_SKIP_SIBLINGS: + case FTW_STOP: + return r; + } + else + return r; + } for (; h; h = h->chain) if (h->dev == st.st_dev && h->ino == st.st_ino) @@ -101,7 +114,10 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int, strcpy(path+j+1, de->d_name); if ((r=do_nftw(path, fn, fd_limit-1, flags, &new))) { closedir(d); - return r; + if ((flags & FTW_ACTIONRETVAL) && r == FTW_SKIP_SIBLINGS) + break; + else + return r; } } closedir(d); @@ -112,8 +128,16 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int, } path[l] = 0; - if ((flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev))) - return r; + if ((flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev))) { + if (flags & FTW_ACTIONRETVAL) + switch (r) { + case FTW_SKIP_SIBLINGS: + case FTW_STOP: + return r; + } + else + return r; + } return 0; } @@ -139,4 +163,5 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str return r; } +#undef nftw64 weak_alias(nftw, nftw64); -- 2.25.1