journal-remote: let user specify just the main part of the url

We can append /upload ourselves.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-07-15 22:34:41 -04:00
parent 9ff48d0982
commit 5bc891206d
2 changed files with 10 additions and 2 deletions
+9 -1
View File
@@ -396,7 +396,13 @@ static int setup_uploader(Uploader *u, const char *url, const char *state_file)
memzero(u, sizeof(Uploader));
u->input = -1;
u->url = url;
if (!startswith(url, "http://") && !startswith(url, "https://"))
url = strappenda("https://", url);
u->url = strappend(url, "/upload");
if (!u->url)
return log_oom();
u->state_file = state_file;
r = sd_event_default(&u->events);
@@ -424,6 +430,8 @@ static void destroy_uploader(Uploader *u) {
free(u->last_cursor);
free(u->current_cursor);
free(u->url);
u->input_event = sd_event_source_unref(u->input_event);
close_fd_input(u);
+1 -1
View File
@@ -23,7 +23,7 @@ typedef struct Uploader {
sd_event *events;
sd_event_source *sigint_event, *sigterm_event;
const char *url;
char *url;
CURL *easy;
bool uploading;
char error[CURL_ERROR_SIZE];