X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fisdir.c;h=ff4eadabe95ac46f4a1da169f468905423518c5c;hb=545b7c8bc2e1716773f38975a2a78b71cc72818f;hp=aafa746508859a1c12f1e102214ca7feefb176d9;hpb=8e8fe8777e71f90eeec25ac267d800150ec34870;p=gnulib.git

diff --git a/lib/isdir.c b/lib/isdir.c
index aafa74650..ff4eadabe 100644
--- a/lib/isdir.c
+++ b/lib/isdir.c
@@ -1,10 +1,11 @@
 /* isdir.c -- determine whether a directory exists
-   Copyright (C) 1990 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1990, 1998, 2006, 2009-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 2, or (at your option)
-   any later version.
+   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
@@ -12,32 +13,19 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
+#include "isdir.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "safe-stat.h"
-
-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
-#endif /* STAT_MACROS_BROKEN.  */
-
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-
 /* If PATH is an existing directory or symbolic link to a directory,
    return nonzero, else 0.  */
-
 int
-isdir (path)
-     char *path;
+isdir (const char *path)
 {
   struct stat stats;