ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "[adb] Followup CL to clean up adb_auth_host.cpp"

Browse source
This commit is contained in:
Treehugger Robot 2016-05-27 23:08:06 +00:00 • committed by Gerrit Code Review
commit 9c7f9215e4
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
adb/adb_auth_host.cpp
View file

@ -24,15 +24,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifndef _WIN32
# include <sys/types.h>
# include <sys/stat.h>
# include <unistd.h>
#endif
#include "adb.h" #include "adb.h"
#include <android-base/errors.h> #include <android-base/errors.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <crypto_utils/android_pubkey.h> #include <crypto_utils/android_pubkey.h>
#include <cutils/list.h> #include <cutils/list.h>
@ -242,25 +237,23 @@ static int read_key(const char *file, struct listnode *list)
static int get_user_keyfilepath(char *filename, size_t len) static int get_user_keyfilepath(char *filename, size_t len)
{ {
char android_dir[PATH_MAX]; const std::string home = adb_get_homedir_path(true);
struct stat buf;
std::string home = adb_get_homedir_path(true);
D("home '%s'", home.c_str()); D("home '%s'", home.c_str());
if (snprintf(android_dir, sizeof(android_dir), "%s%c%s", home.c_str(), const std::string android_dir =
OS_PATH_SEPARATOR, ANDROID_PATH) >= (int)sizeof(android_dir)) android::base::StringPrintf("%s%c%s", home.c_str(),
return -1; OS_PATH_SEPARATOR, ANDROID_PATH);
if (stat(android_dir, &buf)) { struct stat buf;
if (adb_mkdir(android_dir, 0750) < 0) { if (stat(android_dir.c_str(), &buf)) {
D("Cannot mkdir '%s'", android_dir); if (adb_mkdir(android_dir.c_str(), 0750) < 0) {
D("Cannot mkdir '%s'", android_dir.c_str());
return -1; return -1;
} }
} }
return snprintf(filename, len, "%s%c%s", android_dir, OS_PATH_SEPARATOR, return snprintf(filename, len, "%s%c%s",
ADB_KEY_FILE); android_dir.c_str(), OS_PATH_SEPARATOR, ADB_KEY_FILE);
} }
static int get_user_key(struct listnode *list) static int get_user_key(struct listnode *list)