[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Inetutils branch, master, updated. v2.0-20-g353812a
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU Inetutils branch, master, updated. v2.0-20-g353812a |
|
Date: |
Sat, 24 Jul 2021 10:09:25 -0400 (EDT) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".
The branch, master has been updated
via 353812a5d9dfc77e9f70d278b611c6110404b510 (commit)
via 6d0c8ac203aca5ee9d00da918f60f66b8a42fdef (commit)
from 23065b1faf77a10957574d78b6321d875e60304d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=353812a5d9dfc77e9f70d278b611c6110404b510
commit 353812a5d9dfc77e9f70d278b611c6110404b510
Author: Simon Josefsson <simon@josefsson.org>
Date: Sat Jul 24 15:56:30 2021 +0200
Use gnulib's fts code instead of custom libls/ version.
* bootstrap.conf (gnulib_modules): Add fts.
* libls/fts.h, libls/fts.c: Remove files.
* NEWS: Mention change.
* configure.ac: Drop fchdir test.
diff --git a/NEWS b/NEWS
index 4c75bfd..6427c26 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,10 @@ Disable use of readline when environment variable TERM is
unset or set
to "dumb" (caused problems with Emacs AngeFTP on MacOS). Thanks to
Alex Bochannek for report, debugging and patch.
+** ftpd
+
+Our libls now uses gnulib's fts instead of our own custom version.
+
** telnet
*** Implement --bind (-b).
diff --git a/bootstrap.conf b/bootstrap.conf
index b6d1382..abf5a5f 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -49,6 +49,7 @@ extensions
fdl-1.3
filemode
forkpty
+fts
gendocs
getaddrinfo
getcwd
diff --git a/configure.ac b/configure.ac
index af83f35..94d141c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,8 +200,8 @@ AC_SUBST(LIBDL)
AC_SUBST(LIBPAM)
AC_SUBST(FTPD_LIBPAM)
-# Can we use libls? but we must have fchdir()
-if test "$enable_libls" = yes && test "$ac_cv_func_fchdir" = yes ; then
+# Use libls?
+if test "$enable_libls" = yes; then
LIBLS="../libls/libls.a"
libls_BUILD="libls.a"
AC_DEFINE([WITH_LIBLS], 1, [Define to one if you have -lls])
@@ -771,7 +771,7 @@ AC_FUNC_FORK
AC_FUNC_STRCOLL
AC_FUNC_MMAP
-AC_CHECK_FUNCS(cfsetspeed cgetent dirfd fchdir flock \
+AC_CHECK_FUNCS(cfsetspeed cgetent dirfd flock \
fork fpathconf ftruncate \
getcwd getmsg getpwuid_r getspnam getutxent getutxuser \
initgroups initsetproctitle killpg \
diff --git a/libls/Makefile.am b/libls/Makefile.am
index 5123ac5..c7dd4f1 100644
--- a/libls/Makefile.am
+++ b/libls/Makefile.am
@@ -25,6 +25,6 @@ noinst_LIBRARIES = $(libls_BUILD)
EXTRA_LIBRARIES = libls.a
-libls_a_SOURCES = cmp.c stat_flags.c ls.c print.c util.c fts.c
+libls_a_SOURCES = cmp.c stat_flags.c ls.c print.c util.c
-noinst_HEADERS = extern.h ls.h fts.h
+noinst_HEADERS = extern.h ls.h
diff --git a/libls/fts.c b/libls/fts.c
deleted file mode 100644
index b5f5aad..0000000
--- a/libls/fts.c
+++ /dev/null
@@ -1,1098 +0,0 @@
-/*
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
- 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
- 2020, 2021 Free Software Foundation, Inc.
-
- This file is part of GNU Inetutils.
-
- GNU Inetutils is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or (at
- your option) any later version.
-
- GNU Inetutils is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see `http://www.gnu.org/licenses/'. */
-
-/*
- * Copyright (c) 1990, 1993, 1994
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <config.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <unused-parameter.h>
-
-#include "fts.h"
-
-/* Largest alignment size needed, minus one.
- * It is used as value and as bit mask.
- * Usually long double is the worst case. */
-#ifndef ALIGNBYTES
-# define ALIGNBYTES (__alignof__ (long double) - 1)
-#endif
-
-/* Align P to size ALIGNBYTES at adapted boundary. */
-#ifndef ALIGN
-# define ALIGN(p) (((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES)
-#endif
-
-
-static FTSENT *fts_alloc (FTS *, const char *, int);
-static FTSENT *fts_build (FTS *, int);
-static void fts_lfree (FTSENT *);
-static void fts_load (FTS *, FTSENT *);
-static size_t fts_maxarglen (char *const *);
-static void fts_padjust (FTS *, void *);
-static int fts_palloc (FTS *, size_t);
-static FTSENT *fts_sort (FTS *, FTSENT *, int);
-static unsigned short fts_stat (FTS *, struct dirent *, FTSENT *, int);
-
-#ifndef MAX
-# define MAX(a, b) (((a) > (b)) ? (a) : (b))
-#endif
-
-#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
-
-#define ISSET(opt) (sp->fts_options & opt)
-#define SET(opt) (sp->fts_options |= opt)
-
-#define CHDIR(sp, path) (!ISSET(FTS_NOCHDIR) && chdir(path))
-#ifdef HAVE_FCHDIR
-# define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd))
-#else
-# define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && -1)
-#endif
-
-/* fts_build flags */
-#define BCHILD 1 /* fts_children */
-#define BNAMES 2 /* fts_children, names only */
-#define BREAD 3 /* fts_read */
-
-FTS *
-fts_open (char *const *argv, register int options, int (*compar) (const FTSENT
**, const FTSENT **))
-{
- register FTS *sp;
- register FTSENT *p, *root;
- register int nitems;
- FTSENT *parent;
- FTSENT *tmp = NULL;
- int len;
-
- /* Options check. */
- if (options & ~FTS_OPTIONMASK)
- {
- errno = EINVAL;
- return (NULL);
- }
-
- /* Allocate/initialize the stream */
- if ((sp = malloc ((u_int) sizeof (FTS))) == NULL)
- return (NULL);
- memset (sp, 0, sizeof (FTS));
- sp->fts_compar = (int (*)(const void *, const void *)) compar;
- sp->fts_options = options;
-
- /* Logical walks turn on NOCHDIR; symbolic links are too hard. */
- if (ISSET (FTS_LOGICAL))
- SET (FTS_NOCHDIR);
-
- /* Always set NOCHDIR for OS lacking fchdir () */
-#ifndef HAVE_FCHDIR
- SET (FTS_NOCHDIR);
-#endif
- /*
- * Start out with 1K of path space, and enough, in any case,
- * to hold the user's paths.
- */
-#ifndef MAXPATHLEN
-# define MAXPATHLEN 1024
-#endif
- if (fts_palloc (sp, MAX (fts_maxarglen (argv), MAXPATHLEN)))
- goto mem1;
-
- /* Allocate/initialize root's parent. */
- if ((parent = fts_alloc (sp, "", 0)) == NULL)
- goto mem2;
- parent->fts_level = FTS_ROOTPARENTLEVEL;
-
- /* Allocate/initialize root(s). */
- for (root = NULL, nitems = 0; *argv; ++argv, ++nitems)
- {
- /* Don't allow zero-length paths. */
- if ((len = strlen (*argv)) == 0)
- {
- errno = ENOENT;
- goto mem3;
- }
-
- p = fts_alloc (sp, *argv, len);
- p->fts_level = FTS_ROOTLEVEL;
- p->fts_parent = parent;
- p->fts_accpath = p->fts_name;
- p->fts_info = fts_stat (sp, NULL, p, ISSET (FTS_COMFOLLOW));
-
- /* Command-line "." and ".." are real directories. */
- if (p->fts_info == FTS_DOT)
- p->fts_info = FTS_D;
-
- /*
- * If comparison routine supplied, traverse in sorted
- * order; otherwise traverse in the order specified.
- */
- if (compar)
- {
- p->fts_link = root;
- root = p;
- }
- else
- {
- p->fts_link = NULL;
- if (root == NULL)
- tmp = root = p;
- else
- {
- tmp->fts_link = p;
- tmp = p;
- }
- }
- }
- if (compar && nitems > 1)
- root = fts_sort (sp, root, nitems);
-
- /*
- * Allocate a dummy pointer and make fts_read think that we've just
- * finished the node before the root(s); set p->fts_info to FTS_INIT
- * so that everything about the "current" node is ignored.
- */
- if ((sp->fts_cur = fts_alloc (sp, "", 0)) == NULL)
- goto mem3;
- sp->fts_cur->fts_link = root;
- sp->fts_cur->fts_info = FTS_INIT;
-
- /*
- * If using chdir(2), grab a file descriptor pointing to dot to insure
- * that we can get back here; this could be avoided for some paths,
- * but almost certainly not worth the effort. Slashes, symbolic links,
- * and ".." are all fairly nasty problems. Note, if we can't get the
- * descriptor we run anyway, just more slowly.
- */
- if (!ISSET (FTS_NOCHDIR) && (sp->fts_rfd = open (".", O_RDONLY, 0)) < 0)
- SET (FTS_NOCHDIR);
-
- return (sp);
-
-mem3:fts_lfree (root);
- free (parent);
-mem2:free (sp->fts_path);
-mem1:free (sp);
- return (NULL);
-}
-
-static void
-fts_load (FTS *sp, register FTSENT *p)
-{
- register int len;
- register char *cp;
-
- /*
- * Load the stream structure for the next traversal. Since we don't
- * actually enter the directory until after the preorder visit, set
- * the fts_accpath field specially so the chdir gets done to the right
- * place and the user can access the first node. From fts_open it's
- * known that the path will fit.
- */
- len = p->fts_pathlen = p->fts_namelen;
- memmove (sp->fts_path, p->fts_name, len + 1);
- if ((cp = strrchr (p->fts_name, '/')) && (cp != p->fts_name || cp[1]))
- {
- len = strlen (++cp);
- memmove (p->fts_name, cp, len + 1);
- p->fts_namelen = len;
- }
- p->fts_accpath = p->fts_path = sp->fts_path;
- sp->fts_dev = p->fts_dev;
-}
-
-int
-fts_close (FTS *sp)
-{
- register FTSENT *freep, *p;
- int saved_errno = 0;
- int retval = 0;
-
- /*
- * This still works if we haven't read anything -- the dummy structure
- * points to the root list, so we step through to the end of the root
- * list which has a valid parent pointer.
- */
- if (sp->fts_cur)
- {
- for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;)
- {
- freep = p;
- p = p->fts_link ? p->fts_link : p->fts_parent;
- free (freep);
- }
- free (p);
- }
-
- /* Free up child linked list, sort array, path buffer. */
- if (sp->fts_child)
- fts_lfree (sp->fts_child);
- free (sp->fts_array);
- free (sp->fts_path);
-
- /* Return to original directory, save errno if necessary. */
- if (!ISSET (FTS_NOCHDIR))
- {
- saved_errno = fchdir (sp->fts_rfd) ? errno : 0;
- close (sp->fts_rfd);
- }
-
- /* Set errno and return. */
- if (!ISSET (FTS_NOCHDIR) && saved_errno)
- {
- errno = saved_errno;
- retval = -1;
- }
-
- /* Free up the stream pointer. */
- free (sp);
-
- return retval;
-}
-
-/*
- * Special case a root of "/" so that slashes aren't appended which would
- * cause paths to be written as "//foo".
- */
-#define NAPPEND(p) \
- (p->fts_level == FTS_ROOTLEVEL && p->fts_pathlen == 1 && \
- p->fts_path[0] == '/' ? 0 : p->fts_pathlen)
-
-FTSENT *
-fts_read (register FTS *sp)
-{
- register FTSENT *p;
- register FTSENT *tmp;
- register int instr;
- register char *t;
- int saved_errno;
-
- /* If finished or unrecoverable error, return NULL. */
- if (sp->fts_cur == NULL || ISSET (FTS_STOP))
- return (NULL);
-
- /* Set current node pointer. */
- p = sp->fts_cur;
-
- /* Save and zero out user instructions. */
- instr = p->fts_instr;
- p->fts_instr = FTS_NOINSTR;
-
- /* Any type of file may be re-visited; re-stat and re-turn. */
- if (instr == FTS_AGAIN)
- {
- p->fts_info = fts_stat (sp, NULL, p, 0);
- return (p);
- }
-
- /*
- * Following a symlink -- SLNONE test allows application to see
- * SLNONE and recover. If indirecting through a symlink, have
- * keep a pointer to current location. If unable to get that
- * pointer, follow fails.
- */
- if (instr == FTS_FOLLOW &&
- (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE))
- {
- p->fts_info = fts_stat (sp, NULL, p, 1);
- if (p->fts_info == FTS_D && !ISSET (FTS_NOCHDIR))
- {
- if ((p->fts_symfd = open (".", O_RDONLY, 0)) < 0)
- {
- p->fts_errno = errno;
- p->fts_info = FTS_ERR;
- }
- else
- p->fts_flags |= FTS_SYMFOLLOW;
- }
- return (p);
- }
-
- /* Directory in pre-order. */
- if (p->fts_info == FTS_D)
- {
- /* If skipped or crossed mount point, do post-order visit. */
- if (instr == FTS_SKIP ||
- (ISSET (FTS_XDEV) && p->fts_dev != sp->fts_dev))
- {
- if (p->fts_flags & FTS_SYMFOLLOW)
- close (p->fts_symfd);
- if (sp->fts_child)
- {
- fts_lfree (sp->fts_child);
- sp->fts_child = NULL;
- }
- p->fts_info = FTS_DP;
- return (p);
- }
-
- /* Rebuild if only read the names and now traversing. */
- if (sp->fts_child && sp->fts_options & FTS_NAMEONLY)
- {
- sp->fts_options &= ~FTS_NAMEONLY;
- fts_lfree (sp->fts_child);
- sp->fts_child = NULL;
- }
-
- /*
- * Cd to the subdirectory.
- *
- * If have already read and now fail to chdir, whack the list
- * to make the names come out right, and set the parent errno
- * so the application will eventually get an error condition.
- * Set the FTS_DONTCHDIR flag so that when we logically change
- * directories back to the parent we don't do a chdir.
- *
- * If haven't read do so. If the read fails, fts_build sets
- * FTS_STOP or the fts_info field of the node.
- */
- if (sp->fts_child)
- {
- if (CHDIR (sp, p->fts_accpath))
- {
- p->fts_errno = errno;
- p->fts_flags |= FTS_DONTCHDIR;
- for (p = sp->fts_child; p; p = p->fts_link)
- p->fts_accpath = p->fts_parent->fts_accpath;
- }
- }
- else if ((sp->fts_child = fts_build (sp, BREAD)) == NULL)
- {
- if (ISSET (FTS_STOP))
- return (NULL);
- return (p);
- }
- p = sp->fts_child;
- sp->fts_child = NULL;
- goto name;
- }
-
- /* Move to the next node on this level. */
-next:tmp = p;
- if ((p = p->fts_link))
- {
- free (tmp);
-
- /*
- * If reached the top, return to the original directory, and
- * load the paths for the next root.
- */
- if (p->fts_level == FTS_ROOTLEVEL)
- {
- if (!ISSET (FTS_NOCHDIR) && FCHDIR (sp, sp->fts_rfd))
- {
- SET (FTS_STOP);
- return (NULL);
- }
- fts_load (sp, p);
- return (sp->fts_cur = p);
- }
-
- /*
- * User may have called fts_set on the node. If skipped,
- * ignore. If followed, get a file descriptor so we can
- * get back if necessary.
- */
- if (p->fts_instr == FTS_SKIP)
- goto next;
- if (p->fts_instr == FTS_FOLLOW)
- {
- p->fts_info = fts_stat (sp, NULL, p, 1);
- if (p->fts_info == FTS_D && !ISSET (FTS_NOCHDIR))
- {
- if ((p->fts_symfd = open (".", O_RDONLY, 0)) < 0)
- {
- p->fts_errno = errno;
- p->fts_info = FTS_ERR;
- }
- else
- p->fts_flags |= FTS_SYMFOLLOW;
- }
- p->fts_instr = FTS_NOINSTR;
- }
-
- name:t = sp->fts_path + NAPPEND (p->fts_parent);
- *t++ = '/';
- memmove (t, p->fts_name, p->fts_namelen + 1);
- return (sp->fts_cur = p);
- }
-
- /* Move up to the parent node. */
- p = tmp->fts_parent;
- free (tmp);
-
- if (p->fts_level == FTS_ROOTPARENTLEVEL)
- {
- /*
- * Done; free everything up and set errno to 0 so the user
- * can distinguish between error and EOF.
- */
- free (p);
- errno = 0;
- return (sp->fts_cur = NULL);
- }
-
- /* Nul terminate the pathname. */
- sp->fts_path[p->fts_pathlen] = '\0';
-
- /*
- * Return to the parent directory. If at a root node or came through
- * a symlink, go back through the file descriptor. Otherwise, cd up
- * one directory.
- */
- if (p->fts_level == FTS_ROOTLEVEL)
- {
- if (!ISSET (FTS_NOCHDIR) && FCHDIR (sp, sp->fts_rfd))
- {
- SET (FTS_STOP);
- return (NULL);
- }
- }
- else if (p->fts_flags & FTS_SYMFOLLOW)
- {
- if (FCHDIR (sp, p->fts_symfd))
- {
- saved_errno = errno;
- close (p->fts_symfd);
- errno = saved_errno;
- SET (FTS_STOP);
- return (NULL);
- }
- close (p->fts_symfd);
- }
- else if (!(p->fts_flags & FTS_DONTCHDIR))
- {
- if (CHDIR (sp, ".."))
- {
- SET (FTS_STOP);
- return (NULL);
- }
- }
- p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
- return (sp->fts_cur = p);
-}
-
-/*
- * Fts_set takes the stream as an argument although it's not used in this
- * implementation; it would be necessary if anyone wanted to add global
- * semantics to fts using fts_set. An error return is allowed for similar
- * reasons.
- */
-int
-fts_set (FTS *sp _GL_UNUSED_PARAMETER, FTSENT *p, int instr)
-{
- if (instr && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
- instr != FTS_NOINSTR && instr != FTS_SKIP)
- {
- errno = EINVAL;
- return (1);
- }
- p->fts_instr = instr;
- return (0);
-}
-
-FTSENT *
-fts_children (register FTS *sp, int instr)
-{
- register FTSENT *p;
- int fd;
-
- if (instr && instr != FTS_NAMEONLY)
- {
- errno = EINVAL;
- return (NULL);
- }
-
- /* Set current node pointer. */
- p = sp->fts_cur;
-
- /*
- * Errno set to 0 so user can distinguish empty directory from
- * an error.
- */
- errno = 0;
-
- /* Fatal errors stop here. */
- if (ISSET (FTS_STOP))
- return (NULL);
-
- /* Return logical hierarchy of user's arguments. */
- if (p->fts_info == FTS_INIT)
- return (p->fts_link);
-
- /*
- * If not a directory being visited in pre-order, stop here. Could
- * allow FTS_DNR, assuming the user has fixed the problem, but the
- * same effect is available with FTS_AGAIN.
- */
- if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */ )
- return (NULL);
-
- /* Free up any previous child list. */
- if (sp->fts_child)
- fts_lfree (sp->fts_child);
-
- if (instr == FTS_NAMEONLY)
- {
- sp->fts_options |= FTS_NAMEONLY;
- instr = BNAMES;
- }
- else
- instr = BCHILD;
-
- /*
- * If using chdir on a relative path and called BEFORE fts_read does
- * its chdir to the root of a traversal, we can lose -- we need to
- * chdir into the subdirectory, and we don't know where the current
- * directory is, so we can't get back so that the upcoming chdir by
- * fts_read will work.
- */
- if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
- ISSET (FTS_NOCHDIR))
- return (sp->fts_child = fts_build (sp, instr));
-
- if ((fd = open (".", O_RDONLY, 0)) < 0)
- return (NULL);
- sp->fts_child = fts_build (sp, instr);
- if (fchdir (fd))
- return (NULL);
- close (fd);
- return (sp->fts_child);
-}
-
-/*
- * This is the tricky part -- do not casually change *anything* in here. The
- * idea is to build the linked list of entries that are used by fts_children
- * and fts_read. There are lots of special cases.
- *
- * The real slowdown in walking the tree is the stat calls. If FTS_NOSTAT is
- * set and it's a physical walk (so that symbolic links can't be directories),
- * we can do things quickly. First, if it's a 4.4BSD file system, the type
- * of the file is in the directory entry. Otherwise, we assume that the number
- * of subdirectories in a node is equal to the number of links to the parent.
- * The former skips all stat calls. The latter skips stat calls in any leaf
- * directories and for any files after the subdirectories in the directory have
- * been found, cutting the stat calls by about 2/3.
- */
-static FTSENT *
-fts_build (register FTS *sp, int type)
-{
- struct dirent *dp;
- register FTSENT *p, *head;
- register int nitems;
- FTSENT *cur, *tail;
- DIR *dirp;
- void *adjaddr;
- int cderrno, descend, len, level, maxlen, nlinks, saved_errno;
- char *cp = NULL;
-#ifdef HAVE___OPENDIR2
- int oflag;
-#endif
-
- /* Set current node pointer. */
- cur = sp->fts_cur;
-
- /*
- * Open the directory for reading. If this fails, we're done.
- * If being called from fts_read, set the fts_info field.
- */
-#if defined HAVE___OPENDIR2
- oflag = DTF_NODUP;
-
-# ifdef DTF_REWIND
- oflag |= DTF_REWIND;
-# endif
-
-# ifdef DTF_HIDEW
- if (!ISSET (FTS_WHITEOUT))
- oflag |= DTF_HIDEW;
-# endif /* DTF_HIDEW */
-
- dirp = __opendir2 (cur->fts_accpath, oflag);
-#else /* !HAVE___OPENDIR2 */
- dirp = opendir (cur->fts_accpath);
-#endif /* !HAVE___OPENDIR2 */
-
- if (dirp == NULL)
- {
- if (type == BREAD)
- {
- cur->fts_info = FTS_DNR;
- cur->fts_errno = errno;
- }
- return (NULL);
- }
-
- /*
- * Nlinks is the number of possible entries of type directory in the
- * directory if we're cheating on stat calls, 0 if we're not doing
- * any stat calls at all, -1 if we're doing stats on everything.
- */
- if (type == BNAMES)
- nlinks = 0;
- else if (ISSET (FTS_NOSTAT) && ISSET (FTS_PHYSICAL))
- nlinks = cur->fts_nlink - (ISSET (FTS_SEEDOT) ? 0 : 2);
- else
- nlinks = -1;
-
- /*
- * If we're going to need to stat anything or we want to descend
- * and stay in the directory, chdir. If this fails we keep going,
- * but set a flag so we don't chdir after the post-order visit.
- * We won't be able to stat anything, but we can still return the
- * names themselves. Note, that since fts_read won't be able to
- * chdir into the directory, it will have to return different path
- * names than before, i.e. "a/b" instead of "b". Since the node
- * has already been visited in pre-order, have to wait until the
- * post-order visit to return the error. There is a special case
- * here, if there was nothing to stat then it's not an error to
- * not be able to stat. This is all fairly nasty. If a program
- * needed sorted entries or stat information, they had better be
- * checking FTS_NS on the returned nodes.
- */
- cderrno = 0;
- if (nlinks || type == BREAD)
- {
- if (FCHDIR (sp, dirfd (dirp)))
- {
- if (nlinks && type == BREAD)
- cur->fts_errno = errno;
- cur->fts_flags |= FTS_DONTCHDIR;
- descend = 0;
- cderrno = errno;
- }
- else
- descend = 1;
- }
- else
- descend = 0;
-
- /*
- * Figure out the max file name length that can be stored in the
- * current path -- the inner loop allocates more path as necessary.
- * We really wouldn't have to do the maxlen calculations here, we
- * could do them in fts_read before returning the path, but it's a
- * lot easier here since the length is part of the dirent structure.
- *
- * If not changing directories set a pointer so that can just append
- * each new name into the path.
- */
- maxlen = sp->fts_pathlen - cur->fts_pathlen - 1;
- len = NAPPEND (cur);
- if (ISSET (FTS_NOCHDIR))
- {
- cp = sp->fts_path + len;
- *cp++ = '/';
- }
-
- level = cur->fts_level + 1;
-
- /* Read the directory, attaching each entry to the `link' pointer. */
- adjaddr = NULL;
- head = tail = NULL;
- nitems = 0;
- while ((dp = readdir (dirp)))
- {
- int namlen;
-
- if (!ISSET (FTS_SEEDOT) && ISDOT (dp->d_name))
- continue;
-
- namlen = strlen (dp->d_name) + 1;
- if ((p = fts_alloc (sp, dp->d_name, namlen)) == NULL)
- goto mem1;
- if (namlen > maxlen)
- {
- if (fts_palloc (sp, (size_t) namlen))
- {
- /*
- * No more memory for path or structures. Save
- * errno, free up the current structure and the
- * structures already allocated.
- */
- mem1:saved_errno = errno;
- free (p);
- fts_lfree (head);
- closedir (dirp);
- errno = saved_errno;
- cur->fts_info = FTS_ERR;
- SET (FTS_STOP);
- return (NULL);
- }
- adjaddr = sp->fts_path;
- maxlen = sp->fts_pathlen - sp->fts_cur->fts_pathlen - 1;
- }
-
- p->fts_pathlen = len + namlen + 1;
- p->fts_parent = sp->fts_cur;
- p->fts_level = level;
-
- if (cderrno)
- {
- if (nlinks)
- {
- p->fts_info = FTS_NS;
- p->fts_errno = cderrno;
- }
- else
- p->fts_info = FTS_NSOK;
- p->fts_accpath = cur->fts_accpath;
- }
- else if (nlinks == 0
-#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
- || (nlinks > 0 &&
- dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
-#endif
- )
- {
- p->fts_accpath = ISSET (FTS_NOCHDIR) ? p->fts_path : p->fts_name;
- p->fts_info = FTS_NSOK;
- }
- else
- {
- /* Build a file name for fts_stat to stat. */
- if (ISSET (FTS_NOCHDIR))
- {
- p->fts_accpath = p->fts_path;
- memmove (p->fts_name, cp, p->fts_namelen + 1);
- }
- else
- p->fts_accpath = p->fts_name;
- /* Stat it. */
- p->fts_info = fts_stat (sp, dp, p, 0);
-
- /* Decrement link count if applicable. */
- if (nlinks > 0 && (p->fts_info == FTS_D ||
- p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
- --nlinks;
- }
-
- /* We walk in directory order so "ls -f" doesn't get upset. */
- p->fts_link = NULL;
- if (head == NULL)
- head = tail = p;
- else
- {
- tail->fts_link = p;
- tail = p;
- }
- ++nitems;
- }
- closedir (dirp);
-
- /*
- * If had to realloc the path, adjust the addresses for the rest
- * of the tree.
- */
- if (adjaddr)
- fts_padjust (sp, adjaddr);
-
- /*
- * If not changing directories, reset the path back to original
- * state.
- */
- if (ISSET (FTS_NOCHDIR))
- {
- if (cp - 1 > sp->fts_path)
- --cp;
- *cp = '\0';
- }
-
- /*
- * If descended after called from fts_children or after called from
- * fts_read and nothing found, get back. At the root level we use
- * the saved fd; if one of fts_open()'s arguments is a relative path
- * to an empty directory, we wind up here with no other way back. If
- * can't get back, we're done.
- */
- if (descend && (type == BCHILD || !nitems) &&
- (cur->fts_level == FTS_ROOTLEVEL ?
- FCHDIR (sp, sp->fts_rfd) : CHDIR (sp, "..")))
- {
- cur->fts_info = FTS_ERR;
- SET (FTS_STOP);
- return (NULL);
- }
-
- /* If didn't find anything, return NULL. */
- if (!nitems)
- {
- if (type == BREAD)
- cur->fts_info = FTS_DP;
- return (NULL);
- }
-
- /* Sort the entries. */
- if (sp->fts_compar && nitems > 1)
- head = fts_sort (sp, head, nitems);
- return (head);
-}
-
-static unsigned short
-fts_stat (FTS *sp, struct dirent *dp, register FTSENT *p, int follow)
-{
- register FTSENT *t;
- register dev_t dev;
- register ino_t ino;
- struct stat *sbp, sb;
- int saved_errno;
-
- /* If user needs stat info, stat buffer already allocated. */
- sbp = ISSET (FTS_NOSTAT) ? &sb : p->fts_statp;
-
-#if defined DT_WHT && defined S_IFWHT
- /*
- * Whited-out files don't really exist. However, there's stat(2) file
- * mask for them, so we set it so that programs (i.e., find) don't have
- * to test FTS_W separately from other file types.
- */
- if (dp != NULL && dp->d_type == DT_WHT)
- {
- memset (sbp, 0, sizeof (struct stat));
- sbp->st_mode = S_IFWHT;
- return (FTS_W);
- }
-#endif
-
- /*
- * If doing a logical walk, or application requested FTS_FOLLOW, do
- * a stat(2). If that fails, check for a non-existent symlink. If
- * fail, set the errno from the stat call.
- */
- if (ISSET (FTS_LOGICAL) || follow)
- {
- if (stat (p->fts_accpath, sbp))
- {
- saved_errno = errno;
- if (!lstat (p->fts_accpath, sbp))
- {
- errno = 0;
- return (FTS_SLNONE);
- }
- p->fts_errno = saved_errno;
- goto err;
- }
- }
- else if (lstat (p->fts_accpath, sbp))
- {
- p->fts_errno = errno;
- err:memset (sbp, 0, sizeof (struct stat));
- return (FTS_NS);
- }
-
- if (S_ISDIR (sbp->st_mode))
- {
- /*
- * Set the device/inode. Used to find cycles and check for
- * crossing mount points. Also remember the link count, used
- * in fts_build to limit the number of stat calls. It is
- * understood that these fields are only referenced if fts_info
- * is set to FTS_D.
- */
- dev = p->fts_dev = sbp->st_dev;
- ino = p->fts_ino = sbp->st_ino;
- p->fts_nlink = sbp->st_nlink;
-
- if (ISDOT (p->fts_name))
- return (FTS_DOT);
-
- /*
- * Cycle detection is done by brute force when the directory
- * is first encountered. If the tree gets deep enough or the
- * number of symbolic links to directories is high enough,
- * something faster might be worthwhile.
- */
- for (t = p->fts_parent;
- t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
- if (ino == t->fts_ino && dev == t->fts_dev)
- {
- p->fts_cycle = t;
- return (FTS_DC);
- }
- return (FTS_D);
- }
- if (S_ISLNK (sbp->st_mode))
- return (FTS_SL);
- if (S_ISREG (sbp->st_mode))
- return (FTS_F);
- return (FTS_DEFAULT);
-}
-
-static FTSENT *
-fts_sort (FTS *sp, FTSENT *head, register int nitems)
-{
- register FTSENT **ap, *p;
-
- /*
- * Construct an array of pointers to the structures and call qsort(3).
- * Reassemble the array in the order returned by qsort. If unable to
- * sort for memory reasons, return the directory entries in their
- * current order. Allocate enough space for the current needs plus
- * 40 so don't realloc one entry at a time.
- */
- if (nitems > sp->fts_nitems)
- {
- sp->fts_nitems = nitems + 40;
- if ((sp->fts_array = realloc (sp->fts_array,
- (size_t) (sp->fts_nitems *
- sizeof (FTSENT *)))) == NULL)
- {
- sp->fts_nitems = 0;
- return (head);
- }
- }
- for (ap = sp->fts_array, p = head; p; p = p->fts_link)
- *ap++ = p;
- qsort ((void *) sp->fts_array, nitems, sizeof (FTSENT *), sp->fts_compar);
- for (head = *(ap = sp->fts_array); --nitems; ++ap)
- ap[0]->fts_link = ap[1];
- ap[0]->fts_link = NULL;
- return (head);
-}
-
-static FTSENT *
-fts_alloc (FTS *sp, const char *name, register int namelen)
-{
- register FTSENT *p;
- size_t len;
-
- /*
- * The file name is a variable length array and no stat structure is
- * necessary if the user has set the nostat bit. Allocate the FTSENT
- * structure, the file name and the stat structure in one chunk, but
- * be careful that the stat structure is reasonably aligned. Since the
- * fts_name field is declared to be of size 1, the fts_name pointer is
- * namelen + 2 before the first possible address of the stat structure.
- */
- len = sizeof (FTSENT) + namelen;
- if (!ISSET (FTS_NOSTAT))
- len += sizeof (struct stat) + ALIGNBYTES;
- if ((p = malloc (len)) == NULL)
- return (NULL);
-
- /* Copy the name plus the trailing NULL. */
- memmove (p->fts_name, name, namelen + 1);
-
- if (!ISSET (FTS_NOSTAT))
- p->fts_statp = (struct stat *) ALIGN (p->fts_name + namelen + 2);
- p->fts_namelen = namelen;
- p->fts_path = sp->fts_path;
- p->fts_errno = 0;
- p->fts_flags = 0;
- p->fts_instr = FTS_NOINSTR;
- p->fts_number = 0;
- p->fts_pointer = NULL;
- return (p);
-}
-
-static void
-fts_lfree (register FTSENT *head)
-{
- register FTSENT *p;
-
- /* Free a linked list of structures. */
- while ((p = head))
- {
- head = head->fts_link;
- free (p);
- }
-}
-
-/*
- * Allow essentially unlimited paths; find, rm, ls should all work on any tree.
- * Most systems will allow creation of paths much longer than MAXPATHLEN, even
- * though the kernel won't resolve them. Add the size (not just what's needed)
- * plus 256 bytes so don't realloc the path 2 bytes at a time.
- */
-static int
-fts_palloc (FTS *sp, size_t more)
-{
- sp->fts_pathlen += more + 256;
- sp->fts_path = realloc (sp->fts_path, (size_t) sp->fts_pathlen);
- return (sp->fts_path == NULL);
-}
-
-/*
- * When the path is realloc'd, have to fix all of the pointers in structures
- * already returned.
- */
-static void
-fts_padjust (FTS *sp, void *addr)
-{
- FTSENT *p;
-
-#define ADJUST(p) { \
- (p)->fts_accpath = \
- (char *)addr + ((p)->fts_accpath - (p)->fts_path); \
- (p)->fts_path = addr; \
-}
- /* Adjust the current set of children. */
- for (p = sp->fts_child; p; p = p->fts_link)
- ADJUST (p);
-
- /* Adjust the rest of the tree. */
- for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;)
- {
- ADJUST (p);
- p = p->fts_link ? p->fts_link : p->fts_parent;
- }
-}
-
-static size_t
-fts_maxarglen (char *const *argv)
-{
- size_t len, max;
-
- for (max = 0; *argv; ++argv)
- if ((len = strlen (*argv)) > max)
- max = len;
- return (max);
-}
diff --git a/libls/fts.h b/libls/fts.h
deleted file mode 100644
index 3d6a29f..0000000
--- a/libls/fts.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
- 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
- 2020, 2021 Free Software Foundation, Inc.
-
- This file is part of GNU Inetutils.
-
- GNU Inetutils is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or (at
- your option) any later version.
-
- GNU Inetutils is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see `http://www.gnu.org/licenses/'. */
-
-/*
- * Copyright (c) 1989, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _FTS_H
-# define _FTS_H 1
-
-# ifdef HAVE_FEATURES_H
-# include <features.h>
-# endif
-# include <sys/types.h>
-
-typedef struct
-{
- struct _ftsent *fts_cur; /* current node */
- struct _ftsent *fts_child; /* linked list of children */
- struct _ftsent **fts_array; /* sort array */
- dev_t fts_dev; /* starting device # */
- char *fts_path; /* path for this descent */
- int fts_rfd; /* fd for root */
- int fts_pathlen; /* sizeof(path) */
- int fts_nitems; /* elements in the sort array */
- int (*fts_compar) (const void *, const void *); /* compare fn */
-
-# define FTS_COMFOLLOW 0x0001 /* follow command line symlinks */
-# define FTS_LOGICAL 0x0002 /* logical walk */
-# define FTS_NOCHDIR 0x0004 /* don't change directories */
-# define FTS_NOSTAT 0x0008 /* don't get stat info */
-# define FTS_PHYSICAL 0x0010 /* physical walk */
-# define FTS_SEEDOT 0x0020 /* return dot and dot-dot */
-# define FTS_XDEV 0x0040 /* don't cross devices */
-# define FTS_WHITEOUT 0x0080 /* return whiteout information */
-# define FTS_OPTIONMASK 0x00ff /* valid user option mask */
-
-# define FTS_NAMEONLY 0x0100 /* (private) child names only */
-# define FTS_STOP 0x0200 /* (private) unrecoverable error */
- int fts_options; /* fts_open options, global flags */
-} FTS;
-
-typedef struct _ftsent
-{
- struct _ftsent *fts_cycle; /* cycle node */
- struct _ftsent *fts_parent; /* parent directory */
- struct _ftsent *fts_link; /* next file in directory */
- long fts_number; /* local numeric value */
- void *fts_pointer; /* local address value */
- char *fts_accpath; /* access path */
- char *fts_path; /* root path */
- int fts_errno; /* errno for this node */
- int fts_symfd; /* fd for symlink */
- unsigned short fts_pathlen; /* strlen(fts_path) */
- unsigned short fts_namelen; /* strlen(fts_name) */
-
- ino_t fts_ino; /* inode */
- dev_t fts_dev; /* device */
- nlink_t fts_nlink; /* link count */
-
-# define FTS_ROOTPARENTLEVEL -1
-# define FTS_ROOTLEVEL 0
- short fts_level; /* depth (-1 to N) */
-
-# define FTS_D 1 /* preorder directory */
-# define FTS_DC 2 /* directory that causes cycles */
-# define FTS_DEFAULT 3 /* none of the above */
-# define FTS_DNR 4 /* unreadable directory */
-# define FTS_DOT 5 /* dot or dot-dot */
-# define FTS_DP 6 /* postorder directory */
-# define FTS_ERR 7 /* error; errno is set */
-# define FTS_F 8 /* regular file */
-# define FTS_INIT 9 /* initialized only */
-# define FTS_NS 10 /* stat(2) failed */
-# define FTS_NSOK 11 /* no stat(2) requested */
-# define FTS_SL 12 /* symbolic link */
-# define FTS_SLNONE 13 /* symbolic link without target */
-# define FTS_W 14 /* whiteout object */
- unsigned short fts_info; /* user flags for FTSENT structure */
-
-# define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */
-# define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */
- unsigned short fts_flags; /* private flags for FTSENT structure */
-
-# define FTS_AGAIN 1 /* read node again */
-# define FTS_FOLLOW 2 /* follow symbolic link */
-# define FTS_NOINSTR 3 /* no instructions */
-# define FTS_SKIP 4 /* discard node */
- unsigned short fts_instr; /* fts_set() instructions */
-
- struct stat *fts_statp; /* stat(2) information */
- char fts_name[1]; /* file name */
-} FTSENT;
-
-FTSENT *fts_children (FTS *, int);
-int fts_close (FTS *);
-FTS *fts_open (char *const *, int, int (*)(const FTSENT **, const FTSENT **));
-FTSENT *fts_read (FTS *);
-int fts_set (FTS *, FTSENT *, int);
-
-#endif /* fts.h */
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=6d0c8ac203aca5ee9d00da918f60f66b8a42fdef
commit 6d0c8ac203aca5ee9d00da918f60f66b8a42fdef
Author: Simon Josefsson <simon@josefsson.org>
Date: Sat Jul 24 15:34:51 2021 +0200
Remove tests obsoleted by gnulib.
* configure.ac (poll.h, HAVE_SNPRINTF, HAVE_VSNPRINTF, strerror): Drop
tests.
diff --git a/configure.ac b/configure.ac
index 07a02ec..af83f35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -810,30 +810,6 @@ AC_CHECK_FUNC(setpgid, , AC_DEFINE([setpgid], setpgrp,
# the system one doesn't have getopt_long.
AC_CHECK_FUNC(getopt_long)
-AC_CHECK_HEADER(poll.h)
-
-# See if snprintf exists, otherwise just use a bogus version
-AC_CHECK_FUNC(snprintf,
- [AC_DEFINE([HAVE_SNPRINTF], 1, [Define to one if you have snprintf])])
-
-# See if vsnprintf exists, otherwise use our own.
-AC_CHECK_FUNC(vsnprintf,
- [AC_DEFINE([HAVE_VSNPRINTF], 1, [Define to one if you have vsnprintf])])
-
-# See if the system has strerror, and replace it if not
-AC_CHECK_FUNC(strerror)
-if test "$ac_cv_func_strerror" = no; then
- # No strerror, so see if the SYS_ERRLIST variable can be used by
- # ours
- AC_CHECK_FUNC(sys_errlist, AC_DEFINE([HAVE_SYS_ERRLIST], 1,
- [Define to one if you have sys_errlist.]))
- if test "$ac_cv_func_sys_errlist" = yes; then
- AC_CHECK_DECL(sys_errlist, , ,
- [IU_FLUSHLEFT([#include <stdio.h>
- #include <errno.h>])])
- fi
-fi
-
# See if the system has hstrerror, and replace it if not
save_LIBS=$LIBS
-----------------------------------------------------------------------
Summary of changes:
NEWS | 4 +
bootstrap.conf | 1 +
configure.ac | 30 +-
libls/Makefile.am | 4 +-
libls/fts.c | 1098 -----------------------------------------------------
libls/fts.h | 143 -------
6 files changed, 10 insertions(+), 1270 deletions(-)
delete mode 100644 libls/fts.c
delete mode 100644 libls/fts.h
hooks/post-receive
--
GNU Inetutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Inetutils branch, master, updated. v2.0-20-g353812a,
Simon Josefsson <=