From c424de16b1c8607f2caa7c85d69196f9d8e3a103 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 8 Sep 2012 15:11:20 +0200 Subject: maint: move the last coreutils-specific files from lib/ to gl/ Convert the few remaining coreutils-specific files in lib/ to gnulib-style modules under gl/, removing their corresponding .m4 files, since the information recorded in those files is better stored in module-description file in gl/modules/. * bootstrap.conf (gnulib_modules): Add new modules: fd-reopen, buffer-lcm, xfts, strnumcmp. * gl/lib/buffer-lcm.c: Renamed from the file in lib/. * gl/lib/buffer-lcm.h: Likewise. * gl/lib/fd-reopen.c: Likewise. * gl/lib/fd-reopen.h: Likewise. * gl/lib/strintcmp.c: Likewise. * gl/lib/strnumcmp-in.h: Likewise. * gl/lib/strnumcmp.c: Likewise. * gl/lib/strnumcmp.h: Likewise. * gl/lib/xfts.c: Likewise. * gl/lib/xfts.h: Likewise. * gl/modules/buffer-lcm: New module-description file. * gl/modules/fd-reopen: Likewise. * gl/modules/strnumcmp: Likewise. * gl/modules/xfts: Likewise. * m4/fd-reopen.m4: Remove, no longer needed. * m4/strnumcmp.m4: Likewise. * m4/xfts.m4: Likewise. * m4/prereq.m4: Do not AC_REQUIRE the m4 functions from our just-removed m4/*.m4 files. --- lib/xfts.c | 65 -------------------------------------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 lib/xfts.c (limited to 'lib/xfts.c') diff --git a/lib/xfts.c b/lib/xfts.c deleted file mode 100644 index b19200e20..000000000 --- a/lib/xfts.c +++ /dev/null @@ -1,65 +0,0 @@ -/* xfts.c -- a wrapper for fts_open - - Copyright (C) 2003-2012 Free Software Foundation, Inc. - - This program 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. - - This program 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 . */ - -/* Written by Jim Meyering. */ - -#include - -#include -#include -#include -#include - -#include "xalloc.h" -#include "xfts.h" - -/* Fail with a proper diagnostic if fts_open fails. */ - -FTS * -xfts_open (char * const *argv, int options, - int (*compar) (const FTSENT **, const FTSENT **)) -{ - FTS *fts = fts_open (argv, options | FTS_CWDFD, compar); - if (fts == NULL) - { - /* This can fail in two ways: out of memory or with errno==EINVAL, - which indicates it was called with invalid bit_flags. */ - assert (errno != EINVAL); - xalloc_die (); - } - - return fts; -} - -/* When fts_read returns FTS_DC to indicate a directory cycle, - it may or may not indicate a real problem. When a program like - chgrp performs a recursive traversal that requires traversing - symbolic links, it is *not* a problem. However, when invoked - with "-P -R", it deserves a warning. The fts_options member - records the options that control this aspect of fts's behavior, - so test that. */ -bool -cycle_warning_required (FTS const *fts, FTSENT const *ent) -{ -#define ISSET(Fts,Opt) ((Fts)->fts_options & (Opt)) - /* When dereferencing no symlinks, or when dereferencing only - those listed on the command line and we're not processing - a command-line argument, then a cycle is a serious problem. */ - return ((ISSET (fts, FTS_PHYSICAL) && !ISSET (fts, FTS_COMFOLLOW)) - || (ISSET (fts, FTS_PHYSICAL) && ISSET (fts, FTS_COMFOLLOW) - && ent->fts_level != FTS_ROOTLEVEL)); -} -- cgit v1.2.3-54-g00ecf