From 4edb14d20f972595fd08f841b94f7454752e2b5f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 27 Oct 2023 17:31:49 -0700 Subject: [PATCH 04/11] maint: include ctype.h selectively Include ctype.h only in files that need it. Many of its uses are incorrect, as they assume single-byte locales. The idea is to remove the incorrect uses later, when there is time. * src/chroot.c, src/csplit.c, src/dd.c, src/digest.c, src/dircolors.c: * src/expand-common.c, src/expand.c, src/fmt.c, src/fold.c, src/ls.c: * src/od.c, src/pinky.c, src/pr.c, src/ptx.c, src/seq.c: * src/set-fields.c, src/split.c, src/stdbuf.c, src/test.c: * src/tr.c, src/truncate.c, src/unexpand.c, src/wc.c: Include ctype.h. * src/system.h: Do not include ctype.h. include ctype.h.o --- src/chroot.c | 1 + src/csplit.c | 1 + src/dd.c | 1 + src/digest.c | 1 + src/dircolors.c | 1 + src/expand-common.c | 1 + src/expand.c | 1 + src/fmt.c | 1 + src/fold.c | 1 + src/ls.c | 1 + src/od.c | 1 + src/pinky.c | 1 + src/pr.c | 1 + src/ptx.c | 1 + src/seq.c | 1 + src/set-fields.c | 1 + src/split.c | 1 + src/stdbuf.c | 1 + src/system.h | 2 -- src/test.c | 1 + src/tr.c | 1 + src/truncate.c | 1 + src/unexpand.c | 1 + src/wc.c | 1 + 24 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/chroot.c b/src/chroot.c index 6150af5cd..17af5ebe4 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -17,6 +17,7 @@ /* Written by Roland McGrath. */ #include +#include #include #include #include diff --git a/src/csplit.c b/src/csplit.c index dca525aaf..32fb96bca 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -19,6 +19,7 @@ #include +#include #include #include #include diff --git a/src/dd.c b/src/dd.c index 595b8755b..85ea26a3f 100644 --- a/src/dd.c +++ b/src/dd.c @@ -18,6 +18,7 @@ #include +#include #include #include #include diff --git a/src/digest.c b/src/digest.c index 1f3695308..336392608 100644 --- a/src/digest.c +++ b/src/digest.c @@ -18,6 +18,7 @@ #include +#include #include #include diff --git a/src/dircolors.c b/src/dircolors.c index 8a86efb76..f9001de07 100644 --- a/src/dircolors.c +++ b/src/dircolors.c @@ -17,6 +17,7 @@ #include +#include #include #include #include diff --git a/src/expand-common.c b/src/expand-common.c index 89fa56ace..16240802d 100644 --- a/src/expand-common.c +++ b/src/expand-common.c @@ -16,6 +16,7 @@ #include +#include #include #include #include "system.h" diff --git a/src/expand.c b/src/expand.c index 0e74d0cf6..00f2119c6 100644 --- a/src/expand.c +++ b/src/expand.c @@ -34,6 +34,7 @@ #include +#include #include #include #include diff --git a/src/fmt.c b/src/fmt.c index ad7a9ce56..b6fe74630 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -17,6 +17,7 @@ /* Written by Ross Paterson . */ #include +#include #include #include #include diff --git a/src/fold.c b/src/fold.c index 5c0428d80..1a3859097 100644 --- a/src/fold.c +++ b/src/fold.c @@ -18,6 +18,7 @@ #include +#include #include #include #include diff --git a/src/ls.c b/src/ls.c index 769ae85a7..e16972d3e 100644 --- a/src/ls.c +++ b/src/ls.c @@ -36,6 +36,7 @@ Greg Lee . */ #include +#include #include #include diff --git a/src/od.c b/src/od.c index 538175af7..951e88652 100644 --- a/src/od.c +++ b/src/od.c @@ -18,6 +18,7 @@ #include +#include #include #include #include diff --git a/src/pinky.c b/src/pinky.c index db0d2557b..8c872b2fe 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -17,6 +17,7 @@ /* Created by hacking who.c by Kaveh Ghazi ghazi@caip.rutgers.edu */ #include +#include #include #include #include diff --git a/src/pr.c b/src/pr.c index 57361d629..7e680e23c 100644 --- a/src/pr.c +++ b/src/pr.c @@ -309,6 +309,7 @@ #include +#include #include #include #include diff --git a/src/ptx.c b/src/ptx.c index 3cd84b2e9..c1524fed7 100644 --- a/src/ptx.c +++ b/src/ptx.c @@ -19,6 +19,7 @@ #include +#include #include #include #include "system.h" diff --git a/src/seq.c b/src/seq.c index 2822d5c2c..96d14be1c 100644 --- a/src/seq.c +++ b/src/seq.c @@ -17,6 +17,7 @@ /* Written by Ulrich Drepper. */ #include +#include #include #include #include diff --git a/src/set-fields.c b/src/set-fields.c index b299280c0..a524b7fa4 100644 --- a/src/set-fields.c +++ b/src/set-fields.c @@ -19,6 +19,7 @@ #include #include "system.h" +#include #include "quote.h" #include "set-fields.h" diff --git a/src/split.c b/src/split.c index d2cd23234..f56a144a6 100644 --- a/src/split.c +++ b/src/split.c @@ -21,6 +21,7 @@ * support --suppress-matched as in csplit. */ #include +#include #include #include #include diff --git a/src/stdbuf.c b/src/stdbuf.c index 1ec23cf8b..51326ad4e 100644 --- a/src/stdbuf.c +++ b/src/stdbuf.c @@ -17,6 +17,7 @@ /* Written by Pádraig Brady. */ #include +#include #include #include #include diff --git a/src/system.h b/src/system.h index b4e0a7275..8c2a4fd8b 100644 --- a/src/system.h +++ b/src/system.h @@ -142,8 +142,6 @@ enum #include "timespec.h" -#include - /* ISDIGIT differs from isdigit, as follows: - Its arg may be any int or unsigned int; it need not be an unsigned char or EOF. diff --git a/src/test.c b/src/test.c index a4eb40a52..2bcb9abc8 100644 --- a/src/test.c +++ b/src/test.c @@ -27,6 +27,7 @@ #endif #include +#include #include #include diff --git a/src/tr.c b/src/tr.c index 625c27583..292aae1d4 100644 --- a/src/tr.c +++ b/src/tr.c @@ -18,6 +18,7 @@ #include +#include #include #include #include diff --git a/src/truncate.c b/src/truncate.c index 4a828e1da..040172c4d 100644 --- a/src/truncate.c +++ b/src/truncate.c @@ -21,6 +21,7 @@ to better fit the "GNU" environment. */ #include /* sets _FILE_OFFSET_BITS=64 etc. */ +#include #include #include #include diff --git a/src/unexpand.c b/src/unexpand.c index 5a2283fdd..46e943365 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -35,6 +35,7 @@ #include +#include #include #include #include diff --git a/src/wc.c b/src/wc.c index e69ad0d51..43170cf9b 100644 --- a/src/wc.c +++ b/src/wc.c @@ -19,6 +19,7 @@ #include +#include #include #include #include -- 2.39.2