cut: fix -F n-m to match toybox

function                                             old     new   delta
cut_main                                            1339    1391     +52

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/coreutils/cut.c b/coreutils/cut.c
index f4cf5401b..3abebe7ad 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -243,6 +243,16 @@ static void cut_file(FILE *file, const char *delim, const char *odelim,
 						start = next;
 						continue;
 					}
+					/* -F N-M preserves intermediate delimiters: */
+					//printf "1 2  3  4  5  6  7\n" | toybox cut -O: -F2,4-6,7
+					//2:4  5  6:7
+					if (opt_REGEX && dcount <= cut_list[cl_pos].endpos)
+						continue;
+// NB: toybox does the above for -f too, but it's a compatibility bug:
+//printf "1 2 3 4 5 6 7 8\n" | toybox cut -d' ' -O: -f2,4-6,7
+//2:4 5 6:7  // WRONG!
+//printf "1 2 3 4 5 6 7 8\n" | cut -d' ' --output-delimiter=: -f2,4-6,7
+//2:4:5:6:7  // GNU coreutils 9.1
 				}
 #if ENABLE_FEATURE_CUT_REGEX
 				if (end != start || !opt_REGEX)