PATCH] Cygwin: utils: chattr: Allow to clear all attributes with '='.
Christian Franke
Christian.Franke@t-online.de
Thu May 20 21:04:59 GMT 2021
'chattr = FILE' is shorter that 'chattr -rhsat... FILE' :-)
Regards,
Christian
-------------- next part --------------
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
More information about the Cygwin-patches
mailing list