aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2015-10-19 12:41:07 +0100
committerRon Yorston <rmy@pobox.com>2015-10-19 12:41:07 +0100
commitcaab029609633220c417dc0aaa9025fd4b7a169c (patch)
tree6ac64a142c3bebed44b5a6332096b05d90f6ed80
parentde1349a877b46b890325273cb0f84e7be4476bfe (diff)
downloadbusybox-w32-caab029609633220c417dc0aaa9025fd4b7a169c.tar.gz
busybox-w32-caab029609633220c417dc0aaa9025fd4b7a169c.tar.bz2
busybox-w32-caab029609633220c417dc0aaa9025fd4b7a169c.zip
ln: enable in default configuration
-rw-r--r--configs/mingw32_defconfig4
-rw-r--r--configs/mingw64_defconfig4
-rw-r--r--win32/mingw.c2
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 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.25.0.git 3# Busybox version: 1.25.0.git
4# Tue Oct 13 14:47:01 2015 4# Mon Oct 19 10:23:32 2015
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7# CONFIG_PLATFORM_POSIX is not set 7# CONFIG_PLATFORM_POSIX is not set
@@ -246,7 +246,7 @@ CONFIG_HEAD=y
246CONFIG_FEATURE_FANCY_HEAD=y 246CONFIG_FEATURE_FANCY_HEAD=y
247# CONFIG_INSTALL is not set 247# CONFIG_INSTALL is not set
248# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set 248# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
249# CONFIG_LN is not set 249CONFIG_LN=y
250CONFIG_LOGNAME=y 250CONFIG_LOGNAME=y
251CONFIG_LS=y 251CONFIG_LS=y
252CONFIG_FEATURE_LS_FILETYPES=y 252CONFIG_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 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.25.0.git 3# Busybox version: 1.25.0.git
4# Tue Oct 13 14:47:01 2015 4# Mon Oct 19 10:23:32 2015
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7# CONFIG_PLATFORM_POSIX is not set 7# CONFIG_PLATFORM_POSIX is not set
@@ -246,7 +246,7 @@ CONFIG_HEAD=y
246CONFIG_FEATURE_FANCY_HEAD=y 246CONFIG_FEATURE_FANCY_HEAD=y
247# CONFIG_INSTALL is not set 247# CONFIG_INSTALL is not set
248# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set 248# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
249# CONFIG_LN is not set 249CONFIG_LN=y
250CONFIG_LOGNAME=y 250CONFIG_LOGNAME=y
251CONFIG_LS=y 251CONFIG_LS=y
252CONFIG_FEATURE_LS_FILETYPES=y 252CONFIG_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)
126 case ERROR_SHARING_VIOLATION: error = EACCES; break; 126 case ERROR_SHARING_VIOLATION: error = EACCES; break;
127 case ERROR_STACK_OVERFLOW: error = ENOMEM; break; 127 case ERROR_STACK_OVERFLOW: error = ENOMEM; break;
128 case ERROR_SWAPERROR: error = ENOENT; break; 128 case ERROR_SWAPERROR: error = ENOENT; break;
129 case ERROR_TOO_MANY_LINKS: error = EMLINK; break;
129 case ERROR_TOO_MANY_MODULES: error = EMFILE; break; 130 case ERROR_TOO_MANY_MODULES: error = EMFILE; break;
130 case ERROR_TOO_MANY_OPEN_FILES: error = EMFILE; break; 131 case ERROR_TOO_MANY_OPEN_FILES: error = EMFILE; break;
131 case ERROR_UNRECOGNIZED_MEDIA: error = ENXIO; break; 132 case ERROR_UNRECOGNIZED_MEDIA: error = ENXIO; break;
@@ -367,6 +368,7 @@ int mingw_fstat(int fd, struct mingw_stat *buf)
367 buf->st_ino = 0; 368 buf->st_ino = 0;
368 buf->st_uid = DEFAULT_UID; 369 buf->st_uid = DEFAULT_UID;
369 buf->st_gid = DEFAULT_GID; 370 buf->st_gid = DEFAULT_GID;
371 /* could use fdata.nNumberOfLinks but it's inconsistent with stat */
370 buf->st_nlink = 1; 372 buf->st_nlink = 1;
371 buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes); 373 buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes);
372 buf->st_size = fdata.nFileSizeLow | 374 buf->st_size = fdata.nFileSizeLow |