Merge changes I1d398d19,I8f20b3cd am: c97b73aa83 am: 0889353fa5 am: 6c41b5efb1 (16203ffd) · Commits · e / os / android_system_core

adb/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ LIBADB_TEST_SRCS := \
		fdevent_test.cpp \
		socket_test.cpp \
		sysdeps_test.cpp \
		sysdeps/stat_test.cpp \
		transport_test.cpp \

		LIBADB_CFLAGS := \
		@@ -90,6 +91,7 @@ LIBADB_linux_SRC_FILES := \

		LIBADB_windows_SRC_FILES := \
		sysdeps_win32.cpp \
		sysdeps/win32/stat.cpp \
		usb_windows.cpp \

		LIBADB_TEST_windows_SRCS := \

adb/adb_utils_test.cpp

+29 −13

Original line number	Diff line number	Diff line
		@@ -52,25 +52,35 @@ TEST(adb_utils, directory_exists) {

		ASSERT_TRUE(directory_exists(profiles_dir));

		ASSERT_FALSE(directory_exists(subdir(profiles_dir, "does-not-exist")));
		#else
		ASSERT_TRUE(directory_exists("/proc"));
		ASSERT_FALSE(directory_exists("/proc/self")); // Symbolic link.
		ASSERT_FALSE(directory_exists("/proc/does-not-exist"));
		#endif
		}

		#if defined(_WIN32)
		TEST(adb_utils, directory_exists_win32_symlink_junction) {
		char profiles_dir[MAX_PATH];
		DWORD cch = arraysize(profiles_dir);

		// On typical Windows 7, returns C:\Users
		ASSERT_TRUE(GetProfilesDirectoryA(profiles_dir, &cch));

		// On modern (English?) Windows, this is a directory symbolic link to
		// C:\ProgramData. Symbolic links are rare on Windows and the user requires
		// a special permission (by default granted to Administrative users) to
		// create symbolic links.
		ASSERT_FALSE(directory_exists(subdir(profiles_dir, "All Users")));
		EXPECT_FALSE(directory_exists(subdir(profiles_dir, "All Users")));

		// On modern (English?) Windows, this is a directory junction to
		// C:\Users\Default. Junctions are used throughout user profile directories
		// for backwards compatibility and they don't require any special permissions
		// to create.
		ASSERT_FALSE(directory_exists(subdir(profiles_dir, "Default User")));

		ASSERT_FALSE(directory_exists(subdir(profiles_dir, "does-not-exist")));
		#else
		ASSERT_TRUE(directory_exists("/proc"));
		ASSERT_FALSE(directory_exists("/proc/self")); // Symbolic link.
		ASSERT_FALSE(directory_exists("/proc/does-not-exist"));
		#endif
		EXPECT_FALSE(directory_exists(subdir(profiles_dir, "Default User")));
		}
		#endif

		TEST(adb_utils, escape_arg) {
		ASSERT_EQ(R"('')", escape_arg(""));
		@@ -113,14 +123,20 @@ TEST(adb_utils, adb_dirname) {

		void test_mkdirs(const std::string& basepath) {
		// Test creating a directory hierarchy.
		EXPECT_TRUE(mkdirs(basepath));
		ASSERT_TRUE(mkdirs(basepath));
		// Test finding an existing directory hierarchy.
		EXPECT_TRUE(mkdirs(basepath));
		ASSERT_TRUE(mkdirs(basepath));
		// Test mkdirs on an existing hierarchy with a trailing slash.
		ASSERT_TRUE(mkdirs(basepath + '/'));
		#if defined(_WIN32)
		ASSERT_TRUE(mkdirs(basepath + '\\'));
		#endif

		const std::string filepath = basepath + "/file";
		// Verify that the hierarchy was created by trying to create a file in it.
		EXPECT_NE(-1, adb_creat(filepath.c_str(), 0600));
		ASSERT_NE(-1, adb_creat(filepath.c_str(), 0600));
		// If a file exists where we want a directory, the operation should fail.
		EXPECT_FALSE(mkdirs(filepath));
		ASSERT_FALSE(mkdirs(filepath));
		}

		TEST(adb_utils, mkdirs) {

adb/sysdeps.h

+2 −23

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@
		#include <android-base/unique_fd.h>
		#include <android-base/utf8.h>

		#include "sysdeps/stat.h"

		/*
		* 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
		@@ -199,8 +201,6 @@ static __inline__ void close_on_exec(int fd)
		/* nothing really */
		}

		#define lstat stat /* no symlinks on Win32 */

		#define S_ISLNK(m) 0 /* no symlinks on Win32 */

		extern int adb_unlink(const char* path);
		@@ -307,27 +307,6 @@ static __inline__ int adb_is_absolute_host_path(const char* path) {
		return isalpha(path[0]) && path[1] == ':' && path[2] == '\\';
		}

		// 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);

adb/sysdeps/stat.h

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 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.
		*/

		#pragma once

		#include <sys/stat.h>
		#include <sys/types.h>
		#include <unistd.h>

		#if defined(_WIN32)
		// stat is broken on Win32: stat on a path with a trailing slash or backslash will always fail with
		// ENOENT.
		int adb_stat(const char* path, struct adb_stat* buf);

		// 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 {};

		#undef stat
		#define stat adb_stat

		// Windows doesn't have lstat.
		#define lstat adb_stat

		#endif

adb/sysdeps/stat_test.cpp

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 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.
		*/

		#include <string>

		#include <android-base/test_utils.h>
		#include <gtest/gtest.h>

		#include "adb_utils.h"
		#include "sysdeps.h"

		TEST(sysdeps, stat) {
		TemporaryDir td;
		TemporaryFile tf;

		struct stat st;
		ASSERT_EQ(0, stat(td.path, &st));
		ASSERT_FALSE(S_ISREG(st.st_mode));
		ASSERT_TRUE(S_ISDIR(st.st_mode));

		ASSERT_EQ(0, stat((std::string(td.path) + '/').c_str(), &st));
		ASSERT_TRUE(S_ISDIR(st.st_mode));

		#if defined(_WIN32)
		ASSERT_EQ(0, stat((std::string(td.path) + '\\').c_str(), &st));
		ASSERT_TRUE(S_ISDIR(st.st_mode));
		#endif

		std::string nonexistent_path = std::string(td.path) + "/nonexistent";
		ASSERT_EQ(-1, stat(nonexistent_path.c_str(), &st));
		ASSERT_EQ(ENOENT, errno);

		ASSERT_EQ(-1, stat((nonexistent_path + "/").c_str(), &st));
		ASSERT_EQ(ENOENT, errno);

		#if defined(_WIN32)
		ASSERT_EQ(-1, stat((nonexistent_path + "\\").c_str(), &st));
		ASSERT_EQ(ENOENT, errno);
		#endif

		ASSERT_EQ(0, stat(tf.path, &st));
		ASSERT_TRUE(S_ISREG(st.st_mode));
		ASSERT_FALSE(S_ISDIR(st.st_mode));

		ASSERT_EQ(-1, stat((std::string(tf.path) + '/').c_str(), &st));
		ASSERT_EQ(ENOTDIR, errno);

		#if defined(_WIN32)
		ASSERT_EQ(-1, stat((std::string(tf.path) + '\\').c_str(), &st));
		ASSERT_EQ(ENOTDIR, errno);
		#endif
		}