|
|
|
|
@ -587,38 +587,6 @@ sc_adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
|
|
|
|
|
return strdup(buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
sc_adb_get_serialno(struct sc_intr *intr, unsigned flags) {
|
|
|
|
|
const char *const argv[] = SC_ADB_COMMAND("get-serialno");
|
|
|
|
|
|
|
|
|
|
sc_pipe pout;
|
|
|
|
|
sc_pid pid = sc_adb_execute_p(argv, flags, &pout);
|
|
|
|
|
if (pid == SC_PROCESS_NONE) {
|
|
|
|
|
LOGE("Could not execute \"adb get-serialno\"");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char buf[128];
|
|
|
|
|
ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf) - 1);
|
|
|
|
|
sc_pipe_close(pout);
|
|
|
|
|
|
|
|
|
|
bool ok = process_check_success_intr(intr, pid, "adb get-serialno", flags);
|
|
|
|
|
if (!ok) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (r == -1) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert((size_t) r < sizeof(buf));
|
|
|
|
|
buf[r] = '\0';
|
|
|
|
|
size_t len = strcspn(buf, " \r\n");
|
|
|
|
|
buf[len] = '\0';
|
|
|
|
|
|
|
|
|
|
return strdup(buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags) {
|
|
|
|
|
assert(serial);
|
|
|
|
|
|