69d2f98197
This commit fixes two somewhat related issues in shell_service.
- The fd returned by StartSubprocess is owned by a unique_fd
contained in the Subprocess object, but also gets closed by the
caller. Resolve this by duping the returned file descriptor.
- A Subprocess object can be destroyed immediately after its initial
construction in StartSubprocess if we're sufficiently unlucky.
Split up the fork/exec and "start management thread" steps, so that
we can safely do everything we need to do on the Subprocess before
handing it over to the thread that'll eventually destroy it.
Also includes squashed patches from AOSP master that allow for use of
unique_fd inside adb.
Bug: http://b/29254462
Change-Id: Id9cf0b7e7a7293bee7176919edc758597691c636
(cherry picked from commit c0e6e40cc9)
(cherry picked from commit 54c72aaccc)
(cherry picked from commit 2c5d1d7cd9)
(cherry picked from commit 2a7b86337f)
(cherry picked from commit 13ea01db45)
(cherry picked from commit 344778da41)
68 lines
2.2 KiB
C++
68 lines
2.2 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef ANDROID_BASE_STRINGS_H
|
|
#define ANDROID_BASE_STRINGS_H
|
|
|
|
#include <sstream>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
namespace android {
|
|
namespace base {
|
|
|
|
// Splits a string into a vector of strings.
|
|
//
|
|
// The string is split at each occurrence of a character in delimiters.
|
|
//
|
|
// The empty string is not a valid delimiter list.
|
|
std::vector<std::string> Split(const std::string& s,
|
|
const std::string& delimiters);
|
|
|
|
// Trims whitespace off both ends of the given string.
|
|
std::string Trim(const std::string& s);
|
|
|
|
// Joins a container of things into a single string, using the given separator.
|
|
template <typename ContainerT, typename SeparatorT>
|
|
std::string Join(const ContainerT& things, SeparatorT separator) {
|
|
if (things.empty()) {
|
|
return "";
|
|
}
|
|
|
|
std::ostringstream result;
|
|
result << *things.begin();
|
|
for (auto it = std::next(things.begin()); it != things.end(); ++it) {
|
|
result << separator << *it;
|
|
}
|
|
return result.str();
|
|
}
|
|
|
|
// We instantiate the common cases in strings.cpp.
|
|
extern template std::string Join(const std::vector<std::string>&, char);
|
|
extern template std::string Join(const std::vector<const char*>&, char);
|
|
extern template std::string Join(const std::vector<std::string>&, const std::string&);
|
|
extern template std::string Join(const std::vector<const char*>&, const std::string&);
|
|
|
|
// Tests whether 's' starts with 'prefix'.
|
|
bool StartsWith(const std::string& s, const char* prefix);
|
|
|
|
// Tests whether 's' ends with 'suffix'.
|
|
bool EndsWith(const std::string& s, const char* suffix);
|
|
|
|
} // namespace base
|
|
} // namespace android
|
|
|
|
#endif // ANDROID_BASE_STRINGS_H
|