summaryrefslogtreecommitdiff
path: root/lib/stat.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2004-08-07 00:09:38 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2004-08-07 00:09:38 +0000
commita62be9f4039b4499cfbb76e394cad2259d03fa84 (patch)
tree5f444ac72b8b2418f2530af42b6c2fee823d18db /lib/stat.c
parent4d52451995952d65b6772a7849e88866b3542157 (diff)
downloadgnulib-a62be9f4039b4499cfbb76e394cad2259d03fa84.tar.gz
Merge from coreutils.
Diffstat (limited to 'lib/stat.c')
-rw-r--r--lib/stat.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/lib/stat.c b/lib/stat.c
index f8fc82ebce..df0be3a81a 100644
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -3,7 +3,7 @@
has this bug. Also work around a deficiency in Solaris systems (up to at
least Solaris 9) regarding the semantics of `lstat ("symlink/", sbuf).'
- Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free
+ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@ -27,25 +27,11 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
#if defined LSTAT && ! LSTAT_FOLLOWS_SLASHED_SYMLINK
# include <stdlib.h>
# include <string.h>
-# ifdef STAT_MACROS_BROKEN
-# undef S_ISLNK
-# endif
-
-# ifndef S_ISLNK
-# ifdef S_IFLNK
-# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-# else
-# define S_ISLNK(m) 0
-# endif
-# endif
-
+# include "stat-macros.h"
# include "xalloc.h"
/* lstat works differently on Linux and Solaris systems. POSIX (see