From 3ec554d4dd76b2560cb03d930b9381bebb3e99ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Sun, 4 Jan 2026 15:11:57 +0000 Subject: [PATCH] doc: parse any whitespace as an option/description delimiter * src/system.c (oputs_): Use isspace() rather than hardcoding. Note we don't use c_isspace() as we need to support anything coming from translations. --- src/chroot.c | 1 - src/csplit.c | 1 - src/dd.c | 1 - src/expand-common.c | 1 - src/expand.c | 1 - src/fmt.c | 1 - src/fold.c | 1 - src/ls.c | 1 - src/numfmt.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/sort.c | 1 - src/split.c | 1 - src/system.h | 5 +++-- src/test.c | 1 - src/tr.c | 1 - src/truncate.c | 1 - src/unexpand.c | 1 - src/wc.c | 1 - 23 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/chroot.c b/src/chroot.c index 8db28ecf25..48ef38d73c 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -17,7 +17,6 @@ /* Written by Roland McGrath. */ #include -#include #include #include #include diff --git a/src/csplit.c b/src/csplit.c index a28f2fa5fa..2fdc5e819f 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -19,7 +19,6 @@ #include -#include #include #include #include diff --git a/src/dd.c b/src/dd.c index acb268aa40..ff3d420500 100644 --- a/src/dd.c +++ b/src/dd.c @@ -18,7 +18,6 @@ #include -#include #include #include diff --git a/src/expand-common.c b/src/expand-common.c index afe613dc6b..0d4f8955a0 100644 --- a/src/expand-common.c +++ b/src/expand-common.c @@ -16,7 +16,6 @@ #include -#include #include #include #include "system.h" diff --git a/src/expand.c b/src/expand.c index 8539da3e47..ef74ab0f64 100644 --- a/src/expand.c +++ b/src/expand.c @@ -34,7 +34,6 @@ #include -#include #include #include #include diff --git a/src/fmt.c b/src/fmt.c index 72b4d0adf2..e7edb5735c 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -17,7 +17,6 @@ /* Written by Ross Paterson . */ #include -#include #include #include #include diff --git a/src/fold.c b/src/fold.c index 09a7f144ae..1a6432dea7 100644 --- a/src/fold.c +++ b/src/fold.c @@ -18,7 +18,6 @@ #include -#include #include #include #include diff --git a/src/ls.c b/src/ls.c index 3fa04412aa..8d28fe0ff6 100644 --- a/src/ls.c +++ b/src/ls.c @@ -36,7 +36,6 @@ Greg Lee . */ #include -#include #include #include diff --git a/src/numfmt.c b/src/numfmt.c index ac5cd9b7b0..dbb0080270 100644 --- a/src/numfmt.c +++ b/src/numfmt.c @@ -15,7 +15,6 @@ along with this program. If not, see . */ #include -#include #include #include #include diff --git a/src/od.c b/src/od.c index c421bd6da6..725fa72781 100644 --- a/src/od.c +++ b/src/od.c @@ -18,7 +18,6 @@ #include -#include #include #include #include diff --git a/src/pinky.c b/src/pinky.c index 887b32fc41..bcc936ac8b 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -17,7 +17,6 @@ /* 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 5dfc58adba..fa395dc9cd 100644 --- a/src/pr.c +++ b/src/pr.c @@ -309,7 +309,6 @@ #include -#include #include #include #include "system.h" diff --git a/src/ptx.c b/src/ptx.c index 59e8508a6b..5b6b30cf5b 100644 --- a/src/ptx.c +++ b/src/ptx.c @@ -19,7 +19,6 @@ #include -#include #include #include #include "system.h" diff --git a/src/seq.c b/src/seq.c index f728758628..2d3ff322d9 100644 --- a/src/seq.c +++ b/src/seq.c @@ -17,7 +17,6 @@ /* Written by Ulrich Drepper. */ #include -#include #include #include #include diff --git a/src/set-fields.c b/src/set-fields.c index 523549214c..5b3264d35f 100644 --- a/src/set-fields.c +++ b/src/set-fields.c @@ -19,7 +19,6 @@ #include #include "system.h" -#include #include "c-ctype.h" #include "quote.h" #include "set-fields.h" diff --git a/src/sort.c b/src/sort.c index e5f31b1799..c5bf44d31c 100644 --- a/src/sort.c +++ b/src/sort.c @@ -22,7 +22,6 @@ #include -#include #include #include #include diff --git a/src/split.c b/src/split.c index deeff03c33..9878c09f38 100644 --- a/src/split.c +++ b/src/split.c @@ -21,7 +21,6 @@ * support --suppress-matched as in csplit. */ #include -#include #include #include #include diff --git a/src/system.h b/src/system.h index e77a8fe9f9..f6d67450d6 100644 --- a/src/system.h +++ b/src/system.h @@ -20,6 +20,8 @@ #include +#include + #include /* Commonly used file permission combination. */ @@ -568,8 +570,7 @@ oputs_ (MAYBE_UNUSED char const* program, char const *option) /* Set desc_text to spacing after the full option text */ char const *desc_text = option_text + anchor_len; - while (*desc_text && (! (*desc_text == ' ' || *desc_text == '\n') - || *(desc_text + 1) == '-')) + while (*desc_text && (! isspace (*desc_text) || *(desc_text + 1) == '-')) desc_text++; /* write spaces before option text. */ diff --git a/src/test.c b/src/test.c index 9e791c9055..c540c62faa 100644 --- a/src/test.c +++ b/src/test.c @@ -21,7 +21,6 @@ the shell builtin version. */ #include -#include #include #include diff --git a/src/tr.c b/src/tr.c index 139cf971c5..72ffffc771 100644 --- a/src/tr.c +++ b/src/tr.c @@ -18,7 +18,6 @@ #include -#include #include #include #include diff --git a/src/truncate.c b/src/truncate.c index 50e6f70b18..43134c921a 100644 --- a/src/truncate.c +++ b/src/truncate.c @@ -21,7 +21,6 @@ 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 ec6b222ba0..d7954bbb61 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -35,7 +35,6 @@ #include -#include #include #include #include diff --git a/src/wc.c b/src/wc.c index 88a386a0c9..a1c7ca872d 100644 --- a/src/wc.c +++ b/src/wc.c @@ -19,7 +19,6 @@ #include -#include #include #include #include -- 2.47.3