Skip to content

Display and control your Android device

Expose adb execution with redirection

Romain Vimont96b18dabaad0
diff --git a/app/src/adb.c b/app/src/adb.c
index 5bb9df30..6b4d6fc0 100644
--- a/app/src/adb.c
+++ b/app/src/adb.c
@@ -109,7 +109,9 @@ show_adb_err_msg(enum process_result err, const char *const argv[]) {
}
process_t
-adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {
+adb_execute_redirect(const char *serial, const char *const adb_cmd[],
+ size_t len, pipe_t *pipe_stdin, pipe_t *pipe_stdout,
+ pipe_t *pipe_stderr) {
int i;
process_t process;
@@ -129,7 +131,9 @@ adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {
memcpy(&argv[i], adb_cmd, len * sizeof(const char *));
argv[len + i] = NULL;
- enum process_result r = process_execute(argv, &process);
+ enum process_result r =
+ process_execute_redirect(argv, &process, pipe_stdin, pipe_stdout,
+ pipe_stderr);
if (r != PROCESS_SUCCESS) {
show_adb_err_msg(r, argv);
process = PROCESS_NONE;
@@ -139,6 +143,11 @@ adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {
return process;
}
+process_t
+adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {
+ return adb_execute_redirect(serial, adb_cmd, len, NULL, NULL, NULL);
+}
+
process_t
adb_forward(const char *serial, uint16_t local_port,
const char *device_socket_name) {
diff --git a/app/src/adb.h b/app/src/adb.h
index e27f34fa..d2f703a7 100644
--- a/app/src/adb.h
+++ b/app/src/adb.h
@@ -11,6 +11,11 @@
process_t
adb_execute(const char *serial, const char *const adb_cmd[], size_t len);
+process_t
+adb_execute_redirect(const char *serial, const char *const adb_cmd[],
+ size_t len, pipe_t *pipe_stdin, pipe_t *pipe_stdout,
+ pipe_t *pipe_stderr);
+
process_t
adb_forward(const char *serial, uint16_t local_port,
const char *device_socket_name);