[BusyBox-cvs] busybox/networking httpd.c, 1.25, 1.26 inetd.c, 1.20, 1.21 ipcalc.c, 1.9, 1.10 nameif.c, 1.8, 1.9 wget.c, 1.73, 1.74

[Erik Andersen]

Update of /var/cvs/busybox/networking
In directory nail:/tmp/cvs-serv15466/networking

Modified Files:
	httpd.c inetd.c ipcalc.c nameif.c wget.c 
Log Message:
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



Index: nameif.c
===================================================================
RCS file: /var/cvs/busybox/networking/nameif.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/nameif.c	5 Jul 2003 08:00:17 -0000	1.8
+++ b/nameif.c	14 Apr 2004 17:51:24 -0000	1.9
@@ -1,7 +1,7 @@
 /*
  * nameif.c - Naming Interfaces based on MAC address for busybox.
  *
- * Writen 2000 by Andi Kleen.
+ * Written 2000 by Andi Kleen.
  * Busybox port 2002 by Nick Fedchik <nick at fedchik.org.ua>
  *			Glenn McGrath <bug1 at optushome.com.au>
  *
@@ -47,7 +47,7 @@
 /* take from linux/sockios.h */
 #define SIOCSIFNAME	0x8923	/* set interface name */
 
-/* Octets in one ethernet addr, from <linux/if_ether.h> */
+/* Octets in one Ethernet addr, from <linux/if_ether.h> */
 #define ETH_ALEN	6
 
 #ifndef ifr_newname

Index: httpd.c
===================================================================
RCS file: /var/cvs/busybox/networking/httpd.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- a/httpd.c	15 Mar 2004 08:28:48 -0000	1.25
+++ b/httpd.c	14 Apr 2004 17:51:24 -0000	1.26
@@ -40,7 +40,7 @@
  *  foo=`httpd -d $foo`           # decode "Hello%20World" as "Hello World"
  *  bar=`httpd -e "<Hello World>"`  # encode as "&#60Hello&#32World&#62"
  * Note that url encoding for arguments is not the same as html encoding for
- * presenation.  -d decodes a url-encoded argument while -e encodes in html
+ * presentation.  -d decodes a url-encoded argument while -e encodes in html
  * for page display.
  *
  * httpd.conf has the following format:
@@ -55,7 +55,7 @@
  * /adm:toor:PaSsWd  # or user toor, pwd PaSsWd on urls starting with /adm/
  * .au:audio/basic   # additional mime type for audio.au files
  *
- * A/D may be as a/d or allow/deny - first char case unsensitive
+ * A/D may be as a/d or allow/deny - first char case insensitive
  * Deny IP rules take precedence over allow rules.
  *
  *
@@ -127,7 +127,7 @@
 # define cont_l_fmt "%ld"
 #endif
 
-// Note: bussybox xfuncs are not used because we want the server to keep running
+// Note: busybox xfuncs are not used because we want the server to keep running
 //       if something bad happens due to a malformed user request.
 //       As a result, all memory allocation after daemonize
 //       is checked rigorously
@@ -260,7 +260,7 @@
 static const char request_GET[] = "GET";    /* size algorithic optimize */
 
 static const char* const suffixTable [] = {
-/* Warning: shorted equalent suffix in one line must be first */
+/* Warning: shorted equivalent suffix in one line must be first */
   ".htm.html", "text/html",
   ".jpg.jpeg", "image/jpeg",
   ".gif", "image/gif",
@@ -775,7 +775,7 @@
  *
  > $Function: addEnv()
  *
- * $Description: Add an enviornment variable setting to the global list.
+ * $Description: Add an environment variable setting to the global list.
  *    A NAME=VALUE string is allocated, filled, and added to the list of
  *    environment settings passed to the cgi execution script.
  *
@@ -1380,7 +1380,7 @@
 	    return cur->allow_deny == 'A';   /* Allow/Deny */
     }
 
-    /* if uncofigured, return 1 - access from all */
+    /* if unconfigured, return 1 - access from all */
     return !config->flg_deny_all;
 }
 
@@ -1765,7 +1765,7 @@
   while (1) {
     readfd = portfd;
 
-    /* Now wait INDEFINATELY on the set of sockets! */
+    /* Now wait INDEFINITELY on the set of sockets! */
     if (select(server + 1, &readfd, 0, 0, 0) > 0) {
       if (FD_ISSET(server, &readfd)) {
 	int on;
@@ -1990,7 +1990,7 @@
 #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
   server = openServer();
 # ifdef CONFIG_FEATURE_HTTPD_SETUID
-  /* drop privilegies */
+  /* drop privileges */
   if(uid > 0)
 	setuid(uid);
 # endif

Index: inetd.c
===================================================================
RCS file: /var/cvs/busybox/networking/inetd.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- a/inetd.c	22 Feb 2004 11:25:13 -0000	1.20
+++ b/inetd.c	14 Apr 2004 17:51:24 -0000	1.21
@@ -56,7 +56,7 @@
  *      server program                  full path name
  *      server program arguments        maximum of MAXARGS (20)
  *
- * RPC services unsuported
+ * RPC services unsupported
  *
  * Comment lines are indicated by a `#' in column 1.
  */
@@ -345,7 +345,7 @@
 		sep->se_family = AF_UNIX;
 	} else {
 		if (strncmp(cp_ptr, "rpc/", 4) == 0) {
-			syslog(LOG_ERR, "%s: rpc services not suported",
+			syslog(LOG_ERR, "%s: rpc services not supported",
 			    sep->se_service);
 			goto more;
 		}

Index: wget.c
===================================================================
RCS file: /var/cvs/busybox/networking/wget.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- a/wget.c	8 Apr 2004 10:27:11 -0000	1.73
+++ b/wget.c	14 Apr 2004 17:51:24 -0000	1.74
@@ -816,7 +816,7 @@
 #endif
 
 /* Original copyright notice which applies to the CONFIG_FEATURE_WGET_STATUSBAR stuff,
- * much of which was blatently stolen from openssh.  */
+ * much of which was blatantly stolen from openssh.  */
 
 /*-
  * Copyright (c) 1992, 1993

Index: ipcalc.c
===================================================================
RCS file: /var/cvs/busybox/networking/ipcalc.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/ipcalc.c	13 Apr 2004 19:25:57 -0000	1.9
+++ b/ipcalc.c	14 Apr 2004 17:51:24 -0000	1.10
@@ -5,8 +5,8 @@
  * By Jordan Crouse <jordan at cosmicpenguin.net>
  *    Stephan Linz  <linz at li-pro.net>
  *
- * This is a complete reimplentation of the ipcalc program
- * from Redhat.  I didn't look at their source code, but there
+ * This is a complete reimplementation of the ipcalc program
+ * from Red Hat.  I didn't look at their source code, but there
  * is no denying that this is a loving reimplementation
  */