diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-12-26 09:56:23 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-12-26 10:56:00 +0100 |
| commit | 8fedd05841d5e693cd8fb5266a7963bc075c45f6 (patch) | |
| tree | f11d7477e67fa2c9caf25cc8ab7c1c91875d366c | |
| parent | 4b93a2579fb567b9fbbeb24439770d814dac95cd (diff) | |
| download | gnulib-8fedd05841d5e693cd8fb5266a7963bc075c45f6.tar.gz | |
isdir: clean up, since at least grep still uses it
* lib/isdir.c: Include "isdir.h".
(S_ISDIR): Remove now-unneeded definition.
* modules/isdir (Files): Add lib/isdir.h.
* lib/isdir.h: New file, with declaration.
* m4/isdir.m4: Remove file -- unneeded.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/isdir.c | 13 | ||||
| -rw-r--r-- | lib/isdir.h | 1 | ||||
| -rw-r--r-- | m4/isdir.m4 | 11 | ||||
| -rw-r--r-- | modules/isdir | 2 |
5 files changed, 14 insertions, 22 deletions
@@ -1,3 +1,12 @@ +2009-12-26 Jim Meyering <meyering@redhat.com> + + isdir: clean up, since at least grep still uses it + * lib/isdir.c: Include "isdir.h". + (S_ISDIR): Remove now-unneeded definition. + * modules/isdir (Files): Add lib/isdir.h. + * lib/isdir.h: New file, with declaration. + * m4/isdir.m4: Remove file -- unneeded. + 2009-12-25 Bruno Haible <bruno@clisp.org> selinux-h: Make generated .h files standalone. diff --git a/lib/isdir.c b/lib/isdir.c index 0f9aec2f9c..19a3f7d9b1 100644 --- a/lib/isdir.c +++ b/lib/isdir.c @@ -1,6 +1,6 @@ /* isdir.c -- determine whether a directory exists - Copyright (C) 1990, 1998, 2006 Free Software Foundation, Inc. + Copyright (C) 1990, 1998, 2006, 2009 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 @@ -17,20 +17,13 @@ #include <config.h> +#include "isdir.h" + #include <sys/types.h> #include <sys/stat.h> -#if STAT_MACROS_BROKEN -# undef S_ISDIR -#endif - -#if !defined S_ISDIR && defined S_IFDIR -# define S_ISDIR(Mode) (((Mode) & S_IFMT) == S_IFDIR) -#endif - /* If PATH is an existing directory or symbolic link to a directory, return nonzero, else 0. */ - int isdir (const char *path) { diff --git a/lib/isdir.h b/lib/isdir.h new file mode 100644 index 0000000000..80116bc6be --- /dev/null +++ b/lib/isdir.h @@ -0,0 +1 @@ +int isdir (const char *path); diff --git a/m4/isdir.m4 b/m4/isdir.m4 deleted file mode 100644 index 2624856df5..0000000000 --- a/m4/isdir.m4 +++ /dev/null @@ -1,11 +0,0 @@ -# isdir.m4 serial 2 -dnl Copyright (C) 2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_ISDIR], -[ - dnl Prerequisites of lib/isdir.c. - AC_REQUIRE([AC_HEADER_STAT]) -]) diff --git a/modules/isdir b/modules/isdir index 001546ea82..83193e1295 100644 --- a/modules/isdir +++ b/modules/isdir @@ -3,7 +3,7 @@ Determine whether a directory exists. Files: lib/isdir.c -m4/isdir.m4 +lib/isdir.h Depends-on: stat |