>From 23e8d5e630fa39be13bf6a56a9bec68027987518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Thu, 15 Oct 2015 15:15:56 +0100 Subject: [PATCH] maint: fix incorrect spellings etc * NEWS: Use a standard version specification. * doc/coreutils.texi: Fix incorrect grammar. * src/df.c: Update a stale comment. * src/copy.c: Fix incorrect spellings. * src/factor.c: Likewise. * src/ls.c: Likewise. * src/pr.c: Likewise. * src/shred.c: Likewise. * src/sort.c: Likewise. * src/split.c: Likewise. * tests/misc/seq-precision.sh: Likewise. --- NEWS | 2 +- doc/coreutils.texi | 2 +- src/copy.c | 2 +- src/df.c | 2 +- src/factor.c | 2 +- src/ls.c | 6 +++--- src/pr.c | 2 +- src/shred.c | 2 +- src/sort.c | 4 ++-- src/split.c | 2 +- tests/misc/seq-precision.sh | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NEWS b/NEWS index 2988146..524c191 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ GNU coreutils NEWS -*- outline -*- [bug introduced in coreutils-8.10] ls no longer prematurely wraps lines when printing short file names. - [bug introduced in 5.1.0] + [bug introduced in coreutils-5.1.0] shred again uses defined patterns for all iteration counts. [bug introduced in coreutils-5.93] diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 64b6206..33be4d8 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -8667,7 +8667,7 @@ otherwise the cache is dropped for the processed portion of the file. Also when count=0 failure to discard the cache is diagnosed and reflected in the exit status. -Here as some usage examples: +Here are some usage examples: @example # Advise to drop cache for whole file diff --git a/src/copy.c b/src/copy.c index 6771bb5..cc5dfe4 100644 --- a/src/copy.c +++ b/src/copy.c @@ -2375,7 +2375,7 @@ copy_internal (char const *src_name, char const *dst_name, If this happens to you, please do the following and send the output to the bug-reporting address (e.g., in the output of cp --help): touch k; perl -e 'rename "k","/tmp/k" or print "$!(",$!+0,")\n"' - where your current directory is on one partion and /tmp is the other. + where your current directory is on one partition and /tmp is the other. Also, please try to find the E* errno macro name corresponding to the diagnostic and parenthesized integer, and include that in your e-mail. One way to do that is to run a command like this diff --git a/src/df.c b/src/df.c index 250a570..c1c1e68 100644 --- a/src/df.c +++ b/src/df.c @@ -15,7 +15,7 @@ along with this program. If not, see . */ /* Written by David MacKenzie . - --human-readable and --megabyte options added by address@hidden. + --human-readable option added by address@hidden. --si and large file support added by address@hidden. */ #include diff --git a/src/factor.c b/src/factor.c index ee578bf..b195c05 100644 --- a/src/factor.c +++ b/src/factor.c @@ -37,7 +37,7 @@ Using GMP is optional. Define HAVE_GMP to make this code include GMP factoring code. The GMP factoring code is based on GMP's demos/factorize.c - (last synched 2012-09-07). The GMP-based factoring code will stay in GMP + (last synced 2012-09-07). The GMP-based factoring code will stay in GMP factoring code even if numbers get small enough for using the two-word code. diff --git a/src/ls.c b/src/ls.c index 2ae548d..52750b0 100644 --- a/src/ls.c +++ b/src/ls.c @@ -945,7 +945,7 @@ static size_t dired_pos; } \ while (0) -/* With --dired, store pairs of beginning and ending indices of filenames. */ +/* With --dired, store pairs of beginning and ending indices of file names. */ static struct obstack dired_obstack; /* With --dired, store pairs of beginning and ending indices of any @@ -2156,7 +2156,7 @@ get_funky_string (char **dest, const char **src, bool equals_end, state = ST_END; /* End of string */ break; case '\\': - state = ST_BACKSLASH; /* Backslash scape sequence */ + state = ST_BACKSLASH; /* Backslash escape sequence */ ++p; break; case '^': @@ -3478,7 +3478,7 @@ cmp_name (struct fileinfo const *a, struct fileinfo const *b, } /* Compare file extensions. Files with no extension are 'smallest'. - If extensions are the same, compare by filenames instead. */ + If extensions are the same, compare by file names instead. */ static inline int cmp_extension (struct fileinfo const *a, struct fileinfo const *b, diff --git a/src/pr.c b/src/pr.c index a01a0db..f264ba4 100644 --- a/src/pr.c +++ b/src/pr.c @@ -469,7 +469,7 @@ static size_t buff_allocated; we do column balancing on the last page. */ static int *line_vector; -/* Array of horizonal positions. +/* Array of horizontal positions. For each line in line_vector, end_vector[line] is the horizontal position we are in after printing that line. We keep track of this so that we know how much we need to pad to prepare for the next diff --git a/src/shred.c b/src/shred.c index 08e212a..a7cfc6b 100644 --- a/src/shred.c +++ b/src/shred.c @@ -431,7 +431,7 @@ dopass (int fd, struct stat const *st, char const *qname, off_t *sizep, unsigned long int k, unsigned long int n) { off_t size = *sizep; - off_t offset; /* Current file posiiton */ + off_t offset; /* Current file position */ time_t thresh IF_LINT ( = 0); /* Time to maybe print next status update */ time_t now = 0; /* Current time */ size_t lim; /* Amount of data to try writing */ diff --git a/src/sort.c b/src/sort.c index 399b964..4df1268 100644 --- a/src/sort.c +++ b/src/sort.c @@ -238,7 +238,7 @@ struct month struct merge_node { struct line *lo; /* Lines to merge from LO child node. */ - struct line *hi; /* Lines to merge from HI child ndoe. */ + struct line *hi; /* Lines to merge from HI child node. */ struct line *end_lo; /* End of available lines from LO. */ struct line *end_hi; /* End of available lines from HI. */ struct line **dest; /* Pointer to destination of merge. */ @@ -678,7 +678,7 @@ struct sortfile /* The file's name. */ char const *name; - /* Nonnull if this is a temporary file, in which case NAME == TEMP->name. */ + /* Non null if this is a temporary file, in which case NAME == TEMP->name. */ struct tempnode *temp; }; diff --git a/src/split.c b/src/split.c index 5d60376..afa7500 100644 --- a/src/split.c +++ b/src/split.c @@ -1285,7 +1285,7 @@ main (int argc, char **argv) if (split_type != type_undef) FAIL_ONLY_ONE_WAY (); split_type = type_bytes; - /* Limit to OFF_T_MAX, becaue if input is a pipe, we could get more + /* Limit to OFF_T_MAX, because if input is a pipe, we could get more data than is possible to write to a single file, so indicate that immediately rather than having possibly future invocations fail. */ n_units = xdectoumax (optarg, 1, OFF_T_MAX, multipliers, diff --git a/tests/misc/seq-precision.sh b/tests/misc/seq-precision.sh index b8382ca..62464d6 100755 --- a/tests/misc/seq-precision.sh +++ b/tests/misc/seq-precision.sh @@ -25,7 +25,7 @@ seq 999999 inf | head -n2 > out || fail=1 printf "%s\n" 999999 1000000 > exp || framework_failure_ compare exp out || fail=1 -# Excercise buffer handling in non floating point output +# Exercise buffer handling in non floating point output for i in $(seq 100); do n1="$(printf '%*s' $i '' | tr ' ' 9)" n2="1$(echo $n1 | tr 9 0)" -- 2.5.0