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

Merge "Fix quoting of paths in auth code." am: b371af9e0f

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1363936

Change-Id: Ide1441464235ad2839b752e3642a8c88aa7cd784
This commit is contained in:
Treehugger Robot 2020-07-16 17:01:22 +00:00 • committed by Automerger Merge Worker
commit f898aade18
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adb/client/auth.cpp
View file

@ -400,12 +400,12 @@ static void adb_auth_inotify_init(const std::set<std::string>& paths) {
for (const std::string& path : paths) { for (const std::string& path : paths) {
int wd = inotify_add_watch(infd, path.c_str(), IN_CREATE | IN_MOVED_TO); int wd = inotify_add_watch(infd, path.c_str(), IN_CREATE | IN_MOVED_TO);
if (wd < 0) { if (wd < 0) {
PLOG(ERROR) << "failed to inotify_add_watch on path '" << path; PLOG(ERROR) << "failed to inotify_add_watch on path '" << path << "'";
continue; continue;
} }
g_monitored_paths[wd] = path; g_monitored_paths[wd] = path;
LOG(INFO) << "watch descriptor " << wd << " registered for " << path; LOG(INFO) << "watch descriptor " << wd << " registered for '" << path << "'";
} }
fdevent* event = fdevent_create(infd, adb_auth_inotify_update, nullptr); fdevent* event = fdevent_create(infd, adb_auth_inotify_update, nullptr);