projects
/
project
/
uclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fetch: fix segfault after destination was not reached
[project/uclient.git]
/
uclient-fetch.c
diff --git
a/uclient-fetch.c
b/uclient-fetch.c
index
733a5b9
..
22f15c6
100644
(file)
--- a/
uclient-fetch.c
+++ b/
uclient-fetch.c
@@
-16,6
+16,7
@@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#define _GNU_SOURCE
#include <unistd.h>
#include <stdio.h>
#include <dlfcn.h>
#include <unistd.h>
#include <stdio.h>
#include <dlfcn.h>
@@
-145,16
+146,30
@@
static void msg_connecting(struct uclient *cl)
return;
uclient_get_addr(addr, &port, &cl->remote_addr);
return;
uclient_get_addr(addr, &port, &cl->remote_addr);
- fprintf(stderr, "Connecting to %s
%s:%d\n", cl->url->host
, addr, port);
+ fprintf(stderr, "Connecting to %s
:%d\n"
, addr, port);
}
}
-static
void
init_request(struct uclient *cl)
+static
int
init_request(struct uclient *cl)
{
{
+ int rc;
+
out_bytes = 0;
out_bytes = 0;
- uclient_connect(cl);
+
+ rc = uclient_connect(cl);
+ if (rc)
+ return rc;
+
msg_connecting(cl);
msg_connecting(cl);
- uclient_http_set_request_type(cl, "GET");
- uclient_request(cl);
+
+ rc = uclient_http_set_request_type(cl, "GET");
+ if (rc)
+ return rc;
+
+ rc = uclient_request(cl);
+ if (rc)
+ return rc;
+
+ return 0;
}
static void eof_cb(struct uclient *cl)
}
static void eof_cb(struct uclient *cl)
@@
-268,6
+283,7
@@
int main(int argc, char **argv)
struct uclient *cl;
int ch;
int longopt_idx = 0;
struct uclient *cl;
int ch;
int longopt_idx = 0;
+ int rc;
init_ustream_ssl();
init_ustream_ssl();
@@
-327,6
+343,9
@@
int main(int argc, char **argv)
auth_str = username;
}
auth_str = username;
}
+ if (!quiet)
+ fprintf(stderr, "Downloading '%s'\n", argv[0]);
+
cl = uclient_new(argv[0], auth_str, &cb);
if (!cl) {
fprintf(stderr, "Failed to allocate uclient context\n");
cl = uclient_new(argv[0], auth_str, &cb);
if (!cl) {
fprintf(stderr, "Failed to allocate uclient context\n");
@@
-336,8
+355,15
@@
int main(int argc, char **argv)
if (ssl_ctx)
uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
if (ssl_ctx)
uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
- init_request(cl);
- uloop_run();
+ rc = init_request(cl);
+ if (!rc) {
+ /* no error received, we can enter main loop */
+ uloop_run();
+ } else {
+ fprintf(stderr, "Failed to establish connection\n");
+ error_ret = 4;
+ }
+
uloop_done();
uclient_free(cl);
uloop_done();
uclient_free(cl);