win32: consolidate file metadata options

Merge FEATURE_IDENTIFY_OWNER into FEATURE_EXTRA_FILE_DATA.

4 files changed, 6 insertions, 20 deletions

diff --git a/Config.in b/Config.in
index 100f6e491..33365d21c 100644
--- a/Config.in
+++ b/Config.in
@@ -456,22 +456,16 @@ config FEATURE_EURO
         the console is 850 when BusyBox starts it's changed to 858.
 
 config FEATURE_EXTRA_FILE_DATA
-        bool "Read additional file metadata (1.3 kb)"
+        bool "Read additional file metadata (2.1 kb)"
         default y
         depends on PLATFORM_MINGW32
         help
         Read additional file metadata: device id, inode number and number
         of hard links.  This may slow down some file operations but it
         permits extra features such as warning of attempts to copy a file
-        onto itself or to store a tar archive in itself.
-
-config FEATURE_IDENTIFY_OWNER
-        bool "Check whether files belong to current user (0.6 kb)"
-        default y
-        depends on FEATURE_EXTRA_FILE_DATA
-        help
-        Try to determine if files belong to the current user.  If they don't
-        they're listed as belonging to root.
+        onto itself or to store a tar archive in itself.  Also try to
+        determine the ownership of files so that, for example, 'ls' can
+        distinguish files belonging to the current user.
 
 config FEATURE_READLINK2
         bool "Read the contents of symbolic links (1.1 kb)"
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 571aa112c..d7a32e53f 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -49,7 +49,6 @@ CONFIG_FEATURE_ICON=y
 CONFIG_FEATURE_ICON_ALL=y
 CONFIG_FEATURE_EURO=y
 CONFIG_FEATURE_EXTRA_FILE_DATA=y
-CONFIG_FEATURE_IDENTIFY_OWNER=y
 CONFIG_FEATURE_READLINK2=y
 
 #
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 47bfc994a..98317c358 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -49,7 +49,6 @@ CONFIG_FEATURE_ICON=y
 CONFIG_FEATURE_ICON_ALL=y
 CONFIG_FEATURE_EURO=y
 CONFIG_FEATURE_EXTRA_FILE_DATA=y
-CONFIG_FEATURE_IDENTIFY_OWNER=y
 CONFIG_FEATURE_READLINK2=y
 
 #
diff --git a/win32/mingw.c b/win32/mingw.c
index 84b059506..c04cc4872 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -1,7 +1,7 @@
 #include "libbb.h"
 #include <userenv.h>
 #include "lazyload.h"
-#if ENABLE_FEATURE_IDENTIFY_OWNER
+#if ENABLE_FEATURE_EXTRA_FILE_DATA
 #include <aclapi.h>
 #endif
 #if ENABLE_FEATURE_READLINK2
@@ -401,7 +401,7 @@ static int has_exec_format(const char *name)
         return 0;
 }
 
-#if ENABLE_FEATURE_IDENTIFY_OWNER
+#if ENABLE_FEATURE_EXTRA_FILE_DATA
 static uid_t file_owner(HANDLE fh)
 {
         PSID pSidOwner;
@@ -553,12 +553,8 @@ static int do_lstat(int follow, const char *file_name, struct mingw_stat *buf)
                 flags = FILE_FLAG_BACKUP_SEMANTICS;
                 if (S_ISLNK(buf->st_mode))
                         flags |= FILE_FLAG_OPEN_REPARSE_POINT;
-#if ENABLE_FEATURE_IDENTIFY_OWNER
                 fh = CreateFile(file_name, READ_CONTROL, 0, NULL,
                                                         OPEN_EXISTING, flags, NULL);
-#else
-                fh = CreateFile(file_name, 0, 0, NULL, OPEN_EXISTING, flags, NULL);
-#endif
                 if (fh != INVALID_HANDLE_VALUE) {
                         if (GetFileInformationByHandle(fh, &hdata)) {
                                 buf->st_dev = hdata.dwVolumeSerialNumber;
@@ -567,9 +563,7 @@ static int do_lstat(int follow, const char *file_name, struct mingw_stat *buf)
                                 buf->st_nlink = S_ISDIR(buf->st_mode) ? 2 :
                                                         hdata.nNumberOfLinks;
                         }
-#if ENABLE_FEATURE_IDENTIFY_OWNER
                         buf->st_uid = buf->st_gid = file_owner(fh);
-#endif
                         CloseHandle(fh);
                 }
                 else {