Date: Tue, 31 Mar 2009 20:19:24 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 160072 for review Message-ID: <200903312019.n2VKJONm067341@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=160072 Change 160072 by trasz@trasz_victim7 on 2009/03/31 20:19:20 Fix more build problems. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.h#9 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#30 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#7 (text+ko) ==== @@ -144,7 +144,8 @@ static int parse_access_mask(char *str, acl_entry_t entry) { - int error, perm; + int error; + acl_perm_t perm; error = _nfs4_parse_access_mask(str, &perm); if (error) @@ -158,7 +159,8 @@ static int parse_flags(char *str, acl_entry_t entry) { - int error, flags; + int error; + acl_flag_t flags; error = _nfs4_parse_flags(str, &flags); if (error) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.h#9 (text+ko) ==== @@ -45,10 +45,10 @@ int _entry_brand_may_be(const acl_entry_t entry, int brand); void _acl_brand_as(acl_t acl, int brand); void _entry_brand_as(const acl_entry_t entry, int brand); -int _nfs4_format_flags(char *str, size_t size, uint32_t var, int verbose); -int _nfs4_format_access_mask(char *str, size_t size, uint32_t var, int verbose); -int _nfs4_parse_flags(const char *str, uint32_t *var); -int _nfs4_parse_access_mask(const char *str, uint32_t *var); +int _nfs4_format_flags(char *str, size_t size, acl_flag_t var, int verbose); +int _nfs4_format_access_mask(char *str, size_t size, acl_perm_t var, int verbose); +int _nfs4_parse_flags(const char *str, acl_flag_t *var); +int _nfs4_parse_access_mask(const char *str, acl_perm_t *var); int _posix1e_acl_check(acl_t acl); int _posix1e_acl_sort(acl_t acl); int _posix1e_acl(acl_t acl, acl_type_t type); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#7 (text+ko) ==== @@ -62,11 +62,11 @@ { ACL_DELETE, "delete", 'd'}, { ACL_READ_ATTRIBUTES, "read_attributes", 'a'}, { ACL_WRITE_ATTRIBUTES, "write_attributes", 'A'}, - { ACL_READ_EXTATTRIBUTES, "read_xattr", 'R'}, - { ACL_WRITE_EXTATTRIBUTES, "write_xattr", 'W'}, - { ACL_READ_SECURITY, "read_acl", 'c'}, - { ACL_WRITE_SECURITY, "write_acl", 'C'}, - { ACL_CHANGE_OWNER, "write_owner", 'o'}, + { ACL_READ_NAMED_ATTRS, "read_xattr", 'R'}, + { ACL_WRITE_NAMED_ATTRS, "write_xattr", 'W'}, + { ACL_READ_ACL, "read_acl", 'c'}, + { ACL_WRITE_ACL, "write_acl", 'C'}, + { ACL_WRITE_OWNER, "write_owner", 'o'}, { ACL_SYNCHRONIZE, "synchronize", 's'}, { 0, 0, 0}}; @@ -201,7 +201,7 @@ } int -_nfs4_format_flags(char *str, size_t size, uint32_t var, int verbose) +_nfs4_format_flags(char *str, size_t size, acl_flag_t var, int verbose) { if (verbose) return (format_flags_verbose(str, size, var, a_flags)); @@ -210,7 +210,7 @@ } int -_nfs4_format_access_mask(char *str, size_t size, uint32_t var, int verbose) +_nfs4_format_access_mask(char *str, size_t size, acl_perm_t var, int verbose) { if (verbose) return (format_flags_verbose(str, size, var, a_access_masks)); @@ -219,28 +219,33 @@ } int -_nfs4_parse_flags(const char *str, uint32_t *var) +_nfs4_parse_flags(const char *str, acl_flag_t *flags) { int error, try_compact; + int tmpflags; - error = parse_flags_verbose(str, var, a_flags, "flags", &try_compact); + error = parse_flags_verbose(str, &tmpflags, a_flags, "flags", &try_compact); if (error && try_compact) - error = parse_flags_compact(str, var, a_flags, "flags"); + error = parse_flags_compact(str, &tmpflags, a_flags, "flags"); + + *flags = tmpflags; return (error); } int -_nfs4_parse_access_mask(const char *str, uint32_t *var) +_nfs4_parse_access_mask(const char *str, acl_perm_t *perms) { int error, try_compact; + int tmpperms; - error = parse_flags_verbose(str, var, a_access_masks, + error = parse_flags_verbose(str, &tmpperms, a_access_masks, "access permissions", &try_compact); if (error && try_compact) - error = parse_flags_compact(str, var, + error = parse_flags_compact(str, &tmpperms, a_access_masks, "access permissions"); + *perms = tmpperms; + return (error); } - ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#4 (text+ko) ==== @@ -31,13 +31,15 @@ #include <sys/types.h> #include <sys/acl_impl.h> +#if defined(_KERNEL) /* - * When compiling OpenSolaris code, this file is getting included instead - * of FreeBSD one. Pull the original sys/acl.h as well. + * When compiling OpenSolaris kernel code, this file is getting + * included instead of FreeBSD one. Pull the original sys/acl.h as well. */ #undef _SYS_ACL_H #include "../../../../../../sys/acl.h" #define _SYS_ACL_H +#endif /* _KERNEL */ #ifdef __cplusplus extern "C" { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#30 (text+ko) ==== @@ -93,7 +93,7 @@ typedef uint16_t acl_flag_t; typedef int acl_type_t; typedef int *acl_permset_t; -typedef int *acl_flagset_t; +typedef uint16_t *acl_flagset_t; struct acl_entry { acl_tag_t ae_tag;help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903312019.n2VKJONm067341>