[git commit master 1/1] wget: move help text to .c file

Denys Vlasenko vda.linux at googlemail.com
Sun Mar 20 23:37:05 UTC 2011


commit: http://git.busybox.net/busybox/commit/?id=e2e55b0eb5e3518702f31b122acd9894630b0368
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 include/usage.src.h |   25 -------------------------
 networking/wget.c   |   26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/include/usage.src.h b/include/usage.src.h
index 5a725e3..29f7b21 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -4067,31 +4067,6 @@ INSERT
      "\n" \
      "\nUse 500ms to specify period in milliseconds" \
 
-#define wget_trivial_usage \
-	IF_FEATURE_WGET_LONG_OPTIONS( \
-       "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n" \
-       "	[--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
-       "	[--no-check-certificate] [-U|--user-agent AGENT]" \
-			IF_FEATURE_WGET_TIMEOUT("[-T SEC] ") " URL" \
-	) \
-	IF_NOT_FEATURE_WGET_LONG_OPTIONS( \
-       "[-csq] [-O FILE] [-Y on/off] [-P DIR] [-U AGENT]" \
-			IF_FEATURE_WGET_TIMEOUT("[-T SEC] ") " URL" \
-	)
-#define wget_full_usage "\n\n" \
-       "Retrieve files via HTTP or FTP\n" \
-     "\nOptions:" \
-     "\n	-s	Spider mode - only check file existence" \
-     "\n	-c	Continue retrieval of aborted transfer" \
-     "\n	-q	Quiet" \
-     "\n	-P DIR	Save to DIR (default .)" \
-	IF_FEATURE_WGET_TIMEOUT( \
-     "\n	-T SEC	Network read timeout is SEC seconds" \
-	) \
-     "\n	-O FILE	Save to FILE ('-' for stdout)" \
-     "\n	-U STR	Use STR for User-Agent header" \
-     "\n	-Y	Use proxy ('on' or 'off')" \
-
 #define which_trivial_usage \
        "[COMMAND]..."
 #define which_full_usage "\n\n" \
diff --git a/networking/wget.c b/networking/wget.c
index bc92283..c22a76b 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -8,6 +8,32 @@
  * Copyright (C) 2010 Bradley M. Kuhn <bkuhn at ebb.org>
  * Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
  */
+
+//usage:#define wget_trivial_usage
+//usage:	IF_FEATURE_WGET_LONG_OPTIONS(
+//usage:       "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n"
+//usage:       "	[--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n"
+//usage:       "	[--no-check-certificate] [-U|--user-agent AGENT]"
+//usage:			IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:	)
+//usage:	IF_NOT_FEATURE_WGET_LONG_OPTIONS(
+//usage:       "[-csq] [-O FILE] [-Y on/off] [-P DIR] [-U AGENT]"
+//usage:			IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:	)
+//usage:#define wget_full_usage "\n\n"
+//usage:       "Retrieve files via HTTP or FTP\n"
+//usage:     "\nOptions:"
+//usage:     "\n	-s	Spider mode - only check file existence"
+//usage:     "\n	-c	Continue retrieval of aborted transfer"
+//usage:     "\n	-q	Quiet"
+//usage:     "\n	-P DIR	Save to DIR (default .)"
+//usage:	IF_FEATURE_WGET_TIMEOUT(
+//usage:     "\n	-T SEC	Network read timeout is SEC seconds"
+//usage:	)
+//usage:     "\n	-O FILE	Save to FILE ('-' for stdout)"
+//usage:     "\n	-U STR	Use STR for User-Agent header"
+//usage:     "\n	-Y	Use proxy ('on' or 'off')"
+
 #include "libbb.h"
 
 //#define log_io(...) bb_error_msg(__VA_ARGS__)
-- 
1.7.3.4



More information about the busybox-cvs mailing list