diff options
| author | Ron Yorston <rmy@pobox.com> | 2013-03-19 11:18:39 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2013-03-19 11:18:39 +0000 |
| commit | 63d2c5fead323df5f4250ed544d0bc03527c8936 (patch) | |
| tree | 660979b139a4bc4b143c08843cb7efbc69bdcb4d /libbb/xreadlink.c | |
| parent | 27fc2d535588728ac3ca69337271471fb6fe3ee9 (diff) | |
| parent | a42f530e034b673726a91ea5d8202254e677f066 (diff) | |
| download | busybox-w32-63d2c5fead323df5f4250ed544d0bc03527c8936.tar.gz busybox-w32-63d2c5fead323df5f4250ed544d0bc03527c8936.tar.bz2 busybox-w32-63d2c5fead323df5f4250ed544d0bc03527c8936.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/xreadlink.c')
| -rw-r--r-- | libbb/xreadlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c index f2faa6d7a..bc1d0e665 100644 --- a/libbb/xreadlink.c +++ b/libbb/xreadlink.c | |||
| @@ -102,7 +102,8 @@ char* FAST_FUNC xmalloc_readlink_or_warn(const char *path) | |||
| 102 | 102 | ||
| 103 | char* FAST_FUNC xmalloc_realpath(const char *path) | 103 | char* FAST_FUNC xmalloc_realpath(const char *path) |
| 104 | { | 104 | { |
| 105 | #if defined(__GLIBC__) && !defined(__UCLIBC__) | 105 | #if defined(__GLIBC__) || \ |
| 106 | (defined(__UCLIBC__) && UCLIBC_VERSION >= KERNEL_VERSION(0, 9, 31)) | ||
| 106 | /* glibc provides a non-standard extension */ | 107 | /* glibc provides a non-standard extension */ |
| 107 | /* new: POSIX.1-2008 specifies this behavior as well */ | 108 | /* new: POSIX.1-2008 specifies this behavior as well */ |
| 108 | return realpath(path, NULL); | 109 | return realpath(path, NULL); |