mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2025-01-27 10:33:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

(USE_ACL): Define this only #if

Browse Source 
(HAVE_SYS_ACL_H && HAVE_ACL && defined GETACLCNT).
Use `USE_ACL' in place of `HAVE_ACL' everywhere else.  From Kaveh Ghazi.
This commit is contained in:
Jim Meyering 1999-05-05 13:12:28 +00:00
parent c4ddb7f83a
commit 19d33cea2b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ls.c
View File

@ -84,6 +84,13 @@
#include "strverscmp.h" #include "strverscmp.h"
#include "xstrtol.h" #include "xstrtol.h"
/* Use access control lists only under all the following conditions.
Some systems (OSF4, Irix5, Irix6) have the acl function, but not
sys/acl.h or don't define the GETACLCNT macro. */
#if HAVE_SYS_ACL_H && HAVE_ACL && defined GETACLCNT
# define USE_ACL 1
#endif
#define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \ #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \
: (ls_mode == LS_MULTI_COL \ : (ls_mode == LS_MULTI_COL \
? "dir" : "vdir")) ? "dir" : "vdir"))
@ -164,14 +171,14 @@ struct fileinfo
enum filetype filetype; enum filetype filetype;
#if HAVE_ACL #if USE_ACL
/* For long listings, nonzero if the file has an access control list, /* For long listings, nonzero if the file has an access control list,
otherwise zero. */ otherwise zero. */
int have_acl; int have_acl;
#endif #endif
}; };
#if HAVE_ACL #if USE_ACL
# define FILE_HAS_ACL(F) ((F)->have_acl) # define FILE_HAS_ACL(F) ((F)->have_acl)
#else #else
# define FILE_HAS_ACL(F) 0 # define FILE_HAS_ACL(F) 0
@ -1745,7 +1752,7 @@ gobble_file (const char *name, int explicit_arg, const char *dirname)
else else
{ {
val = lstat (path, &files[files_index].stat); val = lstat (path, &files[files_index].stat);
#if HAVE_ACL #if USE_ACL
files[files_index].have_acl = (acl (path, GETACLCNT, 0, NULL) > 4); files[files_index].have_acl = (acl (path, GETACLCNT, 0, NULL) > 4);
#endif #endif
} }