From 6520f19181fc6853a9b2a6ec35acb759cc87e7fc Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Mon, 26 Mar 2012 22:06:17 +0200 Subject: [PATCH] attrib: Dislay attribute flags in the right order. --- programs/attrib/attrib.c | 10 +++++----- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index a00e104198..ca15980375 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -199,22 +199,22 @@ int wmain(int argc, WCHAR *argv[]) } else { static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { - flags[0] = 'H'; + flags[4] = 'H'; } if (fd.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) { flags[1] = 'S'; } if (fd.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) { - flags[2] = 'A'; + flags[0] = 'A'; } if (fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY) { - flags[3] = 'R'; + flags[5] = 'R'; } if (fd.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY) { - flags[4] = 'T'; + flags[6] = 'T'; } if (fd.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) { - flags[5] = 'C'; + flags[7] = 'C'; } strcpyW(name, curdir); strcatW(name, fd.cFileName); diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0b8e17204c..bb7551515b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -696,9 +696,9 @@ bar\baz removed @pwd@\foobar @pwd@ ------------ Testing attrib ------------ -@todo_wine@A @pwd@\foobar\foo@or_broken@A @pwd@\foobar\foo@or_broken@A I @pwd@\foobar\foo +A @pwd@\foobar\foo@or_broken@A @pwd@\foobar\foo@or_broken@A I @pwd@\foobar\foo --- read-only attribute -@todo_wine@A R @pwd@\foobar\foo@or_broken@A R @pwd@\foobar\foo@or_broken@A R I @pwd@\foobar\foo +A R @pwd@\foobar\foo@or_broken@A R @pwd@\foobar\foo@or_broken@A R I @pwd@\foobar\foo foo foo original contents Read-only file not deleted @@ -707,7 +707,7 @@ Read-only file forcibly deleted @todo_wine@A @pwd@\foobar\baz\level2@or_broken@A @pwd@\foobar\baz\level2@or_broken@A I @pwd@\foobar\baz\level2 @todo_wine@A R @pwd@\foobar\level1@or_broken@A R @pwd@\foobar\level1@or_broken@A R I @pwd@\foobar\level1 @todo_wine@A R @pwd@\foobar\baz\level2@or_broken@A R @pwd@\foobar\baz\level2@or_broken@A R I @pwd@\foobar\baz\level2 -@todo_wine@A @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar +A @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar --- folders processing @pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar @todo_wine@ R @pwd@\foobar\baz@or_broken@ R @pwd@\foobar\baz@or_broken@ @pwd@\foobar\baz@or_broken@ R I @pwd@\foobar\baz -- 2.32.0.93.g670b81a890