diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-04-14 17:51:38 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-04-14 17:51:38 +0000 |
commit | aff114c33d2b8879233fa513e6d760d0ef99b632 (patch) | |
tree | 101230a8bd16a03319acc4b9b5fb33c33fb58672 /networking | |
parent | 4c8b0dd97385b820e28bb8cb2d08ef3bd194a16a (diff) | |
download | busybox-w32-aff114c33d2b8879233fa513e6d760d0ef99b632.tar.gz busybox-w32-aff114c33d2b8879233fa513e6d760d0ef99b632.tar.bz2 busybox-w32-aff114c33d2b8879233fa513e6d760d0ef99b632.zip |
Larry Doolittle writes:
This is a bulk spelling fix patch against busybox-1.00-pre10.
If anyone gets a corrupted copy (and cares), let me know and
I will make alternate arrangements.
Erik - please apply.
Authors - please check that I didn't corrupt any meaning.
Package importers - see if any of these changes should be
passed to the upstream authors.
I glossed over lots of sloppy capitalizations, missing apostrophes,
mixed American/British spellings, and German-style compound words.
What is "pretect redefined for test" in cmdedit.c?
Good luck on the 1.00 release!
- Larry
Diffstat (limited to 'networking')
-rw-r--r-- | networking/httpd.c | 16 | ||||
-rw-r--r-- | networking/inetd.c | 4 | ||||
-rw-r--r-- | networking/ipcalc.c | 4 | ||||
-rw-r--r-- | networking/nameif.c | 4 | ||||
-rw-r--r-- | networking/udhcp/clientpacket.c | 2 | ||||
-rw-r--r-- | networking/udhcp/common.c | 2 | ||||
-rw-r--r-- | networking/udhcp/common.h | 4 | ||||
-rw-r--r-- | networking/udhcp/packet.c | 2 | ||||
-rw-r--r-- | networking/udhcp/pidfile.c | 2 | ||||
-rw-r--r-- | networking/udhcp/pidfile.h | 2 | ||||
-rw-r--r-- | networking/udhcp/script.c | 2 | ||||
-rw-r--r-- | networking/udhcp/serverpacket.c | 2 | ||||
-rw-r--r-- | networking/udhcp/signalpipe.c | 4 | ||||
-rw-r--r-- | networking/wget.c | 4 |
14 files changed, 27 insertions, 27 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index aad30a1a1..7322d143a 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -40,7 +40,7 @@ | |||
40 | * foo=`httpd -d $foo` # decode "Hello%20World" as "Hello World" | 40 | * foo=`httpd -d $foo` # decode "Hello%20World" as "Hello World" |
41 | * bar=`httpd -e "<Hello World>"` # encode as "<Hello World>" | 41 | * bar=`httpd -e "<Hello World>"` # encode as "<Hello World>" |
42 | * Note that url encoding for arguments is not the same as html encoding for | 42 | * Note that url encoding for arguments is not the same as html encoding for |
43 | * presenation. -d decodes a url-encoded argument while -e encodes in html | 43 | * presentation. -d decodes a url-encoded argument while -e encodes in html |
44 | * for page display. | 44 | * for page display. |
45 | * | 45 | * |
46 | * httpd.conf has the following format: | 46 | * httpd.conf has the following format: |
@@ -55,7 +55,7 @@ | |||
55 | * /adm:toor:PaSsWd # or user toor, pwd PaSsWd on urls starting with /adm/ | 55 | * /adm:toor:PaSsWd # or user toor, pwd PaSsWd on urls starting with /adm/ |
56 | * .au:audio/basic # additional mime type for audio.au files | 56 | * .au:audio/basic # additional mime type for audio.au files |
57 | * | 57 | * |
58 | * A/D may be as a/d or allow/deny - first char case unsensitive | 58 | * A/D may be as a/d or allow/deny - first char case insensitive |
59 | * Deny IP rules take precedence over allow rules. | 59 | * Deny IP rules take precedence over allow rules. |
60 | * | 60 | * |
61 | * | 61 | * |
@@ -127,7 +127,7 @@ static const char home[] = "./"; | |||
127 | # define cont_l_fmt "%ld" | 127 | # define cont_l_fmt "%ld" |
128 | #endif | 128 | #endif |
129 | 129 | ||
130 | // Note: bussybox xfuncs are not used because we want the server to keep running | 130 | // Note: busybox xfuncs are not used because we want the server to keep running |
131 | // if something bad happens due to a malformed user request. | 131 | // if something bad happens due to a malformed user request. |
132 | // As a result, all memory allocation after daemonize | 132 | // As a result, all memory allocation after daemonize |
133 | // is checked rigorously | 133 | // is checked rigorously |
@@ -260,7 +260,7 @@ static HttpdConfig *config; | |||
260 | static const char request_GET[] = "GET"; /* size algorithic optimize */ | 260 | static const char request_GET[] = "GET"; /* size algorithic optimize */ |
261 | 261 | ||
262 | static const char* const suffixTable [] = { | 262 | static const char* const suffixTable [] = { |
263 | /* Warning: shorted equalent suffix in one line must be first */ | 263 | /* Warning: shorted equivalent suffix in one line must be first */ |
264 | ".htm.html", "text/html", | 264 | ".htm.html", "text/html", |
265 | ".jpg.jpeg", "image/jpeg", | 265 | ".jpg.jpeg", "image/jpeg", |
266 | ".gif", "image/gif", | 266 | ".gif", "image/gif", |
@@ -775,7 +775,7 @@ static char *decodeString(char *orig, int flag_plus_to_space) | |||
775 | * | 775 | * |
776 | > $Function: addEnv() | 776 | > $Function: addEnv() |
777 | * | 777 | * |
778 | * $Description: Add an enviornment variable setting to the global list. | 778 | * $Description: Add an environment variable setting to the global list. |
779 | * A NAME=VALUE string is allocated, filled, and added to the list of | 779 | * A NAME=VALUE string is allocated, filled, and added to the list of |
780 | * environment settings passed to the cgi execution script. | 780 | * environment settings passed to the cgi execution script. |
781 | * | 781 | * |
@@ -1380,7 +1380,7 @@ static int checkPermIP(void) | |||
1380 | return cur->allow_deny == 'A'; /* Allow/Deny */ | 1380 | return cur->allow_deny == 'A'; /* Allow/Deny */ |
1381 | } | 1381 | } |
1382 | 1382 | ||
1383 | /* if uncofigured, return 1 - access from all */ | 1383 | /* if unconfigured, return 1 - access from all */ |
1384 | return !config->flg_deny_all; | 1384 | return !config->flg_deny_all; |
1385 | } | 1385 | } |
1386 | 1386 | ||
@@ -1765,7 +1765,7 @@ static int miniHttpd(int server) | |||
1765 | while (1) { | 1765 | while (1) { |
1766 | readfd = portfd; | 1766 | readfd = portfd; |
1767 | 1767 | ||
1768 | /* Now wait INDEFINATELY on the set of sockets! */ | 1768 | /* Now wait INDEFINITELY on the set of sockets! */ |
1769 | if (select(server + 1, &readfd, 0, 0, 0) > 0) { | 1769 | if (select(server + 1, &readfd, 0, 0, 0) > 0) { |
1770 | if (FD_ISSET(server, &readfd)) { | 1770 | if (FD_ISSET(server, &readfd)) { |
1771 | int on; | 1771 | int on; |
@@ -1990,7 +1990,7 @@ int httpd_main(int argc, char *argv[]) | |||
1990 | #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY | 1990 | #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY |
1991 | server = openServer(); | 1991 | server = openServer(); |
1992 | # ifdef CONFIG_FEATURE_HTTPD_SETUID | 1992 | # ifdef CONFIG_FEATURE_HTTPD_SETUID |
1993 | /* drop privilegies */ | 1993 | /* drop privileges */ |
1994 | if(uid > 0) | 1994 | if(uid > 0) |
1995 | setuid(uid); | 1995 | setuid(uid); |
1996 | # endif | 1996 | # endif |
diff --git a/networking/inetd.c b/networking/inetd.c index 283c33bed..4440a2d30 100644 --- a/networking/inetd.c +++ b/networking/inetd.c | |||
@@ -56,7 +56,7 @@ | |||
56 | * server program full path name | 56 | * server program full path name |
57 | * server program arguments maximum of MAXARGS (20) | 57 | * server program arguments maximum of MAXARGS (20) |
58 | * | 58 | * |
59 | * RPC services unsuported | 59 | * RPC services unsupported |
60 | * | 60 | * |
61 | * Comment lines are indicated by a `#' in column 1. | 61 | * Comment lines are indicated by a `#' in column 1. |
62 | */ | 62 | */ |
@@ -345,7 +345,7 @@ more: | |||
345 | sep->se_family = AF_UNIX; | 345 | sep->se_family = AF_UNIX; |
346 | } else { | 346 | } else { |
347 | if (strncmp(cp_ptr, "rpc/", 4) == 0) { | 347 | if (strncmp(cp_ptr, "rpc/", 4) == 0) { |
348 | syslog(LOG_ERR, "%s: rpc services not suported", | 348 | syslog(LOG_ERR, "%s: rpc services not supported", |
349 | sep->se_service); | 349 | sep->se_service); |
350 | goto more; | 350 | goto more; |
351 | } | 351 | } |
diff --git a/networking/ipcalc.c b/networking/ipcalc.c index 5bf07c675..f8ca9723c 100644 --- a/networking/ipcalc.c +++ b/networking/ipcalc.c | |||
@@ -5,8 +5,8 @@ | |||
5 | * By Jordan Crouse <jordan@cosmicpenguin.net> | 5 | * By Jordan Crouse <jordan@cosmicpenguin.net> |
6 | * Stephan Linz <linz@li-pro.net> | 6 | * Stephan Linz <linz@li-pro.net> |
7 | * | 7 | * |
8 | * This is a complete reimplentation of the ipcalc program | 8 | * This is a complete reimplementation of the ipcalc program |
9 | * from Redhat. I didn't look at their source code, but there | 9 | * from Red Hat. I didn't look at their source code, but there |
10 | * is no denying that this is a loving reimplementation | 10 | * is no denying that this is a loving reimplementation |
11 | */ | 11 | */ |
12 | 12 | ||
diff --git a/networking/nameif.c b/networking/nameif.c index dca7c8c08..dcc5ec097 100644 --- a/networking/nameif.c +++ b/networking/nameif.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * nameif.c - Naming Interfaces based on MAC address for busybox. | 2 | * nameif.c - Naming Interfaces based on MAC address for busybox. |
3 | * | 3 | * |
4 | * Writen 2000 by Andi Kleen. | 4 | * Written 2000 by Andi Kleen. |
5 | * Busybox port 2002 by Nick Fedchik <nick@fedchik.org.ua> | 5 | * Busybox port 2002 by Nick Fedchik <nick@fedchik.org.ua> |
6 | * Glenn McGrath <bug1@optushome.com.au> | 6 | * Glenn McGrath <bug1@optushome.com.au> |
7 | * | 7 | * |
@@ -47,7 +47,7 @@ | |||
47 | /* take from linux/sockios.h */ | 47 | /* take from linux/sockios.h */ |
48 | #define SIOCSIFNAME 0x8923 /* set interface name */ | 48 | #define SIOCSIFNAME 0x8923 /* set interface name */ |
49 | 49 | ||
50 | /* Octets in one ethernet addr, from <linux/if_ether.h> */ | 50 | /* Octets in one Ethernet addr, from <linux/if_ether.h> */ |
51 | #define ETH_ALEN 6 | 51 | #define ETH_ALEN 6 |
52 | 52 | ||
53 | #ifndef ifr_newname | 53 | #ifndef ifr_newname |
diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c index 5b27004f9..ec96601cb 100644 --- a/networking/udhcp/clientpacket.c +++ b/networking/udhcp/clientpacket.c | |||
@@ -82,7 +82,7 @@ static void init_packet(struct dhcpMessage *packet, char type) | |||
82 | } | 82 | } |
83 | 83 | ||
84 | 84 | ||
85 | /* Add a paramater request list for stubborn DHCP servers. Pull the data | 85 | /* Add a parameter request list for stubborn DHCP servers. Pull the data |
86 | * from the struct in options.c. Don't do bounds checking here because it | 86 | * from the struct in options.c. Don't do bounds checking here because it |
87 | * goes towards the head of the packet. */ | 87 | * goes towards the head of the packet. */ |
88 | static void add_requests(struct dhcpMessage *packet) | 88 | static void add_requests(struct dhcpMessage *packet) |
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c index 5dad7d51c..ddfc54732 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * simple helper functions. | 4 | * simple helper functions. |
5 | * | 5 | * |
6 | * Russ Dill <Russ.Dill@asu.edu> 2001-2003 | 6 | * Russ Dill <Russ.Dill@asu.edu> 2001-2003 |
7 | * Rewrited by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003 | 7 | * Rewritten by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003 |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index 677bbfd17..cdc51cf8a 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* common.h | 1 | /* common.h |
2 | * | 2 | * |
3 | * Russ Dill <Russ.Dill@asu.edu> Soptember 2001 | 3 | * Russ Dill <Russ.Dill@asu.edu> September 2001 |
4 | * Rewrited by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003 | 4 | * Rewritten by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003 |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License as published by | 7 | * it under the terms of the GNU General Public License as published by |
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index 7cbd83a35..1c6bb0ca4 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c | |||
@@ -113,7 +113,7 @@ uint16_t checksum(void *addr, int count) | |||
113 | } | 113 | } |
114 | 114 | ||
115 | 115 | ||
116 | /* Constuct a ip/udp header for a packet, and specify the source and dest hardware address */ | 116 | /* Construct a ip/udp header for a packet, and specify the source and dest hardware address */ |
117 | int raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, | 117 | int raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, |
118 | uint32_t dest_ip, int dest_port, uint8_t *dest_arp, int ifindex) | 118 | uint32_t dest_ip, int dest_port, uint8_t *dest_arp, int ifindex) |
119 | { | 119 | { |
diff --git a/networking/udhcp/pidfile.c b/networking/udhcp/pidfile.c index d656c7ad0..2e0c7533e 100644 --- a/networking/udhcp/pidfile.c +++ b/networking/udhcp/pidfile.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * | 2 | * |
3 | * Functions to assist in the writing and removing of pidfiles. | 3 | * Functions to assist in the writing and removing of pidfiles. |
4 | * | 4 | * |
5 | * Russ Dill <Russ.Dill@asu.edu> Soptember 2001 | 5 | * Russ Dill <Russ.Dill@asu.edu> September 2001 |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
diff --git a/networking/udhcp/pidfile.h b/networking/udhcp/pidfile.h index 7f8e8aedc..ea97d1de5 100644 --- a/networking/udhcp/pidfile.h +++ b/networking/udhcp/pidfile.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * | 2 | * |
3 | * Functions to assist in the writing and removing of pidfiles. | 3 | * Functions to assist in the writing and removing of pidfiles. |
4 | * | 4 | * |
5 | * Russ Dill <Russ.Dill@asu.edu> Soptember 2001 | 5 | * Russ Dill <Russ.Dill@asu.edu> September 2001 |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c index cae4db7af..e0a8dad53 100644 --- a/networking/udhcp/script.c +++ b/networking/udhcp/script.c | |||
@@ -132,7 +132,7 @@ static void fill_options(char *dest, uint8_t *option, struct dhcp_option *type_p | |||
132 | } | 132 | } |
133 | 133 | ||
134 | 134 | ||
135 | /* put all the paramaters into an environment */ | 135 | /* put all the parameters into an environment */ |
136 | static char **fill_envp(struct dhcpMessage *packet) | 136 | static char **fill_envp(struct dhcpMessage *packet) |
137 | { | 137 | { |
138 | int num_options = 0; | 138 | int num_options = 0; |
diff --git a/networking/udhcp/serverpacket.c b/networking/udhcp/serverpacket.c index 937436a11..bc9d822a9 100644 --- a/networking/udhcp/serverpacket.c +++ b/networking/udhcp/serverpacket.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* serverpacket.c | 1 | /* serverpacket.c |
2 | * | 2 | * |
3 | * Constuct and send DHCP server packets | 3 | * Construct and send DHCP server packets |
4 | * | 4 | * |
5 | * Russ Dill <Russ.Dill@asu.edu> July 2001 | 5 | * Russ Dill <Russ.Dill@asu.edu> July 2001 |
6 | * | 6 | * |
diff --git a/networking/udhcp/signalpipe.c b/networking/udhcp/signalpipe.c index 4f3292b9d..074c8a603 100644 --- a/networking/udhcp/signalpipe.c +++ b/networking/udhcp/signalpipe.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* signalpipe.c | 1 | /* signalpipe.c |
2 | * | 2 | * |
3 | * Signal pipe infastructure. A reliable way of delivering signals. | 3 | * Signal pipe infrastructure. A reliable way of delivering signals. |
4 | * | 4 | * |
5 | * Russ Dill <Russ.Dill@asu.edu> Decemeber 2003 | 5 | * Russ Dill <Russ.Dill@asu.edu> December 2003 |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
diff --git a/networking/wget.c b/networking/wget.c index 3fbf6b4c2..e233daf05 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -816,7 +816,7 @@ progressmeter(int flag) | |||
816 | #endif | 816 | #endif |
817 | 817 | ||
818 | /* Original copyright notice which applies to the CONFIG_FEATURE_WGET_STATUSBAR stuff, | 818 | /* Original copyright notice which applies to the CONFIG_FEATURE_WGET_STATUSBAR stuff, |
819 | * much of which was blatently stolen from openssh. */ | 819 | * much of which was blatantly stolen from openssh. */ |
820 | 820 | ||
821 | /*- | 821 | /*- |
822 | * Copyright (c) 1992, 1993 | 822 | * Copyright (c) 1992, 1993 |
@@ -850,7 +850,7 @@ progressmeter(int flag) | |||
850 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 850 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
851 | * SUCH DAMAGE. | 851 | * SUCH DAMAGE. |
852 | * | 852 | * |
853 | * $Id: wget.c,v 1.73 2004/04/08 10:27:11 bug1 Exp $ | 853 | * $Id: wget.c,v 1.74 2004/04/14 17:51:24 andersen Exp $ |
854 | */ | 854 | */ |
855 | 855 | ||
856 | 856 | ||