From 963813cd96396f0e1f14cffef2905175d21049a0 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Sat, 4 Jan 2014 22:34:02 +0100 Subject: [PATCH] i18n patch: fix wrongly merged code in cut.c * src/cut.c (cut_characters_or_cut_bytes_no_split): Move setting of print_delimiter into the correct scope. --- coreutils-i18n.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch index f1828f8..59ff7ea 100644 --- a/coreutils-i18n.patch +++ b/coreutils-i18n.patch @@ -238,10 +238,12 @@ diff -urNp coreutils-8.22-orig/src/cut.c coreutils-8.22/src/cut.c + if (output_delimiter_specified) + { + if (print_delimiter && is_range_start_index (idx)) -+ fwrite (output_delimiter_string, sizeof (char), -+ output_delimiter_length, stdout); ++ { ++ fwrite (output_delimiter_string, sizeof (char), ++ output_delimiter_length, stdout); ++ } ++ print_delimiter = true; + } -+ print_delimiter = true; + fwrite (bufpos, mblength, sizeof(char), stdout); + } + }