wget now takes only a URL as a argument; not host + file

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1653 42af7a65-404d-4744-a932-0658087f49c3

11 files changed, 22 insertions, 44 deletions

diff --git a/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/defconfig
index 3c778d294..ddeed33c5 100644
--- a/nuttx/configs/c5471evm/defconfig
+++ b/nuttx/configs/c5471evm/defconfig
@@ -377,14 +377,12 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/c5471evm/dhcpconfig b/nuttx/configs/c5471evm/dhcpconfig
index 50596e337..79d220f8c 100644
--- a/nuttx/configs/c5471evm/dhcpconfig
+++ b/nuttx/configs/c5471evm/dhcpconfig
@@ -377,14 +377,12 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/c5471evm/netconfig b/nuttx/configs/c5471evm/netconfig
index 312b11414..7d63ed47b 100644
--- a/nuttx/configs/c5471evm/netconfig
+++ b/nuttx/configs/c5471evm/netconfig
@@ -377,14 +377,12 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/c5471evm/nshconfig b/nuttx/configs/c5471evm/nshconfig
index ac0ca2582..7ee3d4acc 100644
--- a/nuttx/configs/c5471evm/nshconfig
+++ b/nuttx/configs/c5471evm/nshconfig
@@ -377,14 +377,12 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig
index 51d6c3e0b..d4b3f972d 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/defconfig
+++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig
@@ -717,14 +717,12 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
index 6ffc90611..5bfdf9f9f 100644
--- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
@@ -765,14 +765,12 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig
index 04ad0cb99..eb25f433f 100644
--- a/nuttx/configs/ez80f910200zco/httpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/httpd/defconfig
@@ -773,14 +773,12 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig
index e9dd0d910..6dab0787f 100644
--- a/nuttx/configs/ez80f910200zco/nettest/defconfig
+++ b/nuttx/configs/ez80f910200zco/nettest/defconfig
@@ -758,14 +758,12 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig
index 352542fb5..7a6da036b 100644
--- a/nuttx/configs/ez80f910200zco/nsh/defconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/defconfig
@@ -758,14 +758,12 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig
index 95243d13f..2264c8a05 100644
--- a/nuttx/configs/ez80f910200zco/ostest/defconfig
+++ b/nuttx/configs/ez80f910200zco/ostest/defconfig
@@ -741,14 +741,12 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
diff --git a/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig
index 21521105f..4ea75dfc1 100644
--- a/nuttx/configs/ez80f910200zco/poll/defconfig
+++ b/nuttx/configs/ez80f910200zco/poll/defconfig
@@ -758,14 +758,12 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 
 #
 # Settings for examples/wget
-# CONFIG_EXAMPLE_WGET_HOSTNAME - The host that serves the file
-# CONFIG_EXAMPLE_WGET_FILENAME - The name of the file to get (with leading '/')
+# CONFIG_EXAMPLE_WGET_URL - The URL of the file to get
 # CONFIG_EXAMPLE_WGET_NOMAC - (May be defined to use software assigned MAC)
 # CONFIG_EXAMPLE_WGET_IPADDR - Target IP address
 # CONFIG_EXAMPLE_WGET_DRIPADDR - Default router IP addess
 # CONFIG_EXAMPLE_WGET_NETMASK - Network mask
-CONFIG_EXAMPLE_WGET_HOSTNAME="www.nuttx.org"
-CONFIG_EXAMPLE_WGET_FILENAME="/index.html"
+CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
 CONFIG_EXAMPLE_WGET_NOMAC=y
 CONFIG_EXAMPLE_WGET_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
 CONFIG_EXAMPLE_WGET_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)