f21edf3edd
Certain error conditions were getting lost because adb was wrongly reading DeployAgent's return code as always 0. Test: mm -j 72 Test: adb install -r --fastdeploy --force-agent --local-agent /mnt/raid/boat-attack-apk/boat-attack-swappy.apk Bug: 120197330 Change-Id: If835fd6ca2051be8e5ff6c957e08b1e458053989
99 lines
2.9 KiB
C++
99 lines
2.9 KiB
C++
/*
|
|
* Copyright (C) 2018 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.
|
|
*/
|
|
|
|
#define TRACE_TAG ADB
|
|
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "client/file_sync_client.h"
|
|
#include "commandline.h"
|
|
#include "sysdeps.h"
|
|
|
|
#include "fastdeploycallbacks.h"
|
|
|
|
static void appendBuffer(std::vector<char>* buffer, const char* input, int length) {
|
|
if (buffer != NULL) {
|
|
buffer->insert(buffer->end(), input, input + length);
|
|
}
|
|
}
|
|
|
|
class DeployAgentBufferCallback : public StandardStreamsCallbackInterface {
|
|
public:
|
|
DeployAgentBufferCallback(std::vector<char>* outBuffer, std::vector<char>* errBuffer);
|
|
|
|
virtual void OnStdout(const char* buffer, int length);
|
|
virtual void OnStderr(const char* buffer, int length);
|
|
virtual int Done(int status);
|
|
|
|
private:
|
|
std::vector<char>* mpOutBuffer;
|
|
std::vector<char>* mpErrBuffer;
|
|
};
|
|
|
|
int capture_shell_command(const char* command, std::vector<char>* outBuffer,
|
|
std::vector<char>* errBuffer) {
|
|
DeployAgentBufferCallback cb(outBuffer, errBuffer);
|
|
return send_shell_command(command, false, &cb);
|
|
}
|
|
|
|
DeployAgentFileCallback::DeployAgentFileCallback(FILE* outputFile, std::vector<char>* errBuffer) {
|
|
mpOutFile = outputFile;
|
|
mpErrBuffer = errBuffer;
|
|
mBytesWritten = 0;
|
|
}
|
|
|
|
void DeployAgentFileCallback::OnStdout(const char* buffer, int length) {
|
|
if (mpOutFile != NULL) {
|
|
int bytes_written = fwrite(buffer, 1, length, mpOutFile);
|
|
if (bytes_written != length) {
|
|
printf("Write error %d\n", bytes_written);
|
|
}
|
|
mBytesWritten += bytes_written;
|
|
}
|
|
}
|
|
|
|
void DeployAgentFileCallback::OnStderr(const char* buffer, int length) {
|
|
appendBuffer(mpErrBuffer, buffer, length);
|
|
}
|
|
|
|
int DeployAgentFileCallback::Done(int status) {
|
|
return status;
|
|
}
|
|
|
|
int DeployAgentFileCallback::getBytesWritten() {
|
|
return mBytesWritten;
|
|
}
|
|
|
|
DeployAgentBufferCallback::DeployAgentBufferCallback(std::vector<char>* outBuffer,
|
|
std::vector<char>* errBuffer) {
|
|
mpOutBuffer = outBuffer;
|
|
mpErrBuffer = errBuffer;
|
|
}
|
|
|
|
void DeployAgentBufferCallback::OnStdout(const char* buffer, int length) {
|
|
appendBuffer(mpOutBuffer, buffer, length);
|
|
}
|
|
|
|
void DeployAgentBufferCallback::OnStderr(const char* buffer, int length) {
|
|
appendBuffer(mpErrBuffer, buffer, length);
|
|
}
|
|
|
|
int DeployAgentBufferCallback::Done(int status) {
|
|
return status;
|
|
}
|