Merge branch 'busybox' into merge

4 files changed, 224 insertions, 232 deletions

diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c
index e1a798727..c1e90d13f 100644
--- a/e2fsprogs/chattr.c
+++ b/e2fsprogs/chattr.c
@@ -21,7 +21,7 @@
 
 //usage:#define chattr_trivial_usage
 //usage:     IF_NOT_PLATFORM_MINGW32(
-//usage:       "[-R] [-v VERSION] [-+=AacDdijsStTu] FILE..."
+//usage:       "[-R] [-v VERSION] [-p PROJID] [-+=AacDdijsStTu] FILE..."
 //usage:     )
 //usage:     IF_PLATFORM_MINGW32(
 //usage:       "[-R] [-+rhsatn] FILE..."
@@ -35,24 +35,34 @@
 //usage:     )
 //usage:     "\n        -R      Recurse"
 //usage:     IF_NOT_PLATFORM_MINGW32(
-//usage:     "\n        -v VER  Set version/generation number"
+//usage:     "\n        -v NUM  Set version/generation number"
+//usage:     "\n        -p NUM  Set project number"
 //usage:     )
 //-V, -f accepted but ignored
 //usage:     "\nModifiers:"
 //usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:     "\n        -,+,=   Remove/add/set attributes"
 //usage:     "\nAttributes:"
-//usage:     "\n        A       Don't track atime"
-//usage:     "\n        a       Append mode only"
-//usage:     "\n        c       Enable compress"
-//usage:     "\n        D       Write dir contents synchronously"
+//usage:     "\n        A       No atime"
+//usage:     "\n        a       Append only"
+//usage:     "\n        C       No copy-on-write"
+//usage:     "\n        c       Compressed"
+//usage:     "\n        D       Synchronous dir updates"
 //usage:     "\n        d       Don't backup with dump"
-//usage:     "\n        i       Cannot be modified (immutable)"
-//usage:     "\n        j       Write all data to journal first"
-//usage:     "\n        s       Zero disk storage when deleted"
-//usage:     "\n        S       Write synchronously"
-//usage:     "\n        t       Disable tail-merging of partial blocks with other files"
-//usage:     "\n        u       Allow file to be undeleted"
+//usage:     "\n        E       Encrypted"
+//usage:     "\n        e       File uses extents"
+//usage:     "\n        F       Case-insensitive dir"
+//usage:     "\n        I       Indexed dir"
+//usage:     "\n        i       Immutable"
+//usage:     "\n        j       Write data to journal first"
+//usage:     "\n        N       File is stored in inode"
+//usage:     "\n        P       Hierarchical project ID dir"
+//usage:     "\n        S       Synchronous file updates"
+//usage:     "\n        s       Zero storage when deleted"
+//usage:     "\n        T       Top of dir hierarchy"
+//usage:     "\n        t       Don't tail-merge with other files"
+//usage:     "\n        u       Allow undelete"
+//usage:     "\n        V       Verity"
 //usage:     )
 //usage:     IF_PLATFORM_MINGW32(
 //usage:     "\n        -,+     Remove/add attributes"
@@ -68,18 +78,22 @@
 #include "libbb.h"
 #include "e2fs_lib.h"
 
-#define OPT_ADD 1
-#define OPT_REM 2
-#define OPT_SET 4
-#define OPT_SET_VER 8
+#define OPT_ADD      (1 << 0)
+#define OPT_REM      (1 << 1)
+#define OPT_SET      (1 << 2)
+#define OPT_SET_VER  (1 << 3)
+#define OPT_SET_PROJ (1 << 4)
 
 struct globals {
 #if !ENABLE_PLATFORM_MINGW32
-        unsigned long version;
+        unsigned version;
 #endif
-        unsigned long af;
-        unsigned long rf;
+        unsigned af;
+        unsigned rf;
         int flags;
+#if !ENABLE_PLATFORM_MINGW32
+        uint32_t projid;
+#endif
         smallint recursive;
 };
 
