1 files changed, 78 insertions, 2 deletions

diff --git a/coreutils/ls.c b/coreutils/ls.c
index b69b80460..df4277fbd 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -109,8 +109,11 @@
 //usage:#define ls_full_usage "\n\n"
 //usage:       "List directory contents\n"
 //usage:     "\n        -1      One column output"
-//usage:     "\n        -a      Include names starting with ."
+//usage:     "\n        -a      Include names starting with ." IF_PLATFORM_MINGW32(" and hidden files")
 //usage:     "\n        -A      Like -a, but exclude . and .."
+//usage:        IF_PLATFORM_MINGW32(
+//usage:     "\n        -aa,-AA Like -a,-A but omit hidden system files"
+//usage:        )
 ////usage:     "\n      -C      List by columns" - don't show, this is a default anyway
 //usage:     "\n        -x      List by lines"
 //usage:     "\n        -d      List directory names, not contents"
@@ -316,6 +319,9 @@ struct dnode {
         int       dn_rdev_min;
 //      dev_t     dn_dev;
 //      blksize_t dn_blksize;
+#if ENABLE_PLATFORM_MINGW32
+        DWORD     dn_attr;
+#endif
 };
 
 struct globals {
@@ -337,6 +343,10 @@ struct globals {
         /* Do time() just once. Saves one syscall per file for "ls -l" */
         time_t current_time_t;
 #endif
+#if ENABLE_PLATFORM_MINGW32
+        int a_count, A_count;
+# define HIDSYS (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)
+#endif
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
@@ -497,7 +507,11 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
                         lpath = xmalloc_readlink_or_warn(dn->fullname);
 
         if (opt & OPT_i) /* show inode# */
-                column += printf("%7llu ", (long long) dn->dn_ino);
+#if !ENABLE_FEATURE_EXTRA_FILE_DATA
+                column += printf("%7"LL_FMT"u ", (long long) dn->dn_ino);
+#else
+                column += printf("%19"LL_FMT"u ", (long long) dn->dn_ino);
+#endif
         if (opt & OPT_s) { /* show allocated blocks */
                 if (opt & OPT_h) {
                         column += printf("%"HUMAN_READABLE_MAX_WIDTH_STR"s ",
@@ -659,7 +673,11 @@ static void display_files(struct dnode **dn, unsigned nfiles)
                 }
                 column_width += 2
                         + ((option_mask32 & OPT_Z) ? 33 : 0) /* context width */
+#if !ENABLE_FEATURE_EXTRA_FILE_DATA
                         + ((option_mask32 & OPT_i) ? 8 : 0) /* inode# width */
+#else
+                        + ((option_mask32 & OPT_i) ? 20 : 0) /* inode# width */
+#endif
                         + ((option_mask32 & OPT_s) ? 5 : 0) /* "alloc block" width */
                 ;
                 ncols = (unsigned)G_terminal_width / column_width;
@@ -740,6 +758,9 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f
 
         /* cur->dstat = statbuf: */
         cur->dn_mode   = statbuf.st_mode  ;
+#if ENABLE_PLATFORM_MINGW32
+        cur->dn_attr   = statbuf.st_attr  ;
+#endif
         cur->dn_size   = statbuf.st_size  ;
 #if ENABLE_FEATURE_LS_TIMESTAMPS || ENABLE_FEATURE_LS_SORTFILES
         cur->dn_time   = statbuf.st_mtime ;
@@ -920,6 +941,15 @@ static void sort_and_display_files(struct dnode **dn, unsigned nfiles)
 # define sort_and_display_files(dn, nfiles) display_files(dn, nfiles)
 #endif
 
+#if ENABLE_PLATFORM_MINGW32
+static int hide_file(DWORD attr)
+{
+        return
+                ((attr & FILE_ATTRIBUTE_HIDDEN) && !(option_mask32 & (OPT_a|OPT_A))) ||
+                (((attr & HIDSYS) == HIDSYS) && MAX(G.a_count, G.A_count) > 1);
+}
+#endif
+
 /* Returns NULL-terminated malloced vector of pointers (or NULL) */
 static struct dnode **scan_one_dir(const char *path, unsigned *nfiles_p)
 {
@@ -927,6 +957,9 @@ static struct dnode **scan_one_dir(const char *path, unsigned *nfiles_p)
         struct dirent *entry;
         DIR *dir;
         unsigned i, nfiles;
+#if ENABLE_PLATFORM_MINGW32
+        struct stat statbuf;
+#endif
 
         *nfiles_p = 0;
         dir = warn_opendir(path);
@@ -949,9 +982,29 @@ static struct dnode **scan_one_dir(const char *path, unsigned *nfiles_p)
                                 continue; /* if only -A, skip . and .. but show other dotfiles */
                         }
                 }
+#if ENABLE_PLATFORM_MINGW32
+                if (has_dos_drive_prefix(path) && path[2] == '\0')
+                        fullname = xasprintf("%s%s", path, entry->d_name);
+                else
+#endif
                 fullname = concat_path_file(path, entry->d_name);
+#if ENABLE_PLATFORM_MINGW32
+                /* When showing link targets we must first check the
+                 * attributes of the link itself to see if it's hidden. */
+                if ((option_mask32 & OPT_L) && !lstat(fullname, &statbuf)) {
+                        if (hide_file(statbuf.st_attr)) {
+                                free(fullname);
+                                continue;
+                        }
+                }
+#endif
                 cur = my_stat(fullname, bb_basename(fullname), 0);
+#if !ENABLE_PLATFORM_MINGW32
                 if (!cur) {
+#else
+                if (!cur || hide_file(cur->dn_attr)) {
+                        /* skip invalid or hidden files */
+#endif
                         free(fullname);
                         continue;
                 }
@@ -1060,6 +1113,18 @@ static void scan_and_display_dirs_recur(struct dnode **dn, int first)
         }
 }
 
+#if ENABLE_PLATFORM_MINGW32
+static char *fix_backslash(char *p)
+{
+        const char *flag = getenv("BB_FIX_BACKSLASH");
+        int value = flag ? atoi(flag) : 0;
+
+        if (value == 1)
+                bs_to_slash(p);
+        return p;
+}
+#endif
+
 
 int ls_main(int argc UNUSED_PARAM, char **argv)
 {       /*      ^^^^^^^^^^^^^^^^^ note: if FTPD, argc can be wrong, see ftpd.c */
@@ -1129,9 +1194,11 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                         IF_FEATURE_LS_TIMESTAMPS(":c-u:u-c") /* mtime/atime */
                         /* -w NUM: */
                         IF_FEATURE_LS_WIDTH(":w+")
+                        IF_PLATFORM_MINGW32(":aa:AA")
                 , ls_longopts
                 IF_FEATURE_LS_WIDTH(, /*-T*/ NULL, /*-w*/ &G_terminal_width)
                 IF_FEATURE_LS_COLOR(, &color_opt)
+                IF_PLATFORM_MINGW32(, &G.a_count, &G.A_count)
         );
 #if 0 /* option bits debug */
         bb_error_msg("opt:0x%08x l:%x H:%x color:%x dirs:%x", opt, OPT_l, OPT_H, OPT_color, OPT_dirs_first);
@@ -1204,6 +1271,12 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                 option_mask32 |= OPT_dirs_first;
         }
 
+#if ENABLE_FEATURE_EXTRA_FILE_DATA
+        /* Enable accurate link counts for directories */
+        if (opt & OPT_l)
+                count_subdirs(NULL);
+#endif
+
         argv += optind;
         if (!argv[0])
                 *--argv = (char*)".";
@@ -1215,6 +1288,9 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
         dn = NULL;
         nfiles = 0;
         do {
+#if ENABLE_PLATFORM_MINGW32
+                *argv = fix_backslash(*argv);
+#endif
                 cur = my_stat(*argv, *argv,
                         /* follow links on command line unless -l, -i, -s or -F: */
                         !(option_mask32 & (OPT_l|OPT_i|OPT_s|OPT_F))