Command usage cleanup

[J-u-boot.git] / common / cmd_net.c

diff --git a/common/cmd_net.c b/common/cmd_net.c
index af691a474f652fa862b28b08802e5f57c2bdf0a8..a6878491998afaa299f77ad06306bff83e028939 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -39,7 +39,7 @@ int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        bootp,  3,      1,      do_bootp,
-       "bootp\t- boot image via network using BOOTP/TFTP protocol\n",
+       "boot image via network using BOOTP/TFTP protocol",
        "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 
@@ -50,7 +50,7 @@ int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        tftpboot,       3,      1,      do_tftpb,
-       "tftpboot- boot image via network using TFTP protocol\n",
+       "boot image via network using TFTP protocol",
        "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 
@@ -61,7 +61,7 @@ int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        rarpboot,       3,      1,      do_rarpb,
-       "rarpboot- boot image via network using RARP/TFTP protocol\n",
+       "boot image via network using RARP/TFTP protocol",
        "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 
@@ -73,7 +73,7 @@ int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        dhcp,   3,      1,      do_dhcp,
-       "dhcp\t- boot image via network using DHCP/TFTP protocol\n",
+       "boot image via network using DHCP/TFTP protocol",
        "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 #endif
@@ -86,7 +86,7 @@ int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        nfs,    3,      1,      do_nfs,
-       "nfs\t- boot image via network using NFS protocol\n",
+       "boot image via network using NFS protocol",
        "[loadAddress] [[hostIPaddr:]bootfilename]\n"
 );
 #endif
@@ -154,8 +154,10 @@ static int
 netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
        char *s;
+       char *end;
        int   rcode = 0;
        int   size;
+       ulong addr;
 
        /* pre-set load_addr */
        if ((s = getenv("loadaddr")) != NULL) {
@@ -166,15 +168,17 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
        case 1:
                break;
 
-       case 2: /* only one arg - accept two forms:
-                * just load address, or just boot file name.
-                * The latter form must be written "filename" here.
+       case 2: /*
+                * Only one arg - accept two forms:
+                * Just load address, or just boot file name. The latter
+                * form must be written in a format which can not be
+                * mis-interpreted as a valid number.
                 */
-               if (argv[1][0] == '"') {        /* just boot filename */
-                       copy_filename (BootFile, argv[1], sizeof(BootFile));
-               } else {                        /* load address */
-                       load_addr = simple_strtoul(argv[1], NULL, 16);
-               }
+               addr = simple_strtoul(argv[1], &end, 16);
+               if (end == (argv[1] + strlen(argv[1])))
+                       load_addr = addr;
+               else
+                       copy_filename(BootFile, argv[1], sizeof(BootFile));
                break;
 
        case 3: load_addr = simple_strtoul(argv[1], NULL, 16);
@@ -182,7 +186,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 
                break;
 
-       default: printf ("Usage:\n%s\n", cmdtp->usage);
+       default: cmd_usage(cmdtp);
                show_boot_progress (-80);
                return 1;
        }
@@ -247,7 +251,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        NetPingIP = string_to_ip(argv[1]);
        if (NetPingIP == 0) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return -1;
        }
 
@@ -263,7 +267,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        ping,   2,      1,      do_ping,
-       "ping\t- send ICMP ECHO_REQUEST to network host\n",
+       "send ICMP ECHO_REQUEST to network host",
        "pingAddress\n"
 );
 #endif
@@ -307,7 +311,7 @@ int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        cdp,    1,      1,      do_cdp,
-       "cdp\t- Perform CDP network configuration\n",
+       "Perform CDP network configuration",
 );
 #endif
 
@@ -344,7 +348,7 @@ int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        sntp,   2,      1,      do_sntp,
-       "sntp\t- synchronize RTC via network\n",
+       "synchronize RTC via network",
        "[NTP server IP]\n"
 );
 #endif