diff options
-rw-r--r-- | adb/adb.c | 22 | ||||
-rw-r--r-- | adb/commandline.c | 4 | ||||
-rw-r--r-- | adb/services.c | 12 | ||||
-rw-r--r-- | fastbootd/utils.h | 2 | ||||
-rw-r--r-- | init/builtins.c | 1 | ||||
-rw-r--r-- | init/devices.c | 2 | ||||
-rw-r--r-- | libbacktrace/Android.build.mk | 6 | ||||
-rwxr-xr-x | libbacktrace/Android.mk | 64 | ||||
-rw-r--r-- | liblog/fake_log_device.c | 4 | ||||
-rw-r--r-- | liblog/log_time.cpp | 4 | ||||
-rw-r--r-- | liblog/logprint.c | 4 | ||||
-rw-r--r-- | sdcard/sdcard.c | 1 |
12 files changed, 29 insertions, 97 deletions
@@ -947,7 +947,7 @@ nomem: return INSTALL_STATUS_INTERNAL_ERROR; } -#ifdef HAVE_WIN32_PROC +#if defined(_WIN32) static BOOL WINAPI ctrlc_handler(DWORD type) { exit(STATUS_CONTROL_C_EXIT); @@ -962,7 +962,7 @@ static void adb_cleanup(void) void start_logging(void) { -#ifdef HAVE_WIN32_PROC +#if defined(_WIN32) char temp[ MAX_PATH ]; FILE* fnul; FILE* flog; @@ -1070,7 +1070,7 @@ void adb_set_affinity(void) int launch_server(int server_port) { -#ifdef HAVE_WIN32_PROC +#if defined(_WIN32) /* we need to start the server in the background */ /* we create a PIPE that will be used to wait for the server's "OK" */ /* message since the pipe handles must be inheritable, we use a */ @@ -1169,7 +1169,7 @@ int launch_server(int server_port) return -1; } } -#elif defined(HAVE_FORKEXEC) +#else /* !defined(_WIN32) */ char path[PATH_MAX]; int fd[2]; @@ -1220,12 +1220,10 @@ int launch_server(int server_port) setsid(); } -#else -#error "cannot implement background server start on this platform" -#endif +#endif /* !defined(_WIN32) */ return 0; } -#endif +#endif /* ADB_HOST */ /* Constructs a local name of form tcp:port. * target_str points to the target string, it's content will be overwritten. @@ -1307,9 +1305,9 @@ int adb_main(int is_daemon, int server_port) #endif atexit(adb_cleanup); -#ifdef HAVE_WIN32_PROC +#if defined(_WIN32) SetConsoleCtrlHandler( ctrlc_handler, TRUE ); -#elif defined(HAVE_FORKEXEC) +#else // No SIGCHLD. Let the service subproc handle its children. signal(SIGPIPE, SIG_IGN); #endif @@ -1425,10 +1423,10 @@ int adb_main(int is_daemon, int server_port) if (is_daemon) { // inform our parent that we are up and running. -#ifdef HAVE_WIN32_PROC +#if defined(_WIN32) DWORD count; WriteFile( GetStdHandle( STD_OUTPUT_HANDLE ), "OK\n", 3, &count, NULL ); -#elif defined(HAVE_FORKEXEC) +#else fprintf(stderr, "OK\n"); #endif start_logging(); diff --git a/adb/commandline.c b/adb/commandline.c index 05b4ef6..eea882d 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -729,7 +729,7 @@ static char *escape_arg(const char *s) */ int ppp(int argc, char **argv) { -#ifdef HAVE_WIN32_PROC +#if defined(_WIN32) fprintf(stderr, "error: adb %s not implemented on Win32\n", argv[0]); return -1; #else @@ -792,7 +792,7 @@ int ppp(int argc, char **argv) adb_close(fd); return 0; } -#endif /* !HAVE_WIN32_PROC */ +#endif /* !defined(_WIN32) */ } static int send_shellcommand(transport_type transport, char* serial, char* buf) diff --git a/adb/services.c b/adb/services.c index e61371a..bcfc163 100644 --- a/adb/services.c +++ b/adb/services.c @@ -202,10 +202,10 @@ static void init_subproc_child() static int create_subproc_pty(const char *cmd, const char *arg0, const char *arg1, pid_t *pid) { D("create_subproc_pty(cmd=%s, arg0=%s, arg1=%s)\n", cmd, arg0, arg1); -#ifdef HAVE_WIN32_PROC +#if defined(_WIN32) fprintf(stderr, "error: create_subproc_pty not implemented on Win32 (%s %s %s)\n", cmd, arg0, arg1); return -1; -#else /* !HAVE_WIN32_PROC */ +#else int ptm; ptm = unix_open("/dev/ptmx", O_RDWR | O_CLOEXEC); // | O_NOCTTY); @@ -251,16 +251,16 @@ static int create_subproc_pty(const char *cmd, const char *arg0, const char *arg } else { return ptm; } -#endif /* !HAVE_WIN32_PROC */ +#endif /* !defined(_WIN32) */ } static int create_subproc_raw(const char *cmd, const char *arg0, const char *arg1, pid_t *pid) { D("create_subproc_raw(cmd=%s, arg0=%s, arg1=%s)\n", cmd, arg0, arg1); -#ifdef HAVE_WIN32_PROC +#if defined(_WIN32) fprintf(stderr, "error: create_subproc_raw not implemented on Win32 (%s %s %s)\n", cmd, arg0, arg1); return -1; -#else /* !HAVE_WIN32_PROC */ +#else // 0 is parent socket, 1 is child socket int sv[2]; @@ -295,7 +295,7 @@ static int create_subproc_raw(const char *cmd, const char *arg0, const char *arg adb_close(sv[1]); return sv[0]; } -#endif /* !HAVE_WIN32_PROC */ +#endif /* !defined(_WIN32) */ } #endif /* !ABD_HOST */ diff --git a/fastbootd/utils.h b/fastbootd/utils.h index 3d98699..2f89582 100644 --- a/fastbootd/utils.h +++ b/fastbootd/utils.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -#ifndef _FASTBOOT_UTLIS_H +#ifndef _FASTBOOT_UTILS_H #define _FASTBOOT_UTILS_H #include <stdio.h> diff --git a/init/builtins.c b/init/builtins.c index c192551..7f4daa7 100644 --- a/init/builtins.c +++ b/init/builtins.c @@ -433,6 +433,7 @@ int do_mount(int nargs, char **args) sprintf(tmp, "/dev/block/loop%d", n); loop = open(tmp, mode); if (loop < 0) { + close(fd); return -1; } diff --git a/init/devices.c b/init/devices.c index 2fa5c22..a95111a 100644 --- a/init/devices.c +++ b/init/devices.c @@ -458,7 +458,7 @@ static char **get_character_device_symlinks(struct uevent *uevent) /* skip "/devices/platform/<driver>" */ parent = strchr(uevent->path + pdev->path_len, '/'); - if (!*parent) + if (!parent) goto err; if (!strncmp(parent, "/usb", 4)) { diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk index 2685380..7e1cd53 100644 --- a/libbacktrace/Android.build.mk +++ b/libbacktrace/Android.build.mk @@ -61,12 +61,6 @@ LOCAL_LDLIBS := \ $($(module)_ldlibs_$(build_type)) \ ifeq ($(build_type),target) - ifneq ($($(module)_libc++),) - include external/libcxx/libcxx.mk - else - include external/stlport/libstlport.mk - endif - include $(BUILD_$(build_target)) endif diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index c321369..01b4f4d 100755 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -70,54 +70,9 @@ build_type := target build_target := SHARED_LIBRARY include $(LOCAL_PATH)/Android.build.mk build_type := host +libbacktrace_multilib := both include $(LOCAL_PATH)/Android.build.mk -# Don't build for unbundled branches -ifeq (,$(TARGET_BUILD_APPS)) -#------------------------------------------------------------------------- -# The libbacktrace library (libc++) -#------------------------------------------------------------------------- -libbacktrace_libc++_src_files := \ - BacktraceImpl.cpp \ - BacktraceMap.cpp \ - BacktraceThread.cpp \ - thread_utils.c \ - -libbacktrace_libc++_shared_libraries_target := \ - libcutils \ - libgccdemangle \ - -libbacktrace_libc++_src_files += \ - UnwindCurrent.cpp \ - UnwindMap.cpp \ - UnwindPtrace.cpp \ - -libbacktrace_libc++_c_includes := \ - external/libunwind/include \ - -libbacktrace_libc++_shared_libraries := \ - libunwind \ - libunwind-ptrace \ - -libbacktrace_libc++_shared_libraries_host := \ - liblog \ - -libbacktrace_libc++_static_libraries_host := \ - libcutils \ - -libbacktrace_libc++_libc++ := true - -module := libbacktrace_libc++ -module_tag := optional -build_type := target -build_target := SHARED_LIBRARY -include $(LOCAL_PATH)/Android.build.mk -build_type := host -libbacktrace_libc++_multilib := both -include $(LOCAL_PATH)/Android.build.mk -libbacktrace_libc++_multilib := -endif - #------------------------------------------------------------------------- # The libbacktrace_test library needed by backtrace_test. #------------------------------------------------------------------------- @@ -186,25 +141,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := \ BacktraceMap.cpp \ -include $(BUILD_HOST_SHARED_LIBRARY) - -# Don't build for unbundled branches -ifeq (,$(TARGET_BUILD_APPS)) -#------------------------------------------------------------------------- -# The libbacktrace library (libc++) -#------------------------------------------------------------------------- -include $(CLEAR_VARS) - -LOCAL_MODULE := libbacktrace_libc++ -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := \ - BacktraceMap.cpp \ - LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) -endif # TARGET_BUILD_APPS - endif # HOST_OS-darwin diff --git a/liblog/fake_log_device.c b/liblog/fake_log_device.c index 136792d..b8d87bb 100644 --- a/liblog/fake_log_device.c +++ b/liblog/fake_log_device.c @@ -352,7 +352,7 @@ static ssize_t fake_writev(int fd, const struct iovec *iov, int iovcnt) { static void showLog(LogState *state, int logPrio, const char* tag, const char* msg) { -#if defined(HAVE_LOCALTIME_R) +#if !defined(_WIN32) struct tm tmBuf; #endif struct tm* ptm; @@ -377,7 +377,7 @@ static void showLog(LogState *state, * in the time stamp. Don't use forward slashes, parenthesis, * brackets, asterisks, or other special chars here. */ -#if defined(HAVE_LOCALTIME_R) +#if !defined(_WIN32) ptm = localtime_r(&when, &tmBuf); #else ptm = localtime(&when); diff --git a/liblog/log_time.cpp b/liblog/log_time.cpp index 755c2d9..209a9da 100644 --- a/liblog/log_time.cpp +++ b/liblog/log_time.cpp @@ -39,7 +39,7 @@ char *log_time::strptime(const char *s, const char *format) { #endif struct tm *ptm; -#if (defined(HAVE_LOCALTIME_R)) +#if !defined(_WIN32) struct tm tmBuf; ptm = localtime_r(&now, &tmBuf); #else @@ -78,7 +78,7 @@ char *log_time::strptime(const char *s, const char *format) { ++ret; } now = tv_sec; -#if (defined(HAVE_LOCALTIME_R)) +#if !defined(_WIN32) ptm = localtime_r(&now, &tmBuf); #else ptm = localtime(&now); diff --git a/liblog/logprint.c b/liblog/logprint.c index 244f723..9b5a543 100644 --- a/liblog/logprint.c +++ b/liblog/logprint.c @@ -726,7 +726,7 @@ char *android_log_formatLogLine ( const AndroidLogEntry *entry, size_t *p_outLength) { -#if defined(HAVE_LOCALTIME_R) +#if !defined(_WIN32) struct tm tmBuf; #endif struct tm* ptm; @@ -749,7 +749,7 @@ char *android_log_formatLogLine ( * in the time stamp. Don't use forward slashes, parenthesis, * brackets, asterisks, or other special chars here. */ -#if defined(HAVE_LOCALTIME_R) +#if !defined(_WIN32) ptm = localtime_r(&(entry->tv_sec), &tmBuf); #else ptm = localtime(&(entry->tv_sec)); diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c index 3fc3577..9ba81ff 100644 --- a/sdcard/sdcard.c +++ b/sdcard/sdcard.c @@ -1269,6 +1269,7 @@ static int handle_write(struct fuse* fuse, struct fuse_handler* handler, return -errno; } out.size = res; + out.padding = 0; fuse_reply(fuse, hdr->unique, &out, sizeof(out)); return NO_STATUS; } |