From d55015e4cfd419582a4c7710125571241a377480 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Sun, 17 Oct 2021 16:30:07 +0200 Subject: [PATCH] Expose function to get the device serial Expose adb_get_serialno() to retrieve the device serial via the command "adb getserialno". --- app/src/adb.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ app/src/adb.h | 4 ++++ 2 files changed, 48 insertions(+) diff --git a/app/src/adb.c b/app/src/adb.c index 6b4d6fc0..7f7e28d8 100644 --- a/app/src/adb.c +++ b/app/src/adb.c @@ -233,3 +233,47 @@ adb_install(const char *serial, const char *local) { return proc; } + +static ssize_t +adb_execute_for_output(const char *serial, const char *const adb_cmd[], + size_t adb_cmd_len, char *buf, size_t buf_len, + const char *name) { + pipe_t pipe_stdout; + process_t proc = adb_execute_redirect(serial, adb_cmd, adb_cmd_len, NULL, + &pipe_stdout, NULL); + + ssize_t r = read_pipe_all(pipe_stdout, buf, buf_len); + close_pipe(pipe_stdout); + + if (!process_check_success(proc, name, true)) { + return -1; + } + + return r; +} + +static size_t +truncate_first_line(char *data, size_t len) { + data[len - 1] = '\0'; + char *eol = strpbrk(data, "\r\n"); + if (eol) { + *eol = '\0'; + len = eol - data; + } + return len; +} + +char * +adb_get_serialno(void) { + char buf[128]; + + const char *const adb_cmd[] = {"get-serialno"}; + ssize_t r = adb_execute_for_output(NULL, adb_cmd, ARRAY_LEN(adb_cmd), + buf, sizeof(buf), "get-serialno"); + if (r <= 0) { + return NULL; + } + + truncate_first_line(buf, r); + return strdup(buf); +} diff --git a/app/src/adb.h b/app/src/adb.h index d2f703a7..34182fd3 100644 --- a/app/src/adb.h +++ b/app/src/adb.h @@ -36,4 +36,8 @@ adb_push(const char *serial, const char *local, const char *remote); process_t adb_install(const char *serial, const char *local); +// Return the result of "adb get-serialno". +char * +adb_get_serialno(void); + #endif