aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2020-02-05 20:48:43 -0800
committerRob Landley <rob@landley.net>2020-02-06 11:36:51 -0600
commit01bf7f6e61d13c57aa6159262af43792793afcae (patch)
treea3ea4d4bf7c12002c19fb40776c0499d85f971c8
parentb07b8878da56c633d90eb6f9d5f9737e0bfe62df (diff)
downloadtoybox-01bf7f6e61d13c57aa6159262af43792793afcae.tar.gz
chattr: improve error messages.
When chattr fails in production, it helps to see what it was trying to do. Reuse the lsattr format but without the '-'s. Only read the flags if we have any intention of changing them: `chattr -p 123` has no reason to read the flags. Only write the flags back if they actually change: `chattr +a` shouldn't do anything if that flag is already set, for example. Switch -p and -v to perror_msg() instead of perror_exit() in case they're used with -R. (I suspect that the uses of DIRTREE_ABORT are mistakes given -R, but I'll leave them until I actually hit this.)
-rw-r--r--toys/other/lsattr.c70
1 files changed, 40 insertions, 30 deletions
diff --git a/toys/other/lsattr.c b/toys/other/lsattr.c
index 3f4bf656..090ac318 100644
--- a/toys/other/lsattr.c
+++ b/toys/other/lsattr.c
@@ -124,6 +124,18 @@ static int ext2_getflag(int fd, struct stat *sb, unsigned long *flag)
return (ioctl(fd, FS_IOC_GETFLAGS, (void*)flag));
}
+static char *attrstr(unsigned long attrs, int full)
+{
+ struct ext2_attr *a = e2attrs;
+ char *s = toybuf;
+
+ for (; a->name; a++)
+ if (attrs & a->flag) *s++ = a->opt;
+ else if (full) *s++ = '-';
+ *s = '\0';
+ return toybuf;
+}
+
static void print_file_attr(char *path)
{
unsigned long flag = 0, version = 0;
@@ -164,14 +176,7 @@ static void print_file_attr(char *path)
}
if (!name_found) xprintf("---");
xputc('\n');
- } else {
- int index = 0;
-
- for (; ptr->name; ptr++)
- toybuf[index++] = (flag & ptr->flag) ? ptr->opt : '-';
- toybuf[index] = '\0';
- xprintf("%s %s\n", toybuf, path);
- }
+ } else xprintf("%s %s\n", attrstr(flag, 1), path);
}
xclose(fd);
return;
@@ -209,7 +214,7 @@ void lsattr_main(void)
{
if (!*toys.optargs) dirtree_read(".", retell_dir);
else
- for (; *toys.optargs; toys.optargs++) {
+ for (; *toys.optargs; toys.optargs++) {
struct stat sb;
if (lstat(*toys.optargs, &sb)) perror_msg("stat '%s'", *toys.optargs);
@@ -271,7 +276,6 @@ static void parse_cmdline_arg(char ***argv)
// Update attribute of given file.
static int update_attr(struct dirtree *root)
{
- unsigned long fval = 0;
char *fpath = NULL;
int v = TT.v, fd;
@@ -291,22 +295,29 @@ static int update_attr(struct dirtree *root)
free(fpath);
return DIRTREE_ABORT;
}
- // Get current attr of file.
- if (ext2_getflag(fd, &(root->st), &fval) < 0) {
- perror_msg("read flags of '%s'", fpath);
- free(fpath);
- xclose(fd);
- return DIRTREE_ABORT;
- }
- if (TT.set) { // for '=' operator.
- if (ext2_setflag(fd, &(root->st), TT.set) < 0)
- perror_msg("setting flags '%s'", fpath);
- } else { // for '-' / '+' operator.
- fval &= ~(TT.rm);
- fval |= TT.add;
- if (!S_ISDIR(root->st.st_mode)) fval &= ~FS_DIRSYNC_FL;
- if (ext2_setflag(fd, &(root->st), fval) < 0)
- perror_msg("setting flags '%s'", fpath);
+
+ // Any potential flag changes?
+ if (TT.set | TT.add | TT.set) {
+ unsigned long orig, new;
+
+ // Read current flags.
+ if (ext2_getflag(fd, &(root->st), &orig) < 0) {
+ perror_msg("read flags of '%s'", fpath);
+ free(fpath);
+ xclose(fd);
+ return DIRTREE_ABORT;
+ }
+ // Apply the requested changes.
+ if (TT.set) new = TT.set; // '='.
+ else { // '-' and/or '+'.
+ new = orig;
+ new &= ~(TT.rm);
+ new |= TT.add;
+ if (!S_ISDIR(root->st.st_mode)) new &= ~FS_DIRSYNC_FL;
+ }
+ // Write them back if there was any change.
+ if (orig != new && ext2_setflag(fd, &(root->st), new)<0)
+ perror_msg("%s: setting flags to =%s failed", fpath, attrstr(new, 0));
}
// (FS_IOC_SETVERSION works all the way back to 2.6, but FS_IOC_FSSETXATTR
@@ -316,12 +327,11 @@ static int update_attr(struct dirtree *root)
if (FLAG(p)) {
struct fsxattr_4_5 fsx;
+ int fail = ioctl(fd, FS_IOC_FSGETXATTR_4_5, &fsx);
- if (ioctl(fd, FS_IOC_FSGETXATTR_4_5, &fsx))
- perror_exit("%s: FS_IOC_FSGETXATTR failed", fpath);
fsx.fsx_projid = TT.p;
- if (ioctl(fd, FS_IOC_FSSETXATTR_4_5, &fsx))
- perror_exit("%s: setting projid to %u failed", fpath, fsx.fsx_projid);
+ if (fail || ioctl(fd, FS_IOC_FSSETXATTR_4_5, &fsx))
+ perror_msg("%s: setting projid to %u failed", fpath, fsx.fsx_projid);
}
free(fpath);