From 7e0541bb470a66d401c998c45d4f77e5a6ea089b Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Tue, 8 Sep 2020 16:05:01 +0300
Subject: [PATCH] Pipeline for macos fixed
---
dap-sdk/core/include/dap_common.h | 3 +--
dap-sdk/core/src/dap_common.c | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/dap-sdk/core/include/dap_common.h b/dap-sdk/core/include/dap_common.h
index 874a5dc568..1fb9ca8e86 100755
--- a/dap-sdk/core/include/dap_common.h
+++ b/dap-sdk/core/include/dap_common.h
@@ -392,8 +392,7 @@ int timespec_diff(struct timespec *a_start, struct timespec *a_stop, struct time
int get_select_breaker(void);
int send_select_break(void);
-char * exec_with_ret(const char * a_cmd);
-char * exec_with_ret_multistring(const char * a_cmd);
+int exec_with_ret(char**, const char*);
char * dap_random_string_create_alloc(size_t a_length);
void dap_random_string_fill(char *str, size_t length);
void dap_dump_hex(const void* data, size_t size);
diff --git a/dap-sdk/core/src/dap_common.c b/dap-sdk/core/src/dap_common.c
index ea8ffebd01..7d7f37c473 100755
--- a/dap-sdk/core/src/dap_common.c
+++ b/dap-sdk/core/src/dap_common.c
@@ -519,6 +519,27 @@ int send_select_break( )
return 0;
}
+
+int exec_with_ret(char** repl, const char * a_cmd) {
+ FILE * fp;
+ size_t buf_len = 0;
+ char buf[4096] = {0};
+ fp = popen(a_cmd, "r");
+ if (!fp) {
+ log_it(L_ERROR,"Cmd execution error: '%s'", strerror(errno));
+ return(255);
+ }
+ memset(buf, 0, sizeof(buf));
+ fgets(buf, sizeof(buf) - 1, fp);
+ buf_len = strlen(buf);
+ if(repl) {
+ if(buf[buf_len - 1] == '\n')
+ buf[buf_len - 1] ='\0';
+ *repl = strdup(buf);
+ }
+ return pclose(fp);
+}
+
#ifdef ANDROID1
static u_long myNextRandom = 1;
--
GitLab