Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Add adb flag to disable execution error logs

Browse source 
In addition to disable stdout and stderr of the child process, add a
flag to disable the error log printed by scrcpy if the command failed.

This will we useful for commands which are expected to fail in some
cases (like "adb disconnect" if the device is not connected).

PR #2827 <https://github.com/Genymobile/scrcpy/pull/2827>
This commit is contained in:
Romain Vimont 2021-11-25 22:05:38 +01:00
parent e3d4aa8c5d
commit e6e6f865a0
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/adb.c
View file

@ -112,33 +112,41 @@ show_adb_err_msg(enum sc_process_result err, const char *const argv[]) {
} }
static bool static bool
process_check_success_internal(sc_pid pid, const char *name, bool close) { process_check_success_internal(sc_pid pid, const char *name, bool close,
unsigned flags) {
bool log_errors = !(flags & SC_ADB_NO_LOGERR);
if (pid == SC_PROCESS_NONE) { if (pid == SC_PROCESS_NONE) {
if (log_errors) {
LOGE("Could not execute \"%s\"", name); LOGE("Could not execute \"%s\"", name);
}
return false; return false;
} }
sc_exit_code exit_code = sc_process_wait(pid, close); sc_exit_code exit_code = sc_process_wait(pid, close);
if (exit_code) { if (exit_code) {
if (log_errors) {
if (exit_code != SC_EXIT_CODE_NONE) { if (exit_code != SC_EXIT_CODE_NONE) {
LOGE("\"%s\" returned with value %" SC_PRIexitcode, name, LOGE("\"%s\" returned with value %" SC_PRIexitcode, name,
exit_code); exit_code);
} else { } else {
LOGE("\"%s\" exited unexpectedly", name); LOGE("\"%s\" exited unexpectedly", name);
} }
}
return false; return false;
} }
return true; return true;
} }
static bool static bool
process_check_success_intr(struct sc_intr *intr, sc_pid pid, const char *name) { process_check_success_intr(struct sc_intr *intr, sc_pid pid, const char *name,
unsigned flags) {
if (!sc_intr_set_process(intr, pid)) { if (!sc_intr_set_process(intr, pid)) {
// Already interrupted // Already interrupted
return false; return false;
} }
// Always pass close=false, interrupting would be racy otherwise // Always pass close=false, interrupting would be racy otherwise
bool ret = process_check_success_internal(pid, name, false); bool ret = process_check_success_internal(pid, name, false, flags);
sc_intr_set_process(intr, SC_PROCESS_NONE); sc_intr_set_process(intr, SC_PROCESS_NONE);
@ -217,7 +225,7 @@ adb_forward(struct sc_intr *intr, const char *serial, uint16_t local_port,
const char *const adb_cmd[] = {"forward", local, remote}; const char *const adb_cmd[] = {"forward", local, remote};
sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags); sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
return process_check_success_intr(intr, pid, "adb forward"); return process_check_success_intr(intr, pid, "adb forward", flags);
} }
bool bool
@ -228,7 +236,7 @@ adb_forward_remove(struct sc_intr *intr, const char *serial,
const char *const adb_cmd[] = {"forward", "--remove", local}; const char *const adb_cmd[] = {"forward", "--remove", local};
sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags); sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
return process_check_success_intr(intr, pid, "adb forward --remove"); return process_check_success_intr(intr, pid, "adb forward --remove", flags);
} }
bool bool
@ -242,7 +250,7 @@ adb_reverse(struct sc_intr *intr, const char *serial,
const char *const adb_cmd[] = {"reverse", remote, local}; const char *const adb_cmd[] = {"reverse", remote, local};
sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags); sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
return process_check_success_intr(intr, pid, "adb reverse"); return process_check_success_intr(intr, pid, "adb reverse", flags);
} }
bool bool
@ -253,7 +261,7 @@ adb_reverse_remove(struct sc_intr *intr, const char *serial,
const char *const adb_cmd[] = {"reverse", "--remove", remote}; const char *const adb_cmd[] = {"reverse", "--remove", remote};
sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags); sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
return process_check_success_intr(intr, pid, "adb reverse --remove"); return process_check_success_intr(intr, pid, "adb reverse --remove", flags);
} }
bool bool
@ -281,7 +289,7 @@ adb_push(struct sc_intr *intr, const char *serial, const char *local,
free((void *) local); free((void *) local);
#endif #endif
return process_check_success_intr(intr, pid, "adb push"); return process_check_success_intr(intr, pid, "adb push", flags);
} }
bool bool
@ -303,7 +311,7 @@ adb_install(struct sc_intr *intr, const char *serial, const char *local,
free((void *) local); free((void *) local);
#endif #endif
return process_check_success_intr(intr, pid, "adb install"); return process_check_success_intr(intr, pid, "adb install", flags);
} }
char * char *
@ -321,7 +329,7 @@ adb_get_serialno(struct sc_intr *intr, unsigned flags) {
ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf)); ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf));
sc_pipe_close(pout); sc_pipe_close(pout);
bool ok = process_check_success_intr(intr, pid, "adb get-serialno"); bool ok = process_check_success_intr(intr, pid, "adb get-serialno", flags);
if (!ok) { if (!ok) {
return NULL; return NULL;
} }

1
app/src/adb.h
View file

@ -10,6 +10,7 @@
#define SC_ADB_NO_STDOUT (1 << 0) #define SC_ADB_NO_STDOUT (1 << 0)
#define SC_ADB_NO_STDERR (1 << 1) #define SC_ADB_NO_STDERR (1 << 1)
#define SC_ADB_NO_LOGERR (1 << 2)
sc_pid sc_pid
adb_execute(const char *serial, const char *const adb_cmd[], size_t len, adb_execute(const char *serial, const char *const adb_cmd[], size_t len,