From a4778006c8f2b669afcc45456acf0d21f228208d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 6 Mar 2023 15:37:45 -0800 Subject: [PATCH] =?UTF-8?q?maint:=20pacify=20=E2=80=98make=20syntax-check?= =?UTF-8?q?=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem reported by Pádraig Brady (Bug#61386#226). * src/split.c (parse_chunk): Use die instead of error. (main): Quote a string. * tests/local.mk (all_root_tests): Move du/apparent.sh from here ... (all_tests): ... to here. --- src/split.c | 6 +++--- tests/local.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/split.c b/src/split.c index cc581b6c6..95d174a8b 100644 --- a/src/split.c +++ b/src/split.c @@ -1325,8 +1325,8 @@ parse_chunk (intmax_t *k_units, intmax_t *n_units, char const *arg) *n_units = parse_n_units (argend + 1, "", N_("invalid number of chunks")); if (! (0 < *k_units && *k_units <= *n_units)) - error (EXIT_FAILURE, 0, "%s: %s", _("invalid chunk number"), - quote_mem (arg, argend - arg)); + die (EXIT_FAILURE, 0, "%s: %s", _("invalid chunk number"), + quote_mem (arg, argend - arg)); } else if (! (e <= OVERFLOW_OK && 0 < *n_units)) strtoint_die (N_("invalid number of chunks"), arg); @@ -1561,7 +1561,7 @@ main (int argc, char **argv) if (n_units == 0) { - error (0, 0, _("invalid number of lines: %s"), "0"); + error (0, 0, _("invalid number of lines: %s"), quote ("0")); usage (EXIT_FAILURE); } diff --git a/tests/local.mk b/tests/local.mk index 1fe04235d..1e93290d0 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -118,7 +118,6 @@ all_root_tests = \ tests/dd/skip-seek-past-dev.sh \ tests/df/problematic-chars.sh \ tests/df/over-mount-device.sh \ - tests/du/apparent.sh \ tests/du/bind-mount-dir-cycle.sh \ tests/du/bind-mount-dir-cycle-v2.sh \ tests/id/setgid.sh \ @@ -557,6 +556,7 @@ all_tests = \ tests/df/total-verify.sh \ tests/du/2g.sh \ tests/du/8gb.sh \ + tests/du/apparent.sh \ tests/du/basic.sh \ tests/du/bigtime.sh \ tests/du/deref.sh \ -- 2.39.2