summaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorDenys Vlasenko2021-06-23 19:44:15 +0200
committerDenys Vlasenko2021-06-23 19:44:15 +0200
commit0e55af6c61a5420ffbeae990928b0fc546a7ef06 (patch)
tree6836297d01e7f05f9bbb39044fe000e06fb04776 /e2fsprogs
parent5c89e5a04ec445fd0e7437918290bedc71a4ccad (diff)
downloadbusybox-0e55af6c61a5420ffbeae990928b0fc546a7ef06.zip
busybox-0e55af6c61a5420ffbeae990928b0fc546a7ef06.tar.gz
chattr: if IOC_FSGETXATTR fails, do not try IOC_FSSETXATTR
function old new delta change_attributes 416 410 -6 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/chattr.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c
index 1b12c9f..e599aba 100644
--- a/e2fsprogs/chattr.c
+++ b/e2fsprogs/chattr.c
@@ -141,6 +141,8 @@ static void change_attributes(const char *name, struct globals *gp);
static int FAST_FUNC chattr_dir_proc(const char *dir_name, struct dirent *de, void *gp)
{
+//TODO: use de->d_type (if it's not DT_UNKNOWN) to skip !(REG || DIR || LNK) entries without lstat?
+
char *path = concat_subpath_file(dir_name, de->d_name);
/* path is NULL if de->d_name is "." or "..", else... */
if (path) {
@@ -184,12 +186,14 @@ static void change_attributes(const char *name, struct globals *gp)
struct ext2_fsxattr fsxattr;
r = ioctl(fd, EXT2_IOC_FSGETXATTR, &fsxattr);
/* note: ^^^ may fail in 32-bit userspace on 64-bit kernel (seen on 4.12.0) */
- if (r != 0)
+ if (r != 0) {
bb_perror_msg("getting %s on %s", "project ID", name);
- fsxattr.fsx_projid = gp->projid;
- r = ioctl(fd, EXT2_IOC_FSSETXATTR, &fsxattr);
- if (r != 0)
- bb_perror_msg("setting %s on %s", "project ID", name);
+ } else {
+ fsxattr.fsx_projid = gp->projid;
+ r = ioctl(fd, EXT2_IOC_FSSETXATTR, &fsxattr);
+ if (r != 0)
+ bb_perror_msg("setting %s on %s", "project ID", name);
+ }
}
if (gp->flags & OPT_SET) {