Backport tftp usage message fix.

diff --git a/busybox/applets/usage.h b/busybox/applets/usage.h
index 5f10549675fa33effe764e986cf66be351db7fc2..4d38c43bb9961c4b6b080507523e3de2b31d961c 100644 (file)
--- a/busybox/applets/usage.h
+++ b/busybox/applets/usage.h
@@ -1570,17 +1570,19 @@
 #endif
 
 #define tftp_trivial_usage \
-       "command SOURCE DEST"
+       "[OPTION]... HOST [PORT]"
 #define tftp_full_usage \
        "Transfers a file from/to a tftp server using \"octet\" mode.\n\n" \
-       "Commands:\n" \
+       "Options:\n" \
+       "\t-b SIZE\tTransfer blocks of SIZE octets.\n" \
         USAGE_TFTP_GET(        \
-        "\tget\tGet file from server SOURCE and store to local DEST.\n" \
+        "\t-g\tGet file.\n" \
         ) \
+       "\t-l FILE\tTransfer local FILE.\n" \
         USAGE_TFTP_PUT(        \
-       "\tput\tPut local file SOURCE to server DEST.\n" \
+       "\t-p\tPut file.\n" \
        ) \
-       "\nWhen naming a server, use the syntax \"server:file\"."
+       "\t-r FILE\tTransfer remote FILE.\n"
 
 #define touch_trivial_usage \
        "[-c] FILE [FILE ...]"

diff --git a/busybox/include/usage.h b/busybox/include/usage.h
index 5f10549675fa33effe764e986cf66be351db7fc2..4d38c43bb9961c4b6b080507523e3de2b31d961c 100644 (file)
--- a/busybox/include/usage.h
+++ b/busybox/include/usage.h
@@ -1570,17 +1570,19 @@
 #endif
 
 #define tftp_trivial_usage \
-       "command SOURCE DEST"
+       "[OPTION]... HOST [PORT]"
 #define tftp_full_usage \
        "Transfers a file from/to a tftp server using \"octet\" mode.\n\n" \
-       "Commands:\n" \
+       "Options:\n" \
+       "\t-b SIZE\tTransfer blocks of SIZE octets.\n" \
         USAGE_TFTP_GET(        \
-        "\tget\tGet file from server SOURCE and store to local DEST.\n" \
+        "\t-g\tGet file.\n" \
         ) \
+       "\t-l FILE\tTransfer local FILE.\n" \
         USAGE_TFTP_PUT(        \
-       "\tput\tPut local file SOURCE to server DEST.\n" \
+       "\t-p\tPut file.\n" \
        ) \
-       "\nWhen naming a server, use the syntax \"server:file\"."
+       "\t-r FILE\tTransfer remote FILE.\n"
 
 #define touch_trivial_usage \
        "[-c] FILE [FILE ...]"

diff --git a/busybox/usage.h b/busybox/usage.h
index 5f10549675fa33effe764e986cf66be351db7fc2..4d38c43bb9961c4b6b080507523e3de2b31d961c 100644 (file)
--- a/busybox/usage.h
+++ b/busybox/usage.h
@@ -1570,17 +1570,19 @@
 #endif
 
 #define tftp_trivial_usage \
-       "command SOURCE DEST"
+       "[OPTION]... HOST [PORT]"
 #define tftp_full_usage \
        "Transfers a file from/to a tftp server using \"octet\" mode.\n\n" \
-       "Commands:\n" \
+       "Options:\n" \
+       "\t-b SIZE\tTransfer blocks of SIZE octets.\n" \
         USAGE_TFTP_GET(        \
-        "\tget\tGet file from server SOURCE and store to local DEST.\n" \
+        "\t-g\tGet file.\n" \
         ) \
+       "\t-l FILE\tTransfer local FILE.\n" \
         USAGE_TFTP_PUT(        \
-       "\tput\tPut local file SOURCE to server DEST.\n" \
+       "\t-p\tPut file.\n" \
        ) \
-       "\nWhen naming a server, use the syntax \"server:file\"."
+       "\t-r FILE\tTransfer remote FILE.\n"
 
 #define touch_trivial_usage \
        "[-c] FILE [FILE ...]"