mirror/findutils
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/findutils.git synced 2026-01-26 15:39:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take gnulib-tool's advice about which header files to include.

Browse Source 
* locate/locate.c: Include <regex.h> instead of "regex.h".
Include "fnmatch.h" instead of <fnmatch.h> (because we use
fnmatch-gnu).  Include "gettext.h".
* lib/regexprops.c: Include <regex.h> instead of "regex.h".
* find/tree.c: Include "gettext.h".  Include "fnmatch.h" instead
of <fnmatch.h> (because we use fnmatch-gnu).
* find/parser.c: Include "gettext.h" and <regex.h>.  Include
"fnmatch.h" instead of <fnmatch.h> (because we use fnmatch-gnu).
* find/pred.c: Likewise.
* find/exec.c: Include "gettext.h".
* find/find.c: Likewise.
* find/fstype.c: Likewise.
* find/ftsfind.c: Likewise.
* find/print.c: Likewise.
* lib/buildcmd.c: Likewise.
* lib/fdleak.c: Likewise.
* lib/findutils-version.c: Likewise.
* lib/regextype.c: Likewise.
* lib/safe-atoi.c: Likewise.
* find/util.c: Likewise.
* locate/bigram.c: Likewise.
* locate/code.c: Likewise.
* locate/frcode.c: Likewise.
* locate/word_io.c: Likewise.
* xargs/xargs.c: Likewise.
* find/Makefile.am: Add a comment explaining why gnulib-tool
advised us to use each library.
This commit is contained in:
James Youngman 2011-06-20 00:39:20 +01:00
parent 71c3cb8bc8
commit 0caac6fe3d
23 changed files with 67 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ChangeLog
View File

@ -1,3 +1,34 @@
2011-06-20 James Youngman <jay@gnu.org>
Take gnulib-tool's advice about which header files to include.
* locate/locate.c: Include <regex.h> instead of "regex.h".
Include "fnmatch.h" instead of <fnmatch.h> (because we use
fnmatch-gnu). Include "gettext.h".
* lib/regexprops.c: Include <regex.h> instead of "regex.h".
* find/tree.c: Include "gettext.h". Include "fnmatch.h" instead
of <fnmatch.h> (because we use fnmatch-gnu).
* find/parser.c: Include "gettext.h" and <regex.h>. Include
"fnmatch.h" instead of <fnmatch.h> (because we use fnmatch-gnu).
* find/pred.c: Likewise.
* find/exec.c: Include "gettext.h".
* find/find.c: Likewise.
* find/fstype.c: Likewise.
* find/ftsfind.c: Likewise.
* find/print.c: Likewise.
* lib/buildcmd.c: Likewise.
* lib/fdleak.c: Likewise.
* lib/findutils-version.c: Likewise.
* lib/regextype.c: Likewise.
* lib/safe-atoi.c: Likewise.
* find/util.c: Likewise.
* locate/bigram.c: Likewise.
* locate/code.c: Likewise.
* locate/frcode.c: Likewise.
* locate/word_io.c: Likewise.
* xargs/xargs.c: Likewise.
* find/Makefile.am: Add a comment explaining why gnulib-tool
advised us to use each library.
2011-06-19 James Youngman <jay@gnu.org>
Update gnulib.

9
find/Makefile.am
View File

@ -31,7 +31,14 @@ endif
# man_MANS is not always the same, we want to distribute all of those files.
EXTRA_DIST = defs.h sharefile.h print.h find.1 ftsfind.1 oldfind.1
INCLUDES = -I../gl/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gl/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
LDADD = ./libfindtools.a ../lib/libfind.a ../gl/lib/libgnulib.a $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOSE) $(MODF_LIBM) $(FINDLIBS)
LDADD = ./libfindtools.a ../lib/libfind.a ../gl/lib/libgnulib.a $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOSE) $(MODF_LIBM) $(FINDLIBS) $(GETHOSTNAME_LIB) $(LIB_EACCESS)
# gnulib advises we link against <first> because we use <second>:
# $(GETHOSTNAME_LIB) uname
# $(LIB_CLOCK_GETTIME) (some inditrect dependency)
# $(LIB_EACCESS) faccessat
# $(LIB_SELINUX) selinux-h
# $(MODF_LIBM) modf
SUBDIRS = . testsuite
#$(PROGRAMS): ../lib/libfind.a

1
find/exec.c
View File

@ -30,6 +30,7 @@
/* gnulib headers */
#include "error.h"
#include "dirname.h"
#include "gettext.h"
#include "xalloc.h"
#include "cloexec.h"
#include "save-cwd.h"

1
find/find.c
View File

@ -47,6 +47,7 @@
#include "savedirinfo.h"
#include "buildcmd.h"
#include "dirname.h"
#include "gettext.h"
#include "xgetcwd.h"
#include "error.h"
#include "fdleak.h"

1
find/fstype.c
View File

@ -59,6 +59,7 @@ extern int errno;
#include "extendbuf.h"
#include "mountlist.h"
#include "error.h"
#include "gettext.h"

1
find/ftsfind.c
View File

