Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-29 05:12:41 +00:00
Code Issues Releases Activity

Remove length limit on curl URLs

Browse Source 
Currently, the ${curl} directive only uses the first 127 characters in
the given URL, discarding the rest. Change the parsing in
curl_parse_arg to dynamically allocate the URL string instead,
allowing ${curl} to use URLs of any length.
This commit is contained in:
Andrew Deason 2019-11-27 23:54:28 -06:00 committed by Brenden Matthews
parent 9bee2eec39
commit 5651cf1529
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ccurl_thread.cc
View File

@ -166,7 +166,7 @@ class simple_curl_cb : public curl_callback<std::string> {
*/ */
struct curl_data { struct curl_data {
char uri[128]; char *uri;
float interval; float interval;
}; };
@ -180,24 +180,31 @@ void ccurl_process_info(char *p, int p_max_size, const std::string &uri,
} }
void curl_parse_arg(struct text_object *obj, const char *arg) { void curl_parse_arg(struct text_object *obj, const char *arg) {
int argc;
struct curl_data *cd; struct curl_data *cd;
float interval = 0; float interval = 0;
char *space;
if (strlen(arg) < 1) {
NORM_ERR("wrong number of arguments for $curl");
return;
}
cd = static_cast<struct curl_data *>(malloc(sizeof(struct curl_data))); cd = static_cast<struct curl_data *>(malloc(sizeof(struct curl_data)));
memset(cd, 0, sizeof(struct curl_data)); memset(cd, 0, sizeof(struct curl_data));
argc = sscanf(arg, "%127s %f", cd->uri, &interval); // Default to a 15 minute interval
if (argc < 1) {
free(cd);
NORM_ERR("wrong number of arguments for $curl");
return;
}
if (argc == 1) {
cd->interval = 15 * 60; cd->interval = 15 * 60;
} else {
cd->uri = strdup(arg);
space = strchr(cd->uri, ' ');
if (space) {
// If an explicit interval was given, use that
char *interval_str = &space[1];
*space = '\0';
sscanf(interval_str, "%f", &interval);
cd->interval = interval > 0 ? interval * 60 : active_update_interval(); cd->interval = interval > 0 ? interval * 60 : active_update_interval();
} }
obj->data.opaque = cd; obj->data.opaque = cd;
} }
@ -211,4 +218,8 @@ void curl_print(struct text_object *obj, char *p, unsigned int p_max_size) {
ccurl_process_info(p, p_max_size, cd->uri, cd->interval); ccurl_process_info(p, p_max_size, cd->uri, cd->interval);
} }
void curl_obj_free(struct text_object *obj) { free_and_zero(obj->data.opaque); } void curl_obj_free(struct text_object *obj) {
struct curl_data *cd = static_cast<struct curl_data *>(obj->data.opaque);
free_and_zero(cd->uri);
free_and_zero(obj->data.opaque);
}