chattr,lsattr: improve help messages

List all attributes in the help from lsattr.

Minor changes to attribute names in output.

3 files changed, 26 insertions, 6 deletions

diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c
index e35b9d223..fc500f229 100644
--- a/e2fsprogs/chattr.c
+++ b/e2fsprogs/chattr.c
@@ -39,8 +39,8 @@
 //usage:     "\n        -p NUM  Set project number"
 //usage:     )
 //-V, -f accepted but ignored
-//usage:     "\nModifiers:"
 //usage:     IF_NOT_PLATFORM_MINGW32(
+//usage:     "\nModifiers:"
 //usage:     "\n        -,+,=   Remove/add/set attributes"
 //usage:     "\nAttributes:"
 //usage:     "\n        A       No atime"
@@ -66,7 +66,6 @@
 //usage:     )
 //usage:     IF_PLATFORM_MINGW32(
 //usage:     "\n        -,+     Remove/add attributes"
-//usage:     "\nAttributes:"
 //usage:     "\n        r       Read only"
 //usage:     "\n        h       Hidden"
 //usage:     "\n        s       System"
diff --git a/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c
index 07de5eda7..031f5e06b 100644
--- a/e2fsprogs/e2fs_lib.c
+++ b/e2fsprogs/e2fs_lib.c
@@ -88,20 +88,20 @@ const uint32_t e2attr_flags_value[] = {
 };
 
 const char e2attr_flags_sname[] ALIGN1 =
-        "roecSrhsatn";
+        "RoecSrhsatn";
 
 static const char e2attr_flags_lname[] ALIGN1 =
-        "Reparse" "\0"
+        "Reparse_Point" "\0"
         "Offline" "\0"
         "Encrypted" "\0"
         "Compressed" "\0"
         "Sparse" "\0"
-        "Readonly" "\0"
+        "Read_Only" "\0"
         "Hidden" "\0"
         "System" "\0"
         "Archive" "\0"
         "Temporary" "\0"
-        "Notindexed" "\0"
+        "Not_Indexed" "\0"
         /* Another trailing NUL is added by compiler */;
 #endif
 
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index e86807e85..a6c4a27e9 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -28,7 +28,12 @@
 //usage:       "[-Radl] [FILE]..."
 //usage:     )
 //usage:#define lsattr_full_usage "\n\n"
+//usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:       "List ext2 file attributes\n"
+//usage:     )
+//usage:     IF_PLATFORM_MINGW32(
+//usage:       "List file attributes\n"
+//usage:     )
 //usage:     "\n        -R      Recurse"
 //usage:     "\n        -a      Include names starting with ."
 //usage:     "\n        -d      List directory names, not contents"
@@ -38,6 +43,22 @@
 //usage:     "\n        -p      List project ID"
 //usage:     "\n        -v      List version/generation number"
 //usage:     )
+//usage:     IF_PLATFORM_MINGW32(
+//usage:     "\n\nAttributes:\n"
+//usage:     "\n        j       Junction"
+//usage:     "\n        l       Symbolic link"
+//usage:     "\n        R       Reparse point"
+//usage:     "\n        o       Offline"
+//usage:     "\n        e       Encrypted"
+//usage:     "\n        c       Compressed"
+//usage:     "\n        S       Sparse"
+//usage:     "\n        r       Read only"
+//usage:     "\n        h       Hidden"
+//usage:     "\n        s       System"
+//usage:     "\n        a       Archive"
+//usage:     "\n        t       Temporary"
+//usage:     "\n        n       Not indexed"
+//usage:     )
 
 #include "libbb.h"
 #include "e2fs_lib.h"