generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a1e4a4a3: am 8c41eae6: Merge "Move getusershell/endusershell/setusershell to ndk_cruft.cpp."

Browse Source 
* commit 'a1e4a4a3c68fc99958cc7a6e6fb7fed58feeaae8':
  Move getusershell/endusershell/setusershell to ndk_cruft.cpp.
This commit is contained in:
Yabin Cui 2015-02-25 16:52:39 +00:00 committed by Android Git Automerger
commit e4093959c0
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libc/bionic/ndk_cruft.cpp
View File

@ -26,8 +26,7 @@
* SUCH DAMAGE.
*/
// This file perpetuates the mistakes of the past, but only for 32-bit targets.
#if !defined(__LP64__)
// This file perpetuates the mistakes of the past.
#include <ctype.h>
#include <dirent.h>
@ -46,6 +45,11 @@
#include <unistd.h>
#include <wchar.h>
#include "private/libc_logging.h"
// The part is only for 32-bit targets.
#if !defined(__LP64__)
// These were accidentally declared in <unistd.h> because we stupidly used to inline
// getpagesize() and __getpageshift(). Needed for backwards compatibility with old NDK apps.
extern "C" {
@ -342,4 +346,15 @@ extern "C" void* dlmalloc(size_t size) {
return malloc(size);
}
#endif
#endif // !defined(__LP64__)
// This is never implemented in bionic, only needed for ABI compatibility with the NDK.
extern "C" char* getusershell() {
return NULL;
}
// This is never implemented in bionic, only needed for ABI compatibility with the NDK.
extern "C" void setusershell() { }
// This is never implemented in bionic, only needed for ABI compatibility with the NDK.
extern "C" void endusershell() { }

13
libc/bionic/stubs.cpp
View File

@ -458,19 +458,6 @@ void endpwent() {
UNIMPLEMENTED;
}
char* getusershell() {
UNIMPLEMENTED;
return NULL;
}
void setusershell() {
UNIMPLEMENTED;
}
void endusershell() {
UNIMPLEMENTED;
}
// Portable code should use sysconf(_SC_PAGE_SIZE) directly instead.
int getpagesize() {
// We dont use sysconf(3) here because that drags in stdio, which makes static binaries fat.

4
libc/include/unistd.h
View File

@ -116,10 +116,6 @@ extern int setresgid(gid_t, gid_t, gid_t);
extern int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid);
extern int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid);
extern char* getlogin(void);
extern char* getusershell(void);
extern void setusershell(void);
extern void endusershell(void);
extern long fpathconf(int, int);
extern long pathconf(const char*, int);