| 1 | --- ./jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c 2017-03-02 21:55:47.000000000 +0530 |
| 2 | +++ ../UnixNativeDispatcher.c 2017-03-03 21:37:02.370375158 +0530 |
| 3 | @@ -168,40 +168,6 @@ |
| 4 | #endif |
| 5 | static fdopendir_func* my_fdopendir_func = NULL; |
| 6 | |
| 7 | -#ifdef __ANDROID__ |
| 8 | -/* |
| 9 | - * TODO: Android lacks support for the methods listed below. In it's place are |
| 10 | - * alternatives that use existing Android functionality, but lack reentrant |
| 11 | - * support. Determine if the following are the most suitable alternatives. |
| 12 | - * |
| 13 | - */ |
| 14 | -int getgrgid_r(gid_t gid, struct group* grp, char* buf, size_t buflen, struct group** result) |
| 15 | -{ |
| 16 | - *result = NULL; |
| 17 | - errno = 0; |
| 18 | - grp = getgrgid(gid); |
| 19 | - if (grp == NULL) { |
| 20 | - return errno; |
| 21 | - } |
| 22 | - // buf not used by caller (see below) |
| 23 | - *result = grp; |
| 24 | - return 0; |
| 25 | -} |
| 26 | - |
| 27 | -int getgrnam_r(const char *name, struct group* grp, char* buf, size_t buflen, struct group** result) |
| 28 | -{ |
| 29 | - *result = NULL; |
| 30 | - errno = 0; |
| 31 | - grp = getgrnam(name); |
| 32 | - if (grp == NULL) { |
| 33 | - return errno; |
| 34 | - } |
| 35 | - // buf not used by caller (see below) |
| 36 | - *result = grp; |
| 37 | - return 0; |
| 38 | -} |
| 39 | -#endif |
| 40 | - |
| 41 | /** |
| 42 | * fstatat missing from glibc on Linux. Temporary workaround |
| 43 | * for x86/x64. |