diff options
| author | Elliott Hughes <enh@google.com> | 2020-02-27 17:36:08 -0800 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2020-02-27 20:14:20 -0600 |
| commit | d9522e3ffa9f438eee867eb816baaaaf80bdb9a9 (patch) | |
| tree | 038506594b8caca15ef7a902c4a34ab0471faa04 /toys/other | |
| parent | 5e7b83c5661dc882c96cd3c616afc144ee22f13d (diff) | |
| download | toybox-d9522e3ffa9f438eee867eb816baaaaf80bdb9a9.tar.gz | |
chattr: allow `chattr =`.
Also fix another bug where we were testing `set` twice.
Fixes https://github.com/landley/toybox/issues/172.
Diffstat (limited to 'toys/other')
| -rw-r--r-- | toys/other/lsattr.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/toys/other/lsattr.c b/toys/other/lsattr.c index cd236b9e..3e327920 100644 --- a/toys/other/lsattr.c +++ b/toys/other/lsattr.c @@ -67,6 +67,8 @@ GLOBALS( long p; long add, rm, set; + // !add and !rm tell us whether they were used, but `chattr =` is meaningful. + int have_set; ) #define FS_PROJINHERT_FL 0x20000000 // Linux 4.5 @@ -264,6 +266,7 @@ static void parse_cmdline_arg(char ***argv) TT.add |= get_flag_val(*ptr); break; case '=': + TT.have_set = 1; for (ptr = ++arg; *ptr; ptr++) TT.set |= get_flag_val(*ptr); break; @@ -297,7 +300,7 @@ static int update_attr(struct dirtree *root) } // Any potential flag changes? - if (TT.set | TT.add | TT.set) { + if (TT.have_set | TT.add | TT.rm) { unsigned long orig, new; // Read current flags. @@ -308,7 +311,7 @@ static int update_attr(struct dirtree *root) return DIRTREE_ABORT; } // Apply the requested changes. - if (TT.set) new = TT.set; // '='. + if (TT.have_set) new = TT.set; // '='. else { // '-' and/or '+'. new = orig; new &= ~(TT.rm); @@ -347,10 +350,10 @@ void chattr_main(void) if (TT.p < 0 || TT.p > UINT_MAX) error_exit("bad projid %lu", TT.p); if (TT.v < 0 || TT.v > UINT_MAX) error_exit("bad version %ld", TT.v); if (!*argv) help_exit("no file"); - if (TT.set && (TT.add || TT.rm)) + if (TT.have_set && (TT.add || TT.rm)) error_exit("no '=' with '-' or '+'"); if (TT.rm & TT.add) error_exit("set/unset same flag"); - if (!(TT.add || TT.rm || TT.set || FLAG(p) || FLAG(v))) + if (!(TT.add || TT.rm || TT.have_set || FLAG(p) || FLAG(v))) error_exit("need '-p', '-v', '=', '-', or '+'"); for (; *argv; argv++) dirtree_read(*argv, update_attr); } |