{
char *p;
-#if defined(linux)
+#if defined(linux) && !defined(N_PLAT_NLM) && !defined(__ANDROID__)
p = strerror_r(errorNumber, buf, bufSize);
#else
p = strerror(errorNumber);
* These headers are needed to get __USE_LARGEFILE, __USE_LARGEFILE64,
* and SYS__llseek.
*/
+# ifdef ANDROID_X86
+# undef _GNU_SOURCE
+# endif
# include <features.h>
+# ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+# endif
# include <linux/unistd.h>
+#ifdef ANDROID_X86
+# include <sys/syscall.h>
+#else
# include <syscall.h>
#endif
+#endif
+#if defined __ANDROID__
+# include <sys/syscall.h>
+#endif
#include <sys/stat.h>
#include "su.h"
goto exit;
}
if (retval < leftToWrite) {
- LOG_ONCE((LGPFX" %s wrote %"FMTSZ"d out of %"FMTSZ"u bytes.\n",
- __FUNCTION__, retval, leftToWrite));
+ /*
+ * Using %zd on Android generated a warning about
+ * expecting a "signed size_t" argument; casting retval to
+ * "signed size_t" generated an error, though. We've
+ * already checked for retval == -1 above, so the cast
+ * below should be OK. Refer to bug 817761.
+ */
+ LOG_ONCE((LGPFX" %s wrote %"FMTSZ"u out of %"FMTSZ"u bytes.\n",
+ __FUNCTION__, (size_t)retval, leftToWrite));
}
buf += retval;
* think once more.
*/
-#define ADFS_SUPER_MAGIC 0xADF5
+#define ADFS_SUPER_MAGIC 0xadf5
#define AFFS_SUPER_MAGIC 0xADFF
#define EXT_SUPER_MAGIC 0x137D
#define EXT2_OLD_SUPER_MAGIC 0xEF51
#define NFS_SUPER_MAGIC 0x6969
#define SMB_SUPER_MAGIC 0x517B
#define ISOFS_SUPER_MAGIC 0x9660
-#define JFFS2_SUPER_MAGIC 0x72B6
-#define PROC_SUPER_MAGIC 0x9FA0
-#define OPENPROM_SUPER_MAGIC 0x9FA1
-#define USBDEVICE_SUPER_MAGIC 0x9FA2
+#define JFFS2_SUPER_MAGIC 0x72b6
+#define PROC_SUPER_MAGIC 0x9fa0
+#define OPENPROM_SUPER_MAGIC 0x9fa1
+#define USBDEVICE_SUPER_MAGIC 0x9fa2
#define AUTOFS_SUPER_MAGIC 0x0187
#if !defined(MSDOS_SUPER_MAGIC)
#define XFS_SUPER_MAGIC 0x58465342
#define VMFS_SUPER_MAGIC 0x2fABF15E
#define TMPFS_SUPER_MAGIC 0x01021994
-#define JFS_SUPER_MAGIC 0x3153464A
+#define JFS_SUPER_MAGIC 0x3153464a
#define AFS_SUPER_MAGIC 0x5346414F
#define CIFS_SUPER_MAGIC 0xFF534D42
# include <sys/mount.h>
# else
# include <mntent.h>
-# if defined __ANDROID__
-# include <paths.h> /* for _PATH_MOUNTED */
-# endif
# endif
#include <signal.h>
#endif
* happens the prosix version should be updated to use the generic code.
*/
-#if defined(__USE_FILE_OFFSET64) || defined(sun)
+#if defined(__USE_FILE_OFFSET64) || defined(sun) || defined(__ANDROID__)
# define CAN_USE_FTS 0
#else
# define CAN_USE_FTS 1
/* A string for VMFS on ESX file system type */
#define FS_VMFS_ON_ESX "VMFS"
+#if defined __ANDROID__
+/*
+ * Android doesn't support setmntent(), endmntent() or MOUNTED.
+ */
+#define NO_SETMNTENT
+#define NO_ENDMNTENT
+#endif
+
/*
*-----------------------------------------------------------------------------
timeBuf.tv_nsec = statBuf.__unused3;
*attrChangeTime = TimeUtil_UnixTimeToNtTime(timeBuf);
}
+# elif defined(ANDROID_X86)
+ {
+ struct timespec timeBuf;
+
+ timeBuf.tv_sec = statBuf.st_atime;
+ timeBuf.tv_nsec = statBuf.st_atime_nsec;
+ *accessTime = TimeUtil_UnixTimeToNtTime(timeBuf);
+
+
+ timeBuf.tv_sec = statBuf.st_mtime;
+ timeBuf.tv_nsec = statBuf.st_mtime_nsec;
+ *writeTime = TimeUtil_UnixTimeToNtTime(timeBuf);
+
+ timeBuf.tv_sec = statBuf.st_ctime;
+ timeBuf.tv_nsec = statBuf.st_ctime_nsec;
+ *attrChangeTime = TimeUtil_UnixTimeToNtTime(timeBuf);
+ }
# else
*accessTime = TimeUtil_UnixTimeToNtTime(statBuf.st_atim);
*writeTime = TimeUtil_UnixTimeToNtTime(statBuf.st_mtim);
FilePosixLookupMountPoint(char const *canPath, // IN: Canonical file path
Bool *bind) // OUT: Mounted with --[r]bind?
{
+#if defined NO_SETMNTENT || defined NO_ENDMNTENT
+ NOT_IMPLEMENTED();
+ errno = ENOSYS;
+ return NULL;
+#else
FILE *f;
struct mntent mnt;
char *buf;
size = 4 * FILE_MAXPATH; // Should suffice for most locales
retry:
-#if defined __ANDROID__
- /*
- * Android supports neither setmntent() nor MOUNTED.
- * The code below is a workaround.
- */
- NOT_TESTED();
- f = fopen(_PATH_MOUNTED, "r");
-#else
f = setmntent(MOUNTED, "r");
-#endif
if (f == NULL) {
return NULL;
}
if (strcmp(mnt.mnt_dir, canPath) == 0) {
/*
- * The --bind and --rbind options behave differently. See
+ * The --bind and --rbind options behave differently. See
* FilePosixGetBlockDevice() for details.
*
* Sadly (I blame a bug in 'mount'), there is no way to tell them
free(buf);
return ret;
+#endif
}
#endif
void **buf;
void **alignedResult;
+#undef PAGE_MASK
#define PAGE_MASK (PAGE_SIZE - 1)
#define PAGE_ROUND_DOWN(_value) ((uintptr_t)(_value) & ~PAGE_MASK)
#define PAGE_ROUND_UP(_value) PAGE_ROUND_DOWN((uintptr_t)(_value) + PAGE_MASK)
* leading to a (potentially undetected) mismatch.
*/
-#if defined(linux) && \
+#if defined(linux) && !defined(ANDROID_X86) && \
(!defined(_LARGEFILE64_SOURCE) || _FILE_OFFSET_BITS != 64)
#error LFS support is not enabled!
#endif
#endif
#include <signal.h>
+#ifndef __ANDROID__
#include <sys/ucontext.h>
+#endif
#if __linux__
# if defined(__x86_64__)
#define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[ESP])
#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EIP])
#endif
+#elif defined(ANDROID_X86)
+#define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.eax)
+#define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.ebx)
+#define SC_ECX(uc) ((unsigned long) (uc)->uc_mcontext.ecx)
+#define SC_EDX(uc) ((unsigned long) (uc)->uc_mcontext.edx)
+#define SC_EDI(uc) ((unsigned long) (uc)->uc_mcontext.edi)
+#define SC_ESI(uc) ((unsigned long) (uc)->uc_mcontext.esi)
+#define SC_EBP(uc) ((unsigned long) (uc)->uc_mcontext.ebp)
+#define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.esp)
+#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.eip)
#else
#ifdef __x86_64__
#define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[GNU_REG_RAX])
unsigned int flags, DynBuf *db);
#endif
+#if defined __ANDROID__
+#include "vm_basic_asm.h"
+/*
+ * Android doesn't have swab().
+ */
+void
+swab(const void *__restrict src, // IN/OUT
+ void *__restrict dest, // IN/OUT
+ ssize_t nbytes) // IN
+{
+ const uint16 *p = src;
+ uint16 *q = dest;
+ ssize_t i;
+
+ for (i = 0; i < nbytes / sizeof(*p); i++) {
+ q[i] = Bswap16(p[i]);
+ }
+}
+#endif
#if defined(CURRENT_IS_UTF8) || defined(_WIN32)
/*
#if !defined(USING_AUTOCONF) || defined(HAVE_SYS_VFS_H)
#include <sys/vfs.h>
#endif
-#if !defined(sun) && (!defined(USING_AUTOCONF) || (defined(HAVE_SYS_IO_H) && defined(HAVE_SYS_SYSINFO_H)))
-# ifndef __ANDROID__
-# include <sys/io.h>
-# endif
+#if !defined(sun) && !defined __ANDROID__ && (!defined(USING_AUTOCONF) || (defined(HAVE_SYS_IO_H) && defined(HAVE_SYS_SYSINFO_H)))
+#include <sys/io.h>
#include <sys/sysinfo.h>
#ifndef HAVE_SYSINFO
#define HAVE_SYSINFO 1
{NULL, NULL},
};
+#if defined __ANDROID__
+/*
+ * Android doesn't support getloadavg() or iopl().
+ */
+#define NO_GETLOADAVG
+#define NO_IOPL
+#endif
+
/*
*----------------------------------------------------------------------
float *avg1, // IN/OUT:
float *avg2) // IN/OUT:
{
-#if (defined(__linux__) && !defined(__UCLIBC__)) || defined(__APPLE__)
+#if !defined(NO_GETLOADAVG) && (defined(__linux__) && !defined(__UCLIBC__)) || defined(__APPLE__)
double avg[3];
int res;
privileges --hpreg */
ASSERT(euid != 0 || getuid() == 0);
Id_SetEUid(0);
+#if defined NO_IOPL
+ NOT_IMPLEMENTED();
+ errno = ENOSYS;
+#else
err = iopl(0);
+#endif
Id_SetEUid(euid);
ASSERT_NOT_IMPLEMENTED(err == 0);
}
#include <unistd.h>
#ifdef __APPLE__
#include <sys/socket.h>
+#include <TargetConditionals.h>
+#if !defined TARGET_OS_IPHONE
+#define TARGET_OS_IPHONE 0
+#endif
+#if !TARGET_OS_IPHONE
#include <Security/Authorization.h>
#include <Security/AuthorizationTags.h>
#endif
+#endif
#if defined __ANDROID__
#include <syscall-android.h>
#endif
#endif
#endif // __linux__
-#if defined(__APPLE__)
+#if defined(__APPLE__) && !TARGET_OS_IPHONE
#include <sys/kauth.h>
static AuthorizationRef IdAuthCreate(void);
#endif
-#if defined(__APPLE__)
+#if defined(__APPLE__) && !TARGET_OS_IPHONE
/*
*----------------------------------------------------------------------------
*
uid = (uid_t) -1; // already root; nothing to do
} else {
#if defined(__APPLE__)
+#if TARGET_OS_IPHONE
+ Warning("XXXIOS: implement %s\n", __func__);
+#else
syscall(SYS_settid, KAUTH_UID_NONE, KAUTH_GID_NONE /* Ignored. */);
+#endif
#else
Id_SetRESUid((uid_t) -1, (uid_t) 0, (uid_t) -1); // effectively root
#endif
return 0;
}
-#elif defined(linux) // Linux
+#elif defined(linux) || defined __ANDROID__
#include <unistd.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <sys/time.h>
+#if defined __ANDROID__
+#include <sys/socket.h> // For SOCK_DGRAM etc.
+#endif
/*
#endif // }
+#if defined __ANDROID__
+/*
+ * Android doesn't support dtoa().
+ */
+#define NO_DTOA
+#endif
+
/*
* Local data
*/
char *decimal_point; /* locale specific decimal point */
#if defined __ANDROID__
- static const char dp = '.';
+ static char dp = '.';
#endif
int signflag; /* true if float is negative */
union { /* floating point arguments %[aAeEfFgG] */
goto error;
}
fparg.dbl = a->v.float64;
+#if defined NO_DTOA
+ NOT_TESTED();
+ dtoaresult = NULL;
+ sbuf.error = TRUE;
+
+ goto error;
+#else
dtoaresult = cp =
dtoa(fparg.dbl, expchar ? 2 : 3, prec,
&expt, &signflag, &dtoaend);
+#endif
if (expt == 9999)
expt = INT_MAX;
if (signflag)
#include <mntent.h>
#endif
-#if !defined(__FreeBSD__) || __FreeBSD_release >= 503001
+#if (!defined(__FreeBSD__) || __FreeBSD_release >= 503001) && !defined __ANDROID__
#define VM_SYSTEM_HAS_GETPWNAM_R 1
#define VM_SYSTEM_HAS_GETPWUID_R 1
#define VM_SYSTEM_HAS_GETGRNAM_R 1
static int GetpwInternal_r(struct passwd *pw, char *buf, size_t size,
struct passwd **ppw);
+#if defined __ANDROID__
+/*
+ * Android doesn't support getmntent_r(), getpwent() or setmntent().
+ */
+#define NO_GETMNTENT_R
+#define NO_GETPWENT
+#define NO_SETMNTENT
+
+EXTERN int truncate(const char *, off_t);
+#endif
+
/*
*----------------------------------------------------------------------
struct passwd *
Posix_Getpwent(void)
{
+#if defined NO_GETPWENT
+ NOT_IMPLEMENTED();
+ errno = ENOSYS;
+ return NULL;
+#else
struct passwd *pw = getpwent();
return GetpwInternal(pw);
+#endif
}
#if !defined(VM_SYSTEM_HAS_GETPWNAM_R) || \
Posix_Setmntent(ConstUnicode pathName, // IN:
const char *mode) // IN:
{
+#if defined NO_SETMNTENT
+ NOT_IMPLEMENTED();
+ errno = ENOSYS;
+ return NULL;
+#else
char *path;
FILE *stream;
if (!PosixConvertToCurrent(pathName, &path)) {
return NULL;
}
-#if defined __ANDROID__
- /*
- * Android doesn't support setmntent().
- */
- NOT_TESTED();
- errno = ENOSYS;
- return NULL;
-#else
stream = setmntent(path, mode);
-#endif
free(path);
return stream;
+#endif
}
char *buf, // IN:
int size) // IN:
{
-#if defined __ANDROID__
- /*
- * Android doesn't support getmntent_r();
- * using getmntent() will break thread safety.
- */
+#if defined NO_GETMNTENT_R
+ NOT_IMPLEMENTED();
errno = ENOSYS;
return NULL;
#else
#include "vm_assert.h"
+#ifdef __APPLE__
+#include <TargetConditionals.h>
+#if !defined TARGET_OS_IPHONE
+#define TARGET_OS_IPHONE 0
+#endif
+#endif
+
+
/*
*-----------------------------------------------------------------------------
*
const void *src,
size_t count)
{
+#if !defined(__ANDROID__) && !defined(TARGET_OS_IPHONE)
uintptr_t align = ((uintptr_t)dest | (uintptr_t)src | count);
#if defined __GNUC__
#endif
+#endif
#endif
memcpy(dest, src, count);
}
-#if defined(linux)
+#if defined(linux) && !defined(ANDROID_X86)
+/*
+ * Android x86 has its own gettid. gettid has been declared on
+ * <sys/linux-unistd.h> and defined as an extern function on <unistd.h>.
+ */
+
/*
*-----------------------------------------------------------------------------
*
#define VTHREADBASE_INVALID_KEY (VThreadBaseKeyType)(TLS_OUT_OF_INDEXES)
#else
typedef pthread_key_t VThreadBaseKeyType;
+/* PTHREAD_KEYS_MAX not defined on Android. */
+#if defined __linux__ && !defined PTHREAD_KEYS_MAX
+#define VTHREADBASE_INVALID_KEY (VThreadBaseKeyType)(1024)
+#else
#define VTHREADBASE_INVALID_KEY (VThreadBaseKeyType)(PTHREAD_KEYS_MAX)
#endif
+#endif
static void VThreadBaseSimpleNoID(void);
static void VThreadBaseSimpleFreeID(void *tlsData);
//#include <sys/cdefs.h>
-#if !defined(STR_NO_WIN32_LIBS) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+#if !defined(STR_NO_WIN32_LIBS) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__)
#include <stdio.h>
#include <stdlib.h>
#include "convertutf.h"
#include "str.h"
+
+#if defined __ANDROID__
+/*
+ * Android doesn't support dtoa() or ldtoa().
+ */
+#define NO_DTOA
+#define NO_LDTOA
+#endif
+
static char *__ultoa(u_long, char *, int, int, const char *, int, char,
const char *);
static void __find_arguments(const char *, va_list, union arg **);
* D: expchar holds this character; '\0' if no exponent, e.g. %f
* F: at least two digits for decimal, at least one digit for hex
*/
+#if defined __ANDROID__
+ static char dp = '.';
+#endif
int signflag; /* true if float is negative */
union { /* floating point arguments %[aAeEfFgG] */
double dbl;
convbuf = NULL;
#if !defined(NO_FLOATING_POINT)
dtoaresult = NULL;
+#if !defined __ANDROID__
+ decimal_point = localeconv()->decimal_point;
+#else
+ /*
+ * Struct lconv is not working! For decimal_point,
+ * using '.' instead is a workaround.
+ */
+ decimal_point = &dp;
+#endif
#endif
fmt = (char *)fmt0;
goto rflag;
case '\'':
flags |= GROUPING;
+#if !defined __ANDROID__
thousands_sep = thousands_sepIn;
grouping = groupingIn;
-
+#else
+ /*
+ * Struct lconv is not working! The code below is a workaround.
+ */
+ thousands_sep = ',';
+#endif
/*
* Grouping should not begin with 0, but it nevertheless does (see
* bug 281072) and makes the formatting code behave badly, so we
}
if (flags & LLONGINT) {
fparg.ldbl = GETARG(long double);
+#if defined NO_LDTOA
+ dtoaresult = NULL;
+ /*
+ * Below is to keep compiler happy
+ */
+ signflag = -1;
+ expt = 0;
+ dtoaend = NULL;
+#else
dtoaresult = cp = ldtoa(&fparg.ldbl, expchar ? 2 : 3, prec,
&expt, &signflag, &dtoaend);
+#endif
} else {
fparg.dbl = GETARG(double);
+#if defined NO_DTOA
+ dtoaresult = NULL;
+ /*
+ * Below is to keep compiler happy
+ */
+ signflag = -1;
+ expt = 0;
+ dtoaend = NULL;
+#else
dtoaresult = cp = dtoa(fparg.dbl, expchar ? 2 : 3, prec,
&expt, &signflag, &dtoaend);
+#endif
}
/* Our dtoa / ldtoa call strdup(), which can fail. PR319844 */
# include <dlfcn.h>
#endif
-#if defined(__linux__) && !defined(VMX86_TOOLS)
+#if defined(__linux__) && !defined(VMX86_TOOLS) && !defined(__ANDROID__)
# include <link.h>
#endif
return _URC_END_OF_STACK;
}
-#if !defined(_WIN32) && !defined(VMX86_TOOLS)
+#if !defined(_WIN32) && !defined(VMX86_TOOLS) && !defined(__ANDROID__)
/*
*-----------------------------------------------------------------------------
*
#elif !defined(VM_X86_64)
uintptr_t *x = basePtr;
int i;
-#if !defined(_WIN32) && !defined(VMX86_TOOLS)
+#if !defined(_WIN32) && !defined(VMX86_TOOLS) && !defined(__ANDROID__)
Dl_info dli;
#endif
x = (uintptr_t *) x[0];
}
-#if !defined(_WIN32) && !defined(VMX86_TOOLS)
+#if !defined(_WIN32) && !defined(VMX86_TOOLS) && !defined(__ANDROID__)
/*
* We do a separate pass here that includes symbols in order to
* make sure the base backtrace that does not call dladdr() etc.
projects / thirdparty / open-vm-tools.git / commitdiff
