aboutsummaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-02-12 14:02:28 +0000
committerRon Yorston <rmy@pobox.com>2021-02-12 14:02:28 +0000
commite86a3ddd8b60eb0720874f5b9679446d12a1ac41 (patch)
treef35332dccaec68bfd182f705dcec0b2297d3a578 /win32
parent90f35327c2f31b7e4d938bf4d54e5526e53daee0 (diff)
downloadbusybox-w32-e86a3ddd8b60eb0720874f5b9679446d12a1ac41.tar.gz
busybox-w32-e86a3ddd8b60eb0720874f5b9679446d12a1ac41.tar.bz2
busybox-w32-e86a3ddd8b60eb0720874f5b9679446d12a1ac41.zip
win32: make readlink(2) implementation unconditional
There doesn't seem to be much advantage in having readlink(2) as a configuration option. Making it unconditional reduces divergence from upstream and allows the removal of a check for ENOSYS that's been in busybox-w32 since the start.
Diffstat (limited to 'win32')
-rw-r--r--win32/mingw.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/win32/mingw.c b/win32/mingw.c
index 474d9cdc6..15529ed58 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -4,9 +4,7 @@
4#if ENABLE_FEATURE_EXTRA_FILE_DATA 4#if ENABLE_FEATURE_EXTRA_FILE_DATA
5#include <aclapi.h> 5#include <aclapi.h>
6#endif 6#endif
7#if ENABLE_FEATURE_READLINK2
8#include <ntdef.h> 7#include <ntdef.h>
9#endif
10 8
11#if defined(__MINGW64_VERSION_MAJOR) 9#if defined(__MINGW64_VERSION_MAJOR)
12#if ENABLE_GLOBBING 10#if ENABLE_GLOBBING
@@ -1146,7 +1144,6 @@ char *realpath(const char *path, char *resolved_path)
1146 return NULL; 1144 return NULL;
1147} 1145}
1148 1146
1149#if ENABLE_FEATURE_READLINK2
1150static wchar_t *normalize_ntpath(wchar_t *wbuf) 1147static wchar_t *normalize_ntpath(wchar_t *wbuf)
1151{ 1148{
1152 int i; 1149 int i;
@@ -1206,7 +1203,6 @@ ssize_t readlink(const char *pathname, char *buf, size_t bufsiz)
1206 errno = err_win_to_posix(); 1203 errno = err_win_to_posix();
1207 return -1; 1204 return -1;
1208} 1205}
1209#endif
1210 1206
1211const char *get_busybox_exec_path(void) 1207const char *get_busybox_exec_path(void)
1212{ 1208{