@@ -93,13 +107,15 @@ static unsigned long get_flag(char c)
 
 static char** decode_arg(char **argv, struct globals *gp)
 {
-        unsigned long *fl;
+        unsigned *fl;
         const char *arg = *argv;
         char opt = *arg;
 
         fl = &gp->af;
         if (opt == '-') {
-                gp->flags |= OPT_REM;
+                /* gp->flags |= OPT_REM; - WRONG, it can be an option */
+                /* testcase: chattr =ae -R FILE should not complain "= is incompatible with - and +" */
+                /* (and should not read flags, with =FLAGS they can be just set directly) */
                 fl = &gp->rf;
 #if ENABLE_PLATFORM_MINGW32
         } else { /* if (opt == '+') */
@@ -136,15 +152,22 @@ static char** decode_arg(char **argv, struct globals *gp)
                         if (*arg == 'v') {
                                 if (!*++argv)
                                         bb_show_usage();
-                                gp->version = xatoul(*argv);
+                                gp->version = xatou(*argv);
                                 gp->flags |= OPT_SET_VER;
                                 continue;
                         }
-//TODO: "-p PROJECT_NUM" ?
+                        if (*arg == 'p') {
+                                if (!*++argv)
+                                        bb_show_usage();
+                                gp->projid = xatou32(*argv);
+                                gp->flags |= OPT_SET_PROJ;
+                                continue;
+                        }
 #endif
                         /* not a known option, try as an attribute */
+                        gp->flags |= OPT_REM;
                 }
-                *fl |= get_flag(*arg);
+                *fl |= get_flag(*arg); /* aborts on bad flag letter */
         }
 
         return argv;
