From b2ab920716f640cbaaf486512ba177f4e0b597c5 Mon Sep 17 00:00:00 2001 From: Mark Edgar Date: Sat, 30 May 2020 19:05:46 +0200 Subject: unexpand: correct behavior for --first-only --tabs=4 Prior to the patch, both -f and --first-only are in all cases either no-op or ignored. Without --tabs, --first-only is the default so specifying it is a no-op. With --tabs, --all is implied, and --first-only is intended to reset this. function old new delta expand_main 690 694 +4 Signed-off-by: Mark Edgar Signed-off-by: Denys Vlasenko --- coreutils/expand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coreutils/expand.c') diff --git a/coreutils/expand.c b/coreutils/expand.c index 4fa974d..5f59939 100644 --- a/coreutils/expand.c +++ b/coreutils/expand.c @@ -160,7 +160,7 @@ static void unexpand(FILE *file, unsigned tab_size, unsigned opt) putchar('\t'); } - if ((opt & OPT_INITIAL) && ptr != line) { + if (!(opt & OPT_ALL) && ptr != line) { printf("%*s%s", len, "", ptr); break; } @@ -207,13 +207,13 @@ int expand_main(int argc UNUSED_PARAM, char **argv) "ft:a" "\0" "ta" /* -t NUM sets -a */, - "first-only\0" No_argument "i" + "first-only\0" No_argument "f" "tabs\0" Required_argument "t" "all\0" No_argument "a" , &opt_t ); - /* -f --first-only is the default */ - if (!(opt & OPT_ALL)) opt |= OPT_INITIAL; + /* -t implies -a, but an explicit -f overrides */ + if (opt & OPT_INITIAL) opt &= ~OPT_ALL; } tab_size = xatou_range(opt_t, 1, UINT_MAX); -- cgit v1.1