2009-03-04 04:32:55 +01:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2007 The Android Open Source Project
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* this file contains system-dependent definitions used by ADB
|
|
|
|
* they're related to threads, sockets and file descriptors
|
|
|
|
*/
|
|
|
|
#ifndef _ADB_SYSDEPS_H
|
|
|
|
#define _ADB_SYSDEPS_H
|
|
|
|
|
|
|
|
#ifdef __CYGWIN__
|
|
|
|
# undef _WIN32
|
|
|
|
#endif
|
|
|
|
|
2015-07-24 02:12:58 +02:00
|
|
|
#include <errno.h>
|
|
|
|
|
2015-07-31 08:07:55 +02:00
|
|
|
#include <string>
|
adb: win32: handle incomplete UTF-8 in console output, other fixes
Previously, the various adb_printf, adb_fwrite, etc. functions did not
correctly handle the case of the passed buffer ending with an incomplete
UTF-8 sequence. This is fixed by buffering up incomplete UTF-8 sequences
in g_console_output_buffer (protected by the mutex
g_console_output_buffer) and outputting it later once the full sequence
is available.
A unittest for the main worker function, ParseCompleteUTF8(), was added
to adb_test.
Other fixes:
- Fix the return value of number-of-chars written to be number of UTF-8
bytes instead of number of UTF-16 characters.
- Don't overwrite errno in success cases of various adb_printf, etc.
functions. This might be excessive, but might be useful in the case
when these functions are used for debugging/tracing.
- Add missing UTF-8 stdio functions that aren't currently used by adb,
but might be in the future: vprintf, putc, putchar, puts.
- stdin_raw_init: If we can't get the console handle, don't call
SetConsoleMode(). Not a big deal, but this will prevent erroneous
trace output.
Change-Id: I8730e8af92882c42b884ad921b39a17b54465085
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-16 01:29:36 +01:00
|
|
|
#include <vector>
|
2015-07-31 08:07:55 +02:00
|
|
|
|
2015-11-13 00:20:15 +01:00
|
|
|
// Include this before open/unlink are defined as macros below.
|
2016-02-09 23:59:09 +01:00
|
|
|
#include <android-base/errors.h>
|
2015-12-05 07:00:26 +01:00
|
|
|
#include <android-base/utf8.h>
|
2015-11-13 00:20:15 +01:00
|
|
|
|
2015-02-25 06:26:58 +01:00
|
|
|
/*
|
|
|
|
* TEMP_FAILURE_RETRY is defined by some, but not all, versions of
|
|
|
|
* <unistd.h>. (Alas, it is not as standard as we'd hoped!) So, if it's
|
|
|
|
* not already defined, then define it here.
|
|
|
|
*/
|
|
|
|
#ifndef TEMP_FAILURE_RETRY
|
|
|
|
/* Used to retry syscalls that can return EINTR. */
|
|
|
|
#define TEMP_FAILURE_RETRY(exp) ({ \
|
|
|
|
typeof (exp) _rc; \
|
|
|
|
do { \
|
|
|
|
_rc = (exp); \
|
|
|
|
} while (_rc == -1 && errno == EINTR); \
|
|
|
|
_rc; })
|
|
|
|
#endif
|
|
|
|
|
2015-05-11 10:08:48 +02:00
|
|
|
// Some printf-like functions are implemented in terms of
|
|
|
|
// android::base::StringAppendV, so they should use the same attribute for
|
|
|
|
// compile-time format string checking. On Windows, if the mingw version of
|
|
|
|
// vsnprintf is used in StringAppendV, use `gnu_printf' which allows z in %zd
|
|
|
|
// and PRIu64 (and related) to be recognized by the compile-time checking.
|
|
|
|
#define ADB_FORMAT_ARCHETYPE __printf__
|
|
|
|
#ifdef __USE_MINGW_ANSI_STDIO
|
|
|
|
#if __USE_MINGW_ANSI_STDIO
|
|
|
|
#undef ADB_FORMAT_ARCHETYPE
|
|
|
|
#define ADB_FORMAT_ARCHETYPE gnu_printf
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
#ifdef _WIN32
|
|
|
|
|
2016-01-29 21:08:34 +01:00
|
|
|
// Clang-only nullability specifiers
|
|
|
|
#define _Nonnull
|
|
|
|
#define _Nullable
|
|
|
|
|
2014-11-25 08:34:35 +01:00
|
|
|
#include <ctype.h>
|
|
|
|
#include <direct.h>
|
2015-05-11 10:08:48 +02:00
|
|
|
#include <dirent.h>
|
2014-11-25 08:34:35 +01:00
|
|
|
#include <errno.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
#include <fcntl.h>
|
|
|
|
#include <io.h>
|
2014-11-25 08:34:35 +01:00
|
|
|
#include <process.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
#include <sys/stat.h>
|
2015-05-11 10:08:48 +02:00
|
|
|
#include <utime.h>
|
2014-11-25 08:34:35 +01:00
|
|
|
#include <winsock2.h>
|
|
|
|
#include <windows.h>
|
|
|
|
#include <ws2tcpip.h>
|
|
|
|
|
2015-08-27 03:46:09 +02:00
|
|
|
#include <memory> // unique_ptr
|
2015-11-13 00:20:15 +01:00
|
|
|
#include <string>
|
2015-05-06 22:26:00 +02:00
|
|
|
|
2014-11-25 08:34:35 +01:00
|
|
|
#include "fdevent.h"
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2015-07-31 02:42:01 +02:00
|
|
|
#define OS_PATH_SEPARATORS "\\/"
|
2009-03-04 04:32:55 +01:00
|
|
|
#define OS_PATH_SEPARATOR '\\'
|
|
|
|
#define OS_PATH_SEPARATOR_STR "\\"
|
adb: Add public key authentification
Secure adb using a public key authentication, to allow USB debugging
only from authorized hosts.
When a device is connected to an unauthorized host, the adb daemon sends
the user public key to the device. A popup is shown to ask the user to
allow debugging once or permanantly from the host. The public key is
installed on the device in the later case. Other keys may be installed
at build time.
On the host, the user public/private key pair is automatically generated,
if it does not exist, when the adb daemon starts and is stored in
$HOME/.android/adb_key(.pub) or in $ANDROID_SDK_HOME on windows. If needed,
the ADB_KEYS_PATH env variable may be set to a :-separated (; under
Windows) list of private keys, e.g. company-wide or vendor keys.
On the device, vendors public keys are installed at build time in
/adb_keys. User-installed keys are stored in /data/misc/adb/adb_keys.
ADB Protocol change:
If the device needs to authenticate the host, it replies to CNXN
packets with an AUTH packet. The AUTH packet payload is a random token.
The host signs the token with one of its private keys and sends an AUTH(0)
packet. If the signature verification succeeds, the device replies with
a CNXN packet. Otherwise, it sends a new AUTH packet with a new token so
that the host can retry with another private key. Once the host has tried
all its keys, it can send an AUTH(1) packet with a public key as
payload. adbd then sends the public key to the framework (if it has been
started) for confirmation.
Change-Id: I4e84d7621da956f66ff657245901bdaefead8395
2012-04-12 21:23:49 +02:00
|
|
|
#define ENV_PATH_SEPARATOR_STR ";"
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2015-11-08 00:38:19 +01:00
|
|
|
static __inline__ bool adb_is_separator(char c) {
|
|
|
|
return c == '\\' || c == '/';
|
|
|
|
}
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
typedef CRITICAL_SECTION adb_mutex_t;
|
|
|
|
|
|
|
|
#define ADB_MUTEX_DEFINE(x) adb_mutex_t x
|
|
|
|
|
|
|
|
/* declare all mutexes */
|
2011-03-16 23:57:42 +01:00
|
|
|
/* For win32, adb_sysdeps_init() will do the mutex runtime initialization. */
|
2009-03-04 04:32:55 +01:00
|
|
|
#define ADB_MUTEX(x) extern adb_mutex_t x;
|
|
|
|
#include "mutex_list.h"
|
|
|
|
|
|
|
|
extern void adb_sysdeps_init(void);
|
|
|
|
|
|
|
|
static __inline__ void adb_mutex_lock( adb_mutex_t* lock )
|
|
|
|
{
|
|
|
|
EnterCriticalSection( lock );
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline__ void adb_mutex_unlock( adb_mutex_t* lock )
|
|
|
|
{
|
|
|
|
LeaveCriticalSection( lock );
|
|
|
|
}
|
|
|
|
|
2016-02-12 23:31:15 +01:00
|
|
|
typedef void (*adb_thread_func_t)(void* arg);
|
2016-02-09 23:59:09 +01:00
|
|
|
typedef HANDLE adb_thread_t;
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2016-02-12 23:31:15 +01:00
|
|
|
struct adb_winthread_args {
|
2016-02-09 23:59:09 +01:00
|
|
|
adb_thread_func_t func;
|
|
|
|
void* arg;
|
|
|
|
};
|
|
|
|
|
2016-02-12 23:31:15 +01:00
|
|
|
static unsigned __stdcall adb_winthread_wrapper(void* heap_args) {
|
|
|
|
// Move the arguments from the heap onto the thread's stack.
|
|
|
|
adb_winthread_args thread_args = *static_cast<adb_winthread_args*>(heap_args);
|
|
|
|
delete static_cast<adb_winthread_args*>(heap_args);
|
|
|
|
thread_args.func(thread_args.arg);
|
|
|
|
return 0;
|
2016-02-09 23:59:09 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static __inline__ bool adb_thread_create(adb_thread_func_t func, void* arg,
|
|
|
|
adb_thread_t* thread = nullptr) {
|
2016-02-12 23:31:15 +01:00
|
|
|
adb_winthread_args* args = new adb_winthread_args{.func = func, .arg = arg};
|
|
|
|
uintptr_t handle = _beginthreadex(nullptr, 0, adb_winthread_wrapper, args, 0, nullptr);
|
2016-02-09 23:59:09 +01:00
|
|
|
if (handle != static_cast<uintptr_t>(0)) {
|
|
|
|
if (thread) {
|
|
|
|
*thread = reinterpret_cast<HANDLE>(handle);
|
|
|
|
} else {
|
|
|
|
CloseHandle(thread);
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline__ bool adb_thread_join(adb_thread_t thread) {
|
|
|
|
switch (WaitForSingleObject(thread, INFINITE)) {
|
|
|
|
case WAIT_OBJECT_0:
|
|
|
|
CloseHandle(thread);
|
|
|
|
return true;
|
|
|
|
|
|
|
|
case WAIT_FAILED:
|
|
|
|
fprintf(stderr, "adb_thread_join failed: %s\n",
|
|
|
|
android::base::SystemErrorCodeToString(GetLastError()).c_str());
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2016-02-09 23:59:09 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline__ bool adb_thread_detach(adb_thread_t thread) {
|
|
|
|
CloseHandle(thread);
|
|
|
|
return true;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2016-02-12 23:31:15 +01:00
|
|
|
static __inline__ void __attribute__((noreturn)) adb_thread_exit() {
|
2016-02-13 00:45:04 +01:00
|
|
|
_endthreadex(0);
|
2016-02-12 23:31:15 +01:00
|
|
|
}
|
|
|
|
|
2015-08-29 01:37:29 +02:00
|
|
|
static __inline__ int adb_thread_setname(const std::string& name) {
|
|
|
|
// TODO: See https://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx for how to set
|
|
|
|
// the thread name in Windows. Unfortunately, it only works during debugging, but
|
|
|
|
// our build process doesn't generate PDB files needed for debugging.
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-08-15 18:51:27 +02:00
|
|
|
static __inline__ unsigned long adb_thread_id()
|
|
|
|
{
|
|
|
|
return GetCurrentThreadId();
|
|
|
|
}
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
static __inline__ void close_on_exec(int fd)
|
|
|
|
{
|
2009-05-18 17:36:28 +02:00
|
|
|
/* nothing really */
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#define lstat stat /* no symlinks on Win32 */
|
|
|
|
|
|
|
|
#define S_ISLNK(m) 0 /* no symlinks on Win32 */
|
|
|
|
|
2015-05-11 10:08:48 +02:00
|
|
|
extern int adb_unlink(const char* path);
|
2009-03-04 04:32:55 +01:00
|
|
|
#undef unlink
|
|
|
|
#define unlink ___xxx_unlink
|
|
|
|
|
2015-05-11 10:08:48 +02:00
|
|
|
extern int adb_mkdir(const std::string& path, int mode);
|
2009-03-04 04:32:55 +01:00
|
|
|
#undef mkdir
|
|
|
|
#define mkdir ___xxx_mkdir
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// See the comments for the !defined(_WIN32) versions of adb_*().
|
2009-03-04 04:32:55 +01:00
|
|
|
extern int adb_open(const char* path, int options);
|
|
|
|
extern int adb_creat(const char* path, int mode);
|
|
|
|
extern int adb_read(int fd, void* buf, int len);
|
|
|
|
extern int adb_write(int fd, const void* buf, int len);
|
|
|
|
extern int adb_lseek(int fd, int pos, int where);
|
2009-10-12 05:04:18 +02:00
|
|
|
extern int adb_shutdown(int fd);
|
2009-03-04 04:32:55 +01:00
|
|
|
extern int adb_close(int fd);
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// See the comments for the !defined(_WIN32) version of unix_close().
|
2009-03-04 04:32:55 +01:00
|
|
|
static __inline__ int unix_close(int fd)
|
|
|
|
{
|
|
|
|
return close(fd);
|
|
|
|
}
|
|
|
|
#undef close
|
|
|
|
#define close ____xxx_close
|
|
|
|
|
2015-11-08 02:34:39 +01:00
|
|
|
// Like unix_read(), but may return EINTR.
|
|
|
|
extern int unix_read_interruptible(int fd, void* buf, size_t len);
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// See the comments for the !defined(_WIN32) version of unix_read().
|
2015-11-08 02:34:39 +01:00
|
|
|
static __inline__ int unix_read(int fd, void* buf, size_t len) {
|
|
|
|
return TEMP_FAILURE_RETRY(unix_read_interruptible(fd, buf, len));
|
|
|
|
}
|
2015-03-02 00:06:21 +01:00
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
#undef read
|
|
|
|
#define read ___xxx_read
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// See the comments for the !defined(_WIN32) version of unix_write().
|
2009-03-04 04:32:55 +01:00
|
|
|
static __inline__ int unix_write(int fd, const void* buf, size_t len)
|
|
|
|
{
|
|
|
|
return write(fd, buf, len);
|
|
|
|
}
|
|
|
|
#undef write
|
|
|
|
#define write ___xxx_write
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// See the comments for the !defined(_WIN32) version of adb_open_mode().
|
2009-03-04 04:32:55 +01:00
|
|
|
static __inline__ int adb_open_mode(const char* path, int options, int mode)
|
|
|
|
{
|
2009-05-18 17:36:28 +02:00
|
|
|
return adb_open(path, options);
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// See the comments for the !defined(_WIN32) version of unix_open().
|
2015-05-11 10:08:48 +02:00
|
|
|
extern int unix_open(const char* path, int options, ...);
|
2009-03-04 04:32:55 +01:00
|
|
|
#define open ___xxx_unix_open
|
|
|
|
|
2015-10-28 22:29:51 +01:00
|
|
|
// Checks if |fd| corresponds to a console.
|
|
|
|
// Standard Windows isatty() returns 1 for both console FDs and character
|
|
|
|
// devices like NUL. unix_isatty() performs some extra checking to only match
|
|
|
|
// console FDs.
|
|
|
|
// |fd| must be a real file descriptor, meaning STDxx_FILENO or unix_open() FDs
|
|
|
|
// will work but adb_open() FDs will not. Additionally the OS handle associated
|
|
|
|
// with |fd| must have GENERIC_READ access (which console FDs have by default).
|
|
|
|
// Returns 1 if |fd| is a console FD, 0 otherwise. The value of errno after
|
|
|
|
// calling this function is unreliable and should not be used.
|
|
|
|
int unix_isatty(int fd);
|
|
|
|
#define isatty ___xxx_isatty
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
/* normally provided by <cutils/misc.h> */
|
|
|
|
extern void* load_file(const char* pathname, unsigned* psize);
|
|
|
|
|
2009-05-18 17:07:46 +02:00
|
|
|
/* normally provided by "fdevent.h" */
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
#define FDE_READ 0x0001
|
|
|
|
#define FDE_WRITE 0x0002
|
|
|
|
#define FDE_ERROR 0x0004
|
|
|
|
#define FDE_DONT_CLOSE 0x0080
|
|
|
|
|
|
|
|
typedef void (*fd_func)(int fd, unsigned events, void *userdata);
|
|
|
|
|
|
|
|
fdevent *fdevent_create(int fd, fd_func func, void *arg);
|
|
|
|
void fdevent_destroy(fdevent *fde);
|
|
|
|
void fdevent_install(fdevent *fde, int fd, fd_func func, void *arg);
|
|
|
|
void fdevent_remove(fdevent *item);
|
|
|
|
void fdevent_set(fdevent *fde, unsigned events);
|
|
|
|
void fdevent_add(fdevent *fde, unsigned events);
|
|
|
|
void fdevent_del(fdevent *fde, unsigned events);
|
|
|
|
void fdevent_loop();
|
|
|
|
|
|
|
|
static __inline__ void adb_sleep_ms( int mseconds )
|
|
|
|
{
|
2009-05-18 17:36:28 +02:00
|
|
|
Sleep( mseconds );
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2015-07-31 08:07:55 +02:00
|
|
|
int network_loopback_client(int port, int type, std::string* error);
|
|
|
|
int network_loopback_server(int port, int type, std::string* error);
|
|
|
|
int network_inaddr_any_server(int port, int type, std::string* error);
|
|
|
|
int network_connect(const std::string& host, int port, int type, int timeout,
|
|
|
|
std::string* error);
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
extern int adb_socket_accept(int serverfd, struct sockaddr* addr, socklen_t *addrlen);
|
|
|
|
|
|
|
|
#undef accept
|
|
|
|
#define accept ___xxx_accept
|
|
|
|
|
2015-01-25 23:40:16 +01:00
|
|
|
extern int adb_setsockopt(int fd, int level, int optname, const void* optval, socklen_t optlen);
|
|
|
|
|
|
|
|
#undef setsockopt
|
|
|
|
#define setsockopt ___xxx_setsockopt
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
extern int adb_socketpair( int sv[2] );
|
|
|
|
|
2015-07-31 02:42:01 +02:00
|
|
|
static __inline__ int adb_is_absolute_host_path(const char* path) {
|
2009-03-04 04:32:55 +01:00
|
|
|
return isalpha(path[0]) && path[1] == ':' && path[2] == '\\';
|
|
|
|
}
|
|
|
|
|
2015-05-11 10:08:48 +02:00
|
|
|
// We later define a macro mapping 'stat' to 'adb_stat'. This causes:
|
|
|
|
// struct stat s;
|
|
|
|
// stat(filename, &s);
|
|
|
|
// To turn into the following:
|
|
|
|
// struct adb_stat s;
|
|
|
|
// adb_stat(filename, &s);
|
|
|
|
// To get this to work, we need to make 'struct adb_stat' the same as
|
|
|
|
// 'struct stat'. Note that this definition of 'struct adb_stat' uses the
|
|
|
|
// *current* macro definition of stat, so it may actually be inheriting from
|
|
|
|
// struct _stat32i64 (or some other remapping).
|
|
|
|
struct adb_stat : public stat {};
|
|
|
|
|
|
|
|
static_assert(sizeof(struct adb_stat) == sizeof(struct stat),
|
|
|
|
"structures should be the same");
|
|
|
|
|
|
|
|
extern int adb_stat(const char* f, struct adb_stat* s);
|
|
|
|
|
|
|
|
// stat is already a macro, undefine it so we can redefine it.
|
|
|
|
#undef stat
|
|
|
|
#define stat adb_stat
|
|
|
|
|
|
|
|
// UTF-8 versions of POSIX APIs.
|
|
|
|
extern DIR* adb_opendir(const char* dirname);
|
|
|
|
extern struct dirent* adb_readdir(DIR* dir);
|
|
|
|
extern int adb_closedir(DIR* dir);
|
|
|
|
|
|
|
|
extern int adb_utime(const char *, struct utimbuf *);
|
|
|
|
extern int adb_chmod(const char *, int);
|
|
|
|
|
|
|
|
extern int adb_vfprintf(FILE *stream, const char *format, va_list ap)
|
|
|
|
__attribute__((__format__(ADB_FORMAT_ARCHETYPE, 2, 0)));
|
adb: win32: handle incomplete UTF-8 in console output, other fixes
Previously, the various adb_printf, adb_fwrite, etc. functions did not
correctly handle the case of the passed buffer ending with an incomplete
UTF-8 sequence. This is fixed by buffering up incomplete UTF-8 sequences
in g_console_output_buffer (protected by the mutex
g_console_output_buffer) and outputting it later once the full sequence
is available.
A unittest for the main worker function, ParseCompleteUTF8(), was added
to adb_test.
Other fixes:
- Fix the return value of number-of-chars written to be number of UTF-8
bytes instead of number of UTF-16 characters.
- Don't overwrite errno in success cases of various adb_printf, etc.
functions. This might be excessive, but might be useful in the case
when these functions are used for debugging/tracing.
- Add missing UTF-8 stdio functions that aren't currently used by adb,
but might be in the future: vprintf, putc, putchar, puts.
- stdin_raw_init: If we can't get the console handle, don't call
SetConsoleMode(). Not a big deal, but this will prevent erroneous
trace output.
Change-Id: I8730e8af92882c42b884ad921b39a17b54465085
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-16 01:29:36 +01:00
|
|
|
extern int adb_vprintf(const char *format, va_list ap)
|
|
|
|
__attribute__((__format__(ADB_FORMAT_ARCHETYPE, 1, 0)));
|
2015-05-11 10:08:48 +02:00
|
|
|
extern int adb_fprintf(FILE *stream, const char *format, ...)
|
|
|
|
__attribute__((__format__(ADB_FORMAT_ARCHETYPE, 2, 3)));
|
|
|
|
extern int adb_printf(const char *format, ...)
|
|
|
|
__attribute__((__format__(ADB_FORMAT_ARCHETYPE, 1, 2)));
|
|
|
|
|
|
|
|
extern int adb_fputs(const char* buf, FILE* stream);
|
|
|
|
extern int adb_fputc(int ch, FILE* stream);
|
adb: win32: handle incomplete UTF-8 in console output, other fixes
Previously, the various adb_printf, adb_fwrite, etc. functions did not
correctly handle the case of the passed buffer ending with an incomplete
UTF-8 sequence. This is fixed by buffering up incomplete UTF-8 sequences
in g_console_output_buffer (protected by the mutex
g_console_output_buffer) and outputting it later once the full sequence
is available.
A unittest for the main worker function, ParseCompleteUTF8(), was added
to adb_test.
Other fixes:
- Fix the return value of number-of-chars written to be number of UTF-8
bytes instead of number of UTF-16 characters.
- Don't overwrite errno in success cases of various adb_printf, etc.
functions. This might be excessive, but might be useful in the case
when these functions are used for debugging/tracing.
- Add missing UTF-8 stdio functions that aren't currently used by adb,
but might be in the future: vprintf, putc, putchar, puts.
- stdin_raw_init: If we can't get the console handle, don't call
SetConsoleMode(). Not a big deal, but this will prevent erroneous
trace output.
Change-Id: I8730e8af92882c42b884ad921b39a17b54465085
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-16 01:29:36 +01:00
|
|
|
extern int adb_putchar(int ch);
|
|
|
|
extern int adb_puts(const char* buf);
|
2015-05-11 10:08:48 +02:00
|
|
|
extern size_t adb_fwrite(const void* ptr, size_t size, size_t nmemb,
|
|
|
|
FILE* stream);
|
|
|
|
|
|
|
|
extern FILE* adb_fopen(const char* f, const char* m);
|
|
|
|
|
|
|
|
extern char* adb_getenv(const char* name);
|
|
|
|
|
|
|
|
extern char* adb_getcwd(char* buf, int size);
|
|
|
|
|
|
|
|
// Remap calls to POSIX APIs to our UTF-8 versions.
|
|
|
|
#define opendir adb_opendir
|
|
|
|
#define readdir adb_readdir
|
|
|
|
#define closedir adb_closedir
|
|
|
|
#define rewinddir rewinddir_utf8_not_yet_implemented
|
|
|
|
#define telldir telldir_utf8_not_yet_implemented
|
2015-11-08 03:51:54 +01:00
|
|
|
// Some compiler's C++ headers have members named seekdir, so we can't do the
|
|
|
|
// macro technique and instead cause a link error if seekdir is called.
|
|
|
|
inline void seekdir(DIR*, long) {
|
|
|
|
extern int seekdir_utf8_not_yet_implemented;
|
|
|
|
seekdir_utf8_not_yet_implemented = 1;
|
|
|
|
}
|
2015-05-11 10:08:48 +02:00
|
|
|
|
|
|
|
#define utime adb_utime
|
|
|
|
#define chmod adb_chmod
|
|
|
|
|
|
|
|
#define vfprintf adb_vfprintf
|
adb: win32: handle incomplete UTF-8 in console output, other fixes
Previously, the various adb_printf, adb_fwrite, etc. functions did not
correctly handle the case of the passed buffer ending with an incomplete
UTF-8 sequence. This is fixed by buffering up incomplete UTF-8 sequences
in g_console_output_buffer (protected by the mutex
g_console_output_buffer) and outputting it later once the full sequence
is available.
A unittest for the main worker function, ParseCompleteUTF8(), was added
to adb_test.
Other fixes:
- Fix the return value of number-of-chars written to be number of UTF-8
bytes instead of number of UTF-16 characters.
- Don't overwrite errno in success cases of various adb_printf, etc.
functions. This might be excessive, but might be useful in the case
when these functions are used for debugging/tracing.
- Add missing UTF-8 stdio functions that aren't currently used by adb,
but might be in the future: vprintf, putc, putchar, puts.
- stdin_raw_init: If we can't get the console handle, don't call
SetConsoleMode(). Not a big deal, but this will prevent erroneous
trace output.
Change-Id: I8730e8af92882c42b884ad921b39a17b54465085
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-16 01:29:36 +01:00
|
|
|
#define vprintf adb_vprintf
|
2015-05-11 10:08:48 +02:00
|
|
|
#define fprintf adb_fprintf
|
|
|
|
#define printf adb_printf
|
|
|
|
#define fputs adb_fputs
|
|
|
|
#define fputc adb_fputc
|
adb: win32: handle incomplete UTF-8 in console output, other fixes
Previously, the various adb_printf, adb_fwrite, etc. functions did not
correctly handle the case of the passed buffer ending with an incomplete
UTF-8 sequence. This is fixed by buffering up incomplete UTF-8 sequences
in g_console_output_buffer (protected by the mutex
g_console_output_buffer) and outputting it later once the full sequence
is available.
A unittest for the main worker function, ParseCompleteUTF8(), was added
to adb_test.
Other fixes:
- Fix the return value of number-of-chars written to be number of UTF-8
bytes instead of number of UTF-16 characters.
- Don't overwrite errno in success cases of various adb_printf, etc.
functions. This might be excessive, but might be useful in the case
when these functions are used for debugging/tracing.
- Add missing UTF-8 stdio functions that aren't currently used by adb,
but might be in the future: vprintf, putc, putchar, puts.
- stdin_raw_init: If we can't get the console handle, don't call
SetConsoleMode(). Not a big deal, but this will prevent erroneous
trace output.
Change-Id: I8730e8af92882c42b884ad921b39a17b54465085
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-16 01:29:36 +01:00
|
|
|
// putc may be a macro, so if so, undefine it, so that we can redefine it.
|
|
|
|
#undef putc
|
|
|
|
#define putc(c, s) adb_fputc(c, s)
|
|
|
|
#define putchar adb_putchar
|
|
|
|
#define puts adb_puts
|
2015-05-11 10:08:48 +02:00
|
|
|
#define fwrite adb_fwrite
|
|
|
|
|
|
|
|
#define fopen adb_fopen
|
adb: win32: handle incomplete UTF-8 in console output, other fixes
Previously, the various adb_printf, adb_fwrite, etc. functions did not
correctly handle the case of the passed buffer ending with an incomplete
UTF-8 sequence. This is fixed by buffering up incomplete UTF-8 sequences
in g_console_output_buffer (protected by the mutex
g_console_output_buffer) and outputting it later once the full sequence
is available.
A unittest for the main worker function, ParseCompleteUTF8(), was added
to adb_test.
Other fixes:
- Fix the return value of number-of-chars written to be number of UTF-8
bytes instead of number of UTF-16 characters.
- Don't overwrite errno in success cases of various adb_printf, etc.
functions. This might be excessive, but might be useful in the case
when these functions are used for debugging/tracing.
- Add missing UTF-8 stdio functions that aren't currently used by adb,
but might be in the future: vprintf, putc, putchar, puts.
- stdin_raw_init: If we can't get the console handle, don't call
SetConsoleMode(). Not a big deal, but this will prevent erroneous
trace output.
Change-Id: I8730e8af92882c42b884ad921b39a17b54465085
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-16 01:29:36 +01:00
|
|
|
#define freopen freopen_utf8_not_yet_implemented
|
2015-05-11 10:08:48 +02:00
|
|
|
|
|
|
|
#define getenv adb_getenv
|
|
|
|
#define putenv putenv_utf8_not_yet_implemented
|
|
|
|
#define setenv setenv_utf8_not_yet_implemented
|
|
|
|
#define unsetenv unsetenv_utf8_not_yet_implemented
|
|
|
|
|
|
|
|
#define getcwd adb_getcwd
|
|
|
|
|
2015-10-19 01:45:09 +02:00
|
|
|
char* adb_strerror(int err);
|
|
|
|
#define strerror adb_strerror
|
|
|
|
|
2015-05-11 10:08:48 +02:00
|
|
|
// Helper class to convert UTF-16 argv from wmain() to UTF-8 args that can be
|
|
|
|
// passed to main().
|
|
|
|
class NarrowArgs {
|
|
|
|
public:
|
|
|
|
NarrowArgs(int argc, wchar_t** argv);
|
|
|
|
~NarrowArgs();
|
|
|
|
|
|
|
|
inline char** data() {
|
|
|
|
return narrow_args;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
char** narrow_args;
|
|
|
|
};
|
|
|
|
|
2015-08-09 00:07:07 +02:00
|
|
|
// Windows HANDLE values only use 32-bits of the type, even on 64-bit machines,
|
|
|
|
// so they can fit in an int. To convert back, we just need to sign-extend.
|
|
|
|
// https://msdn.microsoft.com/en-us/library/windows/desktop/aa384203%28v=vs.85%29.aspx
|
|
|
|
// Note that this does not make a HANDLE value work with APIs like open(), nor
|
|
|
|
// does this make a value from open() passable to APIs taking a HANDLE. This
|
|
|
|
// just lets you take a HANDLE, pass it around as an int, and then use it again
|
|
|
|
// as a HANDLE.
|
|
|
|
inline int cast_handle_to_int(const HANDLE h) {
|
|
|
|
// truncate
|
|
|
|
return static_cast<int>(reinterpret_cast<INT_PTR>(h));
|
|
|
|
}
|
|
|
|
|
|
|
|
inline HANDLE cast_int_to_handle(const int fd) {
|
|
|
|
// sign-extend
|
|
|
|
return reinterpret_cast<HANDLE>(static_cast<INT_PTR>(fd));
|
|
|
|
}
|
|
|
|
|
2015-08-27 03:46:09 +02:00
|
|
|
// Deleter for unique_handle. Adapted from many sources, including:
|
|
|
|
// http://stackoverflow.com/questions/14841396/stdunique-ptr-deleters-and-the-win32-api
|
|
|
|
// https://visualstudiomagazine.com/articles/2013/09/01/get-a-handle-on-the-windows-api.aspx
|
|
|
|
class handle_deleter {
|
|
|
|
public:
|
|
|
|
typedef HANDLE pointer;
|
|
|
|
|
|
|
|
void operator()(HANDLE h);
|
|
|
|
};
|
|
|
|
|
|
|
|
// Like std::unique_ptr, but for Windows HANDLE objects that should be
|
|
|
|
// CloseHandle()'d. Operator bool() only checks if the handle != nullptr,
|
|
|
|
// but does not check if the handle != INVALID_HANDLE_VALUE.
|
|
|
|
typedef std::unique_ptr<HANDLE, handle_deleter> unique_handle;
|
|
|
|
|
adb: win32: handle incomplete UTF-8 in console output, other fixes
Previously, the various adb_printf, adb_fwrite, etc. functions did not
correctly handle the case of the passed buffer ending with an incomplete
UTF-8 sequence. This is fixed by buffering up incomplete UTF-8 sequences
in g_console_output_buffer (protected by the mutex
g_console_output_buffer) and outputting it later once the full sequence
is available.
A unittest for the main worker function, ParseCompleteUTF8(), was added
to adb_test.
Other fixes:
- Fix the return value of number-of-chars written to be number of UTF-8
bytes instead of number of UTF-16 characters.
- Don't overwrite errno in success cases of various adb_printf, etc.
functions. This might be excessive, but might be useful in the case
when these functions are used for debugging/tracing.
- Add missing UTF-8 stdio functions that aren't currently used by adb,
but might be in the future: vprintf, putc, putchar, puts.
- stdin_raw_init: If we can't get the console handle, don't call
SetConsoleMode(). Not a big deal, but this will prevent erroneous
trace output.
Change-Id: I8730e8af92882c42b884ad921b39a17b54465085
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-16 01:29:36 +01:00
|
|
|
namespace internal {
|
|
|
|
|
|
|
|
size_t ParseCompleteUTF8(const char* first, const char* last, std::vector<char>* remaining_bytes);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
#else /* !_WIN32 a.k.a. Unix */
|
|
|
|
|
2009-05-18 17:07:46 +02:00
|
|
|
#include "fdevent.h"
|
2009-03-04 04:32:55 +01:00
|
|
|
#include <cutils/misc.h>
|
2015-07-31 08:07:55 +02:00
|
|
|
#include <cutils/sockets.h>
|
2015-07-21 11:06:26 +02:00
|
|
|
#include <cutils/threads.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
#include <signal.h>
|
|
|
|
#include <sys/wait.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
|
|
|
#include <pthread.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <stdarg.h>
|
2015-07-31 08:07:55 +02:00
|
|
|
#include <netdb.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <netinet/tcp.h>
|
|
|
|
#include <string.h>
|
2012-10-13 00:26:45 +02:00
|
|
|
#include <unistd.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2015-05-06 22:26:00 +02:00
|
|
|
#include <string>
|
|
|
|
|
2015-07-31 02:42:01 +02:00
|
|
|
#define OS_PATH_SEPARATORS "/"
|
2009-03-04 04:32:55 +01:00
|
|
|
#define OS_PATH_SEPARATOR '/'
|
|
|
|
#define OS_PATH_SEPARATOR_STR "/"
|
adb: Add public key authentification
Secure adb using a public key authentication, to allow USB debugging
only from authorized hosts.
When a device is connected to an unauthorized host, the adb daemon sends
the user public key to the device. A popup is shown to ask the user to
allow debugging once or permanantly from the host. The public key is
installed on the device in the later case. Other keys may be installed
at build time.
On the host, the user public/private key pair is automatically generated,
if it does not exist, when the adb daemon starts and is stored in
$HOME/.android/adb_key(.pub) or in $ANDROID_SDK_HOME on windows. If needed,
the ADB_KEYS_PATH env variable may be set to a :-separated (; under
Windows) list of private keys, e.g. company-wide or vendor keys.
On the device, vendors public keys are installed at build time in
/adb_keys. User-installed keys are stored in /data/misc/adb/adb_keys.
ADB Protocol change:
If the device needs to authenticate the host, it replies to CNXN
packets with an AUTH packet. The AUTH packet payload is a random token.
The host signs the token with one of its private keys and sends an AUTH(0)
packet. If the signature verification succeeds, the device replies with
a CNXN packet. Otherwise, it sends a new AUTH packet with a new token so
that the host can retry with another private key. Once the host has tried
all its keys, it can send an AUTH(1) packet with a public key as
payload. adbd then sends the public key to the framework (if it has been
started) for confirmation.
Change-Id: I4e84d7621da956f66ff657245901bdaefead8395
2012-04-12 21:23:49 +02:00
|
|
|
#define ENV_PATH_SEPARATOR_STR ":"
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2015-11-08 00:38:19 +01:00
|
|
|
static __inline__ bool adb_is_separator(char c) {
|
|
|
|
return c == '/';
|
|
|
|
}
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
typedef pthread_mutex_t adb_mutex_t;
|
2011-03-16 23:57:42 +01:00
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
#define ADB_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
|
|
|
|
#define adb_mutex_init pthread_mutex_init
|
|
|
|
#define adb_mutex_lock pthread_mutex_lock
|
|
|
|
#define adb_mutex_unlock pthread_mutex_unlock
|
|
|
|
#define adb_mutex_destroy pthread_mutex_destroy
|
|
|
|
|
2011-03-16 23:57:42 +01:00
|
|
|
#define ADB_MUTEX_DEFINE(m) adb_mutex_t m = PTHREAD_MUTEX_INITIALIZER
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
#define adb_cond_t pthread_cond_t
|
|
|
|
#define adb_cond_init pthread_cond_init
|
|
|
|
#define adb_cond_wait pthread_cond_wait
|
|
|
|
#define adb_cond_broadcast pthread_cond_broadcast
|
|
|
|
#define adb_cond_signal pthread_cond_signal
|
|
|
|
#define adb_cond_destroy pthread_cond_destroy
|
|
|
|
|
2011-03-16 23:57:42 +01:00
|
|
|
/* declare all mutexes */
|
|
|
|
#define ADB_MUTEX(x) extern adb_mutex_t x;
|
|
|
|
#include "mutex_list.h"
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
static __inline__ void close_on_exec(int fd)
|
|
|
|
{
|
2009-05-18 17:36:28 +02:00
|
|
|
fcntl( fd, F_SETFD, FD_CLOEXEC );
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// Open a file and return a file descriptor that may be used with unix_read(),
|
|
|
|
// unix_write(), unix_close(), but not adb_read(), adb_write(), adb_close().
|
|
|
|
//
|
|
|
|
// On Unix, this is based on open(), so the file descriptor is a real OS file
|
|
|
|
// descriptor, but the Windows implementation (in sysdeps_win32.cpp) returns a
|
|
|
|
// file descriptor that can only be used with C Runtime APIs (which are wrapped
|
|
|
|
// by unix_read(), unix_write(), unix_close()). Also, the C Runtime has
|
|
|
|
// configurable CR/LF translation which defaults to text mode, but is settable
|
|
|
|
// with _setmode().
|
2009-03-04 04:32:55 +01:00
|
|
|
static __inline__ int unix_open(const char* path, int options,...)
|
|
|
|
{
|
|
|
|
if ((options & O_CREAT) == 0)
|
|
|
|
{
|
2012-10-13 00:26:45 +02:00
|
|
|
return TEMP_FAILURE_RETRY( open(path, options) );
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int mode;
|
|
|
|
va_list args;
|
|
|
|
va_start( args, options );
|
|
|
|
mode = va_arg( args, int );
|
|
|
|
va_end( args );
|
2012-10-13 00:26:45 +02:00
|
|
|
return TEMP_FAILURE_RETRY( open( path, options, mode ) );
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// Similar to the two-argument adb_open(), but takes a mode parameter for file
|
|
|
|
// creation. See adb_open() for more info.
|
2009-03-04 04:32:55 +01:00
|
|
|
static __inline__ int adb_open_mode( const char* pathname, int options, int mode )
|
|
|
|
{
|
2012-10-13 00:26:45 +02:00
|
|
|
return TEMP_FAILURE_RETRY( open( pathname, options, mode ) );
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// Open a file and return a file descriptor that may be used with adb_read(),
|
|
|
|
// adb_write(), adb_close(), but not unix_read(), unix_write(), unix_close().
|
|
|
|
//
|
|
|
|
// On Unix, this is based on open(), but the Windows implementation (in
|
|
|
|
// sysdeps_win32.cpp) uses Windows native file I/O and bypasses the C Runtime
|
|
|
|
// and its CR/LF translation. The returned file descriptor should be used with
|
|
|
|
// adb_read(), adb_write(), adb_close(), etc.
|
2009-03-04 04:32:55 +01:00
|
|
|
static __inline__ int adb_open( const char* pathname, int options )
|
|
|
|
{
|
2012-10-13 00:26:45 +02:00
|
|
|
int fd = TEMP_FAILURE_RETRY( open( pathname, options ) );
|
2009-03-04 04:32:55 +01:00
|
|
|
if (fd < 0)
|
|
|
|
return -1;
|
|
|
|
close_on_exec( fd );
|
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
#undef open
|
|
|
|
#define open ___xxx_open
|
|
|
|
|
2009-10-12 05:04:18 +02:00
|
|
|
static __inline__ int adb_shutdown(int fd)
|
|
|
|
{
|
|
|
|
return shutdown(fd, SHUT_RDWR);
|
|
|
|
}
|
2015-10-07 00:30:03 +02:00
|
|
|
static __inline__ int adb_shutdown(int fd, int direction)
|
|
|
|
{
|
|
|
|
return shutdown(fd, direction);
|
|
|
|
}
|
2009-10-12 05:04:18 +02:00
|
|
|
#undef shutdown
|
|
|
|
#define shutdown ____xxx_shutdown
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// Closes a file descriptor that came from adb_open() or adb_open_mode(), but
|
|
|
|
// not designed to take a file descriptor from unix_open(). See the comments
|
|
|
|
// for adb_open() for more info.
|
2009-03-04 04:32:55 +01:00
|
|
|
static __inline__ int adb_close(int fd)
|
|
|
|
{
|
|
|
|
return close(fd);
|
|
|
|
}
|
|
|
|
#undef close
|
|
|
|
#define close ____xxx_close
|
|
|
|
|
|
|
|
|
|
|
|
static __inline__ int adb_read(int fd, void* buf, size_t len)
|
|
|
|
{
|
2012-10-13 00:26:45 +02:00
|
|
|
return TEMP_FAILURE_RETRY( read( fd, buf, len ) );
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2015-11-08 02:34:39 +01:00
|
|
|
// Like unix_read(), but does not handle EINTR.
|
|
|
|
static __inline__ int unix_read_interruptible(int fd, void* buf, size_t len) {
|
|
|
|
return read(fd, buf, len);
|
|
|
|
}
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
#undef read
|
|
|
|
#define read ___xxx_read
|
|
|
|
|
|
|
|
static __inline__ int adb_write(int fd, const void* buf, size_t len)
|
|
|
|
{
|
2012-10-13 00:26:45 +02:00
|
|
|
return TEMP_FAILURE_RETRY( write( fd, buf, len ) );
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
#undef write
|
|
|
|
#define write ___xxx_write
|
|
|
|
|
|
|
|
static __inline__ int adb_lseek(int fd, int pos, int where)
|
|
|
|
{
|
|
|
|
return lseek(fd, pos, where);
|
|
|
|
}
|
|
|
|
#undef lseek
|
|
|
|
#define lseek ___xxx_lseek
|
|
|
|
|
|
|
|
static __inline__ int adb_unlink(const char* path)
|
|
|
|
{
|
|
|
|
return unlink(path);
|
|
|
|
}
|
|
|
|
#undef unlink
|
|
|
|
#define unlink ___xxx_unlink
|
|
|
|
|
|
|
|
static __inline__ int adb_creat(const char* path, int mode)
|
|
|
|
{
|
2012-10-13 00:26:45 +02:00
|
|
|
int fd = TEMP_FAILURE_RETRY( creat( path, mode ) );
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2009-05-18 17:36:28 +02:00
|
|
|
if ( fd < 0 )
|
|
|
|
return -1;
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
close_on_exec(fd);
|
2009-05-18 17:36:28 +02:00
|
|
|
return fd;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
#undef creat
|
|
|
|
#define creat ___xxx_creat
|
|
|
|
|
2015-10-28 22:29:51 +01:00
|
|
|
static __inline__ int unix_isatty(int fd) {
|
|
|
|
return isatty(fd);
|
|
|
|
}
|
|
|
|
#define isatty ___xxx_isatty
|
|
|
|
|
2015-07-31 08:07:55 +02:00
|
|
|
// Helper for network_* functions.
|
|
|
|
inline int _fd_set_error_str(int fd, std::string* error) {
|
|
|
|
if (fd == -1) {
|
|
|
|
*error = strerror(errno);
|
|
|
|
}
|
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline int network_loopback_client(int port, int type, std::string* error) {
|
|
|
|
return _fd_set_error_str(socket_loopback_client(port, type), error);
|
|
|
|
}
|
|
|
|
|
|
|
|
inline int network_loopback_server(int port, int type, std::string* error) {
|
|
|
|
return _fd_set_error_str(socket_loopback_server(port, type), error);
|
|
|
|
}
|
|
|
|
|
|
|
|
inline int network_inaddr_any_server(int port, int type, std::string* error) {
|
|
|
|
return _fd_set_error_str(socket_inaddr_any_server(port, type), error);
|
|
|
|
}
|
|
|
|
|
|
|
|
inline int network_local_server(const char *name, int namespace_id, int type,
|
|
|
|
std::string* error) {
|
|
|
|
return _fd_set_error_str(socket_local_server(name, namespace_id, type),
|
|
|
|
error);
|
|
|
|
}
|
|
|
|
|
|
|
|
inline int network_connect(const std::string& host, int port, int type,
|
|
|
|
int timeout, std::string* error) {
|
|
|
|
int getaddrinfo_error = 0;
|
|
|
|
int fd = socket_network_client_timeout(host.c_str(), port, type, timeout,
|
|
|
|
&getaddrinfo_error);
|
|
|
|
if (fd != -1) {
|
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
if (getaddrinfo_error != 0) {
|
|
|
|
*error = gai_strerror(getaddrinfo_error);
|
|
|
|
} else {
|
|
|
|
*error = strerror(errno);
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
static __inline__ int adb_socket_accept(int serverfd, struct sockaddr* addr, socklen_t *addrlen)
|
|
|
|
{
|
2011-02-02 03:57:41 +01:00
|
|
|
int fd;
|
|
|
|
|
2012-10-13 00:26:45 +02:00
|
|
|
fd = TEMP_FAILURE_RETRY( accept( serverfd, addr, addrlen ) );
|
2011-02-02 03:57:41 +01:00
|
|
|
if (fd >= 0)
|
|
|
|
close_on_exec(fd);
|
|
|
|
|
|
|
|
return fd;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#undef accept
|
|
|
|
#define accept ___xxx_accept
|
|
|
|
|
2015-05-23 05:09:06 +02:00
|
|
|
// Operate on a file descriptor returned from unix_open() or a well-known file
|
|
|
|
// descriptor such as STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO.
|
|
|
|
//
|
|
|
|
// On Unix, unix_read(), unix_write(), unix_close() map to adb_read(),
|
|
|
|
// adb_write(), adb_close() (which all map to Unix system calls), but the
|
|
|
|
// Windows implementations (in the ifdef above and in sysdeps_win32.cpp) call
|
|
|
|
// into the C Runtime and its configurable CR/LF translation (which is settable
|
|
|
|
// via _setmode()).
|
2009-03-04 04:32:55 +01:00
|
|
|
#define unix_read adb_read
|
|
|
|
#define unix_write adb_write
|
|
|
|
#define unix_close adb_close
|
|
|
|
|
2016-02-12 23:31:15 +01:00
|
|
|
// Win32 is limited to DWORDs for thread return values; limit the POSIX systems to this as well to
|
|
|
|
// ensure compatibility.
|
|
|
|
typedef void (*adb_thread_func_t)(void* arg);
|
2016-02-09 23:59:09 +01:00
|
|
|
typedef pthread_t adb_thread_t;
|
|
|
|
|
2016-02-12 23:31:15 +01:00
|
|
|
struct adb_pthread_args {
|
|
|
|
adb_thread_func_t func;
|
|
|
|
void* arg;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void* adb_pthread_wrapper(void* heap_args) {
|
|
|
|
// Move the arguments from the heap onto the thread's stack.
|
|
|
|
adb_pthread_args thread_args = *reinterpret_cast<adb_pthread_args*>(heap_args);
|
|
|
|
delete static_cast<adb_pthread_args*>(heap_args);
|
|
|
|
thread_args.func(thread_args.arg);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
2016-02-09 23:59:09 +01:00
|
|
|
static __inline__ bool adb_thread_create(adb_thread_func_t start, void* arg,
|
|
|
|
adb_thread_t* thread = nullptr) {
|
|
|
|
pthread_t temp;
|
2015-05-05 22:41:21 +02:00
|
|
|
pthread_attr_t attr;
|
|
|
|
pthread_attr_init(&attr);
|
2016-02-09 23:59:09 +01:00
|
|
|
pthread_attr_setdetachstate(&attr, thread ? PTHREAD_CREATE_JOINABLE : PTHREAD_CREATE_DETACHED);
|
2016-02-12 23:31:15 +01:00
|
|
|
auto* pthread_args = new adb_pthread_args{.func = start, .arg = arg};
|
|
|
|
errno = pthread_create(&temp, &attr, adb_pthread_wrapper, pthread_args);
|
2016-02-09 23:59:09 +01:00
|
|
|
if (errno == 0) {
|
|
|
|
if (thread) {
|
|
|
|
*thread = temp;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline__ bool adb_thread_join(adb_thread_t thread) {
|
|
|
|
errno = pthread_join(thread, nullptr);
|
|
|
|
return errno == 0;
|
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2016-02-09 23:59:09 +01:00
|
|
|
static __inline__ bool adb_thread_detach(adb_thread_t thread) {
|
|
|
|
errno = pthread_detach(thread);
|
|
|
|
return errno == 0;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2016-02-12 23:31:15 +01:00
|
|
|
static __inline__ void __attribute__((noreturn)) adb_thread_exit() {
|
|
|
|
pthread_exit(nullptr);
|
|
|
|
}
|
|
|
|
|
2015-08-29 01:37:29 +02:00
|
|
|
static __inline__ int adb_thread_setname(const std::string& name) {
|
|
|
|
#ifdef __APPLE__
|
|
|
|
return pthread_setname_np(name.c_str());
|
|
|
|
#else
|
|
|
|
const char *s = name.c_str();
|
|
|
|
|
|
|
|
// pthread_setname_np fails rather than truncating long strings.
|
|
|
|
const int max_task_comm_len = 16; // including the null terminator
|
|
|
|
if (name.length() > (max_task_comm_len - 1)) {
|
|
|
|
char buf[max_task_comm_len];
|
|
|
|
strncpy(buf, name.c_str(), sizeof(buf) - 1);
|
|
|
|
buf[sizeof(buf) - 1] = '\0';
|
|
|
|
s = buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pthread_setname_np(pthread_self(), s) ;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2015-01-25 23:40:16 +01:00
|
|
|
static __inline__ int adb_setsockopt( int fd, int level, int optname, const void* optval, socklen_t optlen )
|
|
|
|
{
|
|
|
|
return setsockopt( fd, level, optname, optval, optlen );
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef setsockopt
|
|
|
|
#define setsockopt ___xxx_setsockopt
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
static __inline__ int unix_socketpair( int d, int type, int protocol, int sv[2] )
|
|
|
|
{
|
|
|
|
return socketpair( d, type, protocol, sv );
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline__ int adb_socketpair( int sv[2] )
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = unix_socketpair( AF_UNIX, SOCK_STREAM, 0, sv );
|
|
|
|
if (rc < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
close_on_exec( sv[0] );
|
|
|
|
close_on_exec( sv[1] );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef socketpair
|
|
|
|
#define socketpair ___xxx_socketpair
|
|
|
|
|
|
|
|
static __inline__ void adb_sleep_ms( int mseconds )
|
|
|
|
{
|
2009-05-18 17:36:28 +02:00
|
|
|
usleep( mseconds*1000 );
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2015-05-06 22:26:00 +02:00
|
|
|
static __inline__ int adb_mkdir(const std::string& path, int mode)
|
2009-03-04 04:32:55 +01:00
|
|
|
{
|
2015-05-06 22:26:00 +02:00
|
|
|
return mkdir(path.c_str(), mode);
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
2015-05-06 22:26:00 +02:00
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
#undef mkdir
|
|
|
|
#define mkdir ___xxx_mkdir
|
|
|
|
|
|
|
|
static __inline__ void adb_sysdeps_init(void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2015-05-06 22:26:00 +02:00
|
|
|
static __inline__ int adb_is_absolute_host_path(const char* path) {
|
2009-03-04 04:32:55 +01:00
|
|
|
return path[0] == '/';
|
|
|
|
}
|
|
|
|
|
2014-08-15 18:51:27 +02:00
|
|
|
static __inline__ unsigned long adb_thread_id()
|
|
|
|
{
|
2015-07-21 11:06:26 +02:00
|
|
|
return (unsigned long)gettid();
|
2014-08-15 18:51:27 +02:00
|
|
|
}
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
#endif /* !_WIN32 */
|
|
|
|
|
2015-11-21 07:01:06 +01:00
|
|
|
static inline void disable_tcp_nagle(int fd) {
|
|
|
|
int off = 1;
|
|
|
|
adb_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &off, sizeof(off));
|
|
|
|
}
|
|
|
|
|
2009-03-04 04:32:55 +01:00
|
|
|
#endif /* _ADB_SYSDEPS_H */
|