@@ -154,6 +177,8 @@ static void change_attributes(const char *name, struct globals *gp);
 
 static int FAST_FUNC chattr_dir_proc(const char *dir_name, struct dirent *de, void *gp)
 {
+//TODO: use de->d_type (if it's not DT_UNKNOWN) to skip !(REG || DIR || LNK) entries without lstat?
+
         char *path = concat_subpath_file(dir_name, de->d_name);
         /* path is NULL if de->d_name is "." or "..", else... */
         if (path) {
@@ -165,15 +190,16 @@ static int FAST_FUNC chattr_dir_proc(const char *dir_name, struct dirent *de, vo
 
 static void change_attributes(const char *name, struct globals *gp)
 {
-        unsigned long fsflags;
+        unsigned fsflags;
+#if !ENABLE_PLATFORM_MINGW32
+        int fd;
+#endif
         struct stat st;
 
         if (lstat(name, &st) != 0) {
-                bb_perror_msg("stat %s", name);
+                bb_perror_msg("can't stat '%s'", name);
                 return;
         }
-        if (S_ISLNK(st.st_mode) && gp->recursive)
-                return;
 
         /* Don't try to open device files, fifos etc.  We probably
          * ought to display an error if the file was explicitly given
@@ -183,11 +209,58 @@ static void change_attributes(const char *name, struct globals *gp)
                 return;
 
 #if !ENABLE_PLATFORM_MINGW32
-        if (gp->flags & OPT_SET_VER)
-                if (fsetversion(name, gp->version) != 0)
-                        bb_perror_msg("setting version on %s", name);
-#endif
+        /* There is no way to run needed ioctls on a symlink.
+         * open(O_PATH | O_NOFOLLOW) _can_ be used to get a fd referring to the symlink,
+         * but ioctls fail on such a fd (tried on 4.12.0 kernel).
+         * e2fsprogs-1.46.2 uses open(O_NOFOLLOW), it fails on symlinks.
+         */
+        fd = open_or_warn(name, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOFOLLOW);
+        if (fd >= 0) {
+                int r;
+
+                if (gp->flags & OPT_SET_VER) {
+                        r = ioctl(fd, EXT2_IOC_SETVERSION, &gp->version);
+                        if (r != 0)
+                                bb_perror_msg("setting %s on %s", "version", name);
+                }
 
+                if (gp->flags & OPT_SET_PROJ) {
+                        struct ext2_fsxattr fsxattr;
+                        r = ioctl(fd, EXT2_IOC_FSGETXATTR, &fsxattr);
+                        /* note: ^^^ may fail in 32-bit userspace on 64-bit kernel (seen on 4.12.0) */
+                        if (r != 0) {
+                                bb_perror_msg("getting %s on %s", "project ID", name);
+                        } else {
+                                fsxattr.fsx_projid = gp->projid;
+                                r = ioctl(fd, EXT2_IOC_FSSETXATTR, &fsxattr);
+                                if (r != 0)
+                                        bb_perror_msg("setting %s on %s", "project ID", name);
+                        }
+                }
+
+                if (gp->flags & OPT_SET) {
+                        fsflags = gp->af;
+                } else {
+                        r = ioctl(fd, EXT2_IOC_GETFLAGS, &fsflags);
+                        if (r != 0) {
+                                bb_perror_msg("getting %s on %s", "flags", name);
+                                goto skip_setflags;
+                        }
+                        /*if (gp->flags & OPT_REM) - not needed, rf is zero otherwise */
+                                fsflags &= ~gp->rf;
+                        /*if (gp->flags & OPT_ADD) - not needed, af is zero otherwise */
+                                fsflags |= gp->af;
+// What is this? And why it's not done for SET case?
+                        if (!S_ISDIR(st.st_mode))
+                                fsflags &= ~EXT2_DIRSYNC_FL;
+                }
+                r = ioctl(fd, EXT2_IOC_SETFLAGS, &fsflags);
+                if (r != 0)
+                        bb_perror_msg("setting %s on %s", "flags", name);
+ skip_setflags:
+                close(fd);
+        }
+#else /* ENABLE_PLATFORM_MINGW32 */
         if (gp->flags & OPT_SET) {
                 fsflags = gp->af;
         } else {
@@ -199,16 +272,13 @@ static void change_attributes(const char *name, struct globals *gp)
                         fsflags &= ~gp->rf;
                 /*if (gp->flags & OPT_ADD) - not needed, af is zero otherwise */
                         fsflags |= gp->af;
-#if !ENABLE_PLATFORM_MINGW32
-// What is this? And why it's not done for SET case?
-                if (!S_ISDIR(st.st_mode))
-                        fsflags &= ~EXT2_DIRSYNC_FL;
-#endif
         }
         if (fsetflags(name, fsflags) != 0)
                 bb_perror_msg("setting flags on %s", name);
 
  skip_setflags:
+#endif
+
         if (gp->recursive && S_ISDIR(st.st_mode))
                 iterate_on_dir(name, chattr_dir_proc, gp);
 }
@@ -245,7 +315,7 @@ int chattr_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_PLATFORM_MINGW32
                 bb_simple_error_msg_and_die("must use - or +");
 #else
-                bb_simple_error_msg_and_die("must use '-v', =, - or +");
+                bb_simple_error_msg_and_die("must use -v, -p, =, - or +");
 #endif
 
         /* now run chattr on all the files passed to us */
diff --git a/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c
index d0cacf14c..48c3b68b5 100644
--- a/e2fsprogs/e2fs_lib.c
+++ b/e2fsprogs/e2fs_lib.c
@@ -8,125 +8,7 @@
 #include "libbb.h"
 #include "e2fs_lib.h"
 
-#if !ENABLE_PLATFORM_MINGW32
-#define HAVE_EXT2_IOCTLS 1
-
-#if INT_MAX == LONG_MAX
-#define IF_LONG_IS_SAME(...) __VA_ARGS__
-#define IF_LONG_IS_WIDER(...)
-#else
-#define IF_LONG_IS_SAME(...)
-#define IF_LONG_IS_WIDER(...) __VA_ARGS__
-#endif
-
-static void close_silently(int fd)
-{
-        int e = errno;
-        close(fd);
-        errno = e;
-}
-#endif
-
-
-/* Iterate a function on each entry of a directory */
-int iterate_on_dir(const char *dir_name,
-                int FAST_FUNC (*func)(const char *, struct dirent *, void *),
-                void *private)
-{
-        DIR *dir;
-        struct dirent *de;
-
-        dir = opendir(dir_name);
-        if (dir == NULL) {
-                return -1;
-        }
-        while ((de = readdir(dir)) != NULL) {
-                func(dir_name, de, private);
-        }
-        closedir(dir);
-        return 0;
-}
-
-
-#if !ENABLE_PLATFORM_MINGW32
-/* Get/set a file version on an ext2 file system */
-int fgetsetversion(const char *name, unsigned long *get_version, unsigned long set_version)
-{
-#if HAVE_EXT2_IOCTLS
-        int fd, r;
-        IF_LONG_IS_WIDER(int ver;)
-
-        fd = open(name, O_RDONLY | O_NONBLOCK);
-        if (fd == -1)
-                return -1;
-        if (!get_version) {
-                IF_LONG_IS_WIDER(
-                        ver = (int) set_version;
-                        r = ioctl(fd, EXT2_IOC_SETVERSION, &ver);
-                )
-                IF_LONG_IS_SAME(
-                        r = ioctl(fd, EXT2_IOC_SETVERSION, (void*)&set_version);
-                )
-        } else {
-                IF_LONG_IS_WIDER(
-                        r = ioctl(fd, EXT2_IOC_GETVERSION, &ver);
-                        *get_version = ver;
-                )
-                IF_LONG_IS_SAME(
-                        r = ioctl(fd, EXT2_IOC_GETVERSION, (void*)get_version);
-                )
-        }
-        close_silently(fd);
-        return r;
-#else /* ! HAVE_EXT2_IOCTLS */
-        errno = EOPNOTSUPP;
-        return -1;
-#endif /* ! HAVE_EXT2_IOCTLS */
-}
-
-/* Get/set a file flags on an ext2 file system */
-int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_flags)
-{
-#if HAVE_EXT2_IOCTLS
-        struct stat buf;
-        int fd, r;
-        IF_LONG_IS_WIDER(int f;)
-
-        if (stat(name, &buf) == 0 /* stat is ok */
-         && !S_ISREG(buf.st_mode) && !S_ISDIR(buf.st_mode)
-        ) {
-                goto notsupp;
-        }
-        fd = open(name, O_RDONLY | O_NONBLOCK); /* neither read nor write asked for */
-        if (fd == -1)
-                return -1;
-
-        if (!get_flags) {
-                IF_LONG_IS_WIDER(
-                        f = (int) set_flags;
-                        r = ioctl(fd, EXT2_IOC_SETFLAGS, &f);
-                )
-                IF_LONG_IS_SAME(
-                        r = ioctl(fd, EXT2_IOC_SETFLAGS, (void*)&set_flags);
-                )
-        } else {
-                IF_LONG_IS_WIDER(
-                        r = ioctl(fd, EXT2_IOC_GETFLAGS, &f);
-                        *get_flags = f;
-                )
-                IF_LONG_IS_SAME(
-                        r = ioctl(fd, EXT2_IOC_GETFLAGS, (void*)get_flags);
-                )
-        }
-
-        close_silently(fd);
-        return r;
- notsupp:
-#endif /* HAVE_EXT2_IOCTLS */
-        errno = EOPNOTSUPP;
-        return -1;
-}
-#else /* ENABLE_PLATFORM_MINGW32 */
+#if ENABLE_PLATFORM_MINGW32
 /* Only certain attributes can be set using SetFileAttributes() */
 #define CHATTR_MASK (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \
                         FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE | \
@@ -134,7 +16,7 @@ int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_f
                         FILE_ATTRIBUTE_OFFLINE)
 
 /* Get/set file attributes on a Windows file system */
-int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_flags)
+int fgetsetflags(const char *name, unsigned *get_flags, unsigned set_flags)
 {
         struct stat buf;
 
@@ -156,7 +38,6 @@ int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_f
 }
 #endif
 
