summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2004-10-08 08:27:40 +0000
committerEric Andersen2004-10-08 08:27:40 +0000
commit751750e3ee0195eef802a1554e97712285bf8fd7 (patch)
treed9be042b9ba8bb035142138206b358723b0e7984
parent82baf63de5eb905ab255b4eea31e283f89f4cbf4 (diff)
downloadbusybox-751750e3ee0195eef802a1554e97712285bf8fd7.zip
busybox-751750e3ee0195eef802a1554e97712285bf8fd7.tar.gz
Patch from Denis Vlasenko to fix a problem where
wget http://1.2.3.4/abc/ loses last '/'
-rw-r--r--networking/wget.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/networking/wget.c b/networking/wget.c
index e233daf..45acef4 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -239,11 +239,15 @@ int wget_main(int argc, char **argv)
/* Guess an output filename */
if (!fname_out) {
- fname_out =
+ // Dirty hack. Needed because bb_get_last_path_component
+ // will destroy trailing / by storing '\0' in last byte!
+ if(target.path[strlen(target.path)-1]!='/') {
+ fname_out =
#ifdef CONFIG_FEATURE_WGET_STATUSBAR
- curfile =
+ curfile =
#endif
- bb_get_last_path_component(target.path);
+ bb_get_last_path_component(target.path);
+ }
if (fname_out==NULL || strlen(fname_out)<1) {
fname_out =
#ifdef CONFIG_FEATURE_WGET_STATUSBAR
@@ -850,7 +854,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.74 2004/04/14 17:51:24 andersen Exp $
+ * $Id: wget.c,v 1.75 2004/10/08 08:27:40 andersen Exp $
*/