diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cat.c | 4 | ||||
| -rw-r--r-- | src/chmod.c | 2 | ||||
| -rw-r--r-- | src/copy.c | 2 | ||||
| -rw-r--r-- | src/cp-hash.c | 2 | ||||
| -rw-r--r-- | src/cp.c | 4 | ||||
| -rw-r--r-- | src/dd.c | 4 | ||||
| -rw-r--r-- | src/df.c | 2 | ||||
| -rw-r--r-- | src/digest.c | 4 | ||||
| -rw-r--r-- | src/du.c | 4 | ||||
| -rw-r--r-- | src/expand-common.c | 2 | ||||
| -rw-r--r-- | src/expand-common.h | 2 | ||||
| -rw-r--r-- | src/factor.c | 18 | ||||
| -rw-r--r-- | src/getlimits.c | 2 | ||||
| -rw-r--r-- | src/ioblksize.h | 2 | ||||
| -rw-r--r-- | src/iopoll.c | 2 | ||||
| -rw-r--r-- | src/ln.c | 2 | ||||
| -rw-r--r-- | src/local.mk | 4 | ||||
| -rw-r--r-- | src/ls.c | 4 | ||||
| -rw-r--r-- | src/mv.c | 2 | ||||
| -rw-r--r-- | src/numfmt.c | 2 | ||||
| -rw-r--r-- | src/od.c | 4 | ||||
| -rw-r--r-- | src/pathchk.c | 4 | ||||
| -rw-r--r-- | src/pr.c | 10 | ||||
| -rw-r--r-- | src/prog-fprintf.c | 2 | ||||
| -rw-r--r-- | src/prog-fprintf.h | 2 | ||||
| -rw-r--r-- | src/ptx.c | 4 | ||||
| -rw-r--r-- | src/realpath.c | 2 | ||||
| -rw-r--r-- | src/sort.c | 2 | ||||
| -rw-r--r-- | src/split.c | 4 | ||||
| -rw-r--r-- | src/stat.c | 2 | ||||
| -rw-r--r-- | src/stdbuf.c | 2 | ||||
| -rw-r--r-- | src/stty.c | 2 | ||||
| -rw-r--r-- | src/system.h | 5 | ||||
| -rw-r--r-- | src/timeout.c | 4 | ||||
| -rw-r--r-- | src/tr.c | 2 | ||||
| -rw-r--r-- | src/truncate.c | 2 | ||||
| -rw-r--r-- | src/tsort.c | 7 | ||||
| -rw-r--r-- | src/uniq.c | 2 | ||||
| -rw-r--r-- | src/wc.c | 6 |
39 files changed, 67 insertions, 71 deletions
@@ -19,7 +19,7 @@ * Usually much faster than other versions of cat, the difference is especially apparent when using the -v option. - By tege@sics.se, Torbjorn Granlund, advised by rms, Richard Stallman. */ + By tege@sics.se, Torbjörn Granlund, advised by rms, Richard Stallman. */ #include <config.h> @@ -45,7 +45,7 @@ #define PROGRAM_NAME "cat" #define AUTHORS \ - proper_name ("Torbjorn Granlund"), \ + proper_name_lite ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \ proper_name ("Richard M. Stallman") /* Name of input file. May be "-". */ diff --git a/src/chmod.c b/src/chmod.c index 66d1a61c7..de0c5d07c 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -457,7 +457,7 @@ main (int argc, char **argv) case '=': case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': - /* Support nonportable uses like "chmod -w", but diagnose + /* Support non-portable uses like "chmod -w", but diagnose surprises due to umask confusion. Even though "--", "--r", etc., are valid modes, there is no "case '-'" here since getopt_long reserves leading "--" for long options. */ diff --git a/src/copy.c b/src/copy.c index a60baba80..b9fff03a3 100644 --- a/src/copy.c +++ b/src/copy.c @@ -2996,7 +2996,7 @@ skip: omitted_permissions = 0; /* For directories, the process global context could be reset for - descendents, so use it to set the context for existing dirs here. + descendants, so use it to set the context for existing dirs here. This will also give earlier indication of failure to set ctx. */ if (x->set_security_context || x->preserve_security_context) if (! set_file_security_ctx (dst_name, false, x)) diff --git a/src/cp-hash.c b/src/cp-hash.c index 2f713e2c3..b4812745e 100644 --- a/src/cp-hash.c +++ b/src/cp-hash.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. - Written by Torbjorn Granlund, Sweden (tege@sics.se). + Written by Torbjörn Granlund, Sweden (tege@sics.se). Rewritten to use lib/hash.c by Jim Meyering. */ #include <config.h> @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. - Written by Torbjorn Granlund, David MacKenzie, and Jim Meyering. */ + Written by Torbjörn Granlund, David MacKenzie, and Jim Meyering. */ #include <config.h> #include <stdio.h> @@ -40,7 +40,7 @@ #define PROGRAM_NAME "cp" #define AUTHORS \ - proper_name ("Torbjorn Granlund"), \ + proper_name_lite ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \ proper_name ("David MacKenzie"), \ proper_name ("Jim Meyering") @@ -885,7 +885,7 @@ install_signal_handlers (void) act.sa_handler = siginfo_handler; /* Note we don't use SA_RESTART here and instead handle EINTR explicitly in iftruncate etc. - to avoid blocking on noncommitted read/write calls. */ + to avoid blocking on uncommitted read/write calls. */ act.sa_flags = 0; sigaction (SIGINFO, &act, nullptr); } @@ -1418,7 +1418,7 @@ static intmax_t parse_integer (char const *str, strtol_error *invalid) { /* Call xstrtoumax, not xstrtoimax, since we don't want to - allow strings like " -0". Initialize N to an interminate value; + allow strings like " -0". Initialize N to an indeterminate value; calling code should not rely on this function returning 0 when *INVALID represents a non-overflow error. */ int indeterminate = 0; @@ -43,7 +43,7 @@ #define PROGRAM_NAME "df" #define AUTHORS \ - proper_name ("Torbjorn Granlund"), \ + proper_name_lite ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \ proper_name ("David MacKenzie"), \ proper_name ("Paul Eggert") diff --git a/src/digest.c b/src/digest.c index c78ed66ee..3d239dabd 100644 --- a/src/digest.c +++ b/src/digest.c @@ -135,11 +135,11 @@ proper_name ("David MacKenzie") #elif HASH_ALGO_CKSUM # define AUTHORS \ - proper_name ("Padraig Brady"), \ + proper_name_lite ("Padraig Brady", "P\303\241draig Brady"), \ proper_name ("Q. Frank Xia") #elif HASH_ALGO_BLAKE2 # define AUTHORS \ - proper_name ("Padraig Brady"), \ + proper_name_lite ("Padraig Brady", "P\303\241draig Brady"), \ proper_name ("Samuel Neves") #else # define AUTHORS \ @@ -18,7 +18,7 @@ * Doesn't simply ignore the names of regular files given as arguments when -a is given. - By tege@sics.se, Torbjorn Granlund, + By tege@sics.se, Torbjörn Granlund, and djm@ai.mit.edu, David MacKenzie. Variable blocks added by lm@sgi.com and eggert@twinsun.com. Rewritten to use nftw, then to use fts by Jim Meyering. */ @@ -49,7 +49,7 @@ extern bool fts_debug; #define PROGRAM_NAME "du" #define AUTHORS \ - proper_name ("Torbjorn Granlund"), \ + proper_name_lite ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \ proper_name ("David MacKenzie"), \ proper_name ("Paul Eggert"), \ proper_name ("Jim Meyering") diff --git a/src/expand-common.c b/src/expand-common.c index cc2a1955e..89fa56ace 100644 --- a/src/expand-common.c +++ b/src/expand-common.c @@ -1,4 +1,4 @@ -/* expand-common - common functionality for expand/unexapnd +/* expand-common - common functionality for expand/unexpand Copyright (C) 1989-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/src/expand-common.h b/src/expand-common.h index 035406a7f..daed31ee2 100644 --- a/src/expand-common.h +++ b/src/expand-common.h @@ -1,4 +1,4 @@ -/* expand-common - common functionality for expand/unexapnd +/* expand-common - common functionality for expand/unexpand Copyright (C) 1989-2023 Free Software Foundation, Inc. diff --git a/src/factor.c b/src/factor.c index 9963a5df2..c47250a48 100644 --- a/src/factor.c +++ b/src/factor.c @@ -24,7 +24,7 @@ /* Efficiently factor numbers that fit in one or two words (word = uintmax_t), or, with GMP, numbers of any size. - Code organisation: + Code organization: There are several variants of many functions, for handling one word, two words, and GMP's mpz_t type. If the one-word variant is called foo, the @@ -48,7 +48,7 @@ Status of found factors are checked again using Miller-Rabin and Lucas. We prefer using Hensel norm in the divisions, not the more familiar - Euclidian norm, since the former leads to much faster code. In the + Euclidean norm, since the former leads to much faster code. In the Pollard-Brent rho code and the prime testing code, we use Montgomery's trick of multiplying all n-residues by the word base, allowing cheap Hensel reductions mod n. @@ -77,10 +77,10 @@ using gcc 4.6 and 4.7. Some software pipelining should help; 1, 2, and 4 respectively cycles ought to be possible. - * The redcify function could be vastly improved by using (plain Euclidian) + * The redcify function could be vastly improved by using (plain Euclidean) pre-inversion (such as GMP's invert_limb) and udiv_qrnnd_preinv (from GMP's gmp-impl.h). The redcify2 function could be vastly improved using - similar methoods. These functions currently dominate run time when using + similar methods. These functions currently dominate run time when using the -w option. */ @@ -118,8 +118,8 @@ #define AUTHORS \ proper_name ("Paul Rubin"), \ - proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \ - proper_name_utf8 ("Niels Moller", "Niels M\303\266ller") + proper_name_lite ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \ + proper_name_lite ("Niels Moller", "Niels M\303\266ller") /* Token delimiters when reading from a file. */ #define DELIM "\n\t " @@ -1201,7 +1201,7 @@ prime_p (uintmax_t n) if (n <= 1) return false; - /* We have already casted out small primes. */ + /* We have already cast out small primes. */ if (n < (uintmax_t) FIRST_OMITTED_PRIME * FIRST_OMITTED_PRIME) return true; @@ -1380,7 +1380,7 @@ mp_prime_p (mpz_t n) if (mpz_cmp_ui (n, 1) <= 0) return false; - /* We have already casted out small primes. */ + /* We have already cast out small primes. */ if (mpz_cmp_ui (n, (long) FIRST_OMITTED_PRIME * FIRST_OMITTED_PRIME) < 0) return true; @@ -1876,7 +1876,7 @@ static short const invtab[0x81] = }; /* Compute q = [u/d], r = u mod d. Avoids slow hardware division for the case - that q < 0x40; here it instead uses a table of (Euclidian) inverses. */ + that q < 0x40; here it instead uses a table of (Euclidean) inverses. */ # define div_smallq(q, r, u, d) \ do { \ if ((u) / 0x40 < (d)) \ diff --git a/src/getlimits.c b/src/getlimits.c index b7a825b91..4a9dffecd 100644 --- a/src/getlimits.c +++ b/src/getlimits.c @@ -27,7 +27,7 @@ #define PROGRAM_NAME "getlimits" -#define AUTHORS proper_name ("Padraig Brady") +#define AUTHORS proper_name_lite ("Padraig Brady", "P\303\241draig Brady") #ifndef TIME_T_MAX # define TIME_T_MAX TYPE_MAXIMUM (time_t) diff --git a/src/ioblksize.h b/src/ioblksize.h index 0a2406286..59c16531f 100644 --- a/src/ioblksize.h +++ b/src/ioblksize.h @@ -21,7 +21,7 @@ #include "stat-size.h" -/* As of May 2014, 128KiB is determined to be the minimium +/* As of May 2014, 128KiB is determined to be the minimum blksize to best minimize system call overhead. This can be tested with this script: diff --git a/src/iopoll.c b/src/iopoll.c index 08b99f9f3..e60e0197e 100644 --- a/src/iopoll.c +++ b/src/iopoll.c @@ -54,7 +54,7 @@ to wait for an event, otherwise return the status immediately. Return 0 if not BLOCKing and there is no event on the requested descriptors. Return 0 if FDIN can be read() without blocking, or IOPOLL_BROKEN_OUTPUT if - FDOUT becomes a broken pipe. If !BROKEN_OUTPUT return 0 if FDOUT writeable. + FDOUT becomes a broken pipe. If !BROKEN_OUTPUT return 0 if FDOUT writable. Otherwise return IOPOLL_ERROR if there is a poll() or select() error. */ static int @@ -315,7 +315,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base, to link A to B. But strictly following this has the counterintuitive effect of losing the contents of B if A does not exist. Fortunately, POSIX 2008 clarified that an application is free to fail early if it - can prove that continuing onwards cannot succeed, so we can try to + can prove that continuing onward cannot succeed, so we can try to link A to B before blindly unlinking B, thus sometimes attempting to link a second time during a successful 'ln -f A B'. diff --git a/src/local.mk b/src/local.mk index 549014181..f45b9114c 100644 --- a/src/local.mk +++ b/src/local.mk @@ -296,10 +296,8 @@ src_ls_LDADD += $(FILE_HAS_ACL_LIB) # for various xattr functions copy_ldadd += $(LIB_XATTR) -# for print_unicode_char, proper_name_utf8 -src_factor_LDADD += $(LIBICONV) +# for print_unicode_char src_printf_LDADD += $(LIBICONV) -src_ptx_LDADD += $(LIBICONV) # for libcrypto hash routines src_md5sum_LDADD += $(LIB_CRYPTO) @@ -958,7 +958,7 @@ struct column_info size_t *col_arr; }; -/* Array with information about column filledness. */ +/* Array with information about column fullness. */ static struct column_info *column_info; /* Maximum number of columns ever possible for this display. */ @@ -4644,7 +4644,7 @@ quote_name_buf (char **inbuf, size_t bufsize, char *name, } else { - /* An unprintable multibyte character. + /* An nonprintable multibyte character. Replace it entirely with a question mark. */ p += bytes; @@ -180,7 +180,7 @@ do_move (char const *source, char const *dest, /* In general, when copy returns with copy_into_self set, SOURCE is the same as, or a parent of DEST. In this case we know it's a parent. It doesn't make sense to move a directory into itself, and - besides in some situations doing so would give highly nonintuitive + besides in some situations doing so would give highly unintuitive results. Run this 'mkdir b; touch a c; mv * b' in an empty directory. Here's the result of running echo $(find b -print): b b/a b/b b/b/a b/c. Notice that only file 'a' was copied diff --git a/src/numfmt.c b/src/numfmt.c index 51f69b021..ca2eaffc3 100644 --- a/src/numfmt.c +++ b/src/numfmt.c @@ -605,7 +605,7 @@ simple_strtod_float (char const *input_str, TODO: support locale'd grouping - accept scentific and hex floats (probably use strtold directly) + accept scientific and hex floats (probably use strtold directly) Returns: SSE_OK - valid number. @@ -268,7 +268,7 @@ static enum size_spec fp_type_size[MAX_FP_TYPE_SIZE + 1]; # define WORDS_BIGENDIAN 0 #endif -/* Use native endianess by default. */ +/* Use native endianness by default. */ static bool input_swap; static char const short_options[] = "A:aBbcDdeFfHhIij:LlN:OoS:st:vw::Xx"; @@ -1746,7 +1746,7 @@ main (int argc, char **argv) CASE_OLD_ARG ('i', "dI"); case 'I': case 'L': /* obsolescent and undocumented aliases */ CASE_OLD_ARG ('l', "dL"); - CASE_OLD_ARG ('O', "o4"); /* obsolesent and undocumented */ + CASE_OLD_ARG ('O', "o4"); /* obsolescent and undocumented */ case 'B': /* obsolescent and undocumented alias */ CASE_OLD_ARG ('o', "o2"); CASE_OLD_ARG ('s', "d2"); diff --git a/src/pathchk.c b/src/pathchk.c index 3a29c3d28..9614294f4 100644 --- a/src/pathchk.c +++ b/src/pathchk.c @@ -86,7 +86,7 @@ usage (int status) { printf (_("Usage: %s [OPTION]... NAME...\n"), program_name); fputs (_("\ -Diagnose invalid or unportable file names.\n\ +Diagnose invalid or non-portable file names.\n\ \n\ -p check for most POSIX systems\n\ -P check for empty names and leading \"-\"\n\ @@ -191,7 +191,7 @@ portable_chars_only (char const *file, size_t filelen) mbstate_t mbstate = { 0, }; size_t charlen = mbrlen (invalid, filelen - validlen, &mbstate); error (0, 0, - _("nonportable character %s in file name %s"), + _("non-portable character %s in file name %s"), quotearg_n_style_mem (1, locale_quoting_style, invalid, (charlen <= MB_LEN_MAX ? charlen : 1)), quoteaf_n (0, file)); @@ -97,7 +97,7 @@ adapted to other UNIXes. A violation of downward compatibility has to be accepted. Some NEW CAPITAL LETTER options ( -J, -S, -W) has been introduced to - turn off unexpected interferences of small letter options (-s and -w + turn off unexpected interference of small letter options (-s and -w together with the three column options). -N option and the second argument LAST_PAGE of +FIRST_PAGE offer more flexibility; The detailed handling of form feeds set in the input @@ -143,7 +143,7 @@ (a most frequently used form) still work as usual. -c, --show-control-chars - Print unprintable characters as control prefixes. + Print nonprintable characters as control prefixes. Control-g is printed as ^G (use hat notation) and octal backslash notation. @@ -272,7 +272,7 @@ by form feeds set in the input files. -v, --show-nonprinting - Print unprintable characters as escape sequences. Use + Print nonprintable characters as escape sequences. Use octal backslash notation. Control-G becomes \007. -w PAGE_WIDTH, --width=PAGE_WIDTH @@ -663,11 +663,11 @@ static int number_width; /* Buffer sprintf uses to format a line number. */ static char *number_buff; -/* (-v) True means unprintable characters are printed as escape sequences. +/* (-v) True means nonprintable characters are printed as escape sequences. control-g becomes \007. */ static bool use_esc_sequence = false; -/* (-c) True means unprintable characters are printed as control prefixes. +/* (-c) True means nonprintable characters are printed as control prefixes. control-g becomes ^G. */ static bool use_cntrl_prefix = false; diff --git a/src/prog-fprintf.c b/src/prog-fprintf.c index 1066099b2..6c620c76b 100644 --- a/src/prog-fprintf.c +++ b/src/prog-fprintf.c @@ -1,4 +1,4 @@ -/* prog-fprintf.c - common formating output functions and definitions +/* prog-fprintf.c - common formatting output functions and definitions Copyright (C) 2008-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/src/prog-fprintf.h b/src/prog-fprintf.h index c1493dc63..9d764d493 100644 --- a/src/prog-fprintf.h +++ b/src/prog-fprintf.h @@ -1,4 +1,4 @@ -/* prog-fprintf.h - common formating output functions and definitions +/* prog-fprintf.h - common formatting output functions and definitions Copyright (C) 2008-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -36,7 +36,7 @@ /* TRANSLATORS: Please translate "F. Pinard" to "François Pinard" if "ç" (c-with-cedilla) is available in the translation's character set and encoding. */ -#define AUTHORS proper_name_utf8 ("F. Pinard", "Fran\xc3\xa7ois Pinard") +#define AUTHORS proper_name_lite ("F. Pinard", "Fran\xc3\xa7ois Pinard") /* Number of possible characters in a byte. */ #define CHAR_SET_SIZE 256 @@ -462,7 +462,7 @@ initialize_regex (void) a user provided Break character file, construct a fastmap of characters that may appear in a word. If GNU extensions enabled, include only letters of the underlying character set. If disabled, - include almost everything, even punctuations; stop only on white + include almost everything, even punctuation; stop only on white space. */ if (word_regex.string) diff --git a/src/realpath.c b/src/realpath.c index c4ca5f068..564b8364d 100644 --- a/src/realpath.c +++ b/src/realpath.c @@ -28,7 +28,7 @@ /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "realpath" -#define AUTHORS proper_name ("Padraig Brady") +#define AUTHORS proper_name_lite ("Padraig Brady", "P\303\241draig Brady") enum { diff --git a/src/sort.c b/src/sort.c index 06884dff3..e77984590 100644 --- a/src/sort.c +++ b/src/sort.c @@ -2115,7 +2115,7 @@ xstrxfrm (char *restrict dest, char const *restrict src, size_t destsize) error (0, errno, _("string transformation failed")); error (0, 0, _("set LC_ALL='C' to work around the problem")); error (SORT_FAILURE, 0, - _("the untransformed string was %s"), + _("the original string was %s"), quotearg_n_style (0, locale_quoting_style, src)); } diff --git a/src/split.c b/src/split.c index 609d52e08..a32b2d93e 100644 --- a/src/split.c +++ b/src/split.c @@ -48,7 +48,7 @@ #define PROGRAM_NAME "split" #define AUTHORS \ - proper_name ("Torbjorn Granlund"), \ + proper_name_lite ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \ proper_name ("Richard M. Stallman") /* Shell command to filter through, instead of creating files. */ @@ -1096,7 +1096,7 @@ ofile_open (of_t *files, idx_t i_check, idx_t nfiles) where the other end has closed because of our previous close. In that case we'll immediately get an error, rather than waiting indefinitely. - In specialised cases the consumer can keep reading + In specialized cases the consumer can keep reading from the fifo, terminating on conditions in the data itself, or perhaps never in the case of 'tail -f'. I.e., for fifos it is valid to attempt this reopen. diff --git a/src/stat.c b/src/stat.c index d8678e503..dd8645099 100644 --- a/src/stat.c +++ b/src/stat.c @@ -175,7 +175,7 @@ statfs (char const *filename, struct fs_info *buf) static char const digits[] = "0123456789"; /* Flags that are portable for use in printf, for at least one - conversion specifier; make_format removes unportable flags as + conversion specifier; make_format removes non-portable flags as needed for particular specifiers. The glibc 2.2 extension "I" is listed here; it is removed by make_format because it has undefined behavior elsewhere and because it is incompatible with diff --git a/src/stdbuf.c b/src/stdbuf.c index 38df48e16..2a58c365d 100644 --- a/src/stdbuf.c +++ b/src/stdbuf.c @@ -33,7 +33,7 @@ #define PROGRAM_NAME "stdbuf" #define LIB_NAME "libstdbuf.so" /* FIXME: don't hardcode */ -#define AUTHORS proper_name ("Padraig Brady") +#define AUTHORS proper_name_lite ("Padraig Brady", "P\303\241draig Brady") static char *program_path; diff --git a/src/stty.c b/src/stty.c index 9a2aa62c0..a95a73589 100644 --- a/src/stty.c +++ b/src/stty.c @@ -2305,7 +2305,7 @@ sane_mode (struct termios *mode) } /* Return a string that is the printable representation of character CH. */ -/* Adapted from 'cat' by Torbjorn Granlund. */ +/* Adapted from 'cat' by Torbjörn Granlund. */ static char const * visible (cc_t ch) diff --git a/src/system.h b/src/system.h index 7ba43bd21..21b15839b 100644 --- a/src/system.h +++ b/src/system.h @@ -370,12 +370,11 @@ enum #undef emit_bug_reporting_address #include "propername.h" -/* Define away proper_name (leaving proper_name_utf8, which affects far - fewer programs), since it's not worth the cost of adding ~17KB to +/* Define away proper_name, since it's not worth the cost of adding ~17KB to the x86_64 text size of every single program. This avoids a 40% (almost ~2MB) increase in the file system space utilization for the set of the 100 binaries. */ -#define proper_name(x) (x) +#define proper_name(x) proper_name_lite (x, x) #include "progname.h" diff --git a/src/timeout.c b/src/timeout.c index 76cb6ce85..d2eedc6e0 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -74,7 +74,7 @@ #define PROGRAM_NAME "timeout" -#define AUTHORS proper_name ("Padraig Brady") +#define AUTHORS proper_name_lite ("Padraig Brady", "P\303\241draig Brady") static int timed_out; static int term_signal = SIGTERM; /* same default as kill command. */ @@ -592,7 +592,7 @@ main (int argc, char **argv) unblock_signal (sig); raise (sig); } - /* Allow users to distinguish if command was forcably killed. + /* Allow users to distinguish if command was forcibly killed. Needed with --foreground where we don't send SIGKILL to the timeout process itself. */ if (timed_out && sig == SIGKILL) @@ -206,7 +206,7 @@ static bool delete = false; static bool complement = false; /* When tr is performing translation and string1 is longer than string2, - POSIX says that the result is unspecified. That gives the implementor + POSIX says that the result is unspecified. That gives the implementer of a POSIX conforming version of tr two reasonable choices for the semantics of this case. diff --git a/src/truncate.c b/src/truncate.c index 7ecd595d8..2fe51094d 100644 --- a/src/truncate.c +++ b/src/truncate.c @@ -34,7 +34,7 @@ /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "truncate" -#define AUTHORS proper_name ("Padraig Brady") +#define AUTHORS proper_name_lite ("Padraig Brady", "P\303\241draig Brady") /* (-c) If true, don't create if not already there */ static bool no_create; diff --git a/src/tsort.c b/src/tsort.c index 4ee24ba8c..58bb4874f 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -303,7 +303,7 @@ scan_zeros (struct item *k) loop, print the loop on standard error, remove a relation to break the loop, and return true. - The loop detection strategy is as follows: Realise that what we're + The loop detection strategy is as follows: Realize that what we're dealing with is essentially a directed graph. If we find an item that is part of a graph that contains a cycle we traverse the graph in backwards direction. In general there is no unique way to do @@ -429,14 +429,13 @@ static _Noreturn void tsort (char const *file) { bool ok = true; - struct item *root; struct item *j = nullptr; struct item *k = nullptr; token_buffer tokenbuffer; bool is_stdin = STREQ (file, "-"); - /* Intialize the head of the tree will hold the strings we're sorting. */ - root = new_item (nullptr); + /* Initialize the head of the tree holding the strings we're sorting. */ + struct item *root = new_item (nullptr); if (!is_stdin && ! freopen (file, "r", stdin)) error (EXIT_FAILURE, errno, "%s", quotef (file)); diff --git a/src/uniq.c b/src/uniq.c index 2dbec9fcd..fab04ded8 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -68,7 +68,7 @@ enum countmode static enum countmode countmode; /* Which lines to output: unique lines, the first of a group of - repeated lines, and the second and subsequented of a group of + repeated lines, and the second and subsequent of a group of repeated lines. */ static bool output_unique; static bool output_first_repeated; @@ -459,8 +459,8 @@ wc (int fd, char const *file_x, struct fstatus *fstatus, off_t current_pos) move the last incomplete character of the buffer to the front of the buffer. This is needed because we don't know whether the 'mbrtowc' function updates the state when it returns -2, -- - this is the ISO C 99 and glibc-2.2 behaviour - or not - amended - ANSI C, glibc-2.1 and Solaris 5.7 behaviour. We don't have an + this is the ISO C 99 and glibc-2.2 behavior - or not - amended + ANSI C, glibc-2.1 and Solaris 5.7 behavior. We don't have an autoconf test for this, yet. */ size_t prev = 0; /* number of bytes carried over from previous round */ # else @@ -556,7 +556,7 @@ wc (int fd, char const *file_x, struct fstatus *fstatus, off_t current_pos) if (wide && iswprint (wide_char)) { /* wcwidth can be expensive on OSX for example, - so avoid if uneeded. */ + so avoid if not needed. */ if (print_linelength) { int width = wcwidth (wide_char); |