xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-3113] <fix>: remove curl from TDengine. fix windows compile issue.

This commit is contained in:
Shuduo Sang 2021-03-02 13:27:44 +08:00
parent b2294d84bf
commit 860ede89a2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/kit/taosdemo/taosdemo.c
View File

@ -65,6 +65,9 @@
#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
#endif #endif
#define REQ_EXTRA_BUF_LEN 1024
#define RESP_BUF_LEN 4096
static HANDLE g_stdoutHandle; static HANDLE g_stdoutHandle;
static DWORD g_consoleMode; static DWORD g_consoleMode;
@ -1510,10 +1513,7 @@ static void printfQuerySystemInfo(TAOS * taos) {
} }
#define REQ_EXTRA_BUF_LEN 1024 void ERROR_EXIT(const char *msg) { perror(msg); exit(0); }
#define RESP_BUF_LEN 4096
void ERROR(const char *msg) { perror(msg); exit(0); }
int postProceSql(char* host, uint16_t port, char* sqlstr) int postProceSql(char* host, uint16_t port, char* sqlstr)
{ {
@ -1533,7 +1533,7 @@ int postProceSql(char* host, uint16_t port, char* sqlstr)
request_buf = malloc(req_buf_len); request_buf = malloc(req_buf_len);
if (NULL == request_buf) if (NULL == request_buf)
ERROR("ERROR, cannot allocate memory."); ERROR_EXIT("ERROR, cannot allocate memory.");
int r = snprintf(request_buf, int r = snprintf(request_buf,
req_buf_len, req_buf_len,
@ -1541,20 +1541,20 @@ int postProceSql(char* host, uint16_t port, char* sqlstr)
auth, strlen(sqlstr), sqlstr); auth, strlen(sqlstr), sqlstr);
if (r >= req_buf_len) { if (r >= req_buf_len) {
free(request_buf); free(request_buf);
ERROR("ERROR too long request"); ERROR_EXIT("ERROR too long request");
} }
printf("Request:\n%s\n", request_buf); printf("Request:\n%s\n", request_buf);
sockfd = socket(AF_INET, SOCK_STREAM, 0); sockfd = socket(AF_INET, SOCK_STREAM, 0);
if (sockfd < 0) { if (sockfd < 0) {
free(request_buf); free(request_buf);
ERROR("ERROR opening socket"); ERROR_EXIT("ERROR opening socket");
} }
server = gethostbyname(host); server = gethostbyname(host);
if (server == NULL) { if (server == NULL) {
free(request_buf); free(request_buf);
ERROR("ERROR, no such host"); ERROR_EXIT("ERROR, no such host");
} }
memset(&serv_addr, 0, sizeof(serv_addr)); memset(&serv_addr, 0, sizeof(serv_addr));
@ -1564,7 +1564,7 @@ int postProceSql(char* host, uint16_t port, char* sqlstr)
if (connect(sockfd,(struct sockaddr *)&serv_addr,sizeof(serv_addr)) < 0) { if (connect(sockfd,(struct sockaddr *)&serv_addr,sizeof(serv_addr)) < 0) {
free(request_buf); free(request_buf);
ERROR("ERROR connecting"); ERROR_EXIT("ERROR connecting");
} }
req_str_len = strlen(request_buf); req_str_len = strlen(request_buf);
@ -1572,7 +1572,7 @@ int postProceSql(char* host, uint16_t port, char* sqlstr)
do { do {
bytes = write(sockfd, request_buf + sent, req_str_len - sent); bytes = write(sockfd, request_buf + sent, req_str_len - sent);
if (bytes < 0) if (bytes < 0)
ERROR("ERROR writing message to socket"); ERROR_EXIT("ERROR writing message to socket");
if (bytes == 0) if (bytes == 0)
break; break;
sent+=bytes; sent+=bytes;
@ -1585,7 +1585,7 @@ int postProceSql(char* host, uint16_t port, char* sqlstr)
bytes = read(sockfd, response_buf + received, resp_len - received); bytes = read(sockfd, response_buf + received, resp_len - received);
if (bytes < 0) { if (bytes < 0) {
free(request_buf); free(request_buf);
ERROR("ERROR reading response from socket"); ERROR_EXIT("ERROR reading response from socket");
} }
if (bytes == 0) if (bytes == 0)
break; break;
@ -1594,7 +1594,7 @@ int postProceSql(char* host, uint16_t port, char* sqlstr)
if (received == resp_len) { if (received == resp_len) {
free(request_buf); free(request_buf);
ERROR("ERROR storing complete response from socket"); ERROR_EXIT("ERROR storing complete response from socket");
} }
printf("Response:\n%s\n", response_buf); printf("Response:\n%s\n", response_buf);