svn commit: trunk/busybox: include networking

aldot at busybox.net aldot at busybox.net
Sat Sep 2 15:30:27 UTC 2006


Author: aldot
Date: 2006-09-02 08:30:26 -0700 (Sat, 02 Sep 2006)
New Revision: 16025

Log:
- patch from Csaba Henk to make the "User-Agent" header field configurable.


Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/networking/wget.c


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2006-09-01 17:38:23 UTC (rev 16024)
+++ trunk/busybox/include/usage.h	2006-09-02 15:30:26 UTC (rev 16025)
@@ -3396,7 +3396,8 @@
 
 #define wget_trivial_usage \
 	"[-c|--continue] [-q|--quiet] [-O|--output-document file]\n" \
-	"\t\t[--header 'header: value'] [-Y|--proxy on/off] [-P DIR] url"
+	"\t\t[--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
+	"\t\t[-U|--user-agent agent] url"
 #define wget_full_usage \
 	"wget retrieves files via HTTP or FTP\n\n" \
 	"Options:\n" \
@@ -3404,6 +3405,7 @@
 	"\t-q\tquiet mode - do not print\n" \
 	"\t-P\tSet directory prefix to DIR\n" \
 	"\t-O\tsave to filename ('-' for stdout)\n" \
+	"\t-U\tadjust 'User-Agent' field\n" \
 	"\t-Y\tuse proxy ('on' or 'off')"
 
 #define which_trivial_usage \

Modified: trunk/busybox/networking/wget.c
===================================================================
--- trunk/busybox/networking/wget.c	2006-09-01 17:38:23 UTC (rev 16024)
+++ trunk/busybox/networking/wget.c	2006-09-02 15:30:26 UTC (rev 16025)
@@ -132,6 +132,7 @@
 #define WGET_OPT_HEADER	16
 #define WGET_OPT_PREFIX	32
 #define WGET_OPT_PROXY	64
+#define WGET_OPT_USER_AGENT	128
 
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
 static const struct option wget_long_options[] = {
@@ -142,6 +143,7 @@
 	{ "header",          1, NULL, 131 },
 	{ "directory-prefix",1, NULL, 'P' },
 	{ "proxy",           1, NULL, 'Y' },
+	{ "user-agent",      1, NULL, 'U' },
 	{ 0,                 0, 0, 0 }
 };
 #endif
@@ -172,6 +174,7 @@
 	int quiet_flag = FALSE;		/* Be verry, verry quiet...	    */
 	int use_proxy = 1;		/* Use proxies if env vars are set  */
 	char *proxy_flag = "on";	/* Use proxies if env vars are set  */
+	char *user_agent = "Wget"; /* Content of the "User-Agent" header field */
 
 	/*
 	 * Crack command line.
@@ -180,9 +183,9 @@
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
 	bb_applet_long_options = wget_long_options;
 #endif
-	opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:",
+	opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:U:",
 					&fname_out, &headers_llist,
-					&dir_prefix, &proxy_flag);
+					&dir_prefix, &proxy_flag, &user_agent);
 	if (opt & WGET_OPT_CONTINUE) {
 		++do_continue;
 	}
@@ -317,7 +320,8 @@
 				fprintf(sfp, "GET /%s HTTP/1.1\r\n", target.path);
 			}
 
-			fprintf(sfp, "Host: %s\r\nUser-Agent: Wget\r\n", target.host);
+			fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n", target.host,
+			        user_agent);
 
 #ifdef CONFIG_FEATURE_WGET_AUTHENTICATION
 			if (target.user) {




More information about the busybox-cvs mailing list