From ab62a3096711e3e9c87b6c0405fcecf81f753d53 Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Wed, 30 Jan 2008 01:05:07 +0000 Subject: Stop libattr and libfuse being linked against by programs other than plpfuse. Fix logic of plp_setxattr. It doesn't need to read the non-x attributes, and it now treats the set and cleared EPOC attribute bits properly (I hope!). --- plpfuse/fuse.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'plpfuse') diff --git a/plpfuse/fuse.c b/plpfuse/fuse.c index 883f1d8..3cce988 100644 --- a/plpfuse/fuse.c +++ b/plpfuse/fuse.c @@ -450,7 +450,7 @@ static int plp_setxattr(const char *path, const char *name, const char *value, s { debuglog("plp_setxattr `%s'", ++path); if (strcmp(name, XATTR_NAME) == 0) { - long psidattr, pattr, psize, ptime; + long psisattr, psidattr; char oxattr[XATTR_MAXLEN + 1], nxattr[XATTR_MAXLEN + 1]; if (flags & XATTR_CREATE) { @@ -460,14 +460,12 @@ static int plp_setxattr(const char *path, const char *name, const char *value, s strncpy(nxattr, value, size < XATTR_MAXLEN ? size : XATTR_MAXLEN); nxattr[XATTR_MAXLEN] = '\0'; - if (rfsv_getattr(path, &pattr, &psize, &ptime)) - return rfsv_isalive() ? -ENOENT : -NO_PSION; /* Need to undo earlier increment of path when calling plp_getxattr */ plp_getxattr(path - 1, name, oxattr, XATTR_MAXLEN); - psidattr = pattr; - xattr2pattr(&pattr, &psidattr, oxattr, value); - debuglog("attrs set %x delete %x; %s, %s", pattr, psidattr, oxattr, value); - if (rfsv_setattr(path, pattr, psidattr)) + psisattr = psidattr = 0; + xattr2pattr(&psisattr, &psidattr, oxattr, value); + debuglog("attrs set %x delete %x; %s, %s", psisattr, psidattr, oxattr, value); + if (rfsv_setattr(path, psisattr, psidattr)) return rfsv_isalive() ? -EACCES : -NO_PSION; debuglog("setxattr succeeded"); -- cgit v1.2.3