[PATCH] wget: User-friendly fallback to http

[Lauri Kasanen]

Hi,

GNU wget: wget google.com // ok
bb before: wget google.com // wget: not an http or ftp url

This costs 47 bytes here, but improves the usability quite a bit.

- Lauri

-- 
http://www.fastmail.fm - A no graphics, no pop-ups email service

From a89587e950bbfe1b3682a2c38405967f197a34e9 Mon Sep 17 00:00:00 2001
From: Lauri Kasanen cur...@operamail.com
Date: Mon, 25 Nov 2013 20:53:12 +0200
Subject: [PATCH] wget: User-friendly fallback to http

GNU wget: wget google.com // ok
bb before: wget google.com // wget: not an http or ftp url

Signed-off-by: Lauri Kasanen cur...@operamail.com
---
 networking/wget.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/networking/wget.c b/networking/wget.c
index cfbacec..3c5 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -282,6 +282,11 @@ static void parse_url(const char *src_url, struct host_info *h)
 		h-port = bb_lookup_port(ftp, tcp, 21);
 		h-host = url + 6;
 		h-is_ftp = 1;
+	} else if (!strstr(url, //)) {
+		// GNU wget is user-friendly and falls back to http://
+		h-port = bb_lookup_port(http, tcp, 80);
+		h-host = url;
+		h-is_ftp = 0;
 	} else
 		bb_error_msg_and_die(not an http or ftp url: %s, sanitize_string(url));
 
-- 
1.8.3.1

___
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox

[PATCH] busybox build without od_bloaty

[Daniel Borca]

Use od -b instead of od -t x1 in build scripts.

od -t is not available in non-CONFIG_DESKTOPed busybox od

-dborca
diff --git a/applets/usage_compressed b/applets/usage_compressed
index af66bc5..fb6e1c2 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -10,20 +10,20 @@ test $SED || SED=sed
 test $DD || DD=dd
 
 # Some people were bitten by their system lacking a (proper) od
-od -v -t x1 /dev/null /dev/null
+od -v -b /dev/null /dev/null
 if test $? != 0; then
-   echo 'od tool is not installed or cannot accept -v -t x1 options'
+   echo 'od tool is not installed or cannot accept -v -b options'
exit 1
 fi
 
 exec $target.$$
 
 echo '#define UNPACKED_USAGE  \'
-$loc/usage | od -v -t x1 \
+$loc/usage | od -v -b \
 | $SED -e 's/^[^ ]*//' \
-e 's/ //g' \
-e '/^$/d' \
-   -e 's/\(..\)/\\x\1/g' \
+   -e 's/\(...\)/\\\1/g' \
-e 's/^//' \
-e 's/$/ \\/'
 echo ''
@@ -39,11 +39,11 @@ echo '#define PACKED_USAGE \'
 ## -e '/^$/d' \
 ## -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
 ## -e 's/$/ \\/'
-$loc/usage | bzip2 -1 | $DD bs=2 skip=1 2/dev/null | od -v -t x1 \
+$loc/usage | bzip2 -1 | $DD bs=2 skip=1 2/dev/null | od -v -b \
 | $SED -e 's/^[^ ]*//' \
-e 's/ //g' \
-e '/^$/d' \
-   -e 's/\(..\)/0x\1,/g' \
+   -e 's/\(...\)/0\1,/g' \
-e 's/$/ \\/'
 echo ''
 
diff --git a/scripts/mkconfigs b/scripts/mkconfigs
index db94fcc..6a26fe1 100755
--- a/scripts/mkconfigs
+++ b/scripts/mkconfigs
@@ -65,11 +65,11 @@ static const char bbconfig_config_bz2[] ALIGN1 = {
 
 grep -e '^# CONFIG_' -e '^CONFIG_' $config \
 | bzip2 -1 | dd bs=2 skip=1 2/dev/null \
-| od -v -t x1 \
+| od -v -b \
 | sed -e 's/^[^ ]*//' \
 -e 's/ //g' \
 -e '/^$/d' \
--e 's/\(..\)/0x\1,/g'
+-e 's/\(...\)/0\1,/g'
 
 echo };
 echo #endif
___
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox