From 5e0ab6bf2ab852e608771f06866fb6c50337df85 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 29 Mar 2019 02:24:21 -1100 Subject: [PATCH] Test --- src/komodo_gateway.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 7a002abbe..e019a9d68 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1779,19 +1779,26 @@ void *filestr(long *allocsizep,char *_fname) { long filesize = 0; char *fname,*buf = 0; void *retptr; *allocsizep = 0; - fname = malloc(strlen(_fname)+1); + fname = (char *)malloc(strlen(_fname)+1); strcpy(fname,_fname); retptr = loadfile(fname,(uint8_t **)&buf,&filesize,allocsizep); free(fname); return(retptr); } -char *send_curl(char *url,char *fname) +cJSON *send_curl(char *url,char *fname) { - long fsize; char curlstr[1024]; + long fsize; char curlstr[1024],*jsonstr; cJSON *json=0; sprintf(curlstr,"curl --url \"%s\" > %s",url,fname); - system(curlstr); - return(filestr(&fsize,fname)); + if ( system(curlstr) == 0 ) + { + if ( (jsonstr= filestr((void *)&fsize,fname)) != 0 ) + { + json = cJSON_Parse(jsonstr); + free(jsonstr); + } + } + return(json); } // get_urljson just returns the JSON returned by the URL using issue_curl