From: Paul Eggert Date: Mon, 12 Jul 1999 13:03:58 +0000 (+0000) Subject: (start_header): Do not assume S_IFMT is defined. X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=fbc29baad9c20132aff523fe0654a6adf545290e;p=chaz%2Ftar (start_header): Do not assume S_IFMT is defined. (dump_file): Remove unnecessary check for screwy apollo lossage. Do not assume S_IFBLK and S_IFCHR are defined. --- diff --git a/src/create.c b/src/create.c index fdfc6d3..1ca34a6 100644 --- a/src/create.c +++ b/src/create.c @@ -327,7 +327,7 @@ Removing leading `/' from absolute path names in the archive"))); if (group_option != (gid_t) -1) st->st_gid = group_option; if (mode_option) - st->st_mode = ((st->st_mode & S_IFMT) + st->st_mode = ((st->st_mode & ~MODE_ALL) | mode_adjust (st->st_mode, mode_option)); /* Paul Eggert tried the trivial test ($WRITER cf a b; $READER tvf a) @@ -1516,9 +1516,7 @@ Read error at byte %s, reading %lu bytes, in file %s"), type = BLKTYPE; #endif - /* Avoid screwy apollo lossage where S_IFIFO == S_IFSOCK. */ - -#if (_ISP__M68K == 0) && (_ISP__A88K == 0) && defined(S_ISFIFO) +#ifdef S_ISFIFO else if (S_ISFIFO (current_stat.st_mode)) type = FIFOTYPE; #endif @@ -1544,7 +1542,7 @@ Read error at byte %s, reading %lu bytes, in file %s"), header->header.typeflag = type; -#if defined(S_IFBLK) || defined(S_IFCHR) +#if defined S_ISBLK || defined S_ISCHR if (type != FIFOTYPE) { MAJOR_TO_OCT (major (current_stat.st_rdev), header->header.devmajor);