openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

adb: make sure that file mode macros match linux. 

We use <sys/stat.h> mode macros on the host to parse modes sent over
from the device, so they had better match. Add static_asserts to ensure
this.

(Also, fix the cases where they don't.)

Test: mma -j48, compiled the static_asserts on darwin manually
Change-Id: I883e4e6c7489ea64d3c02d26790ac8293366d989
This commit is contained in:
Josh Gao 2016-11-18 15:17:07 -08:00
parent b6552f376c
commit 05a3abfef3
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
adb/file_sync_client.cpp
View File

@ -43,6 +43,7 @@
#include "adb_utils.h"
#include "file_sync_service.h"
#include "line_printer.h"
#include "sysdeps/stat.h"
#include <android-base/file.h>
#include <android-base/strings.h>
@ -64,15 +65,11 @@ static void ensure_trailing_separators(std::string& local_path, std::string& rem
}
static bool should_pull_file(mode_t mode) {
return mode & (S_IFREG | S_IFBLK | S_IFCHR);
return S_ISREG(mode) || S_ISBLK(mode) || S_ISCHR(mode);
}
static bool should_push_file(mode_t mode) {
mode_t mask = S_IFREG;
#if !defined(_WIN32)
mask |= S_IFLNK;
#endif
return mode & mask;
return S_ISREG(mode) || S_ISLNK(mode);
}
struct copyinfo {

2
adb/sysdeps.h
View File

@ -180,8 +180,6 @@ static __inline__ void close_on_exec(int fd)
/* nothing really */
}
#define S_ISLNK(m) 0 /* no symlinks on Win32 */
extern int adb_unlink(const char* path);
#undef unlink
#define unlink ___xxx_unlink

17
adb/sysdeps/stat.h
View File

@ -43,4 +43,21 @@ struct adb_stat : public stat {};
// Windows doesn't have lstat.
#define lstat adb_stat
// mingw doesn't define S_IFLNK or S_ISLNK.
#define S_IFLNK 0120000
#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
// mingw defines S_IFBLK to a different value from bionic.
#undef S_IFBLK
#define S_IFBLK 0060000
#undef S_ISBLK
#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)
#endif
// Make sure that host file mode values match the ones on the device.
static_assert(S_IFMT == 00170000, "");
static_assert(S_IFLNK == 0120000, "");
static_assert(S_IFREG == 0100000, "");
static_assert(S_IFBLK == 0060000, "");
static_assert(S_IFDIR == 0040000, "");
static_assert(S_IFCHR == 0020000, "");