This commit is contained in:
jl777
2019-03-29 02:24:21 -11:00
parent cd78a331b8
commit 5e0ab6bf2a

View File

@@ -1779,19 +1779,26 @@ void *filestr(long *allocsizep,char *_fname)
{ {
long filesize = 0; char *fname,*buf = 0; void *retptr; long filesize = 0; char *fname,*buf = 0; void *retptr;
*allocsizep = 0; *allocsizep = 0;
fname = malloc(strlen(_fname)+1); fname = (char *)malloc(strlen(_fname)+1);
strcpy(fname,_fname); strcpy(fname,_fname);
retptr = loadfile(fname,(uint8_t **)&buf,&filesize,allocsizep); retptr = loadfile(fname,(uint8_t **)&buf,&filesize,allocsizep);
free(fname); free(fname);
return(retptr); 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); sprintf(curlstr,"curl --url \"%s\" > %s",url,fname);
system(curlstr); if ( system(curlstr) == 0 )
return(filestr(&fsize,fname)); {
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 // get_urljson just returns the JSON returned by the URL using issue_curl