From caab029609633220c417dc0aaa9025fd4b7a169c Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Mon, 19 Oct 2015 12:41:07 +0100 Subject: ln: enable in default configuration --- configs/mingw32_defconfig | 4 ++-- configs/mingw64_defconfig | 4 ++-- win32/mingw.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index dc795dc51..f95f23713 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.25.0.git -# Tue Oct 13 14:47:01 2015 +# Mon Oct 19 10:23:32 2015 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -246,7 +246,7 @@ CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_INSTALL is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LN is not set +CONFIG_LN=y CONFIG_LOGNAME=y CONFIG_LS=y CONFIG_FEATURE_LS_FILETYPES=y diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index b29477e81..a899d5b9d 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.25.0.git -# Tue Oct 13 14:47:01 2015 +# Mon Oct 19 10:23:32 2015 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -246,7 +246,7 @@ CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_INSTALL is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LN is not set +CONFIG_LN=y CONFIG_LOGNAME=y CONFIG_LS=y CONFIG_FEATURE_LS_FILETYPES=y diff --git a/win32/mingw.c b/win32/mingw.c index 211c378a3..86867a437 100644 --- a/win32/mingw.c +++ b/win32/mingw.c @@ -126,6 +126,7 @@ int err_win_to_posix(DWORD winerr) case ERROR_SHARING_VIOLATION: error = EACCES; break; case ERROR_STACK_OVERFLOW: error = ENOMEM; break; case ERROR_SWAPERROR: error = ENOENT; break; + case ERROR_TOO_MANY_LINKS: error = EMLINK; break; case ERROR_TOO_MANY_MODULES: error = EMFILE; break; case ERROR_TOO_MANY_OPEN_FILES: error = EMFILE; break; case ERROR_UNRECOGNIZED_MEDIA: error = ENXIO; break; @@ -367,6 +368,7 @@ int mingw_fstat(int fd, struct mingw_stat *buf) buf->st_ino = 0; buf->st_uid = DEFAULT_UID; buf->st_gid = DEFAULT_GID; + /* could use fdata.nNumberOfLinks but it's inconsistent with stat */ buf->st_nlink = 1; buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes); buf->st_size = fdata.nFileSizeLow | -- cgit v1.2.3-55-g6feb