From: Christian Goeschel Ndjomouo Date: Sat, 6 Jun 2026 15:51:28 +0000 (-0400) Subject: column: remove remaining bitfield in struct member X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ececdb52df244984d34cd90750e00d8e74afb1dc;p=thirdparty%2Futil-linux.git column: remove remaining bitfield in struct member Signed-off-by: Christian Goeschel Ndjomouo --- diff --git a/tests/expected/column/colors-ansi-esc-seq b/tests/expected/column/colors-ansi-esc-seq new file mode 100644 index 000000000..f90e2c380 --- /dev/null +++ b/tests/expected/column/colors-ansi-esc-seq @@ -0,0 +1,49 @@ +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD diff --git a/tests/expected/column/colors-colorscheme b/tests/expected/column/colors-colorscheme new file mode 100644 index 000000000..d6f2a1206 --- /dev/null +++ b/tests/expected/column/colors-colorscheme @@ -0,0 +1,7 @@ +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD diff --git a/tests/expected/column/colors-header-only b/tests/expected/column/colors-header-only new file mode 100644 index 000000000..b6959f320 --- /dev/null +++ b/tests/expected/column/colors-header-only @@ -0,0 +1,133 @@ +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA BBBB C DDDD +A BBB CCCC DDD +AA BB CCC DD +AAAA B CC D +AA BB CC DD +AAAAA BBB CCC DDDD diff --git a/tests/expected/column/colors-names b/tests/expected/column/colors-names new file mode 100644 index 000000000..9c17f7b82 --- /dev/null +++ b/tests/expected/column/colors-names @@ -0,0 +1,133 @@ +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD +COL1  +AAA  BBBB C DDDD +A  BBB CCCC DDD +AA  BB CCC DD +AAAA  B CC D +AA  BB CC DD +AAAAA BBB CCC DDDD diff --git a/tests/ts/column/colors b/tests/ts/column/colors new file mode 100755 index 000000000..ffafa0d4a --- /dev/null +++ b/tests/ts/column/colors @@ -0,0 +1,60 @@ +#!/usr/bin/env bash + +# +# Copyright (C) 2026 Christian Goeschel Ndjomouo +# +# This file is part of util-linux. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +TS_TOPDIR="${0%/*}/../.." +TS_DESC="colors" + +. "$TS_TOPDIR"/functions.sh +ts_init "$*" + +ts_check_test_command "$TS_CMD_COLUMN" +ts_cd "$TS_OUTDIR" + +COLOR_NAMES=( black blink blue bold brown cyan darkgray gray green halfbright + lightblue lightcyan lightgray lightgreen lightmagenta lightred + magenta red yellow ) + +ts_init_subtest "names" + for n in "${COLOR_NAMES[@]}"; do + $TS_CMD_COLUMN --table --color=always --table-column "name=COL1,color=${n}" \ + "$TS_SELF"/files/table >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" + done +ts_finalize_subtest + +ts_init_subtest "header-only" + for n in "${COLOR_NAMES[@]}"; do + $TS_CMD_COLUMN --table --color=always --table-column "name=COL1,headercolor=${n}" \ + "$TS_SELF"/files/table >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" + done +ts_finalize_subtest + +ts_init_subtest "ansi-esc-seq" + for s in "7;37" "1;33" "3;31" "9;35" "1;4;31;45" "2;32;46" "4;38;5;123"; do + $TS_CMD_COLUMN --table --color=always --table-column "name=COL1,color=${s}" \ + "$TS_SELF"/files/table >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" + done +ts_finalize_subtest + + +ts_init_subtest "colorscheme" + XDG_CONFIG_HOME="$TS_SELF/files" $TS_CMD_COLUMN --table --color=always \ + --table-colorscheme test --table-column "name=COL1,colorkey=cols,headercolorkey=header" \ + "$TS_SELF"/files/table >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" +ts_finalize_subtest + + +ts_finalize diff --git a/tests/ts/column/files/terminal-colors.d/test.scheme b/tests/ts/column/files/terminal-colors.d/test.scheme new file mode 100644 index 000000000..51947807c --- /dev/null +++ b/tests/ts/column/files/terminal-colors.d/test.scheme @@ -0,0 +1,2 @@ +cols blue +header 1;4;31 diff --git a/text-utils/column.c b/text-utils/column.c index 00e880e61..d37f87efd 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -102,7 +102,7 @@ struct column_control { header_repeat, header_as_columns, /* --table-header-as-columns */ hide_unnamed, - maxout : 1, + maxout, keep_empty_lines, /* --keep-empty-lines */ tab_noheadings, use_spaces;