Attachment 1543 Details for Bug 3218 – Fix to the xattr attributes emulation through EA in *BSD

[patch] Fix to the xattr attributes emulation through EA in *BSD

patch-lib_system.c (text/plain), 4.70 KB, created by Timur Bakeyev on 2005-10-26 13:52:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timur Bakeyev

Created: 2005-10-26 13:52:32 UTC

Size: 4.70 KB

patch

obsolete

>--- lib/system.c.orig	Mon Oct 24 13:53:12 2005
>+++ lib/system.c	Tue Oct 25 02:45:59 2005
>@@ -1367,7 +1367,7 @@
> 
> /**************************************************************************
>  Wrappers for extented attribute calls. Based on the Linux package with
>- support for IRIX also. Expand as other systems have them.
>+ support for IRIX and (Net|Free)BSD also. Expand as other systems have them.
> ****************************************************************************/
> 
> ssize_t sys_getxattr (const char *path, const char *name, void *value, size_t size)
>@@ -1376,9 +1376,21 @@
> 	return getxattr(path, name, value, size);
> #elif defined(HAVE_EXTATTR_GET_FILE)
> 	char *s;
>+	ssize_t retval;
> 	int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
> 		EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
> 	const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
>+	/*
>+	*BSD implementation has a nasty habbit to silently truncate
>+	returned value by the size of the buffer, so have to check
>+	that buffer is large enough to fit returned value.
>+	*/
>+	retval = extattr_get_file(path, attrnamespace, attrname, NULL, 0);
>+
>+	if(retval > size) {
>+		errno = ERANGE;
>+		return -1;
>+	}
> 
> 	return extattr_get_file(path, attrnamespace, attrname, value, size);
> #elif defined(HAVE_ATTR_GET)
>@@ -1403,10 +1415,18 @@
> 	return lgetxattr(path, name, value, size);
> #elif defined(HAVE_EXTATTR_GET_LINK)
> 	char *s;
>+	ssize_t retval;
> 	int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
> 		EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
> 	const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
> 
>+	retval = extattr_get_link(path, attrnamespace, attrname, NULL, 0);
>+
>+	if(retval > size) {
>+		errno = ERANGE;
>+		return -1;
>+	}
>+
> 	return extattr_get_link(path, attrnamespace, attrname, value, size);
> #elif defined(HAVE_ATTR_GET)
> 	int retval, flags = ATTR_DONTFOLLOW;
>@@ -1430,10 +1450,18 @@
> 	return fgetxattr(filedes, name, value, size);
> #elif defined(HAVE_EXTATTR_GET_FD)
> 	char *s;
>+	ssize_t retval;
> 	int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
> 		EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
> 	const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
> 
>+	retval = extattr_get_fd(filedes, attrnamespace, attrname, NULL, 0);
>+
>+	if(retval > size) {
>+		errno = ERANGE;
>+		return -1;
>+	}
>+
> 	return extattr_get_fd(filedes, attrnamespace, attrname, value, size);
> #elif defined(HAVE_ATTR_GETF)
> 	int retval, flags = 0;
>@@ -1747,7 +1775,24 @@
> 	int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
> 		EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
> 	const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
>-
>+	if (flags) {
>+		/* Check attribute existence */
>+		retval = extattr_get_file(path, attrnamespace, attrname, NULL, 0);
>+		if (retval < 0) {
>+			/* REPLACE attribute, that doesn't exist */
>+			if (flags & XATTR_REPLACE && errno == ENOATTR) {
>+				errno = ENOATTR;
>+				return -1;
>+			}
>+		}
>+		else {
>+			/* CREATE attribute, that already exists */
>+			if (flags & XATTR_CREATE) {
>+				errno = EEXIST;
>+				return -1;
>+			}
>+		}
>+	}
> 	retval = extattr_set_file(path, attrnamespace, attrname, value, size);
> 	return (retval < 0) ? -1 : 0;
> #elif defined(HAVE_ATTR_SET)
>@@ -1775,6 +1820,24 @@
> 	int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
> 		EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
> 	const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
>+	if (flags) {
>+		/* Check attribute existence */
>+		retval = extattr_get_link(path, attrnamespace, attrname, NULL, 0);
>+		if (retval < 0) {
>+			/* REPLACE attribute, that doesn't exist */
>+			if (flags & XATTR_REPLACE && errno == ENOATTR) {
>+				errno = ENOATTR;
>+				return -1;
>+			}
>+		}
>+		else {
>+			/* CREATE attribute, that already exists */
>+			if (flags & XATTR_CREATE) {
>+				errno = EEXIST;
>+				return -1;
>+			}
>+		}
>+	}
> 
> 	retval = extattr_set_link(path, attrnamespace, attrname, value, size);
> 	return (retval < 0) ? -1 : 0;
>@@ -1803,7 +1866,24 @@
> 	int attrnamespace = (strncmp(name, "system", 6) == 0) ? 
> 		EXTATTR_NAMESPACE_SYSTEM : EXTATTR_NAMESPACE_USER;
> 	const char *attrname = ((s=strchr_m(name, '.')) == NULL) ? name : s + 1;
>-
>+	if (flags) {
>+		/* Check attribute existence */
>+		retval = extattr_get_fd(filedes, attrnamespace, attrname, NULL, 0);
>+		if (retval < 0) {
>+			/* REPLACE attribute, that doesn't exist */
>+			if (flags & XATTR_REPLACE && errno == ENOATTR) {
>+				errno = ENOATTR;
>+				return -1;
>+			}
>+		}
>+		else {
>+			/* CREATE attribute, that already exists */
>+			if (flags & XATTR_CREATE) {
>+				errno = EEXIST;
>+				return -1;
>+			}
>+		}
>+	}
> 	retval = extattr_set_fd(filedes, attrnamespace, attrname, value, size);
> 	return (retval < 0) ? -1 : 0;
> #elif defined(HAVE_ATTR_SETF)

Actions: View

Attachments on bug 3218: 1543