drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: utils: chattr: Allow to clear all attributes with '='. 

Signed-off-by: Christian Franke <christian.franke@t-online.de>
This commit is contained in:
Christian Franke 2021-05-21 11:44:32 +02:00 committed by Corinna Vinschen
parent 6462a0844d
commit c0949782b7
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/doc/utils.xml
View File

@ -53,9 +53,10 @@ chattr [-RVfHv] [+-=mode]... [file]...
<para>The format of 'mode' is {+-=}[acCehnrsSt]</para> <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 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> <para>Supported attributes:</para>

13
winsup/utils/chattr.c
View File

@ -23,6 +23,7 @@ details. */
int Ropt, Vopt, fopt; int Ropt, Vopt, fopt;
uint64_t add, del, set; uint64_t add, del, set;
int set_used;
struct option longopts[] = { struct option longopts[] = {
{ "recursive", no_argument, NULL, 'R' }, { "recursive", no_argument, NULL, 'R' },
@ -83,6 +84,7 @@ get_flags (const char *opt)
break; break;
case '=': case '=':
mode = &set; mode = &set;
set_used = 1;
break; break;
default: default:
return 1; return 1;
@ -104,10 +106,10 @@ int
sanity_check () sanity_check ()
{ {
int ret = -1; int ret = -1;
if (!set && !add && !del) if (!set_used && !add && !del)
fprintf (stderr, "%s: Must use at least one of =, + or -\n", fprintf (stderr, "%s: Must use at least one of =, + or -\n",
program_invocation_short_name); program_invocation_short_name);
else if (set && (add | del)) else if (set_used && (add | del))
fprintf (stderr, "%s: = is incompatible with + and -\n", fprintf (stderr, "%s: = is incompatible with + and -\n",
program_invocation_short_name); program_invocation_short_name);
else if ((add & del) != 0) else if ((add & del) != 0)
@ -138,7 +140,7 @@ chattr (const char *path)
program_invocation_short_name, strerror (errno), path); program_invocation_short_name, strerror (errno), path);
return 1; return 1;
} }
if (set) if (set_used)
newflags = set; newflags = set;
else else
{ {
@ -245,9 +247,10 @@ usage (FILE *stream)
"\n" "\n"
"The format of 'mode' is {+-=}[acCehnrsSt]\n" "The format of 'mode' is {+-=}[acCehnrsSt]\n"
"\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" "existing attributes of the files; '-' causes them to be removed; and\n"
"'=' causes them to be the only attributes that the files have.\n" "'=' causes them to be the only attributes that the files have.\n"
"A single '=' causes all attributes to be removed.\n"
"\n" "\n"
"Supported attributes:\n" "Supported attributes:\n"
"\n" "\n"
@ -313,7 +316,7 @@ next:
opt = strchr ("+-=", argv[optind][0]); opt = strchr ("+-=", argv[optind][0]);
if (!opt) if (!opt)
break; break;
if (argv[optind][1] == '\0' || get_flags (argv[optind])) if ((*opt != '=' && argv[optind][1] == '\0') || get_flags (argv[optind]))
usage (stderr); usage (stderr);
++optind; ++optind;
} }