@ -54,6 +54,7 @@
#include "dircallback.h"
#include "cloexec.h"
#include "fdleak.h"
#include "gettext.h"
#include "unused-result.h"
#if ENABLE_NLS

4
find/parser.c
View File

@ -26,8 +26,9 @@
#include <pwd.h>
#include <errno.h>
#include <grp.h>
#include <fnmatch.h>
#include <sys/stat.h>
#include <regex.h>
#include "fnmatch.h"
#include "mountlist.h"
#include "modechange.h"
#include "xstrtol.h"
@ -40,6 +41,7 @@
#include "fts_.h"
#include "parse-datetime.h"
#include "error.h"
#include "gettext.h"
#include "findutils-version.h"
#include "safe-atoi.h"
#include "fdleak.h"

3
find/pred.c
View File

@ -19,7 +19,6 @@
#include <config.h>
#include "defs.h"
#include <fnmatch.h>
#include <math.h>
#include <pwd.h>
#include <grp.h>
@ -42,6 +41,8 @@
#include "stat-size.h"
#include "dircallback.h"
#include "error.h"
#include "fnmatch.h"
#include "gettext.h"
#include "areadlink.h"
#include <selinux/selinux.h>

1
find/print.c
View File

@ -37,6 +37,7 @@
#include "dirname.h"
#include "error.h"
#include "filemode.h"
#include "gettext.h"
#include "human.h"
#include "printquoted.h"
#include "stat-size.h"

3
find/tree.c
View File

@ -21,10 +21,11 @@
#include <assert.h>
#include <stdlib.h>
#include <fnmatch.h>
#include "xalloc.h"
#include "error.h"
#include "fnmatch.h"
#include "gettext.h"
#if ENABLE_NLS

1
find/util.c
View File

@ -33,6 +33,7 @@
#include "quotearg.h"
#include "timespec.h"
#include "error.h"
#include "gettext.h"
#include "verify.h"
#include "fdleak.h"
#include "dircallback.h"

1
lib/buildcmd.c
View File

@ -25,6 +25,7 @@
#include <stdbool.h>
#include <limits.h>
#include "gettext.h"
#if ENABLE_NLS
# include <libintl.h>

1
lib/fdleak.c
View File

@ -33,6 +33,7 @@
#include "dirent-safer.h"
#include "extendbuf.h"
#include "cloexec.h"
#include "gettext.h"
#include "safe-atoi.h"
#include "fdleak.h"
#include "error.h"

2
lib/findutils-version.c
View File

@ -16,6 +16,8 @@
*/
#include <config.h>
#include "gettext.h"
#include "version-etc.h"
#include "findutils-version.h"

2
lib/regexprops.c
View File

@ -33,8 +33,8 @@
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <regex.h>
#include "regex.h"
#include "regextype.h"
#include "progname.h"

1
lib/regextype.c
View File

@ -26,6 +26,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "gettext.h"
#include "regextype.h"
#include "regex.h"
#include "quote.h"

1
lib/safe-atoi.c
View File

@ -20,6 +20,7 @@
#include <stdlib.h>
#include <errno.h>
#include "gettext.h"
#include "safe-atoi.h"
#include "quotearg.h"
#include "error.h"

1
locate/bigram.c
View File

@ -40,6 +40,7 @@
#include <sys/types.h>
#include <xalloc.h>
#include "gettext.h"
#include "progname.h"
#include "closeout.h"

1
locate/code.c
View File

@ -73,6 +73,7 @@
#include "locatedb.h"
#include "closeout.h"
#include "gettext.h"
#include "xalloc.h"
#include "progname.h"
#include "error.h"

1
locate/frcode.c
View File

@ -98,6 +98,7 @@
#endif
#include "gettext.h"
#include "locatedb.h"
#include <getopt.h>
#include "error.h"

5
locate/locate.c
View File

@ -67,7 +67,6 @@
#include <grp.h> /* for setgroups() */
#include <sys/stat.h>
#include <time.h>
#include <fnmatch.h>
#include <getopt.h>
#include <xstrtol.h>
@ -92,6 +91,7 @@
#include <errno.h>
#include <locale.h>
#include <regex.h>
#if ENABLE_NLS
@ -116,6 +116,8 @@
# define N_(String) String
#endif
#include "fnmatch.h"
#include "gettext.h"
#include "locatedb.h"
#include "progname.h"
#include "xalloc.h"
@ -123,7 +125,6 @@
#include "human.h"
#include "dirname.h"
#include "closeout.h"
#include "regex.h"
#include "quotearg.h"
#include "printquoted.h"
#include "regextype.h"

1
locate/word_io.c
View File

@ -25,6 +25,7 @@
#include <stdlib.h>
#include "error.h"
#include "gettext.h"
#include "quotearg.h"
#include "byteswap.h"
#include "locatedb.h"

1
xargs/xargs.c
View File

@ -57,6 +57,7 @@
#include <wchar.h>
#include <stdint.h>
#include "gettext.h"
#include "verify.h"
#include "progname.h"
#include "quotearg.h"