(start_header): Do not assume S_IFMT is defined.

[chaz/tar] / src / list.c

diff --git a/src/list.c b/src/list.c
index a6109ff5f9b812ce759aabef97e497b89f26e5ba..9c6d6a003a1ae3cf4e120fca16e0e9fb1e4d1334 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -70,7 +70,7 @@ read_and (void (*do_something) ())
 
          if (!name_match (current_file_name)
              || current_stat.st_mtime < newer_mtime_option
-             || (exclude_option && check_exclude (current_file_name)))
+             || excluded_filename (excluded, base_name (current_file_name)))
            {
              int isextended = 0;
 
@@ -507,7 +507,7 @@ decode_header (union block *header, struct stat *stat_info,
        }
       switch (header->header.typeflag)
        {
-#ifdef S_IFBLK
+#ifdef S_ISBLK
        case BLKTYPE:
          stat_info->st_rdev
            = makedev (MAJOR_FROM_OCT (header->header.devmajor),
@@ -515,7 +515,7 @@ decode_header (union block *header, struct stat *stat_info,
          break;
 #endif
 
-#ifdef S_IFCHR
+#ifdef S_ISCHR
        case CHRTYPE:
          stat_info->st_rdev
            = makedev (MAJOR_FROM_OCT (header->header.devmajor),
@@ -872,7 +872,7 @@ print_header (void)
 
       switch (current_header->header.typeflag)
        {
-#if defined(S_IFBLK) || defined(S_IFCHR)
+#if defined S_ISBLK || defined S_ISCHR
        case CHRTYPE:
        case BLKTYPE:
          sprintf (size, "%lu,%lu",