-
 #if !ENABLE_PLATFORM_MINGW32
 /* Print file attributes on an ext2 file system */
 const uint32_t e2attr_flags_value[] ALIGN4 = {
@@ -164,9 +45,7 @@ const uint32_t e2attr_flags_value[] ALIGN4 = {
         EXT2_COMPRBLK_FL,
         EXT2_DIRTY_FL,
         EXT2_NOCOMPR_FL,
-        EXT2_ECOMPR_FL,
 #endif
-        EXT2_INDEX_FL,
         EXT2_SECRM_FL,
         EXT2_UNRM_FL,
         EXT2_SYNC_FL,
@@ -176,26 +55,31 @@ const uint32_t e2attr_flags_value[] ALIGN4 = {
         EXT2_NODUMP_FL,
         EXT2_NOATIME_FL,
         EXT2_COMPR_FL,
+        EXT2_ECOMPR_FL,
         EXT3_JOURNAL_DATA_FL,
+        EXT2_INDEX_FL,
         EXT2_NOTAIL_FL,
-        EXT2_TOPDIR_FL
+        EXT2_TOPDIR_FL,
+        EXT2_EXTENT_FL,
+        EXT2_NOCOW_FL,
+        EXT2_CASEFOLD_FL,
+        EXT2_INLINE_DATA_FL,
+        EXT2_PROJINHERIT_FL,
+        EXT2_VERITY_FL,
 };
 
 const char e2attr_flags_sname[] ALIGN1 =
 #ifdef ENABLE_COMPRESSION
-        "BZXE"
+        "BZX"
 #endif
-        "I"
-        "suSDiadAcjtT";
+        "suSDiadAcEjItTeCFNPV";
 
 static const char e2attr_flags_lname[] ALIGN1 =
 #ifdef ENABLE_COMPRESSION
         "Compressed_File" "\0"
         "Compressed_Dirty_File" "\0"
         "Compression_Raw_Access" "\0"
-        "Compression_Error" "\0"
 #endif
-        "Indexed_directory" "\0"
         "Secure_Deletion" "\0"
         "Undelete" "\0"
         "Synchronous_Updates" "\0"
@@ -205,9 +89,17 @@ static const char e2attr_flags_lname[] ALIGN1 =
         "No_Dump" "\0"
         "No_Atime" "\0"
         "Compression_Requested" "\0"
+        "Encrypted" "\0"
         "Journaled_Data" "\0"
+        "Indexed_directory" "\0"
         "No_Tailmerging" "\0"
         "Top_of_Directory_Hierarchies" "\0"
+        "Extents" "\0"
+        "No_COW" "\0"
+        "Casefold" "\0"
+        "Inline_Data" "\0"
+        "Project_Hierarchy" "\0"
+        "Verity" "\0"
         /* Another trailing NUL is added by compiler */;
 #else /* ENABLE_PLATFORM_MINGW32 */
 /* Print file attributes on a Windows file system */
@@ -243,36 +135,41 @@ static const char e2attr_flags_lname[] ALIGN1 =
         /* Another trailing NUL is added by compiler */;
 #endif
 
-void print_e2flags(FILE *f, unsigned long flags, unsigned options)
+void print_e2flags_long(unsigned flags)
 {
         const uint32_t *fv;
         const char *fn;
+        int first = 1;
 
         fv = e2attr_flags_value;
-        if (options & PFOPT_LONG) {
-                int first = 1;
-                fn = e2attr_flags_lname;
-                do {
-                        if (flags & *fv) {
-                                if (!first)
-                                        fputs(", ", f);
-                                fputs(fn, f);
-                                first = 0;
-                        }
-                        fv++;
-                        fn += strlen(fn) + 1;
-                } while (*fn);
-                if (first)
-                        fputs("---", f);
-        } else {
-                fn = e2attr_flags_sname;
-                do  {
-                        char c = '-';
-                        if (flags & *fv)
-                                c = *fn;
-                        fputc(c, f);
-                        fv++;
-                        fn++;
-                } while (*fn);
-        }
+        fn = e2attr_flags_lname;
+        do {
+                if (flags & *fv) {
+                        if (!first)
+                                fputs(", ", stdout);
+                        fputs(fn, stdout);
+                        first = 0;
+                }
+                fv++;
+                fn += strlen(fn) + 1;
+        } while (*fn);
+        if (first)
+                fputs("---", stdout);
+}
+
+void print_e2flags(unsigned flags)
+{
+        const uint32_t *fv;
+        const char *fn;
+
+        fv = e2attr_flags_value;
+        fn = e2attr_flags_sname;
+        do  {
+                char c = '-';
+                if (flags & *fv)
+                        c = *fn;
+                putchar(c);
+                fv++;
+                fn++;
+        } while (*fn);
 }
diff --git a/e2fsprogs/e2fs_lib.h b/e2fsprogs/e2fs_lib.h
index 4a4d4cc27..aa92e63af 100644
--- a/e2fsprogs/e2fs_lib.h
+++ b/e2fsprogs/e2fs_lib.h
@@ -11,25 +11,16 @@
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-/* Iterate a function on each entry of a directory */
-int iterate_on_dir(const char *dir_name,
-                int FAST_FUNC (*func)(const char *, struct dirent *, void *),
-                void *private);
-
-/* Get/set a file version on an ext2 file system */
-int fgetsetversion(const char *name, unsigned long *get_version, unsigned long set_version);
-#define fgetversion(name, version) fgetsetversion(name, version, 0)
-#define fsetversion(name, version) fgetsetversion(name, NULL, version)
-
-/* Get/set a file flags on an ext2 file system */
-int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_flags);
+#if ENABLE_PLATFORM_MINGW32
+/* Get/set a file flags */
+int fgetsetflags(const char *name, unsigned *get_flags, unsigned set_flags);
 #define fgetflags(name, flags) fgetsetflags(name, flags, 0)
 #define fsetflags(name, flags) fgetsetflags(name, NULL, flags)
+#endif
 
-/* Must be 1 for compatibility with 'int long_format'. */
-#define PFOPT_LONG  1
 /* Print file attributes on an ext2 file system */
-void print_e2flags(FILE *f, unsigned long flags, unsigned options);
+void print_e2flags_long(unsigned flags);
+void print_e2flags(unsigned flags);
 
 extern const uint32_t e2attr_flags_value[];
 extern const char e2attr_flags_sname[];
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index ed7b67c6f..d82861e14 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -22,7 +22,7 @@
 
 //usage:#define lsattr_trivial_usage
 //usage:     IF_NOT_PLATFORM_MINGW32(
-//usage:       "[-Radlv] [FILE]..."
+//usage:       "[-Radlpv] [FILE]..."
 //usage:     )
 //usage:     IF_PLATFORM_MINGW32(
 //usage:       "[-Radl] [FILE]..."
@@ -30,10 +30,12 @@
 //usage:#define lsattr_full_usage "\n\n"
 //usage:       "List ext2 file attributes\n"
 //usage:     "\n        -R      Recurse"
-//usage:     "\n        -a      Don't hide entries starting with ."
-//usage:     "\n        -d      List directory entries instead of contents"
+//usage:     "\n        -a      Include names starting with ."
+//usage:     "\n        -d      List directory names, not contents"
+// -a,-d text should match ls --help
 //usage:     "\n        -l      List long flag names"
 //usage:     IF_NOT_PLATFORM_MINGW32(
+//usage:     "\n        -p      List project ID"
 //usage:     "\n        -v      List version/generation number"
 //usage:     )
 
@@ -41,43 +43,71 @@
 #include "e2fs_lib.h"
 
 enum {
-        OPT_RECUR      = 0x1,
-        OPT_ALL        = 0x2,
-        OPT_DIRS_OPT   = 0x4,
-        OPT_PF_LONG    = 0x8,
-        OPT_GENERATION = 0x10,
+        OPT_RECUR      = 1 << 0,
+        OPT_ALL        = 1 << 1,
+        OPT_DIRS_OPT   = 1 << 2,
+        OPT_PF_LONG    = 1 << 3,
+        OPT_GENERATION = 1 << 4,
+        OPT_PROJID     = 1 << 5,
 };
 
 static void list_attributes(const char *name)
 {
-        unsigned long fsflags;
+        unsigned fsflags;
 #if !ENABLE_PLATFORM_MINGW32
-        unsigned long generation;
-#endif
-
-        if (fgetflags(name, &fsflags) != 0)
-                goto read_err;
+        int fd, r;
+
+        /* There is no way to run needed ioctls on a symlink.
+         * open(O_PATH | O_NOFOLLOW) _can_ be used to get a fd referring to the symlink,
+         * but ioctls fail on such a fd (tried on 4.12.0 kernel).
+         * e2fsprogs-1.46.2 uses open(O_NOFOLLOW), it fails on symlinks.
+         */
+        fd = open_or_warn(name, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOFOLLOW);
+        if (fd < 0)
+                return;
+
+        if (option_mask32 & OPT_PROJID) {
+                struct ext2_fsxattr fsxattr;
+                r = ioctl(fd, EXT2_IOC_FSGETXATTR, &fsxattr);
+                /* note: ^^^ may fail in 32-bit userspace on 64-bit kernel (seen on 4.12.0) */
+                if (r != 0)
+                        goto read_err;
+                printf("%5u ", (unsigned)fsxattr.fsx_projid);
+        }
 
-#if !ENABLE_PLATFORM_MINGW32
         if (option_mask32 & OPT_GENERATION) {
-                if (fgetversion(name, &generation) != 0)
+                unsigned generation;
+                r = ioctl(fd, EXT2_IOC_GETVERSION, &generation);
+                if (r != 0)
                         goto read_err;
-                printf("%5lu ", generation);
+                printf("%-10u ", generation);
         }
+
+        r = ioctl(fd, EXT2_IOC_GETFLAGS, &fsflags);
+        if (r != 0)
+                goto read_err;
+
+        close(fd);
+#else /* ENABLE_PLATFORM_MINGW32 */
+        if (fgetflags(name, &fsflags) != 0)
+                goto read_err;
 #endif
 
         if (option_mask32 & OPT_PF_LONG) {
                 printf("%-28s ", name);
-                print_e2flags(stdout, fsflags, PFOPT_LONG);
+                print_e2flags_long(fsflags);
                 bb_putchar('\n');
         } else {
-                print_e2flags(stdout, fsflags, 0);
+                print_e2flags(fsflags);
                 printf(" %s\n", name);
         }
 
         return;
  read_err:
         bb_perror_msg("reading %s", name);
+#if !ENABLE_PLATFORM_MINGW32
+        close(fd);
+#endif
 }
 
 static int FAST_FUNC lsattr_dir_proc(const char *dir_name,
@@ -90,9 +120,13 @@ static int FAST_FUNC lsattr_dir_proc(const char *dir_name,
         path = concat_path_file(dir_name, de->d_name);
 
         if (lstat(path, &st) != 0)
-                bb_perror_msg("stat %s", path);
+                bb_perror_msg("can't stat '%s'", path);
+
         else if (de->d_name[0] != '.' || (option_mask32 & OPT_ALL)) {
-                list_attributes(path);
+                /* Don't try to open device files, fifos etc */
+                if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode) || S_ISDIR(st.st_mode))
+                        list_attributes(path);
+
                 if (S_ISDIR(st.st_mode) && (option_mask32 & OPT_RECUR)
                  && !DOT_OR_DOTDOT(de->d_name)
                 ) {
@@ -111,7 +145,7 @@ static void lsattr_args(const char *name)
         struct stat st;
 
         if (lstat(name, &st) == -1) {
-                bb_perror_msg("stat %s", name);
+                bb_perror_msg("can't stat '%s'", name);
         } else if (S_ISDIR(st.st_mode) && !(option_mask32 & OPT_DIRS_OPT)) {
                 iterate_on_dir(name, lsattr_dir_proc, NULL);
         } else {
@@ -125,7 +159,7 @@ int lsattr_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_PLATFORM_MINGW32
         getopt32(argv, "Radl");
 #else
-        getopt32(argv, "Radlv");
+        getopt32(argv, "Radlvp");
 #endif
         argv += optind;