public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: utils: chattr: Allow to clear all attributes with '='. Date: Fri, 21 May 2021 10:57:13 +0000 (GMT) [thread overview] Message-ID: <20210521105713.2B893385703A@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=c0949782b7dd123a78f5469ca9e088eb33f59030 commit c0949782b7dd123a78f5469ca9e088eb33f59030 Author: Christian Franke <christian.franke@t-online.de> Date: Fri May 21 11:44:32 2021 +0200 Cygwin: utils: chattr: Allow to clear all attributes with '='. Signed-off-by: Christian Franke <christian.franke@t-online.de> Diff: --- winsup/doc/utils.xml | 5 +++-- winsup/utils/chattr.c | 13 ++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/winsup/doc/utils.xml b/winsup/doc/utils.xml index 69611b954..0671a7b4d 100644 --- a/winsup/doc/utils.xml +++ b/winsup/doc/utils.xml @@ -53,9 +53,10 @@ chattr [-RVfHv] [+-=mode]... [file]... <para>The format of 'mode' is {+-=}[acCehnrsSt]</para> - <para>The operator '+' causes the selected attributes to be added to the + <para>The operator '+' causes the selected attributes to be added to the existing attributes of the files; '-' causes them to be removed; and - '=' causes them to be the only attributes that the files have.</para> + '=' causes them to be the only attributes that the files have. + A single '=' causes all attributes to be removed.</para> <para>Supported attributes:</para> diff --git a/winsup/utils/chattr.c b/winsup/utils/chattr.c index 6942e11b0..e3ab1fba8 100644 --- a/winsup/utils/chattr.c +++ b/winsup/utils/chattr.c @@ -23,6 +23,7 @@ details. */ int Ropt, Vopt, fopt; uint64_t add, del, set; +int set_used; struct option longopts[] = { { "recursive", no_argument, NULL, 'R' }, @@ -83,6 +84,7 @@ get_flags (const char *opt) break; case '=': mode = &set; + set_used = 1; break; default: return 1; @@ -104,10 +106,10 @@ int sanity_check () { int ret = -1; - if (!set && !add && !del) + if (!set_used && !add && !del) fprintf (stderr, "%s: Must use at least one of =, + or -\n", program_invocation_short_name); - else if (set && (add | del)) + else if (set_used && (add | del)) fprintf (stderr, "%s: = is incompatible with + and -\n", program_invocation_short_name); else if ((add & del) != 0) @@ -138,7 +140,7 @@ chattr (const char *path) program_invocation_short_name, strerror (errno), path); return 1; } - if (set) + if (set_used) newflags = set; else { @@ -245,9 +247,10 @@ usage (FILE *stream) "\n" "The format of 'mode' is {+-=}[acCehnrsSt]\n" "\n" - "The operator '+' causes the selected attributes to be added to the\n" + "The operator '+' causes the selected attributes to be added to the\n" "existing attributes of the files; '-' causes them to be removed; and\n" "'=' causes them to be the only attributes that the files have.\n" + "A single '=' causes all attributes to be removed.\n" "\n" "Supported attributes:\n" "\n" @@ -313,7 +316,7 @@ next: opt = strchr ("+-=", argv[optind][0]); if (!opt) break; - if (argv[optind][1] == '\0' || get_flags (argv[optind])) + if ((*opt != '=' && argv[optind][1] == '\0') || get_flags (argv[optind])) usage (stderr); ++optind; }
reply other threads:[~2021-05-21 10:57 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210521105713.2B893385703A@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).