[BusyBox-cvs] busybox/util-linux fdisk.c, 1.21, 1.22 fsck_minix.c, 1.39, 1.40 getopt.c, 1.12, 1.13 hwclock.c, 1.12, 1.13 mkfs_minix.c, 1.41, 1.42 mount.c, 1.117, 1.118

Erik Andersen andersen at busybox.net
Wed Apr 14 17:51:43 UTC 2004


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

Modified Files:
	fdisk.c fsck_minix.c getopt.c hwclock.c mkfs_minix.c mount.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: fsck_minix.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/fsck_minix.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- a/fsck_minix.c	15 Mar 2004 08:29:21 -0000	1.39
+++ b/fsck_minix.c	14 Apr 2004 17:51:38 -0000	1.40
@@ -7,7 +7,7 @@
  */
 
 /*
- * 09.11.91  -  made the first rudimetary functions
+ * 09.11.91  -  made the first rudimentary functions
  *
  * 10.11.91  -  updated, does checking, no repairs yet.
  *		Sent out to the mailing-list for testing.
@@ -53,7 +53,7 @@
  *             (Russell King).  He made them for ARM.  It would seem
  *	       that the ARM is powerful enough to do this in C whereas
  *             i386 and m64k must use assembly to get it fast >:-)
- *	       This should make minix fsck systemindependent.
+ *	       This should make minix fsck system-independent.
  *	       (janl at math.uio.no, Nicolai Langfeldt)
  *
  * 04.11.96  - Added minor fixes from Andreas Schwab to avoid compiler
@@ -73,7 +73,7 @@
  * unless you can be sure nobody is writing to it (and remember that the
  * kernel can write to it when it searches for files).
  *
- * Usuage: fsck [-larvsm] device
+ * Usage: fsck [-larvsm] device
  *	-l for a listing of all the filenames
  *	-a for automatic repairs (not implemented)
  *	-r for repairs (interactive) (not implemented)

Index: hwclock.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/hwclock.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/hwclock.c	22 Mar 2004 21:27:39 -0000	1.12
+++ b/hwclock.c	14 Apr 2004 17:51:38 -0000	1.13
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include "busybox.h"
 
-/* Copied from linux/rtc.h to eliminate the kernel dependancy */
+/* Copied from linux/rtc.h to eliminate the kernel dependency */
 struct linux_rtc_time {
 	int tm_sec;
 	int tm_min;

Index: mount.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/mount.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- a/mount.c	12 Apr 2004 15:02:53 -0000	1.117
+++ b/mount.c	14 Apr 2004 17:51:38 -0000	1.118
@@ -31,7 +31,7 @@
  *              major adjustments to option parsing, and some serious
  *              dieting all around.
  *
- * 1999-11-06	mtab suppport is back - andersee
+ * 1999-11-06	mtab support is back - andersee
  *
  * 2000-01-12   Ben Collins <bcollins at debian.org>, Borrowed utils-linux's
  *              mount to add loop support.

Index: mkfs_minix.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/mkfs_minix.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- a/mkfs_minix.c	15 Mar 2004 08:29:21 -0000	1.41
+++ b/mkfs_minix.c	14 Apr 2004 17:51:38 -0000	1.42
@@ -49,7 +49,7 @@
  *
  * Usage:  mkfs [-c | -l filename ] [-v] [-nXX] [-iXX] device [size-in-blocks]
  *
- *	-c for readablility checking (SLOW!)
+ *	-c for readability checking (SLOW!)
  *      -l for getting a list of bad blocks from a file.
  *	-n for namelength (currently the kernel only uses 14 or 30)
  *	-i for number of inodes
@@ -602,7 +602,7 @@
 
 /*
  * Perform a test of a block; return the number of
- * blocks readable/writeable.
+ * blocks readable/writable.
  */
 static inline long do_check(char *buffer, int try, unsigned int current_block)
 {

Index: fdisk.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/fdisk.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- a/fdisk.c	30 Mar 2004 09:33:18 -0000	1.21
+++ b/fdisk.c	14 Apr 2004 17:51:38 -0000	1.22
@@ -475,7 +475,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
+ *    must display the following acknowledgment:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors

Index: getopt.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/getopt.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/getopt.c	19 Mar 2003 09:13:00 -0000	1.12
+++ b/getopt.c	14 Apr 2004 17:51:38 -0000	1.13
@@ -37,7 +37,7 @@
  *     <misiek at misiek.eu.org>)
  * Ported to Busybox - Alfred M. Szmidt <ams at trillian.itslinux.org>
  *  Removed --version/-V and --help/-h in
- *  Removed prase_error(), using bb_error_msg() from Busybox instead
+ *  Removed parse_error(), using bb_error_msg() from Busybox instead
  *  Replaced our_malloc with xmalloc and our_realloc with xrealloc
  *
  */
@@ -99,7 +99,7 @@
                 return BUFFER;
         }
 
-        /* Each character in arg may take upto four characters in the result:
+        /* Each character in arg may take up to four characters in the result:
            For a quote we need a closing quote, a backslash, a quote and an
            opening quote! We need also the global opening and closing quote,
            and one extra character for '\0'. */
@@ -278,7 +278,7 @@
 
 
 /* Exit codes:
- *   0) No errors, succesful operation.
+ *   0) No errors, successful operation.
  *   1) getopt(3) returned an error.
  *   2) A problem with parameter parsing for getopt(1).
  *   3) Internal error, out of memory




More information about the busybox-cvs mailing list