From: Collin Funk <collin.funk1@gmail.com>
Date: Fri, 4 Apr 2025 19:35:15 +0000 (-0700)
Subject: maint: ensure that new "make syntax-check"-run sc_codespell passes
X-Git-Tag: v9.7~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43873a660de20d854d88c04183826c3f8d2466b3;p=thirdparty%2Fcoreutils.git

maint: ensure that new "make syntax-check"-run sc_codespell passes

* cfg.mk (codespell_ignore_words_list): Ignore false-positives.
(exclude_file_name_regexp--sc_codespell): Skip some file names.
* doc/coreutils.texi (mktemp invocation): Use "alphanumeric" which is
consistent with the rest of the documentation.
* src/expand-common.c: Fix typo.
* src/ls.c: Likewise.
* tests/split/l-chunk-root.sh: Likewise.
---

diff --git a/cfg.mk b/cfg.mk
index a085194b69..2b24355ad4 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -955,3 +955,9 @@ _gl_TS_unmarked_extern_vars = ptr_MD5_.*
 # Other tight_scope settings
 _gl_TS_dir = .
 _gl_TS_obj_files = src/*.$(OBJEXT)
+# Settings for running codespell.
+csiwl_1 = debbugs,clen,te,bu,shs,linke,fo,souch,inout,outin
+csiwl_2 = kno,ois,afile,whats,hda,indx,ot,nam
+codespell_ignore_words_list = $(csiwl_1),$(csiwl_2)
+exclude_file_name_regexp--sc_codespell = \
+  ^(THANKS\.in|tests/pr/.*(F|tn?|l(o|m|i)|bl))$$
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 45f4c80026..d6633f04cf 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -14803,7 +14803,7 @@ and print its name.  If given, @var{template} must include at least
 three consecutive @samp{X}s in the last component.  If omitted, the template
 @samp{tmp.XXXXXXXXXX} is used, and option @option{--tmpdir} is
 implied.  The final run of @samp{X}s in the @var{template} will be replaced
-by alpha-numeric characters; thus, on a case-sensitive file system,
+by alphanumeric characters; thus, on a case-sensitive file system,
 and with a @var{template} including a run of @var{n} instances of @samp{X},
 there are @samp{62**@var{n}} potential file names.
 
diff --git a/src/expand-common.c b/src/expand-common.c
index 2dbbbe492e..732123f8d4 100644
--- a/src/expand-common.c
+++ b/src/expand-common.c
@@ -273,7 +273,7 @@ finalize_tab_stops (void)
 
 
 /* Return number of first tab stop after COLUMN.  TAB_INDEX specifies
-   amny multiple tab-sizes.  Set *LAST_TAB depending on whether we are
+   many multiple tab-sizes.  Set *LAST_TAB depending on whether we are
    returning COLUMN + 1 merely because we're past the last tab.
    If the number would overflow, diagnose this and exit.  */
 extern colno
diff --git a/src/ls.c b/src/ls.c
index 2cf4ee4444..6690f7747e 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -3538,7 +3538,7 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
 
       /* Let the user know via '?' if errno is EACCES, which can
          happen with Linux kernel 6.12 on an NFS file system.
-         That's better than a longwinded diagnostic.
+         That's better than a long-winded diagnostic.
 
          Similarly, ignore ENOENT which may happen on some versions
          of cygwin when processing dangling symlinks for example.
diff --git a/tests/split/l-chunk-root.sh b/tests/split/l-chunk-root.sh
index 49d2e559dd..df74a43841 100755
--- a/tests/split/l-chunk-root.sh
+++ b/tests/split/l-chunk-root.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# test splitting into newline delineated chunks from infinite imput
+# test splitting into newline delineated chunks from infinite input
 
 # Copyright (C) 2023-2025 Free Software Foundation, Inc.