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)
100 lines
2.3 KiB
C++
100 lines
2.3 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 _ADB_UTILS_H_
|
|
#define _ADB_UTILS_H_
|
|
|
|
#include <string>
|
|
|
|
#include <android-base/macros.h>
|
|
#include <android-base/unique_fd.h>
|
|
|
|
void close_stdin();
|
|
|
|
bool getcwd(std::string* cwd);
|
|
bool directory_exists(const std::string& path);
|
|
|
|
// Like the regular basename and dirname, but thread-safe on all
|
|
// platforms and capable of correctly handling exotic Windows paths.
|
|
std::string adb_basename(const std::string& path);
|
|
std::string adb_dirname(const std::string& path);
|
|
|
|
// Return the user's home directory.
|
|
// |check_env_first| - if true, on Windows check the ANDROID_SDK_HOME
|
|
// environment variable before trying the WinAPI call (useful when looking for
|
|
// the .android directory)
|
|
std::string adb_get_homedir_path(bool check_env_first);
|
|
|
|
bool mkdirs(const std::string& path);
|
|
|
|
std::string escape_arg(const std::string& s);
|
|
|
|
std::string dump_hex(const void* ptr, size_t byte_count);
|
|
|
|
std::string perror_str(const char* msg);
|
|
|
|
bool set_file_block_mode(int fd, bool block);
|
|
|
|
extern int adb_close(int fd);
|
|
|
|
// Helper to automatically close an FD when it goes out of scope.
|
|
struct AdbCloser {
|
|
static void Close(int fd) {
|
|
adb_close(fd);
|
|
}
|
|
};
|
|
|
|
using unique_fd = android::base::unique_fd_impl<AdbCloser>;
|
|
|
|
class ScopedFd {
|
|
public:
|
|
ScopedFd() {
|
|
}
|
|
|
|
~ScopedFd() {
|
|
Reset();
|
|
}
|
|
|
|
void Reset(int fd = -1) {
|
|
if (fd != fd_) {
|
|
if (valid()) {
|
|
adb_close(fd_);
|
|
}
|
|
fd_ = fd;
|
|
}
|
|
}
|
|
|
|
int Release() {
|
|
int temp = fd_;
|
|
fd_ = -1;
|
|
return temp;
|
|
}
|
|
|
|
bool valid() const {
|
|
return fd_ >= 0;
|
|
}
|
|
|
|
int fd() const {
|
|
return fd_;
|
|
}
|
|
|
|
private:
|
|
int fd_ = -1;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(ScopedFd);
|
|
};
|
|
|
|
#endif
|