X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fisdir.c;h=77cd7a269965d5e251269ebab4592ee5b248d041;hb=13430f1dd9879a79581d9bf903cd87ebcb9d2d6b;hp=dbc9bd07df9c9be1e5ce922fd88654e449678051;hpb=300424a2d37b17d304be2783ed40f2efa4d950c0;p=gnulib.git
diff --git a/lib/isdir.c b/lib/isdir.c
index dbc9bd07d..77cd7a269 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-2011 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,34 +13,21 @@
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 . */
-#ifdef HAVE_CONFIG_H
#include
-#endif
+
+#include "isdir.h"
#include
#include
-#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;
- return SAFE_STAT (path, &stats) == 0 && S_ISDIR (stats.st_mode);
+ return stat (path, &stats) == 0 && S_ISDIR (stats.st_mode);
}