diff options
| author | Jim Meyering <jim@meyering.net> | 2003-10-12 07:03:57 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-10-12 07:03:57 +0000 |
| commit | 498de26ac5799af2c73e607927530bed1ecd02e2 (patch) | |
| tree | 68f7412166cf02dc8d979edf5f0c624bafc82701 /src/copy.c | |
| parent | 4c3c0debef898818e2256f3b673abc14e9b45eab (diff) | |
| download | coreutils-498de26ac5799af2c73e607927530bed1ecd02e2.tar.xz | |
(copy_internal): Don't #ifdef-out simple uses of
S_ISLNK or S_ISSOCK. The S_IS* macros are guaranteed to be defined
via system.h.
Diffstat (limited to 'src/copy.c')
| -rw-r--r-- | src/copy.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/copy.c b/src/copy.c index 283b6952d..3981f9cc8 100644 --- a/src/copy.c +++ b/src/copy.c @@ -1400,10 +1400,7 @@ copy_internal (const char *src_path, const char *dst_path, } else if (S_ISREG (src_type) || (x->copy_as_regular && !S_ISDIR (src_type) -#ifdef S_ISLNK - && !S_ISLNK (src_type) -#endif - )) + && !S_ISLNK (src_type))) { copied_as_regular = 1; /* POSIX says the permission bits of the source file must be @@ -1426,10 +1423,7 @@ copy_internal (const char *src_path, const char *dst_path, else #endif if (S_ISBLK (src_type) || S_ISCHR (src_type) -#ifdef S_ISSOCK - || S_ISSOCK (src_type) -#endif - ) + || S_ISSOCK (src_type)) { if (mknod (dst_path, get_dest_mode (x, src_mode), src_sb.st_rdev)) { |