diff --git a/libc/Android.mk b/libc/Android.mk index e2608710b..c573e3053 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -54,7 +54,6 @@ libc_common_src_files := \ bionic/initgroups.c \ bionic/ioctl.c \ bionic/isatty.c \ - bionic/issetugid.c \ bionic/md5.c \ bionic/memmem.c \ bionic/pathconf.c \ diff --git a/libc/bionic/issetugid.c b/libc/bionic/issetugid.c deleted file mode 100644 index 81f8e410c..000000000 --- a/libc/bionic/issetugid.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - -int issetugid(void) -{ - /* for Bionic, this is sufficient */ - return 0; -} - diff --git a/libc/include/unistd.h b/libc/include/unistd.h index 08a82e6ee..b4982cb0d 100644 --- a/libc/include/unistd.h +++ b/libc/include/unistd.h @@ -92,7 +92,6 @@ extern int setresuid(uid_t, uid_t, uid_t); 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 int issetugid(void); extern char* getlogin(void); extern char* getusershell(void); extern void setusershell(void); diff --git a/libc/upstream-openbsd/android/include/openbsd-compat.h b/libc/upstream-openbsd/android/include/openbsd-compat.h index bacd1d7dd..8618e3104 100644 --- a/libc/upstream-openbsd/android/include/openbsd-compat.h +++ b/libc/upstream-openbsd/android/include/openbsd-compat.h @@ -31,4 +31,7 @@ #define _X _CTYPE_X #define _B _CTYPE_B +/* OpenBSD has this, but we can't really implement it correctly on Linux. */ +#define issetugid() 0 + #endif