From 2b19667f166e123ecf5bd5060f7d0341fb3b667f Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 6 Jul 2004 17:00:36 +0000 Subject: Include "stat-macros.h". (canonicalize_filename_mode): Remove #ifdef S_ISLNK, now that S_ISLNK is guaranteed to be defined (via stat-macros.h). --- lib/canonicalize.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/canonicalize.c b/lib/canonicalize.c index c63c8a5d8..d02279d4f 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -45,6 +45,7 @@ void free (); #include #include "path-concat.h" +#include "stat-macros.h" #include "xalloc.h" #include "xgetcwd.h" @@ -258,7 +259,6 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) st.st_mode = 0; } -# ifdef S_ISLNK if (S_ISLNK (st.st_mode)) do { char *buf; @@ -313,11 +313,12 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) free (buf); } while (0); else -# endif /* S_ISLNK */ - if (!S_ISDIR (st.st_mode) && *end && (can_mode != CAN_MISSING)) { - errno = ENOTDIR; - goto error; + if (!S_ISDIR (st.st_mode) && *end && (can_mode != CAN_MISSING)) + { + errno = ENOTDIR; + goto error; + } } } } -- cgit v1.2.3-54-g00ecf