From aa078afcf9828344697ef0469272657ac12a30b1 Mon Sep 17 00:00:00 2001 From: Kevin Lyda Date: Wed, 18 Apr 2012 00:38:04 +0100 Subject: [PATCH] maint: fix common spelling errors These were identified using: https://github.com/lyda/misspell-check executed like: git ls-files | misspellings -f - * src/cat.c: Correct a spelling error. * src/comm.c: Likewise. * src/expr.c: Likewise. * src/pr.c: Likewise. * src/tac.c: Likewise. * src/test.c: Likewise. * src/ChangeLog-2005: Likewise. * src/ChangeLog-2007: Likewise. * src/NEWS: Likewise. * src/doc/coreutils.texi: Likewise. * src/lib/ChangeLog-2007: Likewise. * src/man/help2man: Likewise. * src/old/fileutils/ChangeLog-1997: Likewise. * src/old/fileutils/NEWS: Likewise. * src/old/sh-utils/ChangeLog.0: Likewise. * src/old/textutils/ChangeLog: Likewise. * src/tests/misc/comm: Likewise. * src/tests/misc/uniq: Likewise. * src/tests/mv/dir2dir: Likewise. * src/cfg.mk (old_NEWS_hash): update with `make update-NEWS-hash` --- ChangeLog-2005 | 2 +- ChangeLog-2007 | 2 +- NEWS | 6 +++--- cfg.mk | 2 +- doc/coreutils.texi | 2 +- lib/ChangeLog-2007 | 2 +- man/help2man | 2 +- old/fileutils/ChangeLog-1997 | 2 +- old/fileutils/NEWS | 2 +- old/sh-utils/ChangeLog.0 | 4 ++-- old/textutils/ChangeLog | 8 ++++---- src/cat.c | 4 ++-- src/comm.c | 2 +- src/expr.c | 2 +- src/pr.c | 2 +- src/tac.c | 2 +- src/test.c | 2 +- tests/misc/comm | 14 +++++++------- tests/misc/uniq | 2 +- tests/mv/dir2dir | 2 +- 20 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ChangeLog-2005 b/ChangeLog-2005 index c334927..6da4ad9 100644 --- a/ChangeLog-2005 +++ b/ChangeLog-2005 @@ -1206,7 +1206,7 @@ * tests/Coreutils.pm: New keywords, ENV and ENV_DEL, to support tests/misc/date. - With todays additions, the generated shell script, + With today's additions, the generated shell script, tests/date/date-tests had becoming far too large (over 350KB), so use the superior-but-perl-requiring framework instead. * tests/date/Test.pm: Move all tests from here... diff --git a/ChangeLog-2007 b/ChangeLog-2007 index c232c29..76128ec 100644 --- a/ChangeLog-2007 +++ b/ChangeLog-2007 @@ -3262,7 +3262,7 @@ rm without -f: give a better diagnostic when euidaccess fails. * src/remove.c (write_protected_non_symlink): Return int, not bool, - so that we can indicate failure too (as a postive error number). + so that we can indicate failure too (as a positive error number). (prompt): If write_protected_non_symlink fails, report that error number and fail rather than charging ahead and removing the dubious entry. Redo the logic of printing a diagnostic so that we need to diff --git a/NEWS b/NEWS index fd563c0..2dc6531 100644 --- a/NEWS +++ b/NEWS @@ -901,7 +901,7 @@ GNU coreutils NEWS -*- outline -*- On Solaris 9, many commands would mistakenly treat file/ the same as file. Now, even on such a system, path resolution obeys the POSIX - rules that a trailing slash ensures that the preceeding name is a + rules that a trailing slash ensures that the preceding name is a directory or a symlink to a directory. ** Changes in behavior @@ -1122,7 +1122,7 @@ GNU coreutils NEWS -*- outline -*- ** Changes in behavior shred, sort, shuf: now use an internal pseudorandom generator by default. - This is mainly noticable in shred where the 3 random passes it does by + This is mainly noticeable in shred where the 3 random passes it does by default should proceed at the speed of the disk. Previously /dev/urandom was used if available, which is relatively slow on GNU/Linux systems. @@ -3368,7 +3368,7 @@ point at which the packages merged to form the coreutils: * Any time style can be preceded by "posix-"; this causes "ls" to use traditional timestamp format when in the POSIX locale. * The default time style is now posix-long-iso instead of posix-iso. - Set TIME_STYLE="posix-iso" to revert to the behavior of 4.1.1 thru 4.1.9. + Set TIME_STYLE="posix-iso" to revert to the behavior of 4.1.1 through 4.1.9. * 'rm dangling-symlink' doesn't prompt [introduced in 4.1.9] * stat: remove support for --secure/-s option and related %S and %C format specs * stat: rename --link/-l to --dereference/-L. diff --git a/cfg.mk b/cfg.mk index 923785e..3fce0ab 100644 --- a/cfg.mk +++ b/cfg.mk @@ -45,7 +45,7 @@ export VERBOSE = yes # 4914152 9e export XZ_OPT = -8e -old_NEWS_hash = 45d520a814b59efc0d2f4f56fd10c578 +old_NEWS_hash = d2ba572c2f1135b74e24ea3fb20e674e # Add an exemption for sc_makefile_at_at_check. _makefile_at_at_check_exceptions = ' && !/^cu_install_program =/' diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 4fb52cb..61b3c89 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -14891,7 +14891,7 @@ parsed reliably. In the following example, @var{release} is @smallexample uname -a -@result{} Linux dum 2.2.18 #4 SMP Tue Jun 5 11:24:08 PDT 2001 i686@c +@result{} Linux dumdum 2.2.18 #4 SMP Tue Jun 5 11:24:08 PDT 2001 i686@c unknown unknown GNU/Linux @end smallexample diff --git a/lib/ChangeLog-2007 b/lib/ChangeLog-2007 index 88198db..c9f3c30 100644 --- a/lib/ChangeLog-2007 +++ b/lib/ChangeLog-2007 @@ -2729,7 +2729,7 @@ (local_zone): Accumulate dsts_seen rather than relying on tm_isdst not being INT_MAX. (get_date): Initialize dsts_seen, and check that it doesn't go over 1. - Use pc_rels_seen to decide whther a date is absolute. + Use pc_rels_seen to decide whether a date is absolute. * getdate.y (number): Don't overwrite year. (get_date): Initialize pc.year.digits to 0, not 4, to enable above diff --git a/man/help2man b/man/help2man index 907dd50..27d04c9 100755 --- a/man/help2man +++ b/man/help2man @@ -254,7 +254,7 @@ if ($opt_output) # ({GNU,Free} ) # - {GNU,Free} # -# and seperated from any copyright/author details by a blank line. +# and separated from any copyright/author details by a blank line. ($_, $version_text) = split /\n+/, $version_text, 2; diff --git a/old/fileutils/ChangeLog-1997 b/old/fileutils/ChangeLog-1997 index 475f49e..53cdf20 100644 --- a/old/fileutils/ChangeLog-1997 +++ b/old/fileutils/ChangeLog-1997 @@ -2542,7 +2542,7 @@ Thu Feb 15 23:08:41 1996 Jim Meyering (meyering@na-net.ornl.gov) Mon Feb 12 23:23:25 1996 Jim Meyering (meyering@na-net.ornl.gov) * configure.in (LIBOBJS): Split assignment into two statements to - accomodate automake-0.29 buglet. + accommodate automake-0.29 buglet. Update for automake-0.29. * Makefile.am (CONFIG_HEADER): Don't define. Automake now does it. diff --git a/old/fileutils/NEWS b/old/fileutils/NEWS index 7034707..8432c53 100644 --- a/old/fileutils/NEWS +++ b/old/fileutils/NEWS @@ -8,7 +8,7 @@ * Any time style can be preceded by "posix-"; this causes "ls" to use traditional timestamp format when in the POSIX locale. * The default time style is now posix-long-iso instead of posix-iso. - Set TIME_STYLE="posix-iso" to revert to the behavior of 4.1.1 thru 4.1.9. + Set TIME_STYLE="posix-iso" to revert to the behavior of 4.1.1 through 4.1.9. * `rm dangling-symlink' doesn't prompt [introduced in 4.1.9] * stat: remove support for --secure/-s option and related %S and %C format specs * stat: rename --link/-l to --dereference/-L. diff --git a/old/sh-utils/ChangeLog.0 b/old/sh-utils/ChangeLog.0 index 0a2cc9b..880e3f3 100644 --- a/old/sh-utils/ChangeLog.0 +++ b/old/sh-utils/ChangeLog.0 @@ -269,7 +269,7 @@ Mon Aug 01 21:58:14 1994 Jim Meyering (meyering@comco.com) * date.1: Correct the documentation, too. * date.c (main, show_date): For -u, use gmtime instead of relying on - localtime's ability to interpret the TZ enviroment variable. + localtime's ability to interpret the TZ environment variable. `date -u' failed (by reporting local time) on romp-ibm-bsd and PCs (DOS and OS/2) running emx 0.8h. From R. Bernstein . @@ -1362,7 +1362,7 @@ Mon Jul 22 15:21:21 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) * stty.c: Use tcflag_t for termios bitmasks. Use speed_t for speeds. Use unsigned long for baud rates to - accomodate large values, and support 57600 and 115200 if available. + accommodate large values, and support 57600 and 115200 if available. * date.c, configure: Instead of SIZE_T_MISSING, define size_t if it's missing. diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog index dd88232..36f58ff 100644 --- a/old/textutils/ChangeLog +++ b/old/textutils/ChangeLog @@ -4869,7 +4869,7 @@ Fri Dec 27 17:29:02 1996 Jim Meyering this time with duplicates removed. * src/pr.c (usage): Break long string literal into two separate - printf statements to accomodate default maximum of 2048 characters + printf statements to accommodate default maximum of 2048 characters for Irix-4.0.5. Reported by Kaveh Ghazi. * Makefile.am (aclocal.m4): No longer depend on acinclude.m4. @@ -5203,7 +5203,7 @@ Fri Oct 4 07:20:37 1996 Jim Meyering (PACKAGE_VERSION): Remove now-unused variable. * lib/long-options.c (parse_long_options): Separate package name - and version number to accomodate new --version output requirement. + and version number to accommodate new --version output requirement. * lib/long-options.h: Update prototype. Thu Oct 3 23:27:31 1996 Jim Meyering @@ -5245,7 +5245,7 @@ Thu Sep 26 21:02:54 1996 Jim Meyering removed soon. Using this option can provoke a memory access violation on some systems because of (unavoidable in an efficient implementation) alignment assumptions made by functions in md5.c. - md5sum.c could leave the option in and accomodate the alignment + md5sum.c could leave the option in and accommodate the alignment restriction, but this option was intended solely for testing, and the tests are now all file-oriented, so it's not necessary. @@ -8697,7 +8697,7 @@ Tue Feb 20 17:09:19 1990 David J. MacKenzie (djm at albert.ai.mit.edu) Sat Feb 10 02:16:40 1990 David J. MacKenzie (djm at albert.ai.mit.edu) * cmp.c (cmp): Rename `r' to `first_diff', and `x' to `smaller'. - Remove unneccessary variable `c1'. If -l was given, increase + Remove unnecessary variable `c1'. If -l was given, increase `char_number' by the number of bytes read, after producing output, rather than by the offset of the first differing bytes, before producing output. diff --git a/src/cat.c b/src/cat.c index 41a1b41..9e901e0 100644 --- a/src/cat.c +++ b/src/cat.c @@ -751,8 +751,8 @@ main (int argc, char **argv) A line number requires seldom more than LINE_COUNTER_BUF_LEN positions. - Align the output buffer to a page size boundary, for efficency on - some paging implementations, so add PAGE_SIZE - 1 bytes to the + Align the output buffer to a page size boundary, for efficiency + on some paging implementations, so add PAGE_SIZE - 1 bytes to the request to make room for the alignment. */ outbuf = xmalloc (outsize - 1 + insize * 4 + LINE_COUNTER_BUF_LEN diff --git a/src/comm.c b/src/comm.c index 04422d6..748147a 100644 --- a/src/comm.c +++ b/src/comm.c @@ -193,7 +193,7 @@ writeline (struct linebuffer const *line, FILE *stream, int class) A message is printed at most once per input file. - This funtion was copied (nearly) verbatim from 'src/join.c'. */ + This function was copied (nearly) verbatim from 'src/join.c'. */ static void check_order (struct linebuffer const *prev, diff --git a/src/expr.c b/src/expr.c index 5368010..700e4af 100644 --- a/src/expr.c +++ b/src/expr.c @@ -18,7 +18,7 @@ Modified for arbitrary-precision calculation by James Youngman. This program evaluates expressions. Each token (operator, operand, - parenthesis) of the expression must be a seperate argument. The + parenthesis) of the expression must be a separate argument. The parser used is a reasonably general one, though any incarnation of it is language-specific. It is especially nice for expressions. diff --git a/src/pr.c b/src/pr.c index 2ea586d..e97c434 100644 --- a/src/pr.c +++ b/src/pr.c @@ -1413,7 +1413,7 @@ init_funcs (void) else { /* When numbering lines of parallel files, we enlarge the - first column to accomodate the number. Looks better than + first column to accommodate the number. Looks better than the Sys V approach. */ if (parallel_files && numbered_lines) h_next = h + chars_per_column + number_width; diff --git a/src/tac.c b/src/tac.c index 2bf8ad2..8bef443 100644 --- a/src/tac.c +++ b/src/tac.c @@ -339,7 +339,7 @@ tac_seekable (int input_fd, const char *file) The source and destination regions probably overlap. */ memmove (G_buffer + read_size, G_buffer, saved_record_size); past_end = G_buffer + read_size + saved_record_size; - /* For non-regexp searches, avoid unneccessary scanning. */ + /* For non-regexp searches, avoid unnecessary scanning. */ if (sentinel_length) match_start = G_buffer + read_size; else diff --git a/src/test.c b/src/test.c index 31a6420..45f2206 100644 --- a/src/test.c +++ b/src/test.c @@ -94,7 +94,7 @@ test_syntax_error (char const *format, char const *arg) } /* Increment our position in the argument list. Check that we're not - past the end of the argument list. This check is supressed if the + past the end of the argument list. This check is suppressed if the argument is false. */ static void diff --git a/tests/misc/comm b/tests/misc/comm index 905b5f8..0de4f69 100755 --- a/tests/misc/comm +++ b/tests/misc/comm @@ -34,25 +34,25 @@ my @Tests = # basic operation ['basic', @inputs, {OUT=>"1\n\t2\n\t\t3\n"} ], - # supress lines unique to file 1 + # suppress lines unique to file 1 ['opt-1', '-1', @inputs, {OUT=>"2\n\t3\n"} ], - # supress lines unique to file 2 + # suppress lines unique to file 2 ['opt-2', '-2', @inputs, {OUT=>"1\n\t3\n"} ], - # supress lines that appear in both files + # suppress lines that appear in both files ['opt-3', '-3', @inputs, {OUT=>"1\n\t2\n"} ], - # supress lines unique to file 1 and lines unique to file 2 + # suppress lines unique to file 1 and lines unique to file 2 ['opt-12', '-1', '-2', @inputs, {OUT=>"3\n"} ], - # supress lines unique to file 1 and those that appear in both files + # suppress lines unique to file 1 and those that appear in both files ['opt-13', '-1', '-3', @inputs, {OUT=>"2\n"} ], - # supress lines unique to file 2 and those that appear in both files + # suppress lines unique to file 2 and those that appear in both files ['opt-23', '-2', '-3', @inputs, {OUT=>"1\n"} ], - # supress all output (really?) + # suppress all output (really?) ['opt-123', '-1', '-2', '-3', @inputs, {OUT=>""} ], # invalid missing command line argument (1) diff --git a/tests/misc/uniq b/tests/misc/uniq index 91028a9..d0e6d15 100755 --- a/tests/misc/uniq +++ b/tests/misc/uniq @@ -162,7 +162,7 @@ my @Tests = ['65', qw(-f 1 -w 3), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\n"}], # Make sure we don't break if the file contains \0 ['90', '', {IN=>"a\0a\na\n"}, {OUT=>"a\0a\na\n"}], - # Check fields seperated by tabs and by spaces + # Check fields separated by tabs and by spaces ['91', '', {IN=>"a\ta\na a\n"}, {OUT=>"a\ta\na a\n"}], ['92', qw(-f 1), {IN=>"a\ta\na a\n"}, {OUT=>"a\ta\na a\n"}], ['93', qw(-f 2), {IN=>"a\ta a\na a a\n"}, {OUT=>"a\ta a\n"}], diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir index c170de2..4322fd2 100755 --- a/tests/mv/dir2dir +++ b/tests/mv/dir2dir @@ -25,7 +25,7 @@ touch a/t/f || framework_failure_ # Expect this to fail with the expected diagnostic. -# For an interrim (pre-6.0) release, it would give an erroneous +# For an interim (pre-6.0) release, it would give an erroneous # diagnostic about moving one directory to a subdirectory of itself. mv b/t a 2> out && fail=1 -- 2.7.4