From 2b729ee1e0cb266bf50df0ca80f123f93384ac77 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 30 Jan 2020 22:04:43 -0600 Subject: Move TOYBOX_VERSION fallback definition to toys.h. (A git build takes it from "git describe".) --- toys/pending/wget.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'toys') diff --git a/toys/pending/wget.c b/toys/pending/wget.c index 405ed942..16672a24 100644 --- a/toys/pending/wget.c +++ b/toys/pending/wget.c @@ -135,7 +135,7 @@ void wget_main(void) FILE *fp; ssize_t len, body_len; char *body, *result, *rc, *r_str, *redir_loc = 0; - char ua[18] = "toybox wget", ver[6], hostname[1024], port[6], path[1024]; + char ua[18] = "toybox wget", hostname[1024], port[6], path[1024]; // TODO extract filename to be saved from URL if (!(toys.optflags & FLAG_O)) help_exit("no filename"); @@ -145,9 +145,7 @@ void wget_main(void) get_info(toys.optargs[0], hostname, port, path); -#ifdef TOYBOX_VERSION - strcat(ua, "/"), strncpy(ver, TOYBOX_VERSION, 5), strcat(ua, ver); -#endif + sprintf("/%s", TOYBOX_VERSION); for (;; redirects--) { sock = conn_svr(hostname, port); // compose HTTP request -- cgit v1.2.3