From: Christian Franke <Christian.Franke@t-online.de>
To: cygwin-patches@cygwin.com
Subject: PATCH] Cygwin: utils: chattr: Allow to clear all attributes with '='.
Date: Thu, 20 May 2021 23:04:59 +0200 [thread overview]
Message-ID: <a8272535-f9a4-cbc0-d0ef-4d9040cc007f@t-online.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 81 bytes --]
'chattr = FILE' is shorter that 'chattr -rhsat... FILE' :-)
Regards,
Christian
[-- Attachment #2: 0001-Cygwin-utils-chattr-Allow-to-clear-all-attributes-wi.patch --]
[-- Type: text/plain, Size: 1810 bytes --]
From 41c1a9648d46835354167a7e024e7191014e1370 Mon Sep 17 00:00:00 2001
From: Christian Franke <christian.franke@t-online.de>
Date: Thu, 20 May 2021 22:52:28 +0200
Subject: [PATCH] Cygwin: utils: chattr: Allow to clear all attributes with
'='.
Signed-off-by: Christian Franke <christian.franke@t-online.de>
---
winsup/utils/chattr.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/winsup/utils/chattr.c b/winsup/utils/chattr.c
index 6942e11b0..b7beff276 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
{
@@ -313,7 +315,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;
}
--
2.31.1
next reply other threads:[~2021-05-20 21:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 21:04 Christian Franke [this message]
2021-05-21 7:58 ` Corinna Vinschen
2021-05-21 10:07 ` Christian Franke
2021-05-21 10:57 ` Corinna Vinschen
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=a8272535-f9a4-cbc0-d0ef-4d9040cc007f@t-online.de \
--to=christian.franke@t-online.de \
--cc=cygwin-patches@cygwin.com \
/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: link
Be 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).