From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by sourceware.org (Postfix) with ESMTPS id DDE453857C68 for ; Wed, 4 Nov 2020 18:38:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DDE453857C68 Received: by mail-io1-xd36.google.com with SMTP id u19so23280129ion.3 for ; Wed, 04 Nov 2020 10:38:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vFBq9WLeBr3vr/Na+jff54s7e+kjFKxa7CSvFwGGDCM=; b=JB1FW0R9BdfIP1FApRh0J7t/PqKqg530cvIus7MlgPOaBLDWqnrie9I1kkuJkT2avL EBqZdIXQ9tcf5E2wo2LhOhpj0xWTaXK0Fk2hZi/lRrWMfHO8IZxMAwahcKFllG9xW1SI 0oNEO4OgPkRxXgDNHg9wCbiT7/f6Co2auV4r2LQHaY8I5K1Jh50+H1m6slIXp2BrAZdF rSQUiaP2acC8AF/zGE33c/m17eNtowGjodNBcBcq3jUASMwPv8ZO3uwwhBT36p/ix0Nq whNv7s7oOaYq0dOJU4k4/6nTfE2nVGS6D0oBouBnflBC2+mhScQCEaMr18fjG3eR0eMY OM+g== X-Gm-Message-State: AOAM530TmkTtOhm30jjUS0ykTO/ShPJ5Lvkipim0K3+Q7nOqLueWaVJr Ha/JyH21UVNnsB2lGwj/FJGzZzxekdAb2gzAcfE= X-Google-Smtp-Source: ABdhPJxOGa0Bd+o/XvMS9KBfwYuhZ0lrNbLFhCYrPRoNVXPOCKgg0KIalXLIMOd6NjNydh66Kpv85eYq9+sEQUyx630= X-Received: by 2002:a5d:8e12:: with SMTP id e18mr16927384iod.99.1604515126340; Wed, 04 Nov 2020 10:38:46 -0800 (PST) MIME-Version: 1.0 References: <20201016074602.13267-1-eshandhawan51@gmail.com> In-Reply-To: From: Eshan Dhawan Date: Thu, 5 Nov 2020 00:08:35 +0530 Message-ID: Subject: Re: [PATCH v3] ftw initial port To: Jeff Johnston Cc: Newlib X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Nov 2020 18:38:49 -0000 Hi jeff, Apologies I missed I will update it soon. Thanks -Eshan On Wed, Nov 4, 2020 at 11:56 PM Jeff Johnston wrote: > Hi Eshan, > > I did review this. I had questions about your weak_alias macro. You > check for _weak_alias, then define weak_alias. If _weak_alias is defined= , > why not just use it? As well, if _weak_alias is not defined, then you ar= e > referencing weak_alias in your code without it being defined. > > -- Jeff J. > > On Wed, Nov 4, 2020 at 1:21 PM Eshan Dhawan via Newlib < > newlib@sourceware.org> wrote: > >> Hello everyone, >> I sent this patch earlier but it seems to be missed between other patche= s. >> I wanted it if you all could review it. >> >> -Eshan >> >> On Fri, Oct 16, 2020 at 1:16 PM Eshan dhawan >> wrote: >> >> > Signed-off-by: Eshan dhawan >> > --- >> > newlib/libc/include/ftw.h | 69 +++++++++++++++ >> > newlib/libc/posix/Makefile.am | 2 +- >> > newlib/libc/posix/ftw.c | 34 ++++++++ >> > newlib/libc/posix/nftw.c | 156 +++++++++++++++++++++++++++++++++= + >> > 4 files changed, 260 insertions(+), 1 deletion(-) >> > create mode 100644 newlib/libc/include/ftw.h >> > create mode 100644 newlib/libc/posix/ftw.c >> > create mode 100644 newlib/libc/posix/nftw.c >> > >> > diff --git a/newlib/libc/include/ftw.h b/newlib/libc/include/ftw.h >> > new file mode 100644 >> > index 000000000..400701cf5 >> > --- /dev/null >> > +++ b/newlib/libc/include/ftw.h >> > @@ -0,0 +1,69 @@ >> > +/* >> > +* Copyright =C2=A9 2005-2020 Rich Felker, et al. >> > +* >> > +* Permission is hereby granted, free of charge, to any person obtaini= ng >> > +* a copy of this software and associated documentation files (the >> > +* "Software"), to deal in the Software without restriction, including >> > +* without limitation the rights to use, copy, modify, merge, publish, >> > +* distribute, sublicense, and/or sell copies of the Software, and to >> > +* permit persons to whom the Software is furnished to do so, subject = to >> > +* the following conditions: >> > +* >> > +* The above copyright notice and this permission notice shall be >> > +* included in all copies or substantial portions of the Software. >> > +* >> > +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >> > +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >> > +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND >> NONINFRINGEMENT. >> > +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR AN= Y >> > +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT= , >> > +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE >> > +* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. >> > +*/ >> > + >> > +#ifndef _FTW_H >> > +#define _FTW_H >> > + >> > +#ifdef __cplusplus >> > +extern "C" { >> > +#endif >> > + >> > +#ifdef _weak_alias(name, aliasname) >> > +# define weak_alias(name, aliasname) \ >> > + extern __typeof (name) aliasname __attribute__ ((__weak__, __alias_= _ >> > (#name))); >> > +#endif >> > + >> > +#include >> > +#include >> > + >> > +#define FTW_F 1 >> > +#define FTW_D 2 >> > +#define FTW_DNR 3 >> > +#define FTW_NS 4 >> > +#define FTW_SL 5 >> > +#define FTW_DP 6 >> > +#define FTW_SLN 7 >> > + >> > +#define FTW_PHYS 1 >> > +#define FTW_MOUNT 2 >> > +#define FTW_CHDIR 4 >> > +#define FTW_DEPTH 8 >> > + >> > +struct FTW { >> > + int base; >> > + int level; >> > +}; >> > + >> > +int ftw(const char *, int (*)(const char *, const struct stat *, int)= , >> > int); >> > +int nftw(const char *, int (*)(const char *, const struct stat *, int= , >> > struct FTW *), int, int); >> > + >> > +#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) >> > +#define ftw64 ftw >> > +#define nftw64 nftw >> > +#endif >> > + >> > +#ifdef __cplusplus >> > +} >> > +#endif >> > + >> > +#endif >> > diff --git a/newlib/libc/posix/Makefile.am >> b/newlib/libc/posix/Makefile.am >> > index 6cdee1df0..5a358f782 100644 >> > --- a/newlib/libc/posix/Makefile.am >> > +++ b/newlib/libc/posix/Makefile.am >> > @@ -10,7 +10,7 @@ GENERAL_SOURCES =3D \ >> > opendir.c readdir.c readdir_r.c \ >> > regcomp.c regerror.c regexec.c regfree.c \ >> > rewinddir.c sleep.c usleep.c \ >> > - telldir.c >> > + telldir.c ftw.c nftw.c >> > >> > ELIX_2_SOURCES =3D \ >> > scandir.c seekdir.c >> > diff --git a/newlib/libc/posix/ftw.c b/newlib/libc/posix/ftw.c >> > new file mode 100644 >> > index 000000000..fa320e9b0 >> > --- /dev/null >> > +++ b/newlib/libc/posix/ftw.c >> > @@ -0,0 +1,34 @@ >> > +/* >> > +* Copyright =C2=A9 2005-2020 Rich Felker, et al. >> > +* >> > +* Permission is hereby granted, free of charge, to any person obtaini= ng >> > +* a copy of this software and associated documentation files (the >> > +* "Software"), to deal in the Software without restriction, including >> > +* without limitation the rights to use, copy, modify, merge, publish, >> > +* distribute, sublicense, and/or sell copies of the Software, and to >> > +* permit persons to whom the Software is furnished to do so, subject = to >> > +* the following conditions: >> > +* >> > +* The above copyright notice and this permission notice shall be >> > +* included in all copies or substantial portions of the Software. >> > +* >> > +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >> > +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >> > +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND >> NONINFRINGEMENT. >> > +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR AN= Y >> > +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT= , >> > +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE >> > +* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. >> > +*/ >> > + >> > +#include >> > + >> > +int ftw(const char *path, int (*fn)(const char *, const struct stat *= , >> > int), int fd_limit) >> > +{ >> > + /* The following cast assumes that calling a function with one >> > + * argument more than it needs behaves as expected. This is >> > + * actually undefined, but works on all real-world machines. *= / >> > + return nftw(path, (int (*)())fn, fd_limit, FTW_PHYS); >> > +} >> > + >> > +weak_alias(ftw, ftw64); >> > diff --git a/newlib/libc/posix/nftw.c b/newlib/libc/posix/nftw.c >> > new file mode 100644 >> > index 000000000..0ffca9f67 >> > --- /dev/null >> > +++ b/newlib/libc/posix/nftw.c >> > @@ -0,0 +1,156 @@ >> > +/* >> > +* Copyright =C2=A9 2005-2020 Rich Felker, et al. >> > +* >> > +* Permission is hereby granted, free of charge, to any person obtaini= ng >> > +* a copy of this software and associated documentation files (the >> > +* "Software"), to deal in the Software without restriction, including >> > +* without limitation the rights to use, copy, modify, merge, publish, >> > +* distribute, sublicense, and/or sell copies of the Software, and to >> > +* permit persons to whom the Software is furnished to do so, subject = to >> > +* the following conditions: >> > +* >> > +* The above copyright notice and this permission notice shall be >> > +* included in all copies or substantial portions of the Software. >> > +* >> > +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >> > +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >> > +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND >> NONINFRINGEMENT. >> > +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR AN= Y >> > +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT= , >> > +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE >> > +* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. >> > +*/ >> > + >> > +#include >> > +#include >> > +#include >> > +#include >> > +#include >> > +#include >> > +#include >> > +#include >> > + >> > +struct history >> > +{ >> > + struct history *chain; >> > + dev_t dev; >> > + ino_t ino; >> > + int level; >> > + int base; >> > +}; >> > + >> > +#undef dirfd >> > +#define dirfd(d) (*(int *)d) >> > + >> > +static int do_nftw(char *path, int (*fn)(const char *, const struct >> stat >> > *, int, struct FTW *), int fd_limit, int flags, struct history *h) >> > +{ >> > + size_t l =3D strlen(path), j =3D l && path[l-1]=3D=3D'/' ? l-1= : l; >> > + struct stat st; >> > + struct history new; >> > + int type; >> > + int r; >> > + struct FTW lev; >> > + >> > + if ((flags & FTW_PHYS) ? lstat(path, &st) : stat(path, &st) < >> 0) { >> > + if (!(flags & FTW_PHYS) && errno=3D=3DENOENT && !lstat= (path, >> > &st)) >> > + type =3D FTW_SLN; >> > + else if (errno !=3D EACCES) return -1; >> > + else type =3D FTW_NS; >> > + } else if (S_ISDIR(st.st_mode)) { >> > + if (access(path, R_OK) < 0) type =3D FTW_DNR; >> > + else if (flags & FTW_DEPTH) type =3D FTW_DP; >> > + else type =3D FTW_D; >> > + } else if (S_ISLNK(st.st_mode)) { >> > + if (flags & FTW_PHYS) type =3D FTW_SL; >> > + else type =3D FTW_SLN; >> > + } else { >> > + type =3D FTW_F; >> > + } >> > + >> > + if ((flags & FTW_MOUNT) && h && st.st_dev !=3D h->dev) >> > + return 0; >> > + >> > + new.chain =3D h; >> > + new.dev =3D st.st_dev; >> > + new.ino =3D st.st_ino; >> > + new.level =3D h ? h->level+1 : 0; >> > + new.base =3D j+1; >> > + >> > + lev.level =3D new.level; >> > + if (h) { >> > + lev.base =3D h->base; >> > + } else { >> > + size_t k; >> > + for (k=3Dj; k && path[k]=3D=3D'/'; k--); >> > + for (; k && path[k-1]!=3D'/'; k--); >> > + lev.base =3D k; >> > + } >> > + >> > + if (!(flags & FTW_DEPTH) && (r=3Dfn(path, &st, type, &lev))) >> > + return r; >> > + >> > + for (; h; h =3D h->chain) >> > + if (h->dev =3D=3D st.st_dev && h->ino =3D=3D st.st_ino= ) >> > + return 0; >> > + >> > + if ((type =3D=3D FTW_D || type =3D=3D FTW_DP) && fd_limit) { >> > + DIR *d =3D opendir(path); >> > + if (d) { >> > + struct dirent *de; >> > + while ((de =3D readdir(d))) { >> > + if (de->d_name[0] =3D=3D '.' >> > + && (!de->d_name[1] >> > + || (de->d_name[1]=3D=3D'.' >> > + && !de->d_name[2]))) continue; >> > + if (strlen(de->d_name) >=3D PATH_MAX-l= ) { >> > + errno =3D ENAMETOOLONG; >> > + closedir(d); >> > + return -1; >> > + } >> > + path[j]=3D'/'; >> > + strcpy(path+j+1, de->d_name); >> > + if ((r=3Ddo_nftw(path, fn, fd_limit-1, >> > flags, &new))) { >> > + closedir(d); >> > + return r; >> > + } >> > + } >> > + closedir(d); >> > + } else if (errno !=3D EACCES) { >> > + return -1; >> > + } >> > + } >> > + >> > + path[l] =3D 0; >> > + if ((flags & FTW_DEPTH) && (r=3Dfn(path, &st, type, &lev))) >> > + return r; >> > + >> > + return 0; >> > +} >> > + >> > +int nftw(const char *path, int (*fn)(const char *, const struct stat = *, >> > int, struct FTW *), int fd_limit, int flags) >> > +{ >> > + int r, cs; >> > + size_t l; >> > + char pathbuf[PATH_MAX+1]; >> > + >> > + if (fd_limit <=3D 0) return 0; >> > + >> > + l =3D strlen(path); >> > + if (l > PATH_MAX) { >> > + errno =3D ENAMETOOLONG; >> > + return -1; >> > + } >> > + memcpy(pathbuf, path, l+1); >> > + >> > +#ifdef _STDIO_WITH_THREAD_CANCELLATION_SUPPORT >> > + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); >> > +#endif >> > + r =3D do_nftw(pathbuf, fn, fd_limit, flags, NULL); >> > +#ifdef _STDIO_WITH_THREAD_CANCELLATION_SUPPORT >> > + pthread_setcancelstate(cs, 0); >> > +#endif >> > + return r; >> > +} >> > + >> > +weak_alias(nftw, nftw64); >> > + >> > -- >> > 2.17.1 >> > >> > >> >> --=20 Thanks - Eshan