Remove all S_IS* and S_IF* definitions.

Instead, just include "stat-macros.h".

1 files changed, 2 insertions, 119 deletions

diff --git a/lib/filemode.c b/lib/filemode.c
index 5e909dfca..0e38e3af3 100644
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -1,5 +1,5 @@
 /* filemode.c -- make a string describing file modes
-   Copyright (C) 1985, 1990, 1993, 1998-2000 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1990, 1993, 1998-2000, 2004 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
@@ -23,98 +23,7 @@
 #include <sys/stat.h>
 
 #include "filemode.h"
-
-#if !S_IRUSR
-# if S_IREAD
-#  define S_IRUSR S_IREAD
-# else
-#  define S_IRUSR 00400
-# endif
-#endif
-
-#if !S_IWUSR
-# if S_IWRITE
-#  define S_IWUSR S_IWRITE
-# else
-#  define S_IWUSR 00200
-# endif
-#endif
-
-#if !S_IXUSR
-# if S_IEXEC
-#  define S_IXUSR S_IEXEC
-# else
-#  define S_IXUSR 00100
-# endif
-#endif
-
-#if !S_IRGRP
-# define S_IRGRP (S_IRUSR >> 3)
-#endif
-#if !S_IWGRP
-# define S_IWGRP (S_IWUSR >> 3)
-#endif
-#if !S_IXGRP
-# define S_IXGRP (S_IXUSR >> 3)
-#endif
-#if !S_IROTH
-# define S_IROTH (S_IRUSR >> 6)
-#endif
-#if !S_IWOTH
-# define S_IWOTH (S_IWUSR >> 6)
-#endif
-#if !S_IXOTH
-# define S_IXOTH (S_IXUSR >> 6)
-#endif
-
-#ifdef STAT_MACROS_BROKEN
-# undef S_ISBLK
-# undef S_ISCHR
-# undef S_ISDIR
-# undef S_ISFIFO
-# undef S_ISLNK
-# undef S_ISMPB
-# undef S_ISMPC
-# undef S_ISNWK
-# undef S_ISREG
-# undef S_ISSOCK
-#endif /* STAT_MACROS_BROKEN.  */
-
-#if !defined S_ISBLK && defined S_IFBLK
-# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
-#endif
-#if !defined S_ISCHR && defined S_IFCHR
-# define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
-#endif
-#if !defined S_ISDIR && defined S_IFDIR
-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-#if !defined S_ISREG && defined S_IFREG
-# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-#if !defined S_ISFIFO && defined S_IFIFO
-# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
-#endif
-#if !defined S_ISLNK && defined S_IFLNK
-# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#endif
-#if !defined S_ISSOCK && defined S_IFSOCK
-# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
-#endif
-#if !defined S_ISMPB && defined S_IFMPB /* V7 */
-# define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB)
-# define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC)
-#endif
-#if !defined S_ISNWK && defined S_IFNWK /* HP/UX */
-# define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
-#endif
-#if !defined S_ISDOOR && defined S_IFDOOR /* Solaris 2.5 and up */
-# define S_ISDOOR(m) (((m) & S_IFMT) == S_IFDOOR)
-#endif
-#if !defined S_ISCTG && defined S_IFCTG /* MassComp */
-# define S_ISCTG(m) (((m) & S_IFMT) == S_IFCTG)
-#endif
-
+#include "stat-macros.h"
 
 
 /* Set the 's' and 't' flags in file attributes string CHARS,
@@ -123,7 +32,6 @@
 static void
 setst (mode_t bits, char *chars)
 {
-#ifdef S_ISUID
   if (bits & S_ISUID)
     {
       if (chars[3] != 'x')
@@ -132,8 +40,6 @@ setst (mode_t bits, char *chars)
       else
 	chars[3] = 's';
     }
-#endif
-#ifdef S_ISGID
   if (bits & S_ISGID)
     {
       if (chars[6] != 'x')
@@ -142,8 +48,6 @@ setst (mode_t bits, char *chars)
       else
 	chars[6] = 's';
     }
-#endif
-#ifdef S_ISVTX
   if (bits & S_ISVTX)
     {
       if (chars[9] != 'x')
@@ -152,7 +56,6 @@ setst (mode_t bits, char *chars)
       else
 	chars[9] = 't';
     }
-#endif
 }
 
 /* Return a character indicating the type of file described by
@@ -174,60 +77,40 @@ setst (mode_t bits, char *chars)
 static char
 ftypelet (mode_t bits)
 {
-#ifdef S_ISBLK
   if (S_ISBLK (bits))
     return 'b';
-#endif
   if (S_ISCHR (bits))
     return 'c';
   if (S_ISDIR (bits))
     return 'd';
   if (S_ISREG (bits))
     return '-';
-#ifdef S_ISFIFO
   if (S_ISFIFO (bits))
     return 'p';
-#endif
-#ifdef S_ISLNK
   if (S_ISLNK (bits))
     return 'l';
-#endif
-#ifdef S_ISSOCK
   if (S_ISSOCK (bits))
     return 's';
-#endif
-#ifdef S_ISMPC
   if (S_ISMPC (bits))
     return 'm';
-#endif
-#ifdef S_ISNWK
   if (S_ISNWK (bits))
     return 'n';
-#endif
-#ifdef S_ISDOOR
   if (S_ISDOOR (bits))
     return 'D';
-#endif
-#ifdef S_ISCTG
   if (S_ISCTG (bits))
     return 'C';
-#endif
 
   /* The following two tests are for Cray DMF (Data Migration
      Facility), which is a HSM file system.  A migrated file has a
      `st_dm_mode' that is different from the normal `st_mode', so any
      tests for migrated files should use the former.  */
 
-#ifdef S_ISOFD
   if (S_ISOFD (bits))
     /* off line, with data  */
     return 'M';
-#endif
-#ifdef S_ISOFL
   /* off line, with no data  */
   if (S_ISOFL (bits))
     return 'M';
-#endif
   return '?';
 }