From: Szabolcs S. <sz...@us...> - 2010-01-15 00:32:00
|
Update of /cvsroot/ntfs-3g/ntfs-3g/libntfs-3g In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28705/libntfs-3g Modified Files: Tag: N2009_11_14_FIXES acls.c attrib.c efs.c inode.c mft.c reparse.c security.c Log Message: fix stat.h/attr.h related compilation errors (Jean-Pierre Andre) Index: security.c =================================================================== RCS file: /cvsroot/ntfs-3g/ntfs-3g/libntfs-3g/security.c,v retrieving revision 1.2.2.119 retrieving revision 1.2.2.119.2.1 diff -u -d -r1.2.2.119 -r1.2.2.119.2.1 --- security.c 5 Nov 2009 11:43:36 -0000 1.2.2.119 +++ security.c 15 Jan 2010 00:31:50 -0000 1.2.2.119.2.1 @@ -41,6 +41,9 @@ #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif #ifdef HAVE_SETXATTR #include <sys/xattr.h> #endif @@ -2893,6 +2896,8 @@ return (allowed); } +#ifdef HAVE_SETXATTR /* extended attributes interface required */ + #if POSIXACLS /* @@ -3074,6 +3079,8 @@ return (res ? -1 : 0); } +#endif /* HAVE_SETXATTR */ + /* * Set new permissions to a file * Checks user mapping has been defined before request for setting @@ -3988,6 +3995,8 @@ return (!scx->mapping[MAPUSERS] || link_group_members(scx)); } +#ifdef HAVE_SETXATTR /* extended attributes interface required */ + /* * Get the ntfs attribute into an extended attribute * The attribute is returned according to cpu endianness @@ -4073,6 +4082,8 @@ return (res ? -1 : 0); } +#endif /* HAVE_SETXATTR */ + /* * Open $Secure once for all * returns zero if it succeeds Index: efs.c =================================================================== RCS file: /cvsroot/ntfs-3g/ntfs-3g/libntfs-3g/Attic/efs.c,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.2.2.1 diff -u -d -r1.1.2.2 -r1.1.2.2.2.1 --- efs.c 1 Jul 2009 18:56:00 -0000 1.1.2.2 +++ efs.c 15 Jan 2010 00:31:50 -0000 1.1.2.2.2.1 @@ -58,6 +58,8 @@ #include "misc.h" #include "efs.h" +#ifdef HAVE_SETXATTR /* extended attributes interface required */ + static ntfschar logged_utility_stream_name[] = { const_cpu_to_le16('$'), const_cpu_to_le16('E'), @@ -337,3 +339,5 @@ ntfs_attr_put_search_ctx(ctx); return (-1); } + +#endif /* HAVE_SETXATTR */ Index: attrib.c =================================================================== RCS file: /cvsroot/ntfs-3g/ntfs-3g/libntfs-3g/attrib.c,v retrieving revision 1.22.2.35.2.1 retrieving revision 1.22.2.35.2.2 diff -u -d -r1.22.2.35.2.1 -r1.22.2.35.2.2 --- attrib.c 15 Jan 2010 00:04:23 -0000 1.22.2.35.2.1 +++ attrib.c 15 Jan 2010 00:31:50 -0000 1.22.2.35.2.2 @@ -40,6 +40,9 @@ #ifdef HAVE_ERRNO_H #include <errno.h> #endif +#ifdef HAVE_LIMITS_H +#include <limits.h> +#endif #include "compat.h" #include "attrib.h" Index: mft.c =================================================================== RCS file: /cvsroot/ntfs-3g/ntfs-3g/libntfs-3g/mft.c,v retrieving revision 1.16.2.15 retrieving revision 1.16.2.15.2.1 diff -u -d -r1.16.2.15 -r1.16.2.15.2.1 --- mft.c 9 Jul 2009 15:20:14 -0000 1.16.2.15 +++ mft.c 15 Jan 2010 00:31:50 -0000 1.16.2.15.2.1 @@ -38,6 +38,9 @@ #ifdef HAVE_STRING_H #include <string.h> #endif +#ifdef HAVE_LIMITS_H +#include <limits.h> +#endif #include <time.h> #include "compat.h" Index: inode.c =================================================================== RCS file: /cvsroot/ntfs-3g/ntfs-3g/libntfs-3g/inode.c,v retrieving revision 1.13.2.20 retrieving revision 1.13.2.20.2.1 diff -u -d -r1.13.2.20 -r1.13.2.20.2.1 --- inode.c 5 Nov 2009 11:44:38 -0000 1.13.2.20 +++ inode.c 15 Jan 2010 00:31:50 -0000 1.13.2.20.2.1 @@ -1197,6 +1197,8 @@ return ret; } +#ifdef HAVE_SETXATTR /* extended attributes interface required */ + /* * Get high precision NTFS times * @@ -1344,3 +1346,5 @@ errno = EEXIST; return (ret); } + +#endif /* HAVE_SETXATTR */ Index: reparse.c =================================================================== RCS file: /cvsroot/ntfs-3g/ntfs-3g/libntfs-3g/Attic/reparse.c,v retrieving revision 1.1.2.13.2.1 retrieving revision 1.1.2.13.2.2 diff -u -d -r1.1.2.13.2.1 -r1.1.2.13.2.2 --- reparse.c 14 Jan 2010 23:48:42 -0000 1.1.2.13.2.1 +++ reparse.c 15 Jan 2010 00:31:50 -0000 1.1.2.13.2.2 @@ -914,6 +914,8 @@ return (possible); } +#ifdef HAVE_SETXATTR /* extended attributes interface required */ + /* * Set the index for new reparse data * @@ -951,6 +953,8 @@ return (ntfs_ie_add(xr,(INDEX_ENTRY*)&indx)); } +#endif /* HAVE_SETXATTR */ + /* * Remove a reparse data index entry if attribute present * @@ -1015,6 +1019,8 @@ return (xr); } +#ifdef HAVE_SETXATTR /* extended attributes interface required */ + /* * Update the reparse data and index * @@ -1079,6 +1085,8 @@ return (res); } +#endif /* HAVE_SETXATTR */ + /* * Delete a reparse index entry * @@ -1116,6 +1124,8 @@ return (res); } +#ifdef HAVE_SETXATTR /* extended attributes interface required */ + /* * Get the ntfs reparse data into an extended attribute * @@ -1294,3 +1304,5 @@ } return (res ? -1 : 0); } + +#endif /* HAVE_SETXATTR */ Index: acls.c =================================================================== RCS file: /cvsroot/ntfs-3g/ntfs-3g/libntfs-3g/Attic/acls.c,v retrieving revision 1.1.2.29 retrieving revision 1.1.2.29.2.1 diff -u -d -r1.1.2.29 -r1.1.2.29.2.1 --- acls.c 3 Nov 2009 14:05:58 -0000 1.1.2.29 +++ acls.c 15 Jan 2010 00:31:50 -0000 1.1.2.29.2.1 @@ -40,6 +40,9 @@ #ifdef HAVE_ERRNO_H #include <errno.h> #endif +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif |