]>
Commit | Line | Data |
---|---|---|
7cf3a80b | 1 | Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) |
e1fb4052 MF |
2 | Date: 2017-03-12 |
3 | Initial Package Version: 8.27 | |
7cf3a80b | 4 | Upstream Status: Rejected |
e1fb4052 MF |
5 | Origin: Based on Fedora's i18n patches at |
6 | http://pkgs.fedoraproject.org/cgit/rpms/coreutils.git/tree/ | |
7 | Description: Fixes i18n issues with various Coreutils programs | |
7cf3a80b | 8 | |
e1fb4052 MF |
9 | diff -Naurp coreutils-8.27-orig/bootstrap.conf coreutils-8.27/bootstrap.conf |
10 | --- coreutils-8.27-orig/bootstrap.conf 2017-03-07 23:34:06.000000000 -0600 | |
11 | +++ coreutils-8.27/bootstrap.conf 2017-03-11 23:47:38.068058445 -0600 | |
12 | @@ -152,6 +152,7 @@ gnulib_modules=" | |
13 | maintainer-makefile | |
14 | malloc-gnu | |
15 | manywarnings | |
16 | + mbfile | |
17 | mbrlen | |
18 | mbrtowc | |
19 | mbsalign | |
20 | diff -Naurp coreutils-8.27-orig/configure.ac coreutils-8.27/configure.ac | |
21 | --- coreutils-8.27-orig/configure.ac 2017-02-26 08:52:29.000000000 -0600 | |
22 | +++ coreutils-8.27/configure.ac 2017-03-11 23:47:38.068058445 -0600 | |
23 | @@ -429,6 +429,8 @@ fi | |
24 | # I'm leaving it here for now. This whole thing needs to be modernized... | |
25 | gl_WINSIZE_IN_PTEM | |
26 | ||
27 | +gl_MBFILE | |
28 | + | |
29 | gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H | |
30 | ||
31 | if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \ | |
32 | diff -Naurp coreutils-8.27-orig/lib/linebuffer.h coreutils-8.27/lib/linebuffer.h | |
33 | --- coreutils-8.27-orig/lib/linebuffer.h 2017-01-01 16:35:38.000000000 -0600 | |
34 | +++ coreutils-8.27/lib/linebuffer.h 2017-03-11 23:47:13.089286391 -0600 | |
7cf3a80b ML |
35 | @@ -21,6 +21,11 @@ |
36 | ||
37 | # include <stdio.h> | |
38 | ||
39 | +/* Get mbstate_t. */ | |
40 | +# if HAVE_WCHAR_H | |
41 | +# include <wchar.h> | |
42 | +# endif | |
43 | + | |
44 | /* A 'struct linebuffer' holds a line of text. */ | |
45 | ||
46 | struct linebuffer | |
47 | @@ -28,6 +33,9 @@ struct linebuffer | |
48 | size_t size; /* Allocated. */ | |
49 | size_t length; /* Used. */ | |
50 | char *buffer; | |
51 | +# if HAVE_WCHAR_H | |
52 | + mbstate_t state; | |
53 | +# endif | |
54 | }; | |
55 | ||
56 | /* Initialize linebuffer LINEBUFFER for use. */ | |
e1fb4052 MF |
57 | diff -Naurp coreutils-8.27-orig/lib/mbfile.c coreutils-8.27/lib/mbfile.c |
58 | --- coreutils-8.27-orig/lib/mbfile.c 1969-12-31 18:00:00.000000000 -0600 | |
59 | +++ coreutils-8.27/lib/mbfile.c 2017-03-11 23:47:38.069058397 -0600 | |
60 | @@ -0,0 +1,3 @@ | |
61 | +#include <config.h> | |
62 | +#define MBFILE_INLINE _GL_EXTERN_INLINE | |
63 | +#include "mbfile.h" | |
64 | diff -Naurp coreutils-8.27-orig/lib/mbfile.h coreutils-8.27/lib/mbfile.h | |
65 | --- coreutils-8.27-orig/lib/mbfile.h 1969-12-31 18:00:00.000000000 -0600 | |
66 | +++ coreutils-8.27/lib/mbfile.h 2017-03-11 23:47:38.069058397 -0600 | |
67 | @@ -0,0 +1,255 @@ | |
68 | +/* Multibyte character I/O: macros for multi-byte encodings. | |
69 | + Copyright (C) 2001, 2005, 2009-2017 Free Software Foundation, Inc. | |
70 | + | |
71 | + This program is free software: you can redistribute it and/or modify | |
72 | + it under the terms of the GNU General Public License as published by | |
73 | + the Free Software Foundation; either version 3 of the License, or | |
74 | + (at your option) any later version. | |
75 | + | |
76 | + This program is distributed in the hope that it will be useful, | |
77 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | |
78 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
79 | + GNU General Public License for more details. | |
80 | + | |
81 | + You should have received a copy of the GNU General Public License | |
82 | + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | |
83 | + | |
84 | +/* Written by Mitsuru Chinen <mchinen@yamato.ibm.com> | |
85 | + and Bruno Haible <bruno@clisp.org>. */ | |
86 | + | |
87 | +/* The macros in this file implement multi-byte character input from a | |
88 | + stream. | |
89 | + | |
90 | + mb_file_t | |
91 | + is the type for multibyte character input stream, usable for variable | |
92 | + declarations. | |
93 | + | |
94 | + mbf_char_t | |
95 | + is the type for multibyte character or EOF, usable for variable | |
96 | + declarations. | |
97 | + | |
98 | + mbf_init (mbf, stream) | |
99 | + initializes the MB_FILE for reading from stream. | |
100 | + | |
101 | + mbf_getc (mbc, mbf) | |
102 | + reads the next multibyte character from mbf and stores it in mbc. | |
103 | + | |
104 | + mb_iseof (mbc) | |
105 | + returns true if mbc represents the EOF value. | |
106 | + | |
107 | + Here are the function prototypes of the macros. | |
108 | + | |
109 | + extern void mbf_init (mb_file_t mbf, FILE *stream); | |
110 | + extern void mbf_getc (mbf_char_t mbc, mb_file_t mbf); | |
111 | + extern bool mb_iseof (const mbf_char_t mbc); | |
112 | + */ | |
113 | + | |
114 | +#ifndef _MBFILE_H | |
115 | +#define _MBFILE_H 1 | |
116 | + | |
117 | +#include <assert.h> | |
118 | +#include <stdbool.h> | |
119 | +#include <stdio.h> | |
120 | +#include <string.h> | |
121 | + | |
122 | +/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before | |
123 | + <wchar.h>. | |
124 | + BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before | |
125 | + <wchar.h>. */ | |
126 | +#include <stdio.h> | |
127 | +#include <time.h> | |
128 | +#include <wchar.h> | |
129 | + | |
130 | +#include "mbchar.h" | |
131 | + | |
132 | +#ifndef _GL_INLINE_HEADER_BEGIN | |
133 | + #error "Please include config.h first." | |
134 | +#endif | |
135 | +_GL_INLINE_HEADER_BEGIN | |
136 | +#ifndef MBFILE_INLINE | |
137 | +# define MBFILE_INLINE _GL_INLINE | |
138 | +#endif | |
139 | + | |
140 | +struct mbfile_multi { | |
141 | + FILE *fp; | |
142 | + bool eof_seen; | |
143 | + bool have_pushback; | |
144 | + mbstate_t state; | |
145 | + unsigned int bufcount; | |
146 | + char buf[MBCHAR_BUF_SIZE]; | |
147 | + struct mbchar pushback; | |
148 | +}; | |
149 | + | |
150 | +MBFILE_INLINE void | |
151 | +mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf) | |
152 | +{ | |
153 | + size_t bytes; | |
154 | + | |
155 | + /* If EOF has already been seen, don't use getc. This matters if | |
156 | + mbf->fp is connected to an interactive tty. */ | |
157 | + if (mbf->eof_seen) | |
158 | + goto eof; | |
159 | + | |
160 | + /* Return character pushed back, if there is one. */ | |
161 | + if (mbf->have_pushback) | |
162 | + { | |
163 | + mb_copy (mbc, &mbf->pushback); | |
164 | + mbf->have_pushback = false; | |
165 | + return; | |
166 | + } | |
167 | + | |
168 | + /* Before using mbrtowc, we need at least one byte. */ | |
169 | + if (mbf->bufcount == 0) | |
170 | + { | |
171 | + int c = getc (mbf->fp); | |
172 | + if (c == EOF) | |
173 | + { | |
174 | + mbf->eof_seen = true; | |
175 | + goto eof; | |
176 | + } | |
177 | + mbf->buf[0] = (unsigned char) c; | |
178 | + mbf->bufcount++; | |
179 | + } | |
180 | + | |
181 | + /* Handle most ASCII characters quickly, without calling mbrtowc(). */ | |
182 | + if (mbf->bufcount == 1 && mbsinit (&mbf->state) && is_basic (mbf->buf[0])) | |
183 | + { | |
184 | + /* These characters are part of the basic character set. ISO C 99 | |
185 | + guarantees that their wide character code is identical to their | |
186 | + char code. */ | |
187 | + mbc->wc = mbc->buf[0] = mbf->buf[0]; | |
188 | + mbc->wc_valid = true; | |
189 | + mbc->ptr = &mbc->buf[0]; | |
190 | + mbc->bytes = 1; | |
191 | + mbf->bufcount = 0; | |
192 | + return; | |
193 | + } | |
194 | + | |
195 | + /* Use mbrtowc on an increasing number of bytes. Read only as many bytes | |
196 | + from mbf->fp as needed. This is needed to give reasonable interactive | |
197 | + behaviour when mbf->fp is connected to an interactive tty. */ | |
198 | + for (;;) | |
199 | + { | |
200 | + /* We don't know whether the 'mbrtowc' function updates the state when | |
201 | + it returns -2, - this is the ISO C 99 and glibc-2.2 behaviour - or | |
202 | + not - amended ANSI C, glibc-2.1 and Solaris 2.7 behaviour. We | |
203 | + don't have an autoconf test for this, yet. | |
204 | + The new behaviour would allow us to feed the bytes one by one into | |
205 | + mbrtowc. But the old behaviour forces us to feed all bytes since | |
206 | + the end of the last character into mbrtowc. Since we want to retry | |
207 | + with more bytes when mbrtowc returns -2, we must backup the state | |
208 | + before calling mbrtowc, because implementations with the new | |
209 | + behaviour will clobber it. */ | |
210 | + mbstate_t backup_state = mbf->state; | |
211 | + | |
212 | + bytes = mbrtowc (&mbc->wc, &mbf->buf[0], mbf->bufcount, &mbf->state); | |
213 | + | |
214 | + if (bytes == (size_t) -1) | |
215 | + { | |
216 | + /* An invalid multibyte sequence was encountered. */ | |
217 | + /* Return a single byte. */ | |
218 | + bytes = 1; | |
219 | + mbc->wc_valid = false; | |
220 | + break; | |
221 | + } | |
222 | + else if (bytes == (size_t) -2) | |
223 | + { | |
224 | + /* An incomplete multibyte character. */ | |
225 | + mbf->state = backup_state; | |
226 | + if (mbf->bufcount == MBCHAR_BUF_SIZE) | |
227 | + { | |
228 | + /* An overlong incomplete multibyte sequence was encountered. */ | |
229 | + /* Return a single byte. */ | |
230 | + bytes = 1; | |
231 | + mbc->wc_valid = false; | |
232 | + break; | |
233 | + } | |
234 | + else | |
235 | + { | |
236 | + /* Read one more byte and retry mbrtowc. */ | |
237 | + int c = getc (mbf->fp); | |
238 | + if (c == EOF) | |
239 | + { | |
240 | + /* An incomplete multibyte character at the end. */ | |
241 | + mbf->eof_seen = true; | |
242 | + bytes = mbf->bufcount; | |
243 | + mbc->wc_valid = false; | |
244 | + break; | |
245 | + } | |
246 | + mbf->buf[mbf->bufcount] = (unsigned char) c; | |
247 | + mbf->bufcount++; | |
248 | + } | |
249 | + } | |
250 | + else | |
251 | + { | |
252 | + if (bytes == 0) | |
253 | + { | |
254 | + /* A null wide character was encountered. */ | |
255 | + bytes = 1; | |
256 | + assert (mbf->buf[0] == '\0'); | |
257 | + assert (mbc->wc == 0); | |
258 | + } | |
259 | + mbc->wc_valid = true; | |
260 | + break; | |
261 | + } | |
262 | + } | |
263 | + | |
264 | + /* Return the multibyte sequence mbf->buf[0..bytes-1]. */ | |
265 | + mbc->ptr = &mbc->buf[0]; | |
266 | + memcpy (&mbc->buf[0], &mbf->buf[0], bytes); | |
267 | + mbc->bytes = bytes; | |
268 | + | |
269 | + mbf->bufcount -= bytes; | |
270 | + if (mbf->bufcount > 0) | |
271 | + { | |
272 | + /* It's not worth calling memmove() for so few bytes. */ | |
273 | + unsigned int count = mbf->bufcount; | |
274 | + char *p = &mbf->buf[0]; | |
275 | + | |
276 | + do | |
277 | + { | |
278 | + *p = *(p + bytes); | |
279 | + p++; | |
280 | + } | |
281 | + while (--count > 0); | |
282 | + } | |
283 | + return; | |
284 | + | |
285 | +eof: | |
286 | + /* An mbchar_t with bytes == 0 is used to indicate EOF. */ | |
287 | + mbc->ptr = NULL; | |
288 | + mbc->bytes = 0; | |
289 | + mbc->wc_valid = false; | |
290 | + return; | |
291 | +} | |
292 | + | |
293 | +MBFILE_INLINE void | |
294 | +mbfile_multi_ungetc (const struct mbchar *mbc, struct mbfile_multi *mbf) | |
295 | +{ | |
296 | + mb_copy (&mbf->pushback, mbc); | |
297 | + mbf->have_pushback = true; | |
298 | +} | |
299 | + | |
300 | +typedef struct mbfile_multi mb_file_t; | |
301 | + | |
302 | +typedef mbchar_t mbf_char_t; | |
303 | + | |
304 | +#define mbf_init(mbf, stream) \ | |
305 | + ((mbf).fp = (stream), \ | |
306 | + (mbf).eof_seen = false, \ | |
307 | + (mbf).have_pushback = false, \ | |
308 | + memset (&(mbf).state, '\0', sizeof (mbstate_t)), \ | |
309 | + (mbf).bufcount = 0) | |
310 | + | |
311 | +#define mbf_getc(mbc, mbf) mbfile_multi_getc (&(mbc), &(mbf)) | |
312 | + | |
313 | +#define mbf_ungetc(mbc, mbf) mbfile_multi_ungetc (&(mbc), &(mbf)) | |
314 | + | |
315 | +#define mb_iseof(mbc) ((mbc).bytes == 0) | |
316 | + | |
317 | +#ifndef _GL_INLINE_HEADER_BEGIN | |
318 | + #error "Please include config.h first." | |
319 | +#endif | |
320 | +_GL_INLINE_HEADER_BEGIN | |
321 | + | |
322 | +#endif /* _MBFILE_H */ | |
323 | diff -Naurp coreutils-8.27-orig/m4/mbfile.m4 coreutils-8.27/m4/mbfile.m4 | |
324 | --- coreutils-8.27-orig/m4/mbfile.m4 1969-12-31 18:00:00.000000000 -0600 | |
325 | +++ coreutils-8.27/m4/mbfile.m4 2017-03-11 23:47:38.070058349 -0600 | |
326 | @@ -0,0 +1,14 @@ | |
327 | +# mbfile.m4 serial 7 | |
328 | +dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc. | |
329 | +dnl This file is free software; the Free Software Foundation | |
330 | +dnl gives unlimited permission to copy and/or distribute it, | |
331 | +dnl with or without modifications, as long as this notice is preserved. | |
332 | + | |
333 | +dnl autoconf tests required for use of mbfile.h | |
334 | +dnl From Bruno Haible. | |
335 | + | |
336 | +AC_DEFUN([gl_MBFILE], | |
337 | +[ | |
338 | + AC_REQUIRE([AC_TYPE_MBSTATE_T]) | |
339 | + : | |
340 | +]) | |
341 | diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c | |
342 | --- coreutils-8.27-orig/src/cut.c 2017-01-01 16:34:24.000000000 -0600 | |
343 | +++ coreutils-8.27/src/cut.c 2017-03-11 23:47:59.526048471 -0600 | |
7cf3a80b ML |
344 | @@ -28,6 +28,11 @@ |
345 | #include <assert.h> | |
346 | #include <getopt.h> | |
347 | #include <sys/types.h> | |
348 | + | |
349 | +/* Get mbstate_t, mbrtowc(). */ | |
350 | +#if HAVE_WCHAR_H | |
351 | +# include <wchar.h> | |
352 | +#endif | |
353 | #include "system.h" | |
354 | ||
355 | #include "error.h" | |
356 | @@ -38,6 +43,18 @@ | |
357 | ||
358 | #include "set-fields.h" | |
359 | ||
360 | +/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC | |
361 | + installation; work around this configuration error. */ | |
362 | +#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 | |
363 | +# undef MB_LEN_MAX | |
364 | +# define MB_LEN_MAX 16 | |
365 | +#endif | |
366 | + | |
367 | +/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ | |
368 | +#if HAVE_MBRTOWC && defined mbstate_t | |
369 | +# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) | |
370 | +#endif | |
371 | + | |
372 | /* The official name of this program (e.g., no 'g' prefix). */ | |
373 | #define PROGRAM_NAME "cut" | |
374 | ||
375 | @@ -54,6 +71,52 @@ | |
376 | } \ | |
377 | while (0) | |
378 | ||
379 | +/* Refill the buffer BUF to get a multibyte character. */ | |
380 | +#define REFILL_BUFFER(BUF, BUFPOS, BUFLEN, STREAM) \ | |
381 | + do \ | |
382 | + { \ | |
383 | + if (BUFLEN < MB_LEN_MAX && !feof (STREAM) && !ferror (STREAM)) \ | |
384 | + { \ | |
385 | + memmove (BUF, BUFPOS, BUFLEN); \ | |
386 | + BUFLEN += fread (BUF + BUFLEN, sizeof(char), BUFSIZ, STREAM); \ | |
387 | + BUFPOS = BUF; \ | |
388 | + } \ | |
389 | + } \ | |
390 | + while (0) | |
391 | + | |
392 | +/* Get wide character on BUFPOS. BUFPOS is not included after that. | |
393 | + If byte sequence is not valid as a character, CONVFAIL is true. Otherwise false. */ | |
394 | +#define GET_NEXT_WC_FROM_BUFFER(WC, BUFPOS, BUFLEN, MBLENGTH, STATE, CONVFAIL) \ | |
395 | + do \ | |
396 | + { \ | |
397 | + mbstate_t state_bak; \ | |
398 | + \ | |
399 | + if (BUFLEN < 1) \ | |
400 | + { \ | |
401 | + WC = WEOF; \ | |
402 | + break; \ | |
403 | + } \ | |
404 | + \ | |
405 | + /* Get a wide character. */ \ | |
406 | + CONVFAIL = false; \ | |
407 | + state_bak = STATE; \ | |
408 | + MBLENGTH = mbrtowc ((wchar_t *)&WC, BUFPOS, BUFLEN, &STATE); \ | |
409 | + \ | |
410 | + switch (MBLENGTH) \ | |
411 | + { \ | |
412 | + case (size_t)-1: \ | |
413 | + case (size_t)-2: \ | |
414 | + CONVFAIL = true; \ | |
415 | + STATE = state_bak; \ | |
416 | + /* Fall througn. */ \ | |
417 | + \ | |
418 | + case 0: \ | |
419 | + MBLENGTH = 1; \ | |
420 | + break; \ | |
421 | + } \ | |
422 | + } \ | |
423 | + while (0) | |
424 | + | |
425 | ||
426 | /* Pointer inside RP. When checking if a byte or field is selected | |
427 | by a finite range, we check if it is between CURRENT_RP.LO | |
428 | @@ -61,6 +124,9 @@ | |
429 | CURRENT_RP.HI then we make CURRENT_RP to point to the next range pair. */ | |
430 | static struct field_range_pair *current_rp; | |
431 | ||
432 | +/* Length of the delimiter given as argument to -d. */ | |
433 | +size_t delimlen; | |
434 | + | |
435 | /* This buffer is used to support the semantics of the -s option | |
436 | (or lack of same) when the specified field list includes (does | |
437 | not include) the first field. In both of those cases, the entire | |
438 | @@ -77,15 +143,25 @@ enum operating_mode | |
439 | { | |
440 | undefined_mode, | |
441 | ||
442 | - /* Output characters that are in the given bytes. */ | |
443 | + /* Output bytes that are at the given positions. */ | |
444 | byte_mode, | |
445 | ||
446 | + /* Output characters that are at the given positions. */ | |
447 | + character_mode, | |
448 | + | |
449 | /* Output the given delimiter-separated fields. */ | |
450 | field_mode | |
451 | }; | |
452 | ||
453 | static enum operating_mode operating_mode; | |
454 | ||
455 | +/* If nonzero, when in byte mode, don't split multibyte characters. */ | |
456 | +static int byte_mode_character_aware; | |
457 | + | |
458 | +/* If nonzero, the function for single byte locale is work | |
459 | + if this program runs on multibyte locale. */ | |
460 | +static int force_singlebyte_mode; | |
461 | + | |
462 | /* If true do not output lines containing no delimiter characters. | |
463 | Otherwise, all such lines are printed. This option is valid only | |
464 | with field mode. */ | |
465 | @@ -97,6 +173,9 @@ static bool complement; | |
466 | ||
467 | /* The delimiter character for field mode. */ | |
468 | static unsigned char delim; | |
469 | +#if HAVE_WCHAR_H | |
470 | +static wchar_t wcdelim; | |
471 | +#endif | |
472 | ||
473 | /* The delimiter for each line/record. */ | |
474 | static unsigned char line_delim = '\n'; | |
475 | @@ -164,7 +243,7 @@ Print selected parts of lines from each | |
476 | -f, --fields=LIST select only these fields; also print any line\n\ | |
477 | that contains no delimiter character, unless\n\ | |
478 | the -s option is specified\n\ | |
479 | - -n (ignored)\n\ | |
480 | + -n with -b: don't split multibyte characters\n\ | |
481 | "), stdout); | |
482 | fputs (_("\ | |
483 | --complement complement the set of selected bytes, characters\n\ | |
484 | @@ -280,6 +359,82 @@ cut_bytes (FILE *stream) | |
485 | } | |
486 | } | |
487 | ||
488 | +#if HAVE_MBRTOWC | |
489 | +/* This function is in use for the following case. | |
490 | + | |
491 | + 1. Read from the stream STREAM, printing to standard output any selected | |
492 | + characters. | |
493 | + | |
494 | + 2. Read from stream STREAM, printing to standard output any selected bytes, | |
495 | + without splitting multibyte characters. */ | |
496 | + | |
497 | +static void | |
498 | +cut_characters_or_cut_bytes_no_split (FILE *stream) | |
499 | +{ | |
500 | + size_t idx; /* number of bytes or characters in the line so far. */ | |
501 | + char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ | |
502 | + char *bufpos; /* Next read position of BUF. */ | |
503 | + size_t buflen; /* The length of the byte sequence in buf. */ | |
504 | + wint_t wc; /* A gotten wide character. */ | |
505 | + size_t mblength; /* The byte size of a multibyte character which shows | |
506 | + as same character as WC. */ | |
507 | + mbstate_t state; /* State of the stream. */ | |
508 | + bool convfail = false; /* true, when conversion failed. Otherwise false. */ | |
509 | + /* Whether to begin printing delimiters between ranges for the current line. | |
510 | + Set after we've begun printing data corresponding to the first range. */ | |
511 | + bool print_delimiter = false; | |
512 | + | |
513 | + idx = 0; | |
514 | + buflen = 0; | |
515 | + bufpos = buf; | |
516 | + memset (&state, '\0', sizeof(mbstate_t)); | |
517 | + | |
518 | + current_rp = frp; | |
519 | + | |
520 | + while (1) | |
521 | + { | |
522 | + REFILL_BUFFER (buf, bufpos, buflen, stream); | |
523 | + | |
524 | + GET_NEXT_WC_FROM_BUFFER (wc, bufpos, buflen, mblength, state, convfail); | |
525 | + (void) convfail; /* ignore unused */ | |
526 | + | |
527 | + if (wc == WEOF) | |
528 | + { | |
529 | + if (idx > 0) | |
530 | + putchar (line_delim); | |
531 | + break; | |
532 | + } | |
533 | + else if (wc == line_delim) | |
534 | + { | |
535 | + putchar (line_delim); | |
536 | + idx = 0; | |
537 | + print_delimiter = false; | |
538 | + current_rp = frp; | |
539 | + } | |
540 | + else | |
541 | + { | |
542 | + next_item (&idx); | |
543 | + if (print_kth (idx)) | |
544 | + { | |
545 | + if (output_delimiter_specified) | |
546 | + { | |
547 | + if (print_delimiter && is_range_start_index (idx)) | |
548 | + { | |
549 | + fwrite (output_delimiter_string, sizeof (char), | |
550 | + output_delimiter_length, stdout); | |
551 | + } | |
552 | + print_delimiter = true; | |
553 | + } | |
554 | + fwrite (bufpos, mblength, sizeof(char), stdout); | |
555 | + } | |
556 | + } | |
557 | + | |
558 | + buflen -= mblength; | |
559 | + bufpos += mblength; | |
560 | + } | |
561 | +} | |
562 | +#endif | |
563 | + | |
564 | /* Read from stream STREAM, printing to standard output any selected fields. */ | |
565 | ||
566 | static void | |
567 | @@ -425,13 +580,211 @@ cut_fields (FILE *stream) | |
568 | } | |
569 | } | |
570 | ||
571 | +#if HAVE_MBRTOWC | |
572 | +static void | |
573 | +cut_fields_mb (FILE *stream) | |
574 | +{ | |
575 | + int c; | |
576 | + size_t field_idx; | |
577 | + int found_any_selected_field; | |
578 | + int buffer_first_field; | |
579 | + int empty_input; | |
580 | + char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ | |
581 | + char *bufpos; /* Next read position of BUF. */ | |
582 | + size_t buflen; /* The length of the byte sequence in buf. */ | |
583 | + wint_t wc = 0; /* A gotten wide character. */ | |
584 | + size_t mblength; /* The byte size of a multibyte character which shows | |
585 | + as same character as WC. */ | |
586 | + mbstate_t state; /* State of the stream. */ | |
587 | + bool convfail = false; /* true, when conversion failed. Otherwise false. */ | |
588 | + | |
589 | + current_rp = frp; | |
590 | + | |
591 | + found_any_selected_field = 0; | |
592 | + field_idx = 1; | |
593 | + bufpos = buf; | |
594 | + buflen = 0; | |
595 | + memset (&state, '\0', sizeof(mbstate_t)); | |
596 | + | |
597 | + c = getc (stream); | |
598 | + empty_input = (c == EOF); | |
599 | + if (c != EOF) | |
600 | + { | |
601 | + ungetc (c, stream); | |
602 | + wc = 0; | |
603 | + } | |
604 | + else | |
605 | + wc = WEOF; | |
606 | + | |
607 | + /* To support the semantics of the -s flag, we may have to buffer | |
608 | + all of the first field to determine whether it is `delimited.' | |
609 | + But that is unnecessary if all non-delimited lines must be printed | |
610 | + and the first field has been selected, or if non-delimited lines | |
611 | + must be suppressed and the first field has *not* been selected. | |
612 | + That is because a non-delimited line has exactly one field. */ | |
613 | + buffer_first_field = (suppress_non_delimited ^ !print_kth (1)); | |
614 | + | |
615 | + while (1) | |
616 | + { | |
617 | + if (field_idx == 1 && buffer_first_field) | |
618 | + { | |
619 | + int len = 0; | |
620 | + | |
621 | + while (1) | |
622 | + { | |
623 | + REFILL_BUFFER (buf, bufpos, buflen, stream); | |
624 | + | |
625 | + GET_NEXT_WC_FROM_BUFFER | |
626 | + (wc, bufpos, buflen, mblength, state, convfail); | |
627 | + | |
628 | + if (wc == WEOF) | |
629 | + break; | |
630 | + | |
631 | + field_1_buffer = xrealloc (field_1_buffer, len + mblength); | |
632 | + memcpy (field_1_buffer + len, bufpos, mblength); | |
633 | + len += mblength; | |
634 | + buflen -= mblength; | |
635 | + bufpos += mblength; | |
636 | + | |
637 | + if (!convfail && (wc == line_delim || wc == wcdelim)) | |
638 | + break; | |
639 | + } | |
640 | + | |
641 | + if (len <= 0 && wc == WEOF) | |
642 | + break; | |
643 | + | |
644 | + /* If the first field extends to the end of line (it is not | |
645 | + delimited) and we are printing all non-delimited lines, | |
646 | + print this one. */ | |
647 | + if (convfail || (!convfail && wc != wcdelim)) | |
648 | + { | |
649 | + if (suppress_non_delimited) | |
650 | + { | |
651 | + /* Empty. */ | |
652 | + } | |
653 | + else | |
654 | + { | |
655 | + fwrite (field_1_buffer, sizeof (char), len, stdout); | |
656 | + /* Make sure the output line is newline terminated. */ | |
657 | + if (convfail || (!convfail && wc != line_delim)) | |
658 | + putchar (line_delim); | |
659 | + } | |
660 | + continue; | |
661 | + } | |
662 | + | |
663 | + if (print_kth (1)) | |
664 | + { | |
665 | + /* Print the field, but not the trailing delimiter. */ | |
666 | + fwrite (field_1_buffer, sizeof (char), len - 1, stdout); | |
667 | + found_any_selected_field = 1; | |
668 | + } | |
669 | + next_item (&field_idx); | |
670 | + } | |
671 | + | |
672 | + if (wc != WEOF) | |
673 | + { | |
674 | + if (print_kth (field_idx)) | |
675 | + { | |
676 | + if (found_any_selected_field) | |
677 | + { | |
678 | + fwrite (output_delimiter_string, sizeof (char), | |
679 | + output_delimiter_length, stdout); | |
680 | + } | |
681 | + found_any_selected_field = 1; | |
682 | + } | |
683 | + | |
684 | + while (1) | |
685 | + { | |
686 | + REFILL_BUFFER (buf, bufpos, buflen, stream); | |
687 | + | |
688 | + GET_NEXT_WC_FROM_BUFFER | |
689 | + (wc, bufpos, buflen, mblength, state, convfail); | |
690 | + | |
691 | + if (wc == WEOF) | |
692 | + break; | |
693 | + else if (!convfail && (wc == wcdelim || wc == line_delim)) | |
694 | + { | |
695 | + buflen -= mblength; | |
696 | + bufpos += mblength; | |
697 | + break; | |
698 | + } | |
699 | + | |
700 | + if (print_kth (field_idx)) | |
701 | + fwrite (bufpos, mblength, sizeof(char), stdout); | |
702 | + | |
703 | + buflen -= mblength; | |
704 | + bufpos += mblength; | |
705 | + } | |
706 | + } | |
707 | + | |
708 | + if ((!convfail || wc == line_delim) && buflen < 1) | |
709 | + wc = WEOF; | |
710 | + | |
711 | + if (!convfail && wc == wcdelim) | |
712 | + next_item (&field_idx); | |
713 | + else if (wc == WEOF || (!convfail && wc == line_delim)) | |
714 | + { | |
715 | + if (found_any_selected_field | |
716 | + || (!empty_input && !(suppress_non_delimited && field_idx == 1))) | |
717 | + putchar (line_delim); | |
718 | + if (wc == WEOF) | |
719 | + break; | |
720 | + field_idx = 1; | |
721 | + current_rp = frp; | |
722 | + found_any_selected_field = 0; | |
723 | + } | |
724 | + } | |
725 | +} | |
726 | +#endif | |
727 | + | |
728 | static void | |
729 | cut_stream (FILE *stream) | |
730 | { | |
731 | - if (operating_mode == byte_mode) | |
732 | - cut_bytes (stream); | |
733 | +#if HAVE_MBRTOWC | |
734 | + if (MB_CUR_MAX > 1 && !force_singlebyte_mode) | |
735 | + { | |
736 | + switch (operating_mode) | |
737 | + { | |
738 | + case byte_mode: | |
739 | + if (byte_mode_character_aware) | |
740 | + cut_characters_or_cut_bytes_no_split (stream); | |
741 | + else | |
742 | + cut_bytes (stream); | |
743 | + break; | |
744 | + | |
745 | + case character_mode: | |
746 | + cut_characters_or_cut_bytes_no_split (stream); | |
747 | + break; | |
748 | + | |
749 | + case field_mode: | |
750 | + if (delimlen == 1) | |
751 | + { | |
752 | + /* Check if we have utf8 multibyte locale, so we can use this | |
753 | + optimization because of uniqueness of characters, which is | |
754 | + not true for e.g. SJIS */ | |
755 | + char * loc = setlocale(LC_CTYPE, NULL); | |
756 | + if (loc && (strstr (loc, "UTF-8") || strstr (loc, "utf-8") || | |
757 | + strstr (loc, "UTF8") || strstr (loc, "utf8"))) | |
758 | + { | |
759 | + cut_fields (stream); | |
760 | + break; | |
761 | + } | |
762 | + } | |
763 | + cut_fields_mb (stream); | |
764 | + break; | |
765 | + | |
766 | + default: | |
767 | + abort (); | |
768 | + } | |
769 | + } | |
770 | else | |
771 | - cut_fields (stream); | |
772 | +#endif | |
773 | + { | |
774 | + if (operating_mode == field_mode) | |
775 | + cut_fields (stream); | |
776 | + else | |
777 | + cut_bytes (stream); | |
778 | + } | |
779 | } | |
780 | ||
781 | /* Process file FILE to standard output. | |
782 | @@ -483,6 +836,7 @@ main (int argc, char **argv) | |
783 | bool ok; | |
784 | bool delim_specified = false; | |
785 | char *spec_list_string IF_LINT ( = NULL); | |
786 | + char mbdelim[MB_LEN_MAX + 1]; | |
787 | ||
788 | initialize_main (&argc, &argv); | |
789 | set_program_name (argv[0]); | |
790 | @@ -505,7 +859,6 @@ main (int argc, char **argv) | |
791 | switch (optc) | |
792 | { | |
793 | case 'b': | |
794 | - case 'c': | |
795 | /* Build the byte list. */ | |
796 | if (operating_mode != undefined_mode) | |
797 | FATAL_ERROR (_("only one type of list may be specified")); | |
798 | @@ -513,6 +866,14 @@ main (int argc, char **argv) | |
799 | spec_list_string = optarg; | |
800 | break; | |
801 | ||
802 | + case 'c': | |
803 | + /* Build the character list. */ | |
804 | + if (operating_mode != undefined_mode) | |
805 | + FATAL_ERROR (_("only one type of list may be specified")); | |
806 | + operating_mode = character_mode; | |
807 | + spec_list_string = optarg; | |
808 | + break; | |
809 | + | |
810 | case 'f': | |
811 | /* Build the field list. */ | |
812 | if (operating_mode != undefined_mode) | |
813 | @@ -524,10 +885,38 @@ main (int argc, char **argv) | |
814 | case 'd': | |
815 | /* New delimiter. */ | |
816 | /* Interpret -d '' to mean 'use the NUL byte as the delimiter.' */ | |
817 | - if (optarg[0] != '\0' && optarg[1] != '\0') | |
818 | - FATAL_ERROR (_("the delimiter must be a single character")); | |
819 | - delim = optarg[0]; | |
820 | - delim_specified = true; | |
821 | + { | |
822 | +#if HAVE_MBRTOWC | |
823 | + if(MB_CUR_MAX > 1) | |
824 | + { | |
825 | + mbstate_t state; | |
826 | + | |
827 | + memset (&state, '\0', sizeof(mbstate_t)); | |
828 | + delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state); | |
829 | + | |
830 | + if (delimlen == (size_t)-1 || delimlen == (size_t)-2) | |
831 | + ++force_singlebyte_mode; | |
832 | + else | |
833 | + { | |
834 | + delimlen = (delimlen < 1) ? 1 : delimlen; | |
835 | + if (wcdelim != L'\0' && *(optarg + delimlen) != '\0') | |
836 | + FATAL_ERROR (_("the delimiter must be a single character")); | |
837 | + memcpy (mbdelim, optarg, delimlen); | |
838 | + mbdelim[delimlen] = '\0'; | |
839 | + if (delimlen == 1) | |
840 | + delim = *optarg; | |
841 | + } | |
842 | + } | |
843 | + | |
844 | + if (MB_CUR_MAX <= 1 || force_singlebyte_mode) | |
845 | +#endif | |
846 | + { | |
847 | + if (optarg[0] != '\0' && optarg[1] != '\0') | |
848 | + FATAL_ERROR (_("the delimiter must be a single character")); | |
849 | + delim = (unsigned char) optarg[0]; | |
850 | + } | |
851 | + delim_specified = true; | |
852 | + } | |
853 | break; | |
854 | ||
855 | case OUTPUT_DELIMITER_OPTION: | |
856 | @@ -540,6 +929,7 @@ main (int argc, char **argv) | |
857 | break; | |
858 | ||
859 | case 'n': | |
860 | + byte_mode_character_aware = 1; | |
861 | break; | |
862 | ||
863 | case 's': | |
864 | @@ -579,15 +969,34 @@ main (int argc, char **argv) | |
865 | | (complement ? SETFLD_COMPLEMENT : 0) ); | |
866 | ||
867 | if (!delim_specified) | |
868 | - delim = '\t'; | |
869 | + { | |
870 | + delim = '\t'; | |
871 | +#ifdef HAVE_MBRTOWC | |
872 | + wcdelim = L'\t'; | |
873 | + mbdelim[0] = '\t'; | |
874 | + mbdelim[1] = '\0'; | |
875 | + delimlen = 1; | |
876 | +#endif | |
877 | + } | |
878 | ||
879 | if (output_delimiter_string == NULL) | |
880 | { | |
881 | - static char dummy[2]; | |
882 | - dummy[0] = delim; | |
883 | - dummy[1] = '\0'; | |
884 | - output_delimiter_string = dummy; | |
885 | - output_delimiter_length = 1; | |
886 | +#ifdef HAVE_MBRTOWC | |
887 | + if (MB_CUR_MAX > 1 && !force_singlebyte_mode) | |
888 | + { | |
889 | + output_delimiter_string = xstrdup(mbdelim); | |
890 | + output_delimiter_length = delimlen; | |
891 | + } | |
892 | + | |
893 | + if (MB_CUR_MAX <= 1 || force_singlebyte_mode) | |
894 | +#endif | |
895 | + { | |
896 | + static char dummy[2]; | |
897 | + dummy[0] = delim; | |
898 | + dummy[1] = '\0'; | |
899 | + output_delimiter_string = dummy; | |
900 | + output_delimiter_length = 1; | |
901 | + } | |
902 | } | |
903 | ||
904 | if (optind == argc) | |
e1fb4052 MF |
905 | diff -Naurp coreutils-8.27-orig/src/expand.c coreutils-8.27/src/expand.c |
906 | --- coreutils-8.27-orig/src/expand.c 2017-02-26 15:42:25.000000000 -0600 | |
907 | +++ coreutils-8.27/src/expand.c 2017-03-11 23:49:06.758133530 -0600 | |
908 | @@ -37,6 +37,9 @@ | |
7cf3a80b ML |
909 | #include <stdio.h> |
910 | #include <getopt.h> | |
911 | #include <sys/types.h> | |
912 | + | |
e1fb4052 | 913 | +#include <mbfile.h> |
7cf3a80b ML |
914 | + |
915 | #include "system.h" | |
e1fb4052 | 916 | #include "die.h" |
7cf3a80b | 917 | #include "xstrndup.h" |
e1fb4052 MF |
918 | @@ -100,19 +103,41 @@ expand (void) |
919 | { | |
920 | /* Input stream. */ | |
921 | FILE *fp = next_file (NULL); | |
922 | + mb_file_t mbf; | |
923 | + mbf_char_t c; | |
924 | + /* True if the starting locale is utf8. */ | |
925 | + bool using_utf_locale; | |
926 | + | |
927 | + /* True if the first file contains BOM header. */ | |
928 | + bool found_bom; | |
929 | + using_utf_locale=check_utf_locale(); | |
930 | ||
931 | if (!fp) | |
932 | return; | |
933 | + mbf_init (mbf, fp); | |
934 | + found_bom=check_bom(fp,&mbf); | |
7cf3a80b | 935 | |
e1fb4052 MF |
936 | - while (true) |
937 | + if (using_utf_locale == false && found_bom == true) | |
938 | + { | |
939 | + /*try using some predefined locale */ | |
7cf3a80b | 940 | + |
e1fb4052 MF |
941 | + if (set_utf_locale () != 0) |
942 | { | |
943 | - /* Input character, or EOF. */ | |
944 | - int c; | |
945 | + error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); | |
946 | + } | |
947 | + } | |
7cf3a80b | 948 | + |
7cf3a80b | 949 | |
e1fb4052 MF |
950 | + if (found_bom == true) |
951 | + { | |
952 | + print_bom(); | |
953 | + } | |
954 | + | |
955 | + while (true) | |
956 | + { | |
957 | /* If true, perform translations. */ | |
958 | bool convert = true; | |
959 | ||
960 | - | |
961 | /* The following variables have valid values only when CONVERT | |
962 | is true: */ | |
963 | ||
964 | @@ -122,17 +147,48 @@ expand (void) | |
965 | /* Index in TAB_LIST of next tab stop to examine. */ | |
966 | size_t tab_index = 0; | |
967 | ||
968 | - | |
969 | /* Convert a line of text. */ | |
970 | ||
971 | do | |
972 | { | |
973 | - while ((c = getc (fp)) < 0 && (fp = next_file (fp))) | |
974 | - continue; | |
975 | + while (true) { | |
976 | + mbf_getc (c, mbf); | |
977 | + if ((mb_iseof (c)) && (fp = next_file (fp))) | |
978 | + { | |
979 | + mbf_init (mbf, fp); | |
980 | + if (fp!=NULL) | |
981 | + { | |
982 | + if (check_bom(fp,&mbf)==true) | |
983 | + { | |
984 | + /*Not the first file - check BOM header*/ | |
985 | + if (using_utf_locale==false && found_bom==false) | |
986 | + { | |
987 | + /*BOM header in subsequent file but not in the first one. */ | |
988 | + error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); | |
989 | + } | |
990 | + } | |
991 | + else | |
992 | + { | |
993 | + if(using_utf_locale==false && found_bom==true) | |
994 | + { | |
995 | + /*First file conatined BOM header - locale was switched to UTF | |
996 | + /*all subsequent files should contain BOM. */ | |
997 | + error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); | |
998 | + } | |
999 | + } | |
1000 | + } | |
1001 | + continue; | |
1002 | + } | |
1003 | + else | |
1004 | + { | |
1005 | + break; | |
1006 | + } | |
1007 | + } | |
1008 | + | |
1009 | ||
1010 | if (convert) | |
1011 | { | |
1012 | - if (c == '\t') | |
1013 | + if (mb_iseq (c, '\t')) | |
1014 | { | |
1015 | /* Column the next input tab stop is on. */ | |
1016 | uintmax_t next_tab_column; | |
1017 | @@ -151,32 +207,34 @@ expand (void) | |
1018 | if (putchar (' ') < 0) | |
1019 | die (EXIT_FAILURE, errno, _("write error")); | |
1020 | ||
1021 | - c = ' '; | |
1022 | + mb_setascii (&c, ' '); | |
1023 | } | |
1024 | - else if (c == '\b') | |
1025 | + else if (mb_iseq (c, '\b')) | |
1026 | { | |
1027 | /* Go back one column, and force recalculation of the | |
1028 | next tab stop. */ | |
1029 | column -= !!column; | |
1030 | tab_index -= !!tab_index; | |
1031 | } | |
1032 | - else | |
1033 | + /* A leading control character could make us trip over. */ | |
1034 | + else if (!mb_iscntrl (c)) | |
1035 | { | |
1036 | - column++; | |
1037 | + column += mb_width (c); | |
1038 | if (!column) | |
1039 | die (EXIT_FAILURE, 0, _("input line is too long")); | |
1040 | } | |
1041 | ||
1042 | - convert &= convert_entire_line || !! isblank (c); | |
1043 | + convert &= convert_entire_line || mb_isblank (c); | |
1044 | } | |
1045 | ||
1046 | - if (c < 0) | |
1047 | + if (mb_iseof (c)) | |
1048 | return; | |
1049 | ||
1050 | - if (putchar (c) < 0) | |
1051 | + mb_putc (c, stdout); | |
1052 | + if (ferror (stdout)) | |
1053 | die (EXIT_FAILURE, errno, _("write error")); | |
1054 | } | |
1055 | - while (c != '\n'); | |
1056 | + while (!mb_iseq (c, '\n')); | |
7cf3a80b ML |
1057 | } |
1058 | } | |
1059 | ||
e1fb4052 MF |
1060 | diff -Naurp coreutils-8.27-orig/src/expand-common.c coreutils-8.27/src/expand-common.c |
1061 | --- coreutils-8.27-orig/src/expand-common.c 2017-03-01 11:22:55.000000000 -0600 | |
1062 | +++ coreutils-8.27/src/expand-common.c 2017-03-11 23:49:06.757133570 -0600 | |
1063 | @@ -18,6 +18,7 @@ | |
1064 | ||
1065 | #include <stdio.h> | |
1066 | #include <sys/types.h> | |
1067 | +#include <mbfile.h> | |
1068 | #include "system.h" | |
1069 | #include "die.h" | |
1070 | #include "error.h" | |
1071 | @@ -105,6 +106,119 @@ set_extend_size (uintmax_t tabval) | |
1072 | return ok; | |
1073 | } | |
1074 | ||
1075 | +extern int | |
1076 | +set_utf_locale (void) | |
7cf3a80b | 1077 | +{ |
e1fb4052 MF |
1078 | + /*try using some predefined locale */ |
1079 | + const char* predef_locales[] = {"C.UTF8","en_US.UTF8","en_GB.UTF8"}; | |
7cf3a80b | 1080 | + |
e1fb4052 MF |
1081 | + const int predef_locales_count=3; |
1082 | + for (int i=0;i<predef_locales_count;i++) | |
1083 | + { | |
1084 | + if (setlocale(LC_ALL,predef_locales[i])!=NULL) | |
1085 | + { | |
1086 | + break; | |
1087 | + } | |
1088 | + else if (i==predef_locales_count-1) | |
1089 | + { | |
1090 | + return 1; | |
1091 | + error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); | |
1092 | + } | |
1093 | + } | |
1094 | + return 0; | |
1095 | +} | |
7cf3a80b | 1096 | + |
e1fb4052 MF |
1097 | +extern bool |
1098 | +check_utf_locale(void) | |
1099 | +{ | |
1100 | + char* locale = setlocale (LC_CTYPE , NULL); | |
1101 | + if (locale == NULL) | |
1102 | + { | |
1103 | + return false; | |
1104 | + } | |
1105 | + else if (strcasestr(locale, "utf8") == NULL && strcasestr(locale, "utf-8") == NULL) | |
1106 | + { | |
1107 | + return false; | |
1108 | + } | |
1109 | + return true; | |
1110 | +} | |
7cf3a80b | 1111 | + |
e1fb4052 MF |
1112 | +extern bool |
1113 | +check_bom(FILE* fp, mb_file_t *mbf) | |
1114 | +{ | |
1115 | + int c; | |
7cf3a80b | 1116 | + |
7cf3a80b | 1117 | + |
e1fb4052 | 1118 | + c=fgetc(fp); |
7cf3a80b | 1119 | + |
e1fb4052 MF |
1120 | + /*test BOM header of the first file */ |
1121 | + mbf->bufcount=0; | |
1122 | + if (c == 0xEF) | |
1123 | + { | |
1124 | + c=fgetc(fp); | |
1125 | + } | |
1126 | + else | |
1127 | + { | |
1128 | + if (c != EOF) | |
1129 | + { | |
1130 | + ungetc(c,fp); | |
1131 | + } | |
1132 | + return false; | |
1133 | + } | |
7cf3a80b | 1134 | + |
e1fb4052 MF |
1135 | + if (c == 0xBB) |
1136 | + { | |
1137 | + c=fgetc(fp); | |
1138 | + } | |
1139 | + else | |
1140 | + { | |
1141 | + if ( c!= EOF ) | |
1142 | + { | |
1143 | + mbf->buf[0]=(unsigned char) 0xEF; | |
1144 | + mbf->bufcount=1; | |
1145 | + ungetc(c,fp); | |
1146 | + return false; | |
1147 | + } | |
1148 | + else | |
1149 | + { | |
1150 | + ungetc(0xEF,fp); | |
1151 | + return false; | |
7cf3a80b | 1152 | + } |
e1fb4052 MF |
1153 | + } |
1154 | + if (c == 0xBF) | |
1155 | + { | |
1156 | + mbf->bufcount=0; | |
1157 | + return true; | |
1158 | + } | |
1159 | + else | |
1160 | + { | |
1161 | + if (c != EOF) | |
1162 | + { | |
1163 | + mbf->buf[0]=(unsigned char) 0xEF; | |
1164 | + mbf->buf[1]=(unsigned char) 0xBB; | |
1165 | + mbf->bufcount=2; | |
1166 | + ungetc(c,fp); | |
1167 | + return false; | |
1168 | + } | |
1169 | + else | |
1170 | + { | |
1171 | + mbf->buf[0]=(unsigned char) 0xEF; | |
1172 | + mbf->bufcount=1; | |
1173 | + ungetc(0xBB,fp); | |
1174 | + return false; | |
1175 | + } | |
1176 | + } | |
1177 | + return false; | |
7cf3a80b | 1178 | +} |
7cf3a80b | 1179 | + |
e1fb4052 MF |
1180 | +extern void |
1181 | +print_bom(void) | |
1182 | +{ | |
1183 | + putc (0xEF, stdout); | |
1184 | + putc (0xBB, stdout); | |
1185 | + putc (0xBF, stdout); | |
1186 | +} | |
1187 | + | |
1188 | /* Add the comma or blank separated list of tab stops STOPS | |
1189 | to the list of tab stops. */ | |
1190 | extern void | |
1191 | diff -Naurp coreutils-8.27-orig/src/expand-common.h coreutils-8.27/src/expand-common.h | |
1192 | --- coreutils-8.27-orig/src/expand-common.h 2017-01-01 16:34:24.000000000 -0600 | |
1193 | +++ coreutils-8.27/src/expand-common.h 2017-03-11 23:49:06.758133530 -0600 | |
1194 | @@ -34,6 +34,18 @@ extern size_t max_column_width; | |
1195 | /* The desired exit status. */ | |
1196 | extern int exit_status; | |
1197 | ||
1198 | +extern int | |
1199 | +set_utf_locale (void); | |
1200 | + | |
1201 | +extern bool | |
1202 | +check_utf_locale(void); | |
1203 | + | |
1204 | +extern bool | |
1205 | +check_bom(FILE* fp, mb_file_t *mbf); | |
1206 | + | |
1207 | +extern void | |
1208 | +print_bom(void); | |
1209 | + | |
1210 | /* Add tab stop TABVAL to the end of 'tab_list'. */ | |
1211 | extern void | |
1212 | add_tab_stop (uintmax_t tabval); | |
1213 | diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c | |
1214 | --- coreutils-8.27-orig/src/fold.c 2017-01-01 16:34:24.000000000 -0600 | |
1215 | +++ coreutils-8.27/src/fold.c 2017-03-11 23:49:30.982169404 -0600 | |
1216 | @@ -22,12 +22,34 @@ | |
7cf3a80b ML |
1217 | #include <getopt.h> |
1218 | #include <sys/types.h> | |
1219 | ||
1220 | +/* Get mbstate_t, mbrtowc(), wcwidth(). */ | |
1221 | +#if HAVE_WCHAR_H | |
1222 | +# include <wchar.h> | |
1223 | +#endif | |
1224 | + | |
1225 | +/* Get iswprint(), iswblank(), wcwidth(). */ | |
1226 | +#if HAVE_WCTYPE_H | |
1227 | +# include <wctype.h> | |
1228 | +#endif | |
1229 | + | |
1230 | #include "system.h" | |
e1fb4052 | 1231 | #include "die.h" |
7cf3a80b ML |
1232 | #include "error.h" |
1233 | #include "fadvise.h" | |
1234 | #include "xdectoint.h" | |
1235 | ||
1236 | +/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC | |
1237 | + installation; work around this configuration error. */ | |
1238 | +#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 | |
1239 | +# undef MB_LEN_MAX | |
1240 | +# define MB_LEN_MAX 16 | |
1241 | +#endif | |
1242 | + | |
1243 | +/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ | |
1244 | +#if HAVE_MBRTOWC && defined mbstate_t | |
1245 | +# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) | |
1246 | +#endif | |
1247 | + | |
1248 | #define TAB_WIDTH 8 | |
1249 | ||
1250 | /* The official name of this program (e.g., no 'g' prefix). */ | |
e1fb4052 | 1251 | @@ -35,20 +57,41 @@ |
7cf3a80b ML |
1252 | |
1253 | #define AUTHORS proper_name ("David MacKenzie") | |
1254 | ||
1255 | +#define FATAL_ERROR(Message) \ | |
1256 | + do \ | |
1257 | + { \ | |
1258 | + error (0, 0, (Message)); \ | |
1259 | + usage (2); \ | |
1260 | + } \ | |
1261 | + while (0) | |
1262 | + | |
1263 | +enum operating_mode | |
1264 | +{ | |
1265 | + /* Fold texts by columns that are at the given positions. */ | |
1266 | + column_mode, | |
1267 | + | |
1268 | + /* Fold texts by bytes that are at the given positions. */ | |
1269 | + byte_mode, | |
1270 | + | |
1271 | + /* Fold texts by characters that are at the given positions. */ | |
1272 | + character_mode, | |
1273 | +}; | |
1274 | + | |
1275 | +/* The argument shows current mode. (Default: column_mode) */ | |
1276 | +static enum operating_mode operating_mode; | |
1277 | + | |
1278 | /* If nonzero, try to break on whitespace. */ | |
1279 | static bool break_spaces; | |
1280 | ||
1281 | -/* If nonzero, count bytes, not column positions. */ | |
1282 | -static bool count_bytes; | |
1283 | - | |
1284 | /* If nonzero, at least one of the files we read was standard input. */ | |
1285 | static bool have_read_stdin; | |
1286 | ||
1287 | -static char const shortopts[] = "bsw:0::1::2::3::4::5::6::7::8::9::"; | |
1288 | +static char const shortopts[] = "bcsw:0::1::2::3::4::5::6::7::8::9::"; | |
1289 | ||
1290 | static struct option const longopts[] = | |
1291 | { | |
1292 | {"bytes", no_argument, NULL, 'b'}, | |
1293 | + {"characters", no_argument, NULL, 'c'}, | |
1294 | {"spaces", no_argument, NULL, 's'}, | |
1295 | {"width", required_argument, NULL, 'w'}, | |
1296 | {GETOPT_HELP_OPTION_DECL}, | |
e1fb4052 | 1297 | @@ -76,6 +119,7 @@ Wrap input lines in each FILE, writing t |
7cf3a80b ML |
1298 | |
1299 | fputs (_("\ | |
1300 | -b, --bytes count bytes rather than columns\n\ | |
1301 | + -c, --characters count characters rather than columns\n\ | |
1302 | -s, --spaces break at spaces\n\ | |
1303 | -w, --width=WIDTH use WIDTH columns instead of 80\n\ | |
1304 | "), stdout); | |
e1fb4052 | 1305 | @@ -93,7 +137,7 @@ Wrap input lines in each FILE, writing t |
7cf3a80b ML |
1306 | static size_t |
1307 | adjust_column (size_t column, char c) | |
1308 | { | |
1309 | - if (!count_bytes) | |
1310 | + if (operating_mode != byte_mode) | |
1311 | { | |
1312 | if (c == '\b') | |
1313 | { | |
e1fb4052 | 1314 | @@ -116,30 +160,14 @@ adjust_column (size_t column, char c) |
7cf3a80b ML |
1315 | to stdout, with maximum line length WIDTH. |
1316 | Return true if successful. */ | |
1317 | ||
1318 | -static bool | |
1319 | -fold_file (char const *filename, size_t width) | |
1320 | +static void | |
1321 | +fold_text (FILE *istream, size_t width, int *saved_errno) | |
1322 | { | |
1323 | - FILE *istream; | |
1324 | int c; | |
1325 | size_t column = 0; /* Screen column where next char will go. */ | |
1326 | size_t offset_out = 0; /* Index in 'line_out' for next char. */ | |
1327 | static char *line_out = NULL; | |
1328 | static size_t allocated_out = 0; | |
1329 | - int saved_errno; | |
1330 | - | |
1331 | - if (STREQ (filename, "-")) | |
1332 | - { | |
1333 | - istream = stdin; | |
1334 | - have_read_stdin = true; | |
1335 | - } | |
1336 | - else | |
1337 | - istream = fopen (filename, "r"); | |
1338 | - | |
1339 | - if (istream == NULL) | |
1340 | - { | |
1341 | - error (0, errno, "%s", quotef (filename)); | |
1342 | - return false; | |
1343 | - } | |
1344 | ||
1345 | fadvise (istream, FADVISE_SEQUENTIAL); | |
1346 | ||
e1fb4052 | 1347 | @@ -169,6 +197,15 @@ fold_file (char const *filename, size_t |
7cf3a80b ML |
1348 | bool found_blank = false; |
1349 | size_t logical_end = offset_out; | |
1350 | ||
1351 | + /* If LINE_OUT has no wide character, | |
1352 | + put a new wide character in LINE_OUT | |
1353 | + if column is bigger than width. */ | |
1354 | + if (offset_out == 0) | |
1355 | + { | |
1356 | + line_out[offset_out++] = c; | |
1357 | + continue; | |
1358 | + } | |
1359 | + | |
1360 | /* Look for the last blank. */ | |
1361 | while (logical_end) | |
1362 | { | |
e1fb4052 | 1363 | @@ -215,11 +252,220 @@ fold_file (char const *filename, size_t |
7cf3a80b ML |
1364 | line_out[offset_out++] = c; |
1365 | } | |
1366 | ||
1367 | - saved_errno = errno; | |
1368 | + *saved_errno = errno; | |
1369 | + | |
1370 | + if (offset_out) | |
1371 | + fwrite (line_out, sizeof (char), (size_t) offset_out, stdout); | |
1372 | + | |
1373 | +} | |
1374 | + | |
1375 | +#if HAVE_MBRTOWC | |
1376 | +static void | |
1377 | +fold_multibyte_text (FILE *istream, size_t width, int *saved_errno) | |
1378 | +{ | |
1379 | + char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ | |
1380 | + size_t buflen = 0; /* The length of the byte sequence in buf. */ | |
1381 | + char *bufpos = buf; /* Next read position of BUF. */ | |
1382 | + wint_t wc; /* A gotten wide character. */ | |
1383 | + size_t mblength; /* The byte size of a multibyte character which shows | |
1384 | + as same character as WC. */ | |
1385 | + mbstate_t state, state_bak; /* State of the stream. */ | |
1386 | + int convfail = 0; /* 1, when conversion is failed. Otherwise 0. */ | |
1387 | + | |
1388 | + static char *line_out = NULL; | |
1389 | + size_t offset_out = 0; /* Index in `line_out' for next char. */ | |
1390 | + static size_t allocated_out = 0; | |
1391 | + | |
1392 | + int increment; | |
1393 | + size_t column = 0; | |
1394 | + | |
1395 | + size_t last_blank_pos; | |
1396 | + size_t last_blank_column; | |
1397 | + int is_blank_seen; | |
1398 | + int last_blank_increment = 0; | |
1399 | + int is_bs_following_last_blank; | |
1400 | + size_t bs_following_last_blank_num; | |
1401 | + int is_cr_after_last_blank; | |
1402 | + | |
1403 | +#define CLEAR_FLAGS \ | |
1404 | + do \ | |
1405 | + { \ | |
1406 | + last_blank_pos = 0; \ | |
1407 | + last_blank_column = 0; \ | |
1408 | + is_blank_seen = 0; \ | |
1409 | + is_bs_following_last_blank = 0; \ | |
1410 | + bs_following_last_blank_num = 0; \ | |
1411 | + is_cr_after_last_blank = 0; \ | |
1412 | + } \ | |
1413 | + while (0) | |
1414 | + | |
1415 | +#define START_NEW_LINE \ | |
1416 | + do \ | |
1417 | + { \ | |
1418 | + putchar ('\n'); \ | |
1419 | + column = 0; \ | |
1420 | + offset_out = 0; \ | |
1421 | + CLEAR_FLAGS; \ | |
1422 | + } \ | |
1423 | + while (0) | |
1424 | + | |
1425 | + CLEAR_FLAGS; | |
1426 | + memset (&state, '\0', sizeof(mbstate_t)); | |
1427 | + | |
1428 | + for (;; bufpos += mblength, buflen -= mblength) | |
1429 | + { | |
1430 | + if (buflen < MB_LEN_MAX && !feof (istream) && !ferror (istream)) | |
1431 | + { | |
1432 | + memmove (buf, bufpos, buflen); | |
1433 | + buflen += fread (buf + buflen, sizeof(char), BUFSIZ, istream); | |
1434 | + bufpos = buf; | |
1435 | + } | |
1436 | + | |
1437 | + if (buflen < 1) | |
1438 | + break; | |
1439 | + | |
1440 | + /* Get a wide character. */ | |
1441 | + state_bak = state; | |
1442 | + mblength = mbrtowc ((wchar_t *)&wc, bufpos, buflen, &state); | |
1443 | + | |
1444 | + switch (mblength) | |
1445 | + { | |
1446 | + case (size_t)-1: | |
1447 | + case (size_t)-2: | |
1448 | + convfail++; | |
1449 | + state = state_bak; | |
1450 | + /* Fall through. */ | |
1451 | + | |
1452 | + case 0: | |
1453 | + mblength = 1; | |
1454 | + break; | |
1455 | + } | |
1456 | + | |
1457 | +rescan: | |
e1fb4052 MF |
1458 | + if (convfail) |
1459 | + increment = 1; | |
1460 | + else if (wc == L'\n') | |
1461 | + { | |
1462 | + /* preserve newline */ | |
1463 | + fwrite (line_out, sizeof(char), offset_out, stdout); | |
1464 | + START_NEW_LINE; | |
1465 | + continue; | |
1466 | + } | |
1467 | + else if (operating_mode == byte_mode) /* byte mode */ | |
7cf3a80b ML |
1468 | + increment = mblength; |
1469 | + else if (operating_mode == character_mode) /* character mode */ | |
1470 | + increment = 1; | |
e1fb4052 | 1471 | + else /* column mode */ |
7cf3a80b | 1472 | + { |
e1fb4052 | 1473 | + switch (wc) |
7cf3a80b | 1474 | + { |
e1fb4052 MF |
1475 | + case L'\b': |
1476 | + increment = (column > 0) ? -1 : 0; | |
1477 | + break; | |
7cf3a80b | 1478 | + |
e1fb4052 MF |
1479 | + case L'\r': |
1480 | + increment = -1 * column; | |
1481 | + break; | |
7cf3a80b | 1482 | + |
e1fb4052 MF |
1483 | + case L'\t': |
1484 | + increment = 8 - column % 8; | |
1485 | + break; | |
7cf3a80b | 1486 | + |
e1fb4052 MF |
1487 | + default: |
1488 | + increment = wcwidth (wc); | |
1489 | + increment = (increment < 0) ? 0 : increment; | |
7cf3a80b ML |
1490 | + } |
1491 | + } | |
1492 | + | |
1493 | + if (column + increment > width && break_spaces && last_blank_pos) | |
1494 | + { | |
1495 | + fwrite (line_out, sizeof(char), last_blank_pos, stdout); | |
1496 | + putchar ('\n'); | |
1497 | + | |
1498 | + offset_out = offset_out - last_blank_pos; | |
1499 | + column = column - last_blank_column + ((is_cr_after_last_blank) | |
1500 | + ? last_blank_increment : bs_following_last_blank_num); | |
1501 | + memmove (line_out, line_out + last_blank_pos, offset_out); | |
1502 | + CLEAR_FLAGS; | |
1503 | + goto rescan; | |
1504 | + } | |
1505 | + | |
1506 | + if (column + increment > width && column != 0) | |
1507 | + { | |
1508 | + fwrite (line_out, sizeof(char), offset_out, stdout); | |
1509 | + START_NEW_LINE; | |
1510 | + goto rescan; | |
1511 | + } | |
1512 | + | |
1513 | + if (allocated_out < offset_out + mblength) | |
1514 | + { | |
1515 | + line_out = X2REALLOC (line_out, &allocated_out); | |
1516 | + } | |
1517 | + | |
1518 | + memcpy (line_out + offset_out, bufpos, mblength); | |
1519 | + offset_out += mblength; | |
1520 | + column += increment; | |
1521 | + | |
1522 | + if (is_blank_seen && !convfail && wc == L'\r') | |
1523 | + is_cr_after_last_blank = 1; | |
1524 | + | |
1525 | + if (is_bs_following_last_blank && !convfail && wc == L'\b') | |
1526 | + ++bs_following_last_blank_num; | |
1527 | + else | |
1528 | + is_bs_following_last_blank = 0; | |
1529 | + | |
1530 | + if (break_spaces && !convfail && iswblank (wc)) | |
1531 | + { | |
1532 | + last_blank_pos = offset_out; | |
1533 | + last_blank_column = column; | |
1534 | + is_blank_seen = 1; | |
1535 | + last_blank_increment = increment; | |
1536 | + is_bs_following_last_blank = 1; | |
1537 | + bs_following_last_blank_num = 0; | |
1538 | + is_cr_after_last_blank = 0; | |
1539 | + } | |
1540 | + } | |
1541 | + | |
1542 | + *saved_errno = errno; | |
1543 | ||
1544 | if (offset_out) | |
1545 | fwrite (line_out, sizeof (char), (size_t) offset_out, stdout); | |
1546 | ||
1547 | +} | |
1548 | +#endif | |
1549 | + | |
1550 | +/* Fold file FILENAME, or standard input if FILENAME is "-", | |
1551 | + to stdout, with maximum line length WIDTH. | |
1552 | + Return 0 if successful, 1 if an error occurs. */ | |
1553 | + | |
1554 | +static bool | |
1555 | +fold_file (char const *filename, size_t width) | |
1556 | +{ | |
1557 | + FILE *istream; | |
1558 | + int saved_errno; | |
1559 | + | |
1560 | + if (STREQ (filename, "-")) | |
1561 | + { | |
1562 | + istream = stdin; | |
1563 | + have_read_stdin = 1; | |
1564 | + } | |
1565 | + else | |
1566 | + istream = fopen (filename, "r"); | |
1567 | + | |
1568 | + if (istream == NULL) | |
1569 | + { | |
e1fb4052 | 1570 | + error (0, errno, "%s", filename); |
7cf3a80b ML |
1571 | + return 1; |
1572 | + } | |
1573 | + | |
1574 | + /* Define how ISTREAM is being folded. */ | |
1575 | +#if HAVE_MBRTOWC | |
1576 | + if (MB_CUR_MAX > 1) | |
1577 | + fold_multibyte_text (istream, width, &saved_errno); | |
1578 | + else | |
1579 | +#endif | |
1580 | + fold_text (istream, width, &saved_errno); | |
1581 | + | |
1582 | if (ferror (istream)) | |
1583 | { | |
1584 | error (0, saved_errno, "%s", quotef (filename)); | |
e1fb4052 | 1585 | @@ -252,7 +498,8 @@ main (int argc, char **argv) |
7cf3a80b ML |
1586 | |
1587 | atexit (close_stdout); | |
1588 | ||
1589 | - break_spaces = count_bytes = have_read_stdin = false; | |
1590 | + operating_mode = column_mode; | |
1591 | + break_spaces = have_read_stdin = false; | |
1592 | ||
1593 | while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) | |
1594 | { | |
e1fb4052 | 1595 | @@ -261,7 +508,15 @@ main (int argc, char **argv) |
7cf3a80b ML |
1596 | switch (optc) |
1597 | { | |
1598 | case 'b': /* Count bytes rather than columns. */ | |
1599 | - count_bytes = true; | |
1600 | + if (operating_mode != column_mode) | |
1601 | + FATAL_ERROR (_("only one way of folding may be specified")); | |
1602 | + operating_mode = byte_mode; | |
1603 | + break; | |
1604 | + | |
1605 | + case 'c': | |
1606 | + if (operating_mode != column_mode) | |
1607 | + FATAL_ERROR (_("only one way of folding may be specified")); | |
1608 | + operating_mode = character_mode; | |
1609 | break; | |
1610 | ||
1611 | case 's': /* Break at word boundaries. */ | |
e1fb4052 MF |
1612 | diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c |
1613 | --- coreutils-8.27-orig/src/join.c 2017-01-01 16:34:24.000000000 -0600 | |
1614 | +++ coreutils-8.27/src/join.c 2017-03-11 23:47:13.091286290 -0600 | |
1615 | @@ -22,19 +22,33 @@ | |
7cf3a80b ML |
1616 | #include <sys/types.h> |
1617 | #include <getopt.h> | |
1618 | ||
1619 | +/* Get mbstate_t, mbrtowc(), mbrtowc(), wcwidth(). */ | |
1620 | +#if HAVE_WCHAR_H | |
1621 | +# include <wchar.h> | |
1622 | +#endif | |
1623 | + | |
1624 | +/* Get iswblank(), towupper. */ | |
1625 | +#if HAVE_WCTYPE_H | |
1626 | +# include <wctype.h> | |
1627 | +#endif | |
1628 | + | |
1629 | #include "system.h" | |
e1fb4052 | 1630 | #include "die.h" |
7cf3a80b ML |
1631 | #include "error.h" |
1632 | #include "fadvise.h" | |
1633 | #include "hard-locale.h" | |
1634 | #include "linebuffer.h" | |
1635 | -#include "memcasecmp.h" | |
1636 | #include "quote.h" | |
1637 | #include "stdio--.h" | |
1638 | #include "xmemcoll.h" | |
1639 | #include "xstrtol.h" | |
1640 | #include "argmatch.h" | |
1641 | ||
1642 | +/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ | |
1643 | +#if HAVE_MBRTOWC && defined mbstate_t | |
1644 | +# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) | |
1645 | +#endif | |
1646 | + | |
1647 | /* The official name of this program (e.g., no 'g' prefix). */ | |
1648 | #define PROGRAM_NAME "join" | |
1649 | ||
e1fb4052 | 1650 | @@ -136,10 +150,12 @@ static struct outlist outlist_head; |
7cf3a80b ML |
1651 | /* Last element in 'outlist', where a new element can be added. */ |
1652 | static struct outlist *outlist_end = &outlist_head; | |
1653 | ||
1654 | -/* Tab character separating fields. If negative, fields are separated | |
1655 | - by any nonempty string of blanks, otherwise by exactly one | |
1656 | - tab character whose value (when cast to unsigned char) equals TAB. */ | |
1657 | -static int tab = -1; | |
1658 | +/* Tab character separating fields. If NULL, fields are separated | |
1659 | + by any nonempty string of blanks. */ | |
1660 | +static char *tab = NULL; | |
1661 | + | |
1662 | +/* The number of bytes used for tab. */ | |
1663 | +static size_t tablen = 0; | |
1664 | ||
1665 | /* If nonzero, check that the input is correctly ordered. */ | |
1666 | static enum | |
e1fb4052 | 1667 | @@ -276,13 +292,14 @@ xfields (struct line *line) |
7cf3a80b ML |
1668 | if (ptr == lim) |
1669 | return; | |
1670 | ||
1671 | - if (0 <= tab && tab != '\n') | |
1672 | + if (tab != NULL) | |
1673 | { | |
1674 | + unsigned char t = tab[0]; | |
1675 | char *sep; | |
1676 | - for (; (sep = memchr (ptr, tab, lim - ptr)) != NULL; ptr = sep + 1) | |
1677 | + for (; (sep = memchr (ptr, t, lim - ptr)) != NULL; ptr = sep + 1) | |
1678 | extract_field (line, ptr, sep - ptr); | |
1679 | } | |
1680 | - else if (tab < 0) | |
1681 | + else | |
1682 | { | |
1683 | /* Skip leading blanks before the first field. */ | |
1684 | while (field_sep (*ptr)) | |
e1fb4052 | 1685 | @@ -306,6 +323,147 @@ xfields (struct line *line) |
7cf3a80b ML |
1686 | extract_field (line, ptr, lim - ptr); |
1687 | } | |
1688 | ||
1689 | +#if HAVE_MBRTOWC | |
1690 | +static void | |
1691 | +xfields_multibyte (struct line *line) | |
1692 | +{ | |
1693 | + char *ptr = line->buf.buffer; | |
1694 | + char const *lim = ptr + line->buf.length - 1; | |
1695 | + wchar_t wc = 0; | |
1696 | + size_t mblength = 1; | |
1697 | + mbstate_t state, state_bak; | |
1698 | + | |
1699 | + memset (&state, 0, sizeof (mbstate_t)); | |
1700 | + | |
1701 | + if (ptr >= lim) | |
1702 | + return; | |
1703 | + | |
1704 | + if (tab != NULL) | |
1705 | + { | |
1706 | + char *sep = ptr; | |
1707 | + for (; ptr < lim; ptr = sep + mblength) | |
1708 | + { | |
1709 | + sep = ptr; | |
1710 | + while (sep < lim) | |
1711 | + { | |
1712 | + state_bak = state; | |
1713 | + mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); | |
1714 | + | |
1715 | + if (mblength == (size_t)-1 || mblength == (size_t)-2) | |
1716 | + { | |
1717 | + mblength = 1; | |
1718 | + state = state_bak; | |
1719 | + } | |
1720 | + mblength = (mblength < 1) ? 1 : mblength; | |
1721 | + | |
1722 | + if (mblength == tablen && !memcmp (sep, tab, mblength)) | |
1723 | + break; | |
1724 | + else | |
1725 | + { | |
1726 | + sep += mblength; | |
1727 | + continue; | |
1728 | + } | |
1729 | + } | |
1730 | + | |
1731 | + if (sep >= lim) | |
1732 | + break; | |
1733 | + | |
1734 | + extract_field (line, ptr, sep - ptr); | |
1735 | + } | |
1736 | + } | |
1737 | + else | |
1738 | + { | |
1739 | + /* Skip leading blanks before the first field. */ | |
1740 | + while(ptr < lim) | |
1741 | + { | |
1742 | + state_bak = state; | |
1743 | + mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); | |
1744 | + | |
1745 | + if (mblength == (size_t)-1 || mblength == (size_t)-2) | |
1746 | + { | |
1747 | + mblength = 1; | |
1748 | + state = state_bak; | |
1749 | + break; | |
1750 | + } | |
1751 | + mblength = (mblength < 1) ? 1 : mblength; | |
1752 | + | |
1753 | + if (!iswblank(wc) && wc != '\n') | |
1754 | + break; | |
1755 | + ptr += mblength; | |
1756 | + } | |
1757 | + | |
1758 | + do | |
1759 | + { | |
1760 | + char *sep; | |
1761 | + state_bak = state; | |
1762 | + mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); | |
1763 | + if (mblength == (size_t)-1 || mblength == (size_t)-2) | |
1764 | + { | |
1765 | + mblength = 1; | |
1766 | + state = state_bak; | |
1767 | + break; | |
1768 | + } | |
1769 | + mblength = (mblength < 1) ? 1 : mblength; | |
1770 | + | |
1771 | + sep = ptr + mblength; | |
1772 | + while (sep < lim) | |
1773 | + { | |
1774 | + state_bak = state; | |
1775 | + mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); | |
1776 | + if (mblength == (size_t)-1 || mblength == (size_t)-2) | |
1777 | + { | |
1778 | + mblength = 1; | |
1779 | + state = state_bak; | |
1780 | + break; | |
1781 | + } | |
1782 | + mblength = (mblength < 1) ? 1 : mblength; | |
1783 | + | |
1784 | + if (iswblank (wc) || wc == '\n') | |
1785 | + break; | |
1786 | + | |
1787 | + sep += mblength; | |
1788 | + } | |
1789 | + | |
1790 | + extract_field (line, ptr, sep - ptr); | |
1791 | + if (sep >= lim) | |
1792 | + return; | |
1793 | + | |
1794 | + state_bak = state; | |
1795 | + mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); | |
1796 | + if (mblength == (size_t)-1 || mblength == (size_t)-2) | |
1797 | + { | |
1798 | + mblength = 1; | |
1799 | + state = state_bak; | |
1800 | + break; | |
1801 | + } | |
1802 | + mblength = (mblength < 1) ? 1 : mblength; | |
1803 | + | |
1804 | + ptr = sep + mblength; | |
1805 | + while (ptr < lim) | |
1806 | + { | |
1807 | + state_bak = state; | |
1808 | + mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); | |
1809 | + if (mblength == (size_t)-1 || mblength == (size_t)-2) | |
1810 | + { | |
1811 | + mblength = 1; | |
1812 | + state = state_bak; | |
1813 | + break; | |
1814 | + } | |
1815 | + mblength = (mblength < 1) ? 1 : mblength; | |
1816 | + | |
1817 | + if (!iswblank (wc) && wc != '\n') | |
1818 | + break; | |
1819 | + | |
1820 | + ptr += mblength; | |
1821 | + } | |
1822 | + } | |
1823 | + while (ptr < lim); | |
1824 | + } | |
1825 | + | |
1826 | + extract_field (line, ptr, lim - ptr); | |
1827 | +} | |
1828 | +#endif | |
1829 | + | |
1830 | static void | |
1831 | freeline (struct line *line) | |
1832 | { | |
e1fb4052 | 1833 | @@ -327,56 +485,133 @@ keycmp (struct line const *line1, struct |
7cf3a80b ML |
1834 | size_t jf_1, size_t jf_2) |
1835 | { | |
1836 | /* Start of field to compare in each file. */ | |
1837 | - char *beg1; | |
1838 | - char *beg2; | |
1839 | - | |
1840 | - size_t len1; | |
1841 | - size_t len2; /* Length of fields to compare. */ | |
1842 | + char *beg[2]; | |
1843 | + char *copy[2]; | |
1844 | + size_t len[2]; /* Length of fields to compare. */ | |
1845 | int diff; | |
1846 | + int i, j; | |
1847 | + int mallocd = 0; | |
1848 | ||
1849 | if (jf_1 < line1->nfields) | |
1850 | { | |
1851 | - beg1 = line1->fields[jf_1].beg; | |
1852 | - len1 = line1->fields[jf_1].len; | |
1853 | + beg[0] = line1->fields[jf_1].beg; | |
1854 | + len[0] = line1->fields[jf_1].len; | |
1855 | } | |
1856 | else | |
1857 | { | |
1858 | - beg1 = NULL; | |
1859 | - len1 = 0; | |
1860 | + beg[0] = NULL; | |
1861 | + len[0] = 0; | |
1862 | } | |
1863 | ||
1864 | if (jf_2 < line2->nfields) | |
1865 | { | |
1866 | - beg2 = line2->fields[jf_2].beg; | |
1867 | - len2 = line2->fields[jf_2].len; | |
1868 | + beg[1] = line2->fields[jf_2].beg; | |
1869 | + len[1] = line2->fields[jf_2].len; | |
1870 | } | |
1871 | else | |
1872 | { | |
1873 | - beg2 = NULL; | |
1874 | - len2 = 0; | |
1875 | + beg[1] = NULL; | |
1876 | + len[1] = 0; | |
1877 | } | |
1878 | ||
1879 | - if (len1 == 0) | |
1880 | - return len2 == 0 ? 0 : -1; | |
1881 | - if (len2 == 0) | |
1882 | + if (len[0] == 0) | |
1883 | + return len[1] == 0 ? 0 : -1; | |
1884 | + if (len[1] == 0) | |
1885 | return 1; | |
1886 | ||
1887 | if (ignore_case) | |
1888 | { | |
1889 | - /* FIXME: ignore_case does not work with NLS (in particular, | |
1890 | - with multibyte chars). */ | |
1891 | - diff = memcasecmp (beg1, beg2, MIN (len1, len2)); | |
1892 | +#ifdef HAVE_MBRTOWC | |
1893 | + if (MB_CUR_MAX > 1) | |
1894 | + { | |
1895 | + size_t mblength; | |
1896 | + wchar_t wc, uwc; | |
1897 | + mbstate_t state, state_bak; | |
1898 | + | |
1899 | + memset (&state, '\0', sizeof (mbstate_t)); | |
1900 | + | |
1901 | + for (i = 0; i < 2; i++) | |
1902 | + { | |
1903 | + mallocd = 1; | |
1904 | + copy[i] = xmalloc (len[i] + 1); | |
1905 | + memset (copy[i], '\0',len[i] + 1); | |
1906 | + | |
1907 | + for (j = 0; j < MIN (len[0], len[1]);) | |
1908 | + { | |
1909 | + state_bak = state; | |
1910 | + mblength = mbrtowc (&wc, beg[i] + j, len[i] - j, &state); | |
1911 | + | |
1912 | + switch (mblength) | |
1913 | + { | |
1914 | + case (size_t) -1: | |
1915 | + case (size_t) -2: | |
1916 | + state = state_bak; | |
1917 | + /* Fall through */ | |
1918 | + case 0: | |
1919 | + mblength = 1; | |
1920 | + break; | |
1921 | + | |
1922 | + default: | |
1923 | + uwc = towupper (wc); | |
1924 | + | |
1925 | + if (uwc != wc) | |
1926 | + { | |
1927 | + mbstate_t state_wc; | |
1928 | + size_t mblen; | |
1929 | + | |
1930 | + memset (&state_wc, '\0', sizeof (mbstate_t)); | |
1931 | + mblen = wcrtomb (copy[i] + j, uwc, &state_wc); | |
1932 | + assert (mblen != (size_t)-1); | |
1933 | + } | |
1934 | + else | |
1935 | + memcpy (copy[i] + j, beg[i] + j, mblength); | |
1936 | + } | |
1937 | + j += mblength; | |
1938 | + } | |
1939 | + copy[i][j] = '\0'; | |
1940 | + } | |
1941 | + } | |
1942 | + else | |
1943 | +#endif | |
1944 | + { | |
1945 | + for (i = 0; i < 2; i++) | |
1946 | + { | |
1947 | + mallocd = 1; | |
1948 | + copy[i] = xmalloc (len[i] + 1); | |
1949 | + | |
1950 | + for (j = 0; j < MIN (len[0], len[1]); j++) | |
1951 | + copy[i][j] = toupper (beg[i][j]); | |
1952 | + | |
1953 | + copy[i][j] = '\0'; | |
1954 | + } | |
1955 | + } | |
1956 | } | |
1957 | else | |
1958 | { | |
1959 | - if (hard_LC_COLLATE) | |
1960 | - return xmemcoll (beg1, len1, beg2, len2); | |
1961 | - diff = memcmp (beg1, beg2, MIN (len1, len2)); | |
1962 | + copy[0] = beg[0]; | |
1963 | + copy[1] = beg[1]; | |
e1fb4052 MF |
1964 | } |
1965 | ||
7cf3a80b ML |
1966 | + if (hard_LC_COLLATE) |
1967 | + { | |
1968 | + diff = xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]); | |
1969 | + | |
1970 | + if (mallocd) | |
1971 | + for (i = 0; i < 2; i++) | |
1972 | + free (copy[i]); | |
1973 | + | |
1974 | + return diff; | |
e1fb4052 | 1975 | + } |
7cf3a80b ML |
1976 | + diff = memcmp (copy[0], copy[1], MIN (len[0], len[1])); |
1977 | + | |
1978 | + if (mallocd) | |
1979 | + for (i = 0; i < 2; i++) | |
1980 | + free (copy[i]); | |
1981 | + | |
e1fb4052 | 1982 | + |
7cf3a80b ML |
1983 | if (diff) |
1984 | return diff; | |
1985 | - return len1 < len2 ? -1 : len1 != len2; | |
1986 | + return len[0] - len[1]; | |
1987 | } | |
1988 | ||
1989 | /* Check that successive input lines PREV and CURRENT from input file | |
e1fb4052 | 1990 | @@ -468,6 +703,11 @@ get_line (FILE *fp, struct line **linep, |
7cf3a80b ML |
1991 | } |
1992 | ++line_no[which - 1]; | |
1993 | ||
1994 | +#if HAVE_MBRTOWC | |
1995 | + if (MB_CUR_MAX > 1) | |
1996 | + xfields_multibyte (line); | |
1997 | + else | |
1998 | +#endif | |
1999 | xfields (line); | |
2000 | ||
2001 | if (prevline[which - 1]) | |
e1fb4052 | 2002 | @@ -567,21 +807,28 @@ prfield (size_t n, struct line const *li |
7cf3a80b ML |
2003 | |
2004 | /* Output all the fields in line, other than the join field. */ | |
2005 | ||
2006 | +#define PUT_TAB_CHAR \ | |
2007 | + do \ | |
2008 | + { \ | |
2009 | + (tab != NULL) ? \ | |
2010 | + fwrite(tab, sizeof(char), tablen, stdout) : putchar (' '); \ | |
2011 | + } \ | |
2012 | + while (0) | |
2013 | + | |
2014 | static void | |
2015 | prfields (struct line const *line, size_t join_field, size_t autocount) | |
2016 | { | |
2017 | size_t i; | |
2018 | size_t nfields = autoformat ? autocount : line->nfields; | |
2019 | - char output_separator = tab < 0 ? ' ' : tab; | |
2020 | ||
2021 | for (i = 0; i < join_field && i < nfields; ++i) | |
2022 | { | |
2023 | - putchar (output_separator); | |
2024 | + PUT_TAB_CHAR; | |
2025 | prfield (i, line); | |
2026 | } | |
2027 | for (i = join_field + 1; i < nfields; ++i) | |
2028 | { | |
2029 | - putchar (output_separator); | |
2030 | + PUT_TAB_CHAR; | |
2031 | prfield (i, line); | |
2032 | } | |
2033 | } | |
e1fb4052 | 2034 | @@ -592,7 +839,6 @@ static void |
7cf3a80b ML |
2035 | prjoin (struct line const *line1, struct line const *line2) |
2036 | { | |
2037 | const struct outlist *outlist; | |
2038 | - char output_separator = tab < 0 ? ' ' : tab; | |
2039 | size_t field; | |
2040 | struct line const *line; | |
2041 | ||
e1fb4052 | 2042 | @@ -626,7 +872,7 @@ prjoin (struct line const *line1, struct |
7cf3a80b ML |
2043 | o = o->next; |
2044 | if (o == NULL) | |
2045 | break; | |
2046 | - putchar (output_separator); | |
2047 | + PUT_TAB_CHAR; | |
2048 | } | |
2049 | putchar (eolchar); | |
2050 | } | |
e1fb4052 | 2051 | @@ -1104,20 +1350,43 @@ main (int argc, char **argv) |
7cf3a80b ML |
2052 | |
2053 | case 't': | |
2054 | { | |
2055 | - unsigned char newtab = optarg[0]; | |
2056 | + char *newtab = NULL; | |
2057 | + size_t newtablen; | |
2058 | + newtab = xstrdup (optarg); | |
2059 | +#if HAVE_MBRTOWC | |
2060 | + if (MB_CUR_MAX > 1) | |
2061 | + { | |
2062 | + mbstate_t state; | |
2063 | + | |
2064 | + memset (&state, 0, sizeof (mbstate_t)); | |
2065 | + newtablen = mbrtowc (NULL, newtab, | |
2066 | + strnlen (newtab, MB_LEN_MAX), | |
2067 | + &state); | |
2068 | + if (newtablen == (size_t) 0 | |
2069 | + || newtablen == (size_t) -1 | |
2070 | + || newtablen == (size_t) -2) | |
2071 | + newtablen = 1; | |
2072 | + } | |
2073 | + else | |
2074 | +#endif | |
2075 | + newtablen = 1; | |
2076 | if (! newtab) | |
2077 | - newtab = '\n'; /* '' => process the whole line. */ | |
7cf3a80b | 2078 | + newtab = (char*)"\n"; /* '' => process the whole line. */ |
7cf3a80b ML |
2079 | else if (optarg[1]) |
2080 | { | |
2081 | - if (STREQ (optarg, "\\0")) | |
2082 | - newtab = '\0'; | |
2083 | - else | |
e1fb4052 MF |
2084 | - die (EXIT_FAILURE, 0, _("multi-character tab %s"), |
2085 | - quote (optarg)); | |
7cf3a80b ML |
2086 | + if (newtablen == 1 && newtab[1]) |
2087 | + { | |
2088 | + if (STREQ (newtab, "\\0")) | |
2089 | + newtab[0] = '\0'; | |
2090 | + } | |
2091 | + } | |
2092 | + if (tab != NULL && strcmp (tab, newtab)) | |
2093 | + { | |
2094 | + free (newtab); | |
e1fb4052 | 2095 | + die (EXIT_FAILURE, 0, _("incompatible tabs")); |
7cf3a80b ML |
2096 | } |
2097 | - if (0 <= tab && tab != newtab) | |
e1fb4052 | 2098 | - die (EXIT_FAILURE, 0, _("incompatible tabs")); |
7cf3a80b | 2099 | tab = newtab; |
7cf3a80b | 2100 | + tablen = newtablen; |
e1fb4052 | 2101 | } |
7cf3a80b ML |
2102 | break; |
2103 | ||
e1fb4052 MF |
2104 | diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c |
2105 | --- coreutils-8.27-orig/src/pr.c 2017-01-01 16:34:24.000000000 -0600 | |
2106 | +++ coreutils-8.27/src/pr.c 2017-03-11 23:47:13.094286139 -0600 | |
7cf3a80b ML |
2107 | @@ -311,6 +311,24 @@ |
2108 | ||
2109 | #include <getopt.h> | |
2110 | #include <sys/types.h> | |
2111 | + | |
2112 | +/* Get MB_LEN_MAX. */ | |
2113 | +#include <limits.h> | |
2114 | +/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC | |
2115 | + installation; work around this configuration error. */ | |
2116 | +#if !defined MB_LEN_MAX || MB_LEN_MAX == 1 | |
2117 | +# define MB_LEN_MAX 16 | |
2118 | +#endif | |
2119 | + | |
2120 | +/* Get MB_CUR_MAX. */ | |
2121 | +#include <stdlib.h> | |
2122 | + | |
2123 | +/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ | |
2124 | +/* Get mbstate_t, mbrtowc(), wcwidth(). */ | |
2125 | +#if HAVE_WCHAR_H | |
2126 | +# include <wchar.h> | |
2127 | +#endif | |
2128 | + | |
2129 | #include "system.h" | |
e1fb4052 | 2130 | #include "die.h" |
7cf3a80b | 2131 | #include "error.h" |
e1fb4052 | 2132 | @@ -324,6 +342,18 @@ |
7cf3a80b ML |
2133 | #include "xstrtol.h" |
2134 | #include "xdectoint.h" | |
2135 | ||
2136 | +/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ | |
2137 | +#if HAVE_MBRTOWC && defined mbstate_t | |
2138 | +# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) | |
2139 | +#endif | |
2140 | + | |
2141 | +#ifndef HAVE_DECL_WCWIDTH | |
2142 | +"this configure-time declaration test was not run" | |
2143 | +#endif | |
2144 | +#if !HAVE_DECL_WCWIDTH | |
2145 | +extern int wcwidth (); | |
2146 | +#endif | |
2147 | + | |
2148 | /* The official name of this program (e.g., no 'g' prefix). */ | |
2149 | #define PROGRAM_NAME "pr" | |
2150 | ||
e1fb4052 | 2151 | @@ -416,7 +446,20 @@ struct COLUMN |
7cf3a80b ML |
2152 | |
2153 | typedef struct COLUMN COLUMN; | |
2154 | ||
2155 | -static int char_to_clump (char c); | |
2156 | +/* Funtion pointers to switch functions for single byte locale or for | |
2157 | + multibyte locale. If multibyte functions do not exist in your sysytem, | |
2158 | + these pointers always point the function for single byte locale. */ | |
2159 | +static void (*print_char) (char c); | |
2160 | +static int (*char_to_clump) (char c); | |
2161 | + | |
2162 | +/* Functions for single byte locale. */ | |
2163 | +static void print_char_single (char c); | |
2164 | +static int char_to_clump_single (char c); | |
2165 | + | |
2166 | +/* Functions for multibyte locale. */ | |
2167 | +static void print_char_multi (char c); | |
2168 | +static int char_to_clump_multi (char c); | |
2169 | + | |
2170 | static bool read_line (COLUMN *p); | |
2171 | static bool print_page (void); | |
2172 | static bool print_stored (COLUMN *p); | |
e1fb4052 | 2173 | @@ -428,6 +471,7 @@ static void add_line_number (COLUMN *p); |
7cf3a80b ML |
2174 | static void getoptnum (const char *n_str, int min, int *num, |
2175 | const char *errfmt); | |
2176 | static void getoptarg (char *arg, char switch_char, char *character, | |
2177 | + int *character_length, int *character_width, | |
2178 | int *number); | |
2179 | static void print_files (int number_of_files, char **av); | |
2180 | static void init_parameters (int number_of_files); | |
e1fb4052 | 2181 | @@ -441,7 +485,6 @@ static void store_char (char c); |
7cf3a80b ML |
2182 | static void pad_down (unsigned int lines); |
2183 | static void read_rest_of_line (COLUMN *p); | |
2184 | static void skip_read (COLUMN *p, int column_number); | |
2185 | -static void print_char (char c); | |
2186 | static void cleanup (void); | |
2187 | static void print_sep_string (void); | |
2188 | static void separator_string (const char *optarg_S); | |
e1fb4052 | 2189 | @@ -453,7 +496,7 @@ static COLUMN *column_vector; |
7cf3a80b ML |
2190 | we store the leftmost columns contiguously in buff. |
2191 | To print a line from buff, get the index of the first character | |
2192 | from line_vector[i], and print up to line_vector[i + 1]. */ | |
2193 | -static char *buff; | |
2194 | +static unsigned char *buff; | |
2195 | ||
2196 | /* Index of the position in buff where the next character | |
2197 | will be stored. */ | |
e1fb4052 | 2198 | @@ -557,7 +600,7 @@ static int chars_per_column; |
7cf3a80b ML |
2199 | static bool untabify_input = false; |
2200 | ||
2201 | /* (-e) The input tab character. */ | |
2202 | -static char input_tab_char = '\t'; | |
2203 | +static char input_tab_char[MB_LEN_MAX] = "\t"; | |
2204 | ||
2205 | /* (-e) Tabstops are at chars_per_tab, 2*chars_per_tab, 3*chars_per_tab, ... | |
2206 | where the leftmost column is 1. */ | |
e1fb4052 | 2207 | @@ -567,7 +610,10 @@ static int chars_per_input_tab = 8; |
7cf3a80b ML |
2208 | static bool tabify_output = false; |
2209 | ||
2210 | /* (-i) The output tab character. */ | |
2211 | -static char output_tab_char = '\t'; | |
2212 | +static char output_tab_char[MB_LEN_MAX] = "\t"; | |
2213 | + | |
2214 | +/* (-i) The byte length of output tab character. */ | |
2215 | +static int output_tab_char_length = 1; | |
2216 | ||
2217 | /* (-i) The width of the output tab. */ | |
2218 | static int chars_per_output_tab = 8; | |
e1fb4052 | 2219 | @@ -637,7 +683,13 @@ static int line_number; |
7cf3a80b ML |
2220 | static bool numbered_lines = false; |
2221 | ||
2222 | /* (-n) Character which follows each line number. */ | |
2223 | -static char number_separator = '\t'; | |
2224 | +static char number_separator[MB_LEN_MAX] = "\t"; | |
2225 | + | |
2226 | +/* (-n) The byte length of the character which follows each line number. */ | |
2227 | +static int number_separator_length = 1; | |
2228 | + | |
2229 | +/* (-n) The character width of the character which follows each line number. */ | |
2230 | +static int number_separator_width = 0; | |
2231 | ||
2232 | /* (-n) line counting starts with 1st line of input file (not with 1st | |
2233 | line of 1st page printed). */ | |
e1fb4052 | 2234 | @@ -690,6 +742,7 @@ static bool use_col_separator = false; |
7cf3a80b | 2235 | -a|COLUMN|-m is a 'space' and with the -J option a 'tab'. */ |
e1fb4052 | 2236 | static char const *col_sep_string = ""; |
7cf3a80b ML |
2237 | static int col_sep_length = 0; |
2238 | +static int col_sep_width = 0; | |
2239 | static char *column_separator = (char *) " "; | |
2240 | static char *line_separator = (char *) "\t"; | |
2241 | ||
e1fb4052 MF |
2242 | @@ -851,6 +904,13 @@ separator_string (const char *optarg_S) |
2243 | integer_overflow (); | |
2244 | col_sep_length = len; | |
2245 | col_sep_string = optarg_S; | |
7cf3a80b ML |
2246 | + |
2247 | +#if HAVE_MBRTOWC | |
2248 | + if (MB_CUR_MAX > 1) | |
2249 | + col_sep_width = mbswidth (col_sep_string, 0); | |
2250 | + else | |
2251 | +#endif | |
2252 | + col_sep_width = col_sep_length; | |
2253 | } | |
2254 | ||
2255 | int | |
e1fb4052 | 2256 | @@ -875,6 +935,21 @@ main (int argc, char **argv) |
7cf3a80b ML |
2257 | |
2258 | atexit (close_stdout); | |
2259 | ||
2260 | +/* Define which functions are used, the ones for single byte locale or the ones | |
2261 | + for multibyte locale. */ | |
2262 | +#if HAVE_MBRTOWC | |
2263 | + if (MB_CUR_MAX > 1) | |
2264 | + { | |
2265 | + print_char = print_char_multi; | |
2266 | + char_to_clump = char_to_clump_multi; | |
2267 | + } | |
2268 | + else | |
2269 | +#endif | |
2270 | + { | |
2271 | + print_char = print_char_single; | |
2272 | + char_to_clump = char_to_clump_single; | |
2273 | + } | |
2274 | + | |
2275 | n_files = 0; | |
2276 | file_names = (argc > 1 | |
e1fb4052 MF |
2277 | ? xnmalloc (argc - 1, sizeof (char *)) |
2278 | @@ -951,8 +1026,12 @@ main (int argc, char **argv) | |
7cf3a80b ML |
2279 | break; |
2280 | case 'e': | |
2281 | if (optarg) | |
2282 | - getoptarg (optarg, 'e', &input_tab_char, | |
2283 | - &chars_per_input_tab); | |
2284 | + { | |
2285 | + int dummy_length, dummy_width; | |
2286 | + | |
2287 | + getoptarg (optarg, 'e', input_tab_char, &dummy_length, | |
2288 | + &dummy_width, &chars_per_input_tab); | |
2289 | + } | |
2290 | /* Could check tab width > 0. */ | |
2291 | untabify_input = true; | |
2292 | break; | |
e1fb4052 | 2293 | @@ -965,8 +1044,12 @@ main (int argc, char **argv) |
7cf3a80b ML |
2294 | break; |
2295 | case 'i': | |
2296 | if (optarg) | |
2297 | - getoptarg (optarg, 'i', &output_tab_char, | |
2298 | - &chars_per_output_tab); | |
2299 | + { | |
2300 | + int dummy_width; | |
2301 | + | |
2302 | + getoptarg (optarg, 'i', output_tab_char, &output_tab_char_length, | |
2303 | + &dummy_width, &chars_per_output_tab); | |
2304 | + } | |
2305 | /* Could check tab width > 0. */ | |
2306 | tabify_output = true; | |
2307 | break; | |
e1fb4052 | 2308 | @@ -984,8 +1067,8 @@ main (int argc, char **argv) |
7cf3a80b ML |
2309 | case 'n': |
2310 | numbered_lines = true; | |
2311 | if (optarg) | |
2312 | - getoptarg (optarg, 'n', &number_separator, | |
2313 | - &chars_per_number); | |
2314 | + getoptarg (optarg, 'n', number_separator, &number_separator_length, | |
2315 | + &number_separator_width, &chars_per_number); | |
2316 | break; | |
2317 | case 'N': | |
2318 | skip_count = false; | |
e1fb4052 | 2319 | @@ -1010,6 +1093,7 @@ main (int argc, char **argv) |
7cf3a80b | 2320 | /* Reset an additional input of -s, -S dominates -s */ |
e1fb4052 MF |
2321 | col_sep_string = ""; |
2322 | col_sep_length = 0; | |
2323 | + col_sep_width = 0; | |
7cf3a80b ML |
2324 | use_col_separator = true; |
2325 | if (optarg) | |
2326 | separator_string (optarg); | |
e1fb4052 | 2327 | @@ -1166,10 +1250,45 @@ getoptnum (const char *n_str, int min, i |
7cf3a80b ML |
2328 | a number. */ |
2329 | ||
2330 | static void | |
2331 | -getoptarg (char *arg, char switch_char, char *character, int *number) | |
2332 | +getoptarg (char *arg, char switch_char, char *character, int *character_length, | |
2333 | + int *character_width, int *number) | |
2334 | { | |
2335 | if (!ISDIGIT (*arg)) | |
2336 | - *character = *arg++; | |
2337 | + { | |
2338 | +#ifdef HAVE_MBRTOWC | |
2339 | + if (MB_CUR_MAX > 1) /* for multibyte locale. */ | |
2340 | + { | |
2341 | + wchar_t wc; | |
2342 | + size_t mblength; | |
2343 | + int width; | |
2344 | + mbstate_t state = {'\0'}; | |
2345 | + | |
2346 | + mblength = mbrtowc (&wc, arg, strnlen(arg, MB_LEN_MAX), &state); | |
2347 | + | |
2348 | + if (mblength == (size_t)-1 || mblength == (size_t)-2) | |
2349 | + { | |
2350 | + *character_length = 1; | |
2351 | + *character_width = 1; | |
2352 | + } | |
2353 | + else | |
2354 | + { | |
2355 | + *character_length = (mblength < 1) ? 1 : mblength; | |
2356 | + width = wcwidth (wc); | |
2357 | + *character_width = (width < 0) ? 0 : width; | |
2358 | + } | |
2359 | + | |
2360 | + strncpy (character, arg, *character_length); | |
2361 | + arg += *character_length; | |
2362 | + } | |
2363 | + else /* for single byte locale. */ | |
2364 | +#endif | |
2365 | + { | |
2366 | + *character = *arg++; | |
2367 | + *character_length = 1; | |
2368 | + *character_width = 1; | |
2369 | + } | |
2370 | + } | |
2371 | + | |
2372 | if (*arg) | |
2373 | { | |
2374 | long int tmp_long; | |
e1fb4052 | 2375 | @@ -1191,6 +1310,11 @@ static void |
7cf3a80b ML |
2376 | init_parameters (int number_of_files) |
2377 | { | |
2378 | int chars_used_by_number = 0; | |
2379 | + int mb_len = 1; | |
2380 | +#if HAVE_MBRTOWC | |
2381 | + if (MB_CUR_MAX > 1) | |
2382 | + mb_len = MB_LEN_MAX; | |
2383 | +#endif | |
2384 | ||
2385 | lines_per_body = lines_per_page - lines_per_header - lines_per_footer; | |
2386 | if (lines_per_body <= 0) | |
e1fb4052 | 2387 | @@ -1228,7 +1352,7 @@ init_parameters (int number_of_files) |
7cf3a80b ML |
2388 | else |
2389 | col_sep_string = column_separator; | |
2390 | ||
2391 | - col_sep_length = 1; | |
2392 | + col_sep_length = col_sep_width = 1; | |
2393 | use_col_separator = true; | |
2394 | } | |
2395 | /* It's rather pointless to define a TAB separator with column | |
e1fb4052 | 2396 | @@ -1258,11 +1382,11 @@ init_parameters (int number_of_files) |
7cf3a80b ML |
2397 | + TAB_WIDTH (chars_per_input_tab, chars_per_number); */ |
2398 | ||
2399 | /* Estimate chars_per_text without any margin and keep it constant. */ | |
2400 | - if (number_separator == '\t') | |
2401 | + if (number_separator[0] == '\t') | |
2402 | number_width = (chars_per_number | |
2403 | + TAB_WIDTH (chars_per_default_tab, chars_per_number)); | |
2404 | else | |
2405 | - number_width = chars_per_number + 1; | |
2406 | + number_width = chars_per_number + number_separator_width; | |
2407 | ||
2408 | /* The number is part of the column width unless we are | |
2409 | printing files in parallel. */ | |
e1fb4052 | 2410 | @@ -1271,7 +1395,7 @@ init_parameters (int number_of_files) |
7cf3a80b ML |
2411 | } |
2412 | ||
e1fb4052 MF |
2413 | int sep_chars, useful_chars; |
2414 | - if (INT_MULTIPLY_WRAPV (columns - 1, col_sep_length, &sep_chars)) | |
2415 | + if (INT_MULTIPLY_WRAPV (columns - 1, col_sep_width, &sep_chars)) | |
2416 | sep_chars = INT_MAX; | |
2417 | if (INT_SUBTRACT_WRAPV (chars_per_line - chars_used_by_number, sep_chars, | |
2418 | &useful_chars)) | |
2419 | @@ -1294,7 +1418,7 @@ init_parameters (int number_of_files) | |
7cf3a80b ML |
2420 | We've to use 8 as the lower limit, if we use chars_per_default_tab = 8 |
2421 | to expand a tab which is not an input_tab-char. */ | |
2422 | free (clump_buff); | |
2423 | - clump_buff = xmalloc (MAX (8, chars_per_input_tab)); | |
2424 | + clump_buff = xmalloc (mb_len * MAX (8, chars_per_input_tab)); | |
2425 | } | |
2426 | ||
2427 | /* Open the necessary files, | |
e1fb4052 | 2428 | @@ -1402,7 +1526,7 @@ init_funcs (void) |
7cf3a80b ML |
2429 | |
2430 | /* Enlarge p->start_position of first column to use the same form of | |
2431 | padding_not_printed with all columns. */ | |
2432 | - h = h + col_sep_length; | |
2433 | + h = h + col_sep_width; | |
2434 | ||
2435 | /* This loop takes care of all but the rightmost column. */ | |
2436 | ||
e1fb4052 | 2437 | @@ -1436,7 +1560,7 @@ init_funcs (void) |
7cf3a80b ML |
2438 | } |
2439 | else | |
2440 | { | |
2441 | - h = h_next + col_sep_length; | |
2442 | + h = h_next + col_sep_width; | |
2443 | h_next = h + chars_per_column; | |
2444 | } | |
2445 | } | |
e1fb4052 | 2446 | @@ -1727,9 +1851,9 @@ static void |
7cf3a80b ML |
2447 | align_column (COLUMN *p) |
2448 | { | |
2449 | padding_not_printed = p->start_position; | |
e1fb4052 MF |
2450 | - if (col_sep_length < padding_not_printed) |
2451 | + if (col_sep_width < padding_not_printed) | |
7cf3a80b ML |
2452 | { |
2453 | - pad_across_to (padding_not_printed - col_sep_length); | |
2454 | + pad_across_to (padding_not_printed - col_sep_width); | |
2455 | padding_not_printed = ANYWHERE; | |
2456 | } | |
2457 | ||
e1fb4052 | 2458 | @@ -2004,13 +2128,13 @@ store_char (char c) |
7cf3a80b ML |
2459 | /* May be too generous. */ |
2460 | buff = X2REALLOC (buff, &buff_allocated); | |
2461 | } | |
2462 | - buff[buff_current++] = c; | |
2463 | + buff[buff_current++] = (unsigned char) c; | |
2464 | } | |
2465 | ||
2466 | static void | |
2467 | add_line_number (COLUMN *p) | |
2468 | { | |
2469 | - int i; | |
2470 | + int i, j; | |
2471 | char *s; | |
2472 | int num_width; | |
2473 | ||
e1fb4052 | 2474 | @@ -2027,22 +2151,24 @@ add_line_number (COLUMN *p) |
7cf3a80b ML |
2475 | /* Tabification is assumed for multiple columns, also for n-separators, |
2476 | but 'default n-separator = TAB' hasn't been given priority over | |
2477 | equal column_width also specified by POSIX. */ | |
2478 | - if (number_separator == '\t') | |
2479 | + if (number_separator[0] == '\t') | |
2480 | { | |
2481 | i = number_width - chars_per_number; | |
2482 | while (i-- > 0) | |
2483 | (p->char_func) (' '); | |
2484 | } | |
2485 | else | |
2486 | - (p->char_func) (number_separator); | |
2487 | + for (j = 0; j < number_separator_length; j++) | |
2488 | + (p->char_func) (number_separator[j]); | |
2489 | } | |
2490 | else | |
2491 | /* To comply with POSIX, we avoid any expansion of default TAB | |
2492 | separator with a single column output. No column_width requirement | |
2493 | has to be considered. */ | |
2494 | { | |
2495 | - (p->char_func) (number_separator); | |
2496 | - if (number_separator == '\t') | |
2497 | + for (j = 0; j < number_separator_length; j++) | |
2498 | + (p->char_func) (number_separator[j]); | |
2499 | + if (number_separator[0] == '\t') | |
2500 | output_position = POS_AFTER_TAB (chars_per_output_tab, | |
2501 | output_position); | |
2502 | } | |
e1fb4052 | 2503 | @@ -2203,7 +2329,7 @@ print_white_space (void) |
7cf3a80b ML |
2504 | while (goal - h_old > 1 |
2505 | && (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal) | |
2506 | { | |
2507 | - putchar (output_tab_char); | |
2508 | + fwrite (output_tab_char, sizeof(char), output_tab_char_length, stdout); | |
2509 | h_old = h_new; | |
2510 | } | |
2511 | while (++h_old <= goal) | |
e1fb4052 | 2512 | @@ -2223,6 +2349,7 @@ print_sep_string (void) |
7cf3a80b | 2513 | { |
e1fb4052 | 2514 | char const *s = col_sep_string; |
7cf3a80b ML |
2515 | int l = col_sep_length; |
2516 | + int not_space_flag; | |
2517 | ||
e1fb4052 MF |
2518 | if (separators_not_printed <= 0) |
2519 | { | |
2520 | @@ -2234,6 +2361,7 @@ print_sep_string (void) | |
7cf3a80b ML |
2521 | { |
2522 | for (; separators_not_printed > 0; --separators_not_printed) | |
2523 | { | |
2524 | + not_space_flag = 0; | |
2525 | while (l-- > 0) | |
2526 | { | |
2527 | /* 3 types of sep_strings: spaces only, spaces and chars, | |
e1fb4052 | 2528 | @@ -2247,12 +2375,15 @@ print_sep_string (void) |
7cf3a80b ML |
2529 | } |
2530 | else | |
2531 | { | |
2532 | + not_space_flag = 1; | |
2533 | if (spaces_not_printed > 0) | |
2534 | print_white_space (); | |
2535 | putchar (*s++); | |
2536 | - ++output_position; | |
2537 | } | |
2538 | } | |
2539 | + if (not_space_flag) | |
2540 | + output_position += col_sep_width; | |
2541 | + | |
2542 | /* sep_string ends with some spaces */ | |
2543 | if (spaces_not_printed > 0) | |
2544 | print_white_space (); | |
e1fb4052 | 2545 | @@ -2280,7 +2411,7 @@ print_clump (COLUMN *p, int n, char *clu |
7cf3a80b ML |
2546 | required number of tabs and spaces. */ |
2547 | ||
2548 | static void | |
2549 | -print_char (char c) | |
2550 | +print_char_single (char c) | |
2551 | { | |
2552 | if (tabify_output) | |
2553 | { | |
e1fb4052 | 2554 | @@ -2304,6 +2435,74 @@ print_char (char c) |
7cf3a80b ML |
2555 | putchar (c); |
2556 | } | |
2557 | ||
2558 | +#ifdef HAVE_MBRTOWC | |
2559 | +static void | |
2560 | +print_char_multi (char c) | |
2561 | +{ | |
2562 | + static size_t mbc_pos = 0; | |
2563 | + static char mbc[MB_LEN_MAX] = {'\0'}; | |
2564 | + static mbstate_t state = {'\0'}; | |
2565 | + mbstate_t state_bak; | |
2566 | + wchar_t wc; | |
2567 | + size_t mblength; | |
2568 | + int width; | |
2569 | + | |
2570 | + if (tabify_output) | |
2571 | + { | |
2572 | + state_bak = state; | |
2573 | + mbc[mbc_pos++] = c; | |
2574 | + mblength = mbrtowc (&wc, mbc, mbc_pos, &state); | |
2575 | + | |
2576 | + while (mbc_pos > 0) | |
2577 | + { | |
2578 | + switch (mblength) | |
2579 | + { | |
2580 | + case (size_t)-2: | |
2581 | + state = state_bak; | |
2582 | + return; | |
2583 | + | |
2584 | + case (size_t)-1: | |
2585 | + state = state_bak; | |
2586 | + ++output_position; | |
2587 | + putchar (mbc[0]); | |
2588 | + memmove (mbc, mbc + 1, MB_CUR_MAX - 1); | |
2589 | + --mbc_pos; | |
2590 | + break; | |
2591 | + | |
2592 | + case 0: | |
2593 | + mblength = 1; | |
2594 | + | |
2595 | + default: | |
2596 | + if (wc == L' ') | |
2597 | + { | |
2598 | + memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); | |
2599 | + --mbc_pos; | |
2600 | + ++spaces_not_printed; | |
2601 | + return; | |
2602 | + } | |
2603 | + else if (spaces_not_printed > 0) | |
2604 | + print_white_space (); | |
2605 | + | |
2606 | + /* Nonprintables are assumed to have width 0, except L'\b'. */ | |
2607 | + if ((width = wcwidth (wc)) < 1) | |
2608 | + { | |
2609 | + if (wc == L'\b') | |
2610 | + --output_position; | |
2611 | + } | |
2612 | + else | |
2613 | + output_position += width; | |
2614 | + | |
2615 | + fwrite (mbc, sizeof(char), mblength, stdout); | |
2616 | + memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); | |
2617 | + mbc_pos -= mblength; | |
2618 | + } | |
2619 | + } | |
2620 | + return; | |
2621 | + } | |
2622 | + putchar (c); | |
2623 | +} | |
2624 | +#endif | |
2625 | + | |
2626 | /* Skip to page PAGE before printing. | |
2627 | PAGE may be larger than total number of pages. */ | |
2628 | ||
e1fb4052 | 2629 | @@ -2483,9 +2682,9 @@ read_line (COLUMN *p) |
7cf3a80b ML |
2630 | align_empty_cols = false; |
2631 | } | |
2632 | ||
e1fb4052 MF |
2633 | - if (col_sep_length < padding_not_printed) |
2634 | + if (col_sep_width < padding_not_printed) | |
7cf3a80b ML |
2635 | { |
2636 | - pad_across_to (padding_not_printed - col_sep_length); | |
2637 | + pad_across_to (padding_not_printed - col_sep_width); | |
2638 | padding_not_printed = ANYWHERE; | |
2639 | } | |
2640 | ||
e1fb4052 | 2641 | @@ -2555,7 +2754,7 @@ print_stored (COLUMN *p) |
7cf3a80b ML |
2642 | int i; |
2643 | ||
2644 | int line = p->current_line++; | |
2645 | - char *first = &buff[line_vector[line]]; | |
2646 | + unsigned char *first = &buff[line_vector[line]]; | |
2647 | /* FIXME | |
2648 | UMR: Uninitialized memory read: | |
2649 | * This is occurring while in: | |
e1fb4052 | 2650 | @@ -2567,7 +2766,7 @@ print_stored (COLUMN *p) |
7cf3a80b ML |
2651 | xmalloc [xmalloc.c:94] |
2652 | init_store_cols [pr.c:1648] | |
2653 | */ | |
2654 | - char *last = &buff[line_vector[line + 1]]; | |
2655 | + unsigned char *last = &buff[line_vector[line + 1]]; | |
2656 | ||
2657 | pad_vertically = true; | |
2658 | ||
e1fb4052 | 2659 | @@ -2586,9 +2785,9 @@ print_stored (COLUMN *p) |
7cf3a80b ML |
2660 | } |
2661 | } | |
2662 | ||
e1fb4052 MF |
2663 | - if (col_sep_length < padding_not_printed) |
2664 | + if (col_sep_width < padding_not_printed) | |
7cf3a80b ML |
2665 | { |
2666 | - pad_across_to (padding_not_printed - col_sep_length); | |
2667 | + pad_across_to (padding_not_printed - col_sep_width); | |
2668 | padding_not_printed = ANYWHERE; | |
2669 | } | |
2670 | ||
e1fb4052 | 2671 | @@ -2601,8 +2800,8 @@ print_stored (COLUMN *p) |
7cf3a80b ML |
2672 | if (spaces_not_printed == 0) |
2673 | { | |
2674 | output_position = p->start_position + end_vector[line]; | |
2675 | - if (p->start_position - col_sep_length == chars_per_margin) | |
2676 | - output_position -= col_sep_length; | |
2677 | + if (p->start_position - col_sep_width == chars_per_margin) | |
2678 | + output_position -= col_sep_width; | |
2679 | } | |
2680 | ||
2681 | return true; | |
e1fb4052 | 2682 | @@ -2621,7 +2820,7 @@ print_stored (COLUMN *p) |
7cf3a80b ML |
2683 | number of characters is 1.) */ |
2684 | ||
2685 | static int | |
2686 | -char_to_clump (char c) | |
2687 | +char_to_clump_single (char c) | |
2688 | { | |
2689 | unsigned char uc = c; | |
2690 | char *s = clump_buff; | |
e1fb4052 | 2691 | @@ -2631,10 +2830,10 @@ char_to_clump (char c) |
7cf3a80b ML |
2692 | int chars; |
2693 | int chars_per_c = 8; | |
2694 | ||
2695 | - if (c == input_tab_char) | |
2696 | + if (c == input_tab_char[0]) | |
2697 | chars_per_c = chars_per_input_tab; | |
2698 | ||
2699 | - if (c == input_tab_char || c == '\t') | |
2700 | + if (c == input_tab_char[0] || c == '\t') | |
2701 | { | |
2702 | width = TAB_WIDTH (chars_per_c, input_position); | |
2703 | ||
e1fb4052 | 2704 | @@ -2715,6 +2914,164 @@ char_to_clump (char c) |
7cf3a80b ML |
2705 | return chars; |
2706 | } | |
2707 | ||
2708 | +#ifdef HAVE_MBRTOWC | |
2709 | +static int | |
2710 | +char_to_clump_multi (char c) | |
2711 | +{ | |
2712 | + static size_t mbc_pos = 0; | |
2713 | + static char mbc[MB_LEN_MAX] = {'\0'}; | |
2714 | + static mbstate_t state = {'\0'}; | |
2715 | + mbstate_t state_bak; | |
2716 | + wchar_t wc; | |
2717 | + size_t mblength; | |
2718 | + int wc_width; | |
2719 | + register char *s = clump_buff; | |
2720 | + register int i, j; | |
2721 | + char esc_buff[4]; | |
2722 | + int width; | |
2723 | + int chars; | |
2724 | + int chars_per_c = 8; | |
2725 | + | |
2726 | + state_bak = state; | |
2727 | + mbc[mbc_pos++] = c; | |
2728 | + mblength = mbrtowc (&wc, mbc, mbc_pos, &state); | |
2729 | + | |
2730 | + width = 0; | |
2731 | + chars = 0; | |
2732 | + while (mbc_pos > 0) | |
2733 | + { | |
2734 | + switch (mblength) | |
2735 | + { | |
2736 | + case (size_t)-2: | |
2737 | + state = state_bak; | |
2738 | + return 0; | |
2739 | + | |
2740 | + case (size_t)-1: | |
2741 | + state = state_bak; | |
2742 | + mblength = 1; | |
2743 | + | |
2744 | + if (use_esc_sequence || use_cntrl_prefix) | |
2745 | + { | |
2746 | + width = +4; | |
2747 | + chars = +4; | |
2748 | + *s++ = '\\'; | |
2749 | + sprintf (esc_buff, "%03o", (unsigned char) mbc[0]); | |
2750 | + for (i = 0; i <= 2; ++i) | |
2751 | + *s++ = (int) esc_buff[i]; | |
2752 | + } | |
2753 | + else | |
2754 | + { | |
2755 | + width += 1; | |
2756 | + chars += 1; | |
2757 | + *s++ = mbc[0]; | |
2758 | + } | |
2759 | + break; | |
2760 | + | |
2761 | + case 0: | |
2762 | + mblength = 1; | |
2763 | + /* Fall through */ | |
2764 | + | |
2765 | + default: | |
2766 | + if (memcmp (mbc, input_tab_char, mblength) == 0) | |
2767 | + chars_per_c = chars_per_input_tab; | |
2768 | + | |
2769 | + if (memcmp (mbc, input_tab_char, mblength) == 0 || c == '\t') | |
2770 | + { | |
2771 | + int width_inc; | |
2772 | + | |
2773 | + width_inc = TAB_WIDTH (chars_per_c, input_position); | |
2774 | + width += width_inc; | |
2775 | + | |
2776 | + if (untabify_input) | |
2777 | + { | |
2778 | + for (i = width_inc; i; --i) | |
2779 | + *s++ = ' '; | |
2780 | + chars += width_inc; | |
2781 | + } | |
2782 | + else | |
2783 | + { | |
2784 | + for (i = 0; i < mblength; i++) | |
2785 | + *s++ = mbc[i]; | |
2786 | + chars += mblength; | |
2787 | + } | |
2788 | + } | |
2789 | + else if ((wc_width = wcwidth (wc)) < 1) | |
2790 | + { | |
2791 | + if (use_esc_sequence) | |
2792 | + { | |
2793 | + for (i = 0; i < mblength; i++) | |
2794 | + { | |
2795 | + width += 4; | |
2796 | + chars += 4; | |
2797 | + *s++ = '\\'; | |
2798 | + sprintf (esc_buff, "%03o", (unsigned char) mbc[i]); | |
2799 | + for (j = 0; j <= 2; ++j) | |
2800 | + *s++ = (int) esc_buff[j]; | |
2801 | + } | |
2802 | + } | |
2803 | + else if (use_cntrl_prefix) | |
2804 | + { | |
2805 | + if (wc < 0200) | |
2806 | + { | |
2807 | + width += 2; | |
2808 | + chars += 2; | |
2809 | + *s++ = '^'; | |
2810 | + *s++ = wc ^ 0100; | |
2811 | + } | |
2812 | + else | |
2813 | + { | |
2814 | + for (i = 0; i < mblength; i++) | |
2815 | + { | |
2816 | + width += 4; | |
2817 | + chars += 4; | |
2818 | + *s++ = '\\'; | |
2819 | + sprintf (esc_buff, "%03o", (unsigned char) mbc[i]); | |
2820 | + for (j = 0; j <= 2; ++j) | |
2821 | + *s++ = (int) esc_buff[j]; | |
2822 | + } | |
2823 | + } | |
2824 | + } | |
2825 | + else if (wc == L'\b') | |
2826 | + { | |
2827 | + width += -1; | |
2828 | + chars += 1; | |
2829 | + *s++ = c; | |
2830 | + } | |
2831 | + else | |
2832 | + { | |
2833 | + width += 0; | |
2834 | + chars += mblength; | |
2835 | + for (i = 0; i < mblength; i++) | |
2836 | + *s++ = mbc[i]; | |
2837 | + } | |
2838 | + } | |
2839 | + else | |
2840 | + { | |
2841 | + width += wc_width; | |
2842 | + chars += mblength; | |
2843 | + for (i = 0; i < mblength; i++) | |
2844 | + *s++ = mbc[i]; | |
2845 | + } | |
2846 | + } | |
2847 | + memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); | |
2848 | + mbc_pos -= mblength; | |
2849 | + } | |
2850 | + | |
2851 | + /* Too many backspaces must put us in position 0 -- never negative. */ | |
2852 | + if (width < 0 && input_position == 0) | |
2853 | + { | |
2854 | + chars = 0; | |
2855 | + input_position = 0; | |
2856 | + } | |
2857 | + else if (width < 0 && input_position <= -width) | |
2858 | + input_position = 0; | |
2859 | + else | |
2860 | + input_position += width; | |
2861 | + | |
2862 | + return chars; | |
2863 | +} | |
2864 | +#endif | |
2865 | + | |
2866 | /* We've just printed some files and need to clean up things before | |
2867 | looking for more options and printing the next batch of files. | |
2868 | ||
e1fb4052 MF |
2869 | diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c |
2870 | --- coreutils-8.27-orig/src/sort.c 2017-01-01 16:34:24.000000000 -0600 | |
2871 | +++ coreutils-8.27/src/sort.c 2017-03-11 23:49:22.416505389 -0600 | |
7cf3a80b ML |
2872 | @@ -29,6 +29,14 @@ |
2873 | #include <sys/wait.h> | |
2874 | #include <signal.h> | |
2875 | #include <assert.h> | |
2876 | +#if HAVE_WCHAR_H | |
2877 | +# include <wchar.h> | |
2878 | +#endif | |
2879 | +/* Get isw* functions. */ | |
2880 | +#if HAVE_WCTYPE_H | |
2881 | +# include <wctype.h> | |
2882 | +#endif | |
2883 | + | |
2884 | #include "system.h" | |
2885 | #include "argmatch.h" | |
e1fb4052 MF |
2886 | #include "die.h" |
2887 | @@ -165,14 +173,39 @@ static int decimal_point; | |
7cf3a80b ML |
2888 | /* Thousands separator; if -1, then there isn't one. */ |
2889 | static int thousands_sep; | |
2890 | ||
2891 | +/* True if -f is specified. */ | |
2892 | +static bool folding; | |
2893 | + | |
2894 | /* Nonzero if the corresponding locales are hard. */ | |
2895 | static bool hard_LC_COLLATE; | |
2896 | -#if HAVE_NL_LANGINFO | |
2897 | +#if HAVE_LANGINFO_CODESET | |
2898 | static bool hard_LC_TIME; | |
2899 | #endif | |
2900 | ||
2901 | #define NONZERO(x) ((x) != 0) | |
2902 | ||
2903 | +/* get a multibyte character's byte length. */ | |
2904 | +#define GET_BYTELEN_OF_CHAR(LIM, PTR, MBLENGTH, STATE) \ | |
2905 | + do \ | |
2906 | + { \ | |
2907 | + wchar_t wc; \ | |
2908 | + mbstate_t state_bak; \ | |
2909 | + \ | |
2910 | + state_bak = STATE; \ | |
2911 | + mblength = mbrtowc (&wc, PTR, LIM - PTR, &STATE); \ | |
2912 | + \ | |
2913 | + switch (MBLENGTH) \ | |
2914 | + { \ | |
2915 | + case (size_t)-1: \ | |
2916 | + case (size_t)-2: \ | |
2917 | + STATE = state_bak; \ | |
2918 | + /* Fall through. */ \ | |
2919 | + case 0: \ | |
2920 | + MBLENGTH = 1; \ | |
2921 | + } \ | |
2922 | + } \ | |
2923 | + while (0) | |
2924 | + | |
2925 | /* The kind of blanks for '-b' to skip in various options. */ | |
2926 | enum blanktype { bl_start, bl_end, bl_both }; | |
2927 | ||
e1fb4052 | 2928 | @@ -346,13 +379,11 @@ static bool reverse; |
7cf3a80b ML |
2929 | they were read if all keys compare equal. */ |
2930 | static bool stable; | |
2931 | ||
2932 | -/* If TAB has this value, blanks separate fields. */ | |
2933 | -enum { TAB_DEFAULT = CHAR_MAX + 1 }; | |
2934 | - | |
2935 | -/* Tab character separating fields. If TAB_DEFAULT, then fields are | |
2936 | +/* Tab character separating fields. If tab_length is 0, then fields are | |
2937 | separated by the empty string between a non-blank character and a blank | |
2938 | character. */ | |
2939 | -static int tab = TAB_DEFAULT; | |
2940 | +static char tab[MB_LEN_MAX + 1]; | |
2941 | +static size_t tab_length = 0; | |
2942 | ||
2943 | /* Flag to remove consecutive duplicate lines from the output. | |
2944 | Only the last of a sequence of equal lines will be output. */ | |
e1fb4052 | 2945 | @@ -811,6 +842,46 @@ reap_all (void) |
7cf3a80b ML |
2946 | reap (-1); |
2947 | } | |
2948 | ||
2949 | +/* Function pointers. */ | |
2950 | +static void | |
2951 | +(*inittables) (void); | |
2952 | +static char * | |
2953 | +(*begfield) (const struct line*, const struct keyfield *); | |
2954 | +static char * | |
2955 | +(*limfield) (const struct line*, const struct keyfield *); | |
2956 | +static void | |
2957 | +(*skipblanks) (char **ptr, char *lim); | |
2958 | +static int | |
2959 | +(*getmonth) (char const *, size_t, char **); | |
2960 | +static int | |
2961 | +(*keycompare) (const struct line *, const struct line *); | |
2962 | +static int | |
2963 | +(*numcompare) (const char *, const char *); | |
2964 | + | |
2965 | +/* Test for white space multibyte character. | |
2966 | + Set LENGTH the byte length of investigated multibyte character. */ | |
2967 | +#if HAVE_MBRTOWC | |
2968 | +static int | |
2969 | +ismbblank (const char *str, size_t len, size_t *length) | |
2970 | +{ | |
2971 | + size_t mblength; | |
2972 | + wchar_t wc; | |
2973 | + mbstate_t state; | |
2974 | + | |
2975 | + memset (&state, '\0', sizeof(mbstate_t)); | |
2976 | + mblength = mbrtowc (&wc, str, len, &state); | |
2977 | + | |
2978 | + if (mblength == (size_t)-1 || mblength == (size_t)-2) | |
2979 | + { | |
2980 | + *length = 1; | |
2981 | + return 0; | |
2982 | + } | |
2983 | + | |
2984 | + *length = (mblength < 1) ? 1 : mblength; | |
2985 | + return iswblank (wc) || wc == '\n'; | |
2986 | +} | |
2987 | +#endif | |
2988 | + | |
2989 | /* Clean up any remaining temporary files. */ | |
2990 | ||
2991 | static void | |
e1fb4052 | 2992 | @@ -1255,7 +1326,7 @@ zaptemp (char const *name) |
7cf3a80b ML |
2993 | free (node); |
2994 | } | |
2995 | ||
2996 | -#if HAVE_NL_LANGINFO | |
2997 | +#if HAVE_LANGINFO_CODESET | |
2998 | ||
2999 | static int | |
3000 | struct_month_cmp (void const *m1, void const *m2) | |
e1fb4052 | 3001 | @@ -1270,7 +1341,7 @@ struct_month_cmp (void const *m1, void c |
7cf3a80b ML |
3002 | /* Initialize the character class tables. */ |
3003 | ||
3004 | static void | |
3005 | -inittables (void) | |
3006 | +inittables_uni (void) | |
3007 | { | |
3008 | size_t i; | |
3009 | ||
e1fb4052 | 3010 | @@ -1282,7 +1353,7 @@ inittables (void) |
7cf3a80b ML |
3011 | fold_toupper[i] = toupper (i); |
3012 | } | |
3013 | ||
3014 | -#if HAVE_NL_LANGINFO | |
3015 | +#if HAVE_LANGINFO_CODESET | |
3016 | /* If we're not in the "C" locale, read different names for months. */ | |
3017 | if (hard_LC_TIME) | |
3018 | { | |
e1fb4052 | 3019 | @@ -1364,6 +1435,84 @@ specify_nmerge (int oi, char c, char con |
7cf3a80b ML |
3020 | xstrtol_fatal (e, oi, c, long_options, s); |
3021 | } | |
3022 | ||
3023 | +#if HAVE_MBRTOWC | |
3024 | +static void | |
3025 | +inittables_mb (void) | |
3026 | +{ | |
3027 | + int i, j, k, l; | |
3028 | + char *name, *s, *lc_time, *lc_ctype; | |
3029 | + size_t s_len, mblength; | |
3030 | + char mbc[MB_LEN_MAX]; | |
3031 | + wchar_t wc, pwc; | |
3032 | + mbstate_t state_mb, state_wc; | |
3033 | + | |
3034 | + lc_time = setlocale (LC_TIME, ""); | |
3035 | + if (lc_time) | |
3036 | + lc_time = xstrdup (lc_time); | |
3037 | + | |
3038 | + lc_ctype = setlocale (LC_CTYPE, ""); | |
3039 | + if (lc_ctype) | |
3040 | + lc_ctype = xstrdup (lc_ctype); | |
3041 | + | |
3042 | + if (lc_time && lc_ctype) | |
3043 | + /* temporarily set LC_CTYPE to match LC_TIME, so that we can convert | |
3044 | + * the names of months to upper case */ | |
3045 | + setlocale (LC_CTYPE, lc_time); | |
3046 | + | |
3047 | + for (i = 0; i < MONTHS_PER_YEAR; i++) | |
3048 | + { | |
3049 | + s = (char *) nl_langinfo (ABMON_1 + i); | |
3050 | + s_len = strlen (s); | |
3051 | + monthtab[i].name = name = (char *) xmalloc (s_len + 1); | |
3052 | + monthtab[i].val = i + 1; | |
3053 | + | |
3054 | + memset (&state_mb, '\0', sizeof (mbstate_t)); | |
3055 | + memset (&state_wc, '\0', sizeof (mbstate_t)); | |
3056 | + | |
3057 | + for (j = 0; j < s_len;) | |
3058 | + { | |
3059 | + if (!ismbblank (s + j, s_len - j, &mblength)) | |
3060 | + break; | |
3061 | + j += mblength; | |
3062 | + } | |
3063 | + | |
3064 | + for (k = 0; j < s_len;) | |
3065 | + { | |
3066 | + mblength = mbrtowc (&wc, (s + j), (s_len - j), &state_mb); | |
3067 | + assert (mblength != (size_t)-1 && mblength != (size_t)-2); | |
3068 | + if (mblength == 0) | |
3069 | + break; | |
3070 | + | |
3071 | + pwc = towupper (wc); | |
3072 | + if (pwc == wc) | |
3073 | + { | |
3074 | + memcpy (mbc, s + j, mblength); | |
3075 | + j += mblength; | |
3076 | + } | |
3077 | + else | |
3078 | + { | |
3079 | + j += mblength; | |
3080 | + mblength = wcrtomb (mbc, pwc, &state_wc); | |
3081 | + assert (mblength != (size_t)0 && mblength != (size_t)-1); | |
3082 | + } | |
3083 | + | |
3084 | + for (l = 0; l < mblength; l++) | |
3085 | + name[k++] = mbc[l]; | |
3086 | + } | |
3087 | + name[k] = '\0'; | |
3088 | + } | |
3089 | + qsort ((void *) monthtab, MONTHS_PER_YEAR, | |
3090 | + sizeof (struct month), struct_month_cmp); | |
3091 | + | |
3092 | + if (lc_time && lc_ctype) | |
3093 | + /* restore the original locales */ | |
3094 | + setlocale (LC_CTYPE, lc_ctype); | |
3095 | + | |
3096 | + free (lc_ctype); | |
3097 | + free (lc_time); | |
3098 | +} | |
3099 | +#endif | |
3100 | + | |
3101 | /* Specify the amount of main memory to use when sorting. */ | |
3102 | static void | |
3103 | specify_sort_size (int oi, char c, char const *s) | |
e1fb4052 | 3104 | @@ -1597,7 +1746,7 @@ buffer_linelim (struct buffer const *buf |
7cf3a80b ML |
3105 | by KEY in LINE. */ |
3106 | ||
3107 | static char * | |
3108 | -begfield (struct line const *line, struct keyfield const *key) | |
3109 | +begfield_uni (const struct line *line, const struct keyfield *key) | |
3110 | { | |
3111 | char *ptr = line->text, *lim = ptr + line->length - 1; | |
3112 | size_t sword = key->sword; | |
e1fb4052 | 3113 | @@ -1606,10 +1755,10 @@ begfield (struct line const *line, struc |
7cf3a80b ML |
3114 | /* The leading field separator itself is included in a field when -t |
3115 | is absent. */ | |
3116 | ||
3117 | - if (tab != TAB_DEFAULT) | |
3118 | + if (tab_length) | |
3119 | while (ptr < lim && sword--) | |
3120 | { | |
3121 | - while (ptr < lim && *ptr != tab) | |
3122 | + while (ptr < lim && *ptr != tab[0]) | |
3123 | ++ptr; | |
3124 | if (ptr < lim) | |
3125 | ++ptr; | |
e1fb4052 | 3126 | @@ -1635,11 +1784,70 @@ begfield (struct line const *line, struc |
7cf3a80b ML |
3127 | return ptr; |
3128 | } | |
3129 | ||
3130 | +#if HAVE_MBRTOWC | |
3131 | +static char * | |
3132 | +begfield_mb (const struct line *line, const struct keyfield *key) | |
3133 | +{ | |
3134 | + int i; | |
3135 | + char *ptr = line->text, *lim = ptr + line->length - 1; | |
3136 | + size_t sword = key->sword; | |
3137 | + size_t schar = key->schar; | |
3138 | + size_t mblength; | |
3139 | + mbstate_t state; | |
3140 | + | |
3141 | + memset (&state, '\0', sizeof(mbstate_t)); | |
3142 | + | |
3143 | + if (tab_length) | |
3144 | + while (ptr < lim && sword--) | |
3145 | + { | |
3146 | + while (ptr < lim && memcmp (ptr, tab, tab_length) != 0) | |
3147 | + { | |
3148 | + GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); | |
3149 | + ptr += mblength; | |
3150 | + } | |
3151 | + if (ptr < lim) | |
3152 | + { | |
3153 | + GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); | |
3154 | + ptr += mblength; | |
3155 | + } | |
3156 | + } | |
3157 | + else | |
3158 | + while (ptr < lim && sword--) | |
3159 | + { | |
3160 | + while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) | |
3161 | + ptr += mblength; | |
3162 | + if (ptr < lim) | |
3163 | + { | |
3164 | + GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); | |
3165 | + ptr += mblength; | |
3166 | + } | |
3167 | + while (ptr < lim && !ismbblank (ptr, lim - ptr, &mblength)) | |
3168 | + ptr += mblength; | |
3169 | + } | |
3170 | + | |
3171 | + if (key->skipsblanks) | |
3172 | + while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) | |
3173 | + ptr += mblength; | |
3174 | + | |
3175 | + for (i = 0; i < schar; i++) | |
3176 | + { | |
3177 | + GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); | |
3178 | + | |
3179 | + if (ptr + mblength > lim) | |
3180 | + break; | |
3181 | + else | |
3182 | + ptr += mblength; | |
3183 | + } | |
3184 | + | |
3185 | + return ptr; | |
3186 | +} | |
3187 | +#endif | |
3188 | + | |
3189 | /* Return the limit of (a pointer to the first character after) the field | |
3190 | in LINE specified by KEY. */ | |
3191 | ||
3192 | static char * | |
3193 | -limfield (struct line const *line, struct keyfield const *key) | |
3194 | +limfield_uni (const struct line *line, const struct keyfield *key) | |
3195 | { | |
3196 | char *ptr = line->text, *lim = ptr + line->length - 1; | |
3197 | size_t eword = key->eword, echar = key->echar; | |
e1fb4052 | 3198 | @@ -1654,10 +1862,10 @@ limfield (struct line const *line, struc |
7cf3a80b ML |
3199 | 'beginning' is the first character following the delimiting TAB. |
3200 | Otherwise, leave PTR pointing at the first 'blank' character after | |
3201 | the preceding field. */ | |
3202 | - if (tab != TAB_DEFAULT) | |
3203 | + if (tab_length) | |
3204 | while (ptr < lim && eword--) | |
3205 | { | |
3206 | - while (ptr < lim && *ptr != tab) | |
3207 | + while (ptr < lim && *ptr != tab[0]) | |
3208 | ++ptr; | |
3209 | if (ptr < lim && (eword || echar)) | |
3210 | ++ptr; | |
e1fb4052 | 3211 | @@ -1703,10 +1911,10 @@ limfield (struct line const *line, struc |
7cf3a80b ML |
3212 | */ |
3213 | ||
3214 | /* Make LIM point to the end of (one byte past) the current field. */ | |
3215 | - if (tab != TAB_DEFAULT) | |
3216 | + if (tab_length) | |
3217 | { | |
3218 | char *newlim; | |
3219 | - newlim = memchr (ptr, tab, lim - ptr); | |
3220 | + newlim = memchr (ptr, tab[0], lim - ptr); | |
3221 | if (newlim) | |
3222 | lim = newlim; | |
3223 | } | |
e1fb4052 | 3224 | @@ -1737,6 +1945,130 @@ limfield (struct line const *line, struc |
7cf3a80b ML |
3225 | return ptr; |
3226 | } | |
3227 | ||
3228 | +#if HAVE_MBRTOWC | |
3229 | +static char * | |
3230 | +limfield_mb (const struct line *line, const struct keyfield *key) | |
3231 | +{ | |
3232 | + char *ptr = line->text, *lim = ptr + line->length - 1; | |
3233 | + size_t eword = key->eword, echar = key->echar; | |
3234 | + int i; | |
3235 | + size_t mblength; | |
3236 | + mbstate_t state; | |
3237 | + | |
3238 | + if (echar == 0) | |
3239 | + eword++; /* skip all of end field. */ | |
3240 | + | |
3241 | + memset (&state, '\0', sizeof(mbstate_t)); | |
3242 | + | |
3243 | + if (tab_length) | |
3244 | + while (ptr < lim && eword--) | |
3245 | + { | |
3246 | + while (ptr < lim && memcmp (ptr, tab, tab_length) != 0) | |
3247 | + { | |
3248 | + GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); | |
3249 | + ptr += mblength; | |
3250 | + } | |
3251 | + if (ptr < lim && (eword | echar)) | |
3252 | + { | |
3253 | + GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); | |
3254 | + ptr += mblength; | |
3255 | + } | |
3256 | + } | |
3257 | + else | |
3258 | + while (ptr < lim && eword--) | |
3259 | + { | |
3260 | + while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) | |
3261 | + ptr += mblength; | |
3262 | + if (ptr < lim) | |
3263 | + { | |
3264 | + GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); | |
3265 | + ptr += mblength; | |
3266 | + } | |
3267 | + while (ptr < lim && !ismbblank (ptr, lim - ptr, &mblength)) | |
3268 | + ptr += mblength; | |
3269 | + } | |
3270 | + | |
3271 | + | |
3272 | +# ifdef POSIX_UNSPECIFIED | |
3273 | + /* Make LIM point to the end of (one byte past) the current field. */ | |
3274 | + if (tab_length) | |
3275 | + { | |
3276 | + char *newlim, *p; | |
3277 | + | |
3278 | + newlim = NULL; | |
3279 | + for (p = ptr; p < lim;) | |
3280 | + { | |
3281 | + if (memcmp (p, tab, tab_length) == 0) | |
3282 | + { | |
3283 | + newlim = p; | |
3284 | + break; | |
3285 | + } | |
3286 | + | |
3287 | + GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); | |
3288 | + p += mblength; | |
3289 | + } | |
3290 | + } | |
3291 | + else | |
3292 | + { | |
3293 | + char *newlim; | |
3294 | + newlim = ptr; | |
3295 | + | |
3296 | + while (newlim < lim && ismbblank (newlim, lim - newlim, &mblength)) | |
3297 | + newlim += mblength; | |
3298 | + if (ptr < lim) | |
3299 | + { | |
3300 | + GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); | |
3301 | + ptr += mblength; | |
3302 | + } | |
3303 | + while (newlim < lim && !ismbblank (newlim, lim - newlim, &mblength)) | |
3304 | + newlim += mblength; | |
3305 | + lim = newlim; | |
3306 | + } | |
3307 | +# endif | |
3308 | + | |
3309 | + if (echar != 0) | |
3310 | + { | |
3311 | + /* If we're skipping leading blanks, don't start counting characters | |
3312 | + * until after skipping past any leading blanks. */ | |
3313 | + if (key->skipeblanks) | |
3314 | + while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) | |
3315 | + ptr += mblength; | |
3316 | + | |
3317 | + memset (&state, '\0', sizeof(mbstate_t)); | |
3318 | + | |
3319 | + /* Advance PTR by ECHAR (if possible), but no further than LIM. */ | |
3320 | + for (i = 0; i < echar; i++) | |
3321 | + { | |
3322 | + GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); | |
3323 | + | |
3324 | + if (ptr + mblength > lim) | |
3325 | + break; | |
3326 | + else | |
3327 | + ptr += mblength; | |
3328 | + } | |
3329 | + } | |
3330 | + | |
3331 | + return ptr; | |
3332 | +} | |
3333 | +#endif | |
3334 | + | |
3335 | +static void | |
3336 | +skipblanks_uni (char **ptr, char *lim) | |
3337 | +{ | |
3338 | + while (*ptr < lim && blanks[to_uchar (**ptr)]) | |
3339 | + ++(*ptr); | |
3340 | +} | |
3341 | + | |
3342 | +#if HAVE_MBRTOWC | |
3343 | +static void | |
3344 | +skipblanks_mb (char **ptr, char *lim) | |
3345 | +{ | |
3346 | + size_t mblength; | |
3347 | + while (*ptr < lim && ismbblank (*ptr, lim - *ptr, &mblength)) | |
3348 | + (*ptr) += mblength; | |
3349 | +} | |
3350 | +#endif | |
3351 | + | |
3352 | /* Fill BUF reading from FP, moving buf->left bytes from the end | |
3353 | of buf->buf to the beginning first. If EOF is reached and the | |
3354 | file wasn't terminated by a newline, supply one. Set up BUF's line | |
e1fb4052 | 3355 | @@ -1823,8 +2155,22 @@ fillbuf (struct buffer *buf, FILE *fp, c |
7cf3a80b ML |
3356 | else |
3357 | { | |
3358 | if (key->skipsblanks) | |
3359 | - while (blanks[to_uchar (*line_start)]) | |
3360 | - line_start++; | |
3361 | + { | |
3362 | +#if HAVE_MBRTOWC | |
3363 | + if (MB_CUR_MAX > 1) | |
3364 | + { | |
3365 | + size_t mblength; | |
3366 | + while (line_start < line->keylim && | |
3367 | + ismbblank (line_start, | |
3368 | + line->keylim - line_start, | |
3369 | + &mblength)) | |
3370 | + line_start += mblength; | |
3371 | + } | |
3372 | + else | |
3373 | +#endif | |
3374 | + while (blanks[to_uchar (*line_start)]) | |
3375 | + line_start++; | |
3376 | + } | |
3377 | line->keybeg = line_start; | |
3378 | } | |
3379 | } | |
e1fb4052 MF |
3380 | @@ -1958,12 +2304,10 @@ find_unit_order (char const *number) |
3381 | <none/unknown> < K/k < M < G < T < P < E < Z < Y */ | |
3382 | ||
3383 | static int | |
3384 | -human_numcompare (char const *a, char const *b) | |
3385 | +human_numcompare (char *a, char *b) | |
3386 | { | |
3387 | - while (blanks[to_uchar (*a)]) | |
3388 | - a++; | |
3389 | - while (blanks[to_uchar (*b)]) | |
3390 | - b++; | |
3391 | + skipblanks(&a, a + strlen(a)); | |
3392 | + skipblanks(&b, b + strlen(b)); | |
3393 | ||
3394 | int diff = find_unit_order (a) - find_unit_order (b); | |
3395 | return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep)); | |
3396 | @@ -1974,7 +2318,7 @@ human_numcompare (char const *a, char co | |
7cf3a80b ML |
3397 | hideously fast. */ |
3398 | ||
3399 | static int | |
3400 | -numcompare (char const *a, char const *b) | |
3401 | +numcompare_uni (const char *a, const char *b) | |
3402 | { | |
3403 | while (blanks[to_uchar (*a)]) | |
3404 | a++; | |
e1fb4052 | 3405 | @@ -1984,6 +2328,25 @@ numcompare (char const *a, char const *b |
7cf3a80b ML |
3406 | return strnumcmp (a, b, decimal_point, thousands_sep); |
3407 | } | |
3408 | ||
3409 | +#if HAVE_MBRTOWC | |
3410 | +static int | |
3411 | +numcompare_mb (const char *a, const char *b) | |
3412 | +{ | |
3413 | + size_t mblength, len; | |
3414 | + len = strlen (a); /* okay for UTF-8 */ | |
3415 | + while (*a && ismbblank (a, len > MB_CUR_MAX ? MB_CUR_MAX : len, &mblength)) | |
3416 | + { | |
3417 | + a += mblength; | |
3418 | + len -= mblength; | |
3419 | + } | |
3420 | + len = strlen (b); /* okay for UTF-8 */ | |
3421 | + while (*b && ismbblank (b, len > MB_CUR_MAX ? MB_CUR_MAX : len, &mblength)) | |
3422 | + b += mblength; | |
3423 | + | |
3424 | + return strnumcmp (a, b, decimal_point, thousands_sep); | |
3425 | +} | |
3426 | +#endif /* HAV_EMBRTOWC */ | |
3427 | + | |
3428 | /* Work around a problem whereby the long double value returned by glibc's | |
3429 | strtold ("NaN", ...) contains uninitialized bits: clear all bytes of | |
3430 | A and B before calling strtold. FIXME: remove this function once | |
e1fb4052 | 3431 | @@ -2034,7 +2397,7 @@ general_numcompare (char const *sa, char |
7cf3a80b ML |
3432 | Return 0 if the name in S is not recognized. */ |
3433 | ||
3434 | static int | |
3435 | -getmonth (char const *month, char **ea) | |
3436 | +getmonth_uni (char const *month, size_t len, char **ea) | |
3437 | { | |
3438 | size_t lo = 0; | |
3439 | size_t hi = MONTHS_PER_YEAR; | |
e1fb4052 | 3440 | @@ -2310,15 +2673,14 @@ debug_key (struct line const *line, stru |
7cf3a80b ML |
3441 | char saved = *lim; |
3442 | *lim = '\0'; | |
3443 | ||
3444 | - while (blanks[to_uchar (*beg)]) | |
3445 | - beg++; | |
3446 | + skipblanks (&beg, lim); | |
3447 | ||
3448 | char *tighter_lim = beg; | |
3449 | ||
3450 | if (lim < beg) | |
3451 | tighter_lim = lim; | |
3452 | else if (key->month) | |
3453 | - getmonth (beg, &tighter_lim); | |
3454 | + getmonth (beg, lim-beg, &tighter_lim); | |
3455 | else if (key->general_numeric) | |
3456 | ignore_value (strtold (beg, &tighter_lim)); | |
3457 | else if (key->numeric || key->human_numeric) | |
e1fb4052 MF |
3458 | @@ -2452,7 +2814,7 @@ key_warnings (struct keyfield const *gke |
3459 | /* Warn about significant leading blanks. */ | |
3460 | bool implicit_skip = key_numeric (key) || key->month; | |
7cf3a80b | 3461 | bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */ |
e1fb4052 MF |
3462 | - if (!zero_width && !gkey_only && tab == TAB_DEFAULT && !line_offset |
3463 | + if (!zero_width && !gkey_only && !tab_length && !line_offset | |
3464 | && ((!key->skipsblanks && !implicit_skip) | |
7cf3a80b ML |
3465 | || (!key->skipsblanks && key->schar) |
3466 | || (!key->skipeblanks && key->echar))) | |
e1fb4052 | 3467 | @@ -2510,11 +2872,87 @@ key_warnings (struct keyfield const *gke |
7cf3a80b ML |
3468 | error (0, 0, _("option '-r' only applies to last-resort comparison")); |
3469 | } | |
3470 | ||
3471 | +#if HAVE_MBRTOWC | |
3472 | +static int | |
3473 | +getmonth_mb (const char *s, size_t len, char **ea) | |
3474 | +{ | |
3475 | + char *month; | |
3476 | + register size_t i; | |
3477 | + register int lo = 0, hi = MONTHS_PER_YEAR, result; | |
3478 | + char *tmp; | |
3479 | + size_t wclength, mblength; | |
3480 | + const char *pp; | |
3481 | + const wchar_t *wpp; | |
3482 | + wchar_t *month_wcs; | |
3483 | + mbstate_t state; | |
3484 | + | |
3485 | + while (len > 0 && ismbblank (s, len, &mblength)) | |
3486 | + { | |
3487 | + s += mblength; | |
3488 | + len -= mblength; | |
3489 | + } | |
3490 | + | |
3491 | + if (len == 0) | |
3492 | + return 0; | |
3493 | + | |
3494 | + if (SIZE_MAX - len < 1) | |
3495 | + xalloc_die (); | |
3496 | + | |
3497 | + month = (char *) xnmalloc (len + 1, MB_CUR_MAX); | |
3498 | + | |
3499 | + pp = tmp = (char *) xnmalloc (len + 1, MB_CUR_MAX); | |
3500 | + memcpy (tmp, s, len); | |
3501 | + tmp[len] = '\0'; | |
3502 | + wpp = month_wcs = (wchar_t *) xnmalloc (len + 1, sizeof (wchar_t)); | |
3503 | + memset (&state, '\0', sizeof (mbstate_t)); | |
3504 | + | |
3505 | + wclength = mbsrtowcs (month_wcs, &pp, len + 1, &state); | |
3506 | + if (wclength == (size_t)-1 || pp != NULL) | |
3507 | + error (SORT_FAILURE, 0, _("Invalid multibyte input %s."), quote(s)); | |
3508 | + | |
3509 | + for (i = 0; i < wclength; i++) | |
3510 | + { | |
3511 | + month_wcs[i] = towupper(month_wcs[i]); | |
3512 | + if (iswblank (month_wcs[i])) | |
3513 | + { | |
3514 | + month_wcs[i] = L'\0'; | |
3515 | + break; | |
3516 | + } | |
3517 | + } | |
3518 | + | |
3519 | + mblength = wcsrtombs (month, &wpp, (len + 1) * MB_CUR_MAX, &state); | |
3520 | + assert (mblength != (-1) && wpp == NULL); | |
3521 | + | |
3522 | + do | |
3523 | + { | |
3524 | + int ix = (lo + hi) / 2; | |
3525 | + | |
3526 | + if (strncmp (month, monthtab[ix].name, strlen (monthtab[ix].name)) < 0) | |
3527 | + hi = ix; | |
3528 | + else | |
3529 | + lo = ix; | |
3530 | + } | |
3531 | + while (hi - lo > 1); | |
3532 | + | |
3533 | + result = (!strncmp (month, monthtab[lo].name, strlen (monthtab[lo].name)) | |
3534 | + ? monthtab[lo].val : 0); | |
3535 | + | |
3536 | + if (ea && result) | |
3537 | + *ea = (char*) s + strlen (monthtab[lo].name); | |
3538 | + | |
3539 | + free (month); | |
3540 | + free (tmp); | |
3541 | + free (month_wcs); | |
3542 | + | |
3543 | + return result; | |
3544 | +} | |
3545 | +#endif | |
3546 | + | |
3547 | /* Compare two lines A and B trying every key in sequence until there | |
3548 | are no more keys or a difference is found. */ | |
3549 | ||
3550 | static int | |
3551 | -keycompare (struct line const *a, struct line const *b) | |
3552 | +keycompare_uni (const struct line *a, const struct line *b) | |
3553 | { | |
3554 | struct keyfield *key = keylist; | |
3555 | ||
e1fb4052 | 3556 | @@ -2599,7 +3037,7 @@ keycompare (struct line const *a, struct |
7cf3a80b ML |
3557 | else if (key->human_numeric) |
3558 | diff = human_numcompare (ta, tb); | |
3559 | else if (key->month) | |
3560 | - diff = getmonth (ta, NULL) - getmonth (tb, NULL); | |
3561 | + diff = getmonth (ta, tlena, NULL) - getmonth (tb, tlenb, NULL); | |
3562 | else if (key->random) | |
3563 | diff = compare_random (ta, tlena, tb, tlenb); | |
3564 | else if (key->version) | |
e1fb4052 | 3565 | @@ -2715,6 +3153,211 @@ keycompare (struct line const *a, struct |
7cf3a80b ML |
3566 | return key->reverse ? -diff : diff; |
3567 | } | |
3568 | ||
3569 | +#if HAVE_MBRTOWC | |
3570 | +static int | |
3571 | +keycompare_mb (const struct line *a, const struct line *b) | |
3572 | +{ | |
3573 | + struct keyfield *key = keylist; | |
3574 | + | |
3575 | + /* For the first iteration only, the key positions have been | |
3576 | + precomputed for us. */ | |
3577 | + char *texta = a->keybeg; | |
3578 | + char *textb = b->keybeg; | |
3579 | + char *lima = a->keylim; | |
3580 | + char *limb = b->keylim; | |
3581 | + | |
3582 | + size_t mblength_a, mblength_b; | |
3583 | + wchar_t wc_a, wc_b; | |
3584 | + mbstate_t state_a, state_b; | |
3585 | + | |
3586 | + int diff = 0; | |
3587 | + | |
3588 | + memset (&state_a, '\0', sizeof(mbstate_t)); | |
3589 | + memset (&state_b, '\0', sizeof(mbstate_t)); | |
3590 | + /* Ignore keys with start after end. */ | |
3591 | + if (a->keybeg - a->keylim > 0) | |
3592 | + return 0; | |
3593 | + | |
3594 | + | |
3595 | + /* Ignore and/or translate chars before comparing. */ | |
3596 | +# define IGNORE_CHARS(NEW_LEN, LEN, TEXT, COPY, WC, MBLENGTH, STATE) \ | |
3597 | + do \ | |
3598 | + { \ | |
3599 | + wchar_t uwc; \ | |
3600 | + char mbc[MB_LEN_MAX]; \ | |
3601 | + mbstate_t state_wc; \ | |
3602 | + \ | |
3603 | + for (NEW_LEN = i = 0; i < LEN;) \ | |
3604 | + { \ | |
3605 | + mbstate_t state_bak; \ | |
3606 | + \ | |
3607 | + state_bak = STATE; \ | |
3608 | + MBLENGTH = mbrtowc (&WC, TEXT + i, LEN - i, &STATE); \ | |
3609 | + \ | |
3610 | + if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1 \ | |
3611 | + || MBLENGTH == 0) \ | |
3612 | + { \ | |
3613 | + if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \ | |
3614 | + STATE = state_bak; \ | |
3615 | + if (!ignore) \ | |
3616 | + COPY[NEW_LEN++] = TEXT[i]; \ | |
3617 | + i++; \ | |
3618 | + continue; \ | |
3619 | + } \ | |
3620 | + \ | |
3621 | + if (ignore) \ | |
3622 | + { \ | |
3623 | + if ((ignore == nonprinting && !iswprint (WC)) \ | |
3624 | + || (ignore == nondictionary \ | |
3625 | + && !iswalnum (WC) && !iswblank (WC))) \ | |
3626 | + { \ | |
3627 | + i += MBLENGTH; \ | |
3628 | + continue; \ | |
3629 | + } \ | |
3630 | + } \ | |
3631 | + \ | |
3632 | + if (translate) \ | |
3633 | + { \ | |
3634 | + \ | |
3635 | + uwc = towupper(WC); \ | |
3636 | + if (WC == uwc) \ | |
3637 | + { \ | |
3638 | + memcpy (mbc, TEXT + i, MBLENGTH); \ | |
3639 | + i += MBLENGTH; \ | |
3640 | + } \ | |
3641 | + else \ | |
3642 | + { \ | |
3643 | + i += MBLENGTH; \ | |
3644 | + WC = uwc; \ | |
3645 | + memset (&state_wc, '\0', sizeof (mbstate_t)); \ | |
3646 | + \ | |
3647 | + MBLENGTH = wcrtomb (mbc, WC, &state_wc); \ | |
3648 | + assert (MBLENGTH != (size_t)-1 && MBLENGTH != 0); \ | |
3649 | + } \ | |
3650 | + \ | |
3651 | + for (j = 0; j < MBLENGTH; j++) \ | |
3652 | + COPY[NEW_LEN++] = mbc[j]; \ | |
3653 | + } \ | |
3654 | + else \ | |
3655 | + for (j = 0; j < MBLENGTH; j++) \ | |
3656 | + COPY[NEW_LEN++] = TEXT[i++]; \ | |
3657 | + } \ | |
3658 | + COPY[NEW_LEN] = '\0'; \ | |
3659 | + } \ | |
3660 | + while (0) | |
3661 | + | |
3662 | + /* Actually compare the fields. */ | |
3663 | + | |
3664 | + for (;;) | |
3665 | + { | |
3666 | + /* Find the lengths. */ | |
3667 | + size_t lena = lima <= texta ? 0 : lima - texta; | |
3668 | + size_t lenb = limb <= textb ? 0 : limb - textb; | |
3669 | + | |
3670 | + char enda IF_LINT (= 0); | |
3671 | + char endb IF_LINT (= 0); | |
3672 | + | |
3673 | + char const *translate = key->translate; | |
3674 | + bool const *ignore = key->ignore; | |
3675 | + | |
3676 | + if (ignore || translate) | |
3677 | + { | |
3678 | + if (SIZE_MAX - lenb - 2 < lena) | |
3679 | + xalloc_die (); | |
3680 | + char *copy_a = (char *) xnmalloc (lena + lenb + 2, MB_CUR_MAX); | |
3681 | + char *copy_b = copy_a + lena * MB_CUR_MAX + 1; | |
3682 | + size_t new_len_a, new_len_b; | |
3683 | + size_t i, j; | |
3684 | + | |
3685 | + IGNORE_CHARS (new_len_a, lena, texta, copy_a, | |
3686 | + wc_a, mblength_a, state_a); | |
3687 | + IGNORE_CHARS (new_len_b, lenb, textb, copy_b, | |
3688 | + wc_b, mblength_b, state_b); | |
3689 | + texta = copy_a; textb = copy_b; | |
3690 | + lena = new_len_a; lenb = new_len_b; | |
3691 | + } | |
3692 | + else | |
3693 | + { | |
3694 | + /* Use the keys in-place, temporarily null-terminated. */ | |
3695 | + enda = texta[lena]; texta[lena] = '\0'; | |
3696 | + endb = textb[lenb]; textb[lenb] = '\0'; | |
3697 | + } | |
3698 | + | |
3699 | + if (key->random) | |
3700 | + diff = compare_random (texta, lena, textb, lenb); | |
3701 | + else if (key->numeric | key->general_numeric | key->human_numeric) | |
3702 | + { | |
3703 | + char savea = *lima, saveb = *limb; | |
3704 | + | |
3705 | + *lima = *limb = '\0'; | |
3706 | + diff = (key->numeric ? numcompare (texta, textb) | |
3707 | + : key->general_numeric ? general_numcompare (texta, textb) | |
3708 | + : human_numcompare (texta, textb)); | |
3709 | + *lima = savea, *limb = saveb; | |
3710 | + } | |
3711 | + else if (key->version) | |
3712 | + diff = filevercmp (texta, textb); | |
3713 | + else if (key->month) | |
3714 | + diff = getmonth (texta, lena, NULL) - getmonth (textb, lenb, NULL); | |
3715 | + else if (lena == 0) | |
3716 | + diff = - NONZERO (lenb); | |
3717 | + else if (lenb == 0) | |
3718 | + diff = 1; | |
3719 | + else if (hard_LC_COLLATE && !folding) | |
3720 | + { | |
3721 | + diff = xmemcoll0 (texta, lena + 1, textb, lenb + 1); | |
3722 | + } | |
3723 | + else | |
3724 | + { | |
3725 | + diff = memcmp (texta, textb, MIN (lena, lenb)); | |
3726 | + if (diff == 0) | |
3727 | + diff = lena < lenb ? -1 : lena != lenb; | |
3728 | + } | |
3729 | + | |
3730 | + if (ignore || translate) | |
3731 | + free (texta); | |
3732 | + else | |
3733 | + { | |
3734 | + texta[lena] = enda; | |
3735 | + textb[lenb] = endb; | |
3736 | + } | |
3737 | + | |
3738 | + if (diff) | |
3739 | + goto not_equal; | |
3740 | + | |
3741 | + key = key->next; | |
3742 | + if (! key) | |
3743 | + break; | |
3744 | + | |
3745 | + /* Find the beginning and limit of the next field. */ | |
3746 | + if (key->eword != -1) | |
3747 | + lima = limfield (a, key), limb = limfield (b, key); | |
3748 | + else | |
3749 | + lima = a->text + a->length - 1, limb = b->text + b->length - 1; | |
3750 | + | |
3751 | + if (key->sword != -1) | |
3752 | + texta = begfield (a, key), textb = begfield (b, key); | |
3753 | + else | |
3754 | + { | |
3755 | + texta = a->text, textb = b->text; | |
3756 | + if (key->skipsblanks) | |
3757 | + { | |
3758 | + while (texta < lima && ismbblank (texta, lima - texta, &mblength_a)) | |
3759 | + texta += mblength_a; | |
3760 | + while (textb < limb && ismbblank (textb, limb - textb, &mblength_b)) | |
3761 | + textb += mblength_b; | |
3762 | + } | |
3763 | + } | |
3764 | + } | |
3765 | + | |
3766 | +not_equal: | |
3767 | + if (key && key->reverse) | |
3768 | + return -diff; | |
3769 | + else | |
3770 | + return diff; | |
3771 | +} | |
3772 | +#endif | |
3773 | + | |
3774 | /* Compare two lines A and B, returning negative, zero, or positive | |
3775 | depending on whether A compares less than, equal to, or greater than B. */ | |
3776 | ||
e1fb4052 | 3777 | @@ -2742,7 +3385,7 @@ compare (struct line const *a, struct li |
7cf3a80b ML |
3778 | diff = - NONZERO (blen); |
3779 | else if (blen == 0) | |
3780 | diff = 1; | |
3781 | - else if (hard_LC_COLLATE) | |
3782 | + else if (hard_LC_COLLATE && !folding) | |
3783 | { | |
3784 | /* Note xmemcoll0 is a performance enhancement as | |
3785 | it will not unconditionally write '\0' after the | |
e1fb4052 | 3786 | @@ -4139,6 +4782,7 @@ set_ordering (char const *s, struct keyf |
7cf3a80b ML |
3787 | break; |
3788 | case 'f': | |
3789 | key->translate = fold_toupper; | |
3790 | + folding = true; | |
3791 | break; | |
3792 | case 'g': | |
3793 | key->general_numeric = true; | |
e1fb4052 | 3794 | @@ -4218,7 +4862,7 @@ main (int argc, char **argv) |
7cf3a80b ML |
3795 | initialize_exit_failure (SORT_FAILURE); |
3796 | ||
3797 | hard_LC_COLLATE = hard_locale (LC_COLLATE); | |
3798 | -#if HAVE_NL_LANGINFO | |
3799 | +#if HAVE_LANGINFO_CODESET | |
3800 | hard_LC_TIME = hard_locale (LC_TIME); | |
3801 | #endif | |
3802 | ||
e1fb4052 | 3803 | @@ -4239,6 +4883,29 @@ main (int argc, char **argv) |
7cf3a80b ML |
3804 | thousands_sep = -1; |
3805 | } | |
3806 | ||
3807 | +#if HAVE_MBRTOWC | |
3808 | + if (MB_CUR_MAX > 1) | |
3809 | + { | |
3810 | + inittables = inittables_mb; | |
3811 | + begfield = begfield_mb; | |
3812 | + limfield = limfield_mb; | |
3813 | + skipblanks = skipblanks_mb; | |
3814 | + getmonth = getmonth_mb; | |
3815 | + keycompare = keycompare_mb; | |
3816 | + numcompare = numcompare_mb; | |
3817 | + } | |
3818 | + else | |
3819 | +#endif | |
3820 | + { | |
3821 | + inittables = inittables_uni; | |
3822 | + begfield = begfield_uni; | |
3823 | + limfield = limfield_uni; | |
3824 | + skipblanks = skipblanks_uni; | |
3825 | + getmonth = getmonth_uni; | |
3826 | + keycompare = keycompare_uni; | |
3827 | + numcompare = numcompare_uni; | |
3828 | + } | |
3829 | + | |
3830 | have_read_stdin = false; | |
3831 | inittables (); | |
3832 | ||
e1fb4052 | 3833 | @@ -4513,13 +5180,34 @@ main (int argc, char **argv) |
7cf3a80b ML |
3834 | |
3835 | case 't': | |
3836 | { | |
3837 | - char newtab = optarg[0]; | |
3838 | - if (! newtab) | |
3839 | + char newtab[MB_LEN_MAX + 1]; | |
3840 | + size_t newtab_length = 1; | |
3841 | + strncpy (newtab, optarg, MB_LEN_MAX); | |
3842 | + if (! newtab[0]) | |
e1fb4052 | 3843 | die (SORT_FAILURE, 0, _("empty tab")); |
7cf3a80b ML |
3844 | - if (optarg[1]) |
3845 | +#if HAVE_MBRTOWC | |
3846 | + if (MB_CUR_MAX > 1) | |
3847 | + { | |
3848 | + wchar_t wc; | |
3849 | + mbstate_t state; | |
3850 | + | |
3851 | + memset (&state, '\0', sizeof (mbstate_t)); | |
3852 | + newtab_length = mbrtowc (&wc, newtab, strnlen (newtab, | |
3853 | + MB_LEN_MAX), | |
3854 | + &state); | |
3855 | + switch (newtab_length) | |
3856 | + { | |
3857 | + case (size_t) -1: | |
3858 | + case (size_t) -2: | |
3859 | + case 0: | |
3860 | + newtab_length = 1; | |
3861 | + } | |
3862 | + } | |
3863 | +#endif | |
3864 | + if (newtab_length == 1 && optarg[1]) | |
3865 | { | |
3866 | if (STREQ (optarg, "\\0")) | |
3867 | - newtab = '\0'; | |
3868 | + newtab[0] = '\0'; | |
3869 | else | |
3870 | { | |
3871 | /* Provoke with 'sort -txx'. Complain about | |
e1fb4052 MF |
3872 | @@ -4530,9 +5218,11 @@ main (int argc, char **argv) |
3873 | quote (optarg)); | |
7cf3a80b ML |
3874 | } |
3875 | } | |
3876 | - if (tab != TAB_DEFAULT && tab != newtab) | |
e1fb4052 MF |
3877 | + if (tab_length && (tab_length != newtab_length |
3878 | + || memcmp (tab, newtab, tab_length) != 0)) | |
3879 | die (SORT_FAILURE, 0, _("incompatible tabs")); | |
7cf3a80b ML |
3880 | - tab = newtab; |
3881 | + memcpy (tab, newtab, newtab_length); | |
3882 | + tab_length = newtab_length; | |
3883 | } | |
3884 | break; | |
3885 | ||
e1fb4052 | 3886 | @@ -4770,12 +5460,10 @@ main (int argc, char **argv) |
7cf3a80b ML |
3887 | sort (files, nfiles, outfile, nthreads); |
3888 | } | |
3889 | ||
3890 | -#ifdef lint | |
3891 | if (files_from) | |
3892 | readtokens0_free (&tok); | |
3893 | else | |
3894 | free (files); | |
3895 | -#endif | |
3896 | ||
3897 | if (have_read_stdin && fclose (stdin) == EOF) | |
e1fb4052 MF |
3898 | sort_die (_("close failed"), "-"); |
3899 | diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c | |
3900 | --- coreutils-8.27-orig/src/unexpand.c 2017-01-01 16:34:24.000000000 -0600 | |
3901 | +++ coreutils-8.27/src/unexpand.c 2017-03-11 23:49:06.758133530 -0600 | |
3902 | @@ -38,6 +38,9 @@ | |
7cf3a80b ML |
3903 | #include <stdio.h> |
3904 | #include <getopt.h> | |
3905 | #include <sys/types.h> | |
3906 | + | |
e1fb4052 | 3907 | +#include <mbfile.h> |
7cf3a80b ML |
3908 | + |
3909 | #include "system.h" | |
e1fb4052 | 3910 | #include "die.h" |
7cf3a80b | 3911 | #include "xstrndup.h" |
e1fb4052 MF |
3912 | @@ -107,24 +110,47 @@ unexpand (void) |
3913 | { | |
3914 | /* Input stream. */ | |
3915 | FILE *fp = next_file (NULL); | |
3916 | + mb_file_t mbf; | |
3917 | ||
3918 | /* The array of pending blanks. In non-POSIX locales, blanks can | |
3919 | include characters other than spaces, so the blanks must be | |
3920 | stored, not merely counted. */ | |
3921 | - char *pending_blank; | |
3922 | + mbf_char_t *pending_blank; | |
3923 | + /* True if the starting locale is utf8. */ | |
3924 | + bool using_utf_locale; | |
3925 | + | |
3926 | + /* True if the first file contains BOM header. */ | |
3927 | + bool found_bom; | |
3928 | + using_utf_locale=check_utf_locale(); | |
3929 | ||
3930 | if (!fp) | |
3931 | return; | |
3932 | + mbf_init (mbf, fp); | |
3933 | + found_bom=check_bom(fp,&mbf); | |
7cf3a80b | 3934 | |
e1fb4052 MF |
3935 | + if (using_utf_locale == false && found_bom == true) |
3936 | + { | |
3937 | + /*try using some predefined locale */ | |
7cf3a80b | 3938 | + |
e1fb4052 | 3939 | + if (set_utf_locale () != 0) |
7cf3a80b | 3940 | + { |
e1fb4052 | 3941 | + error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); |
7cf3a80b | 3942 | + } |
e1fb4052 MF |
3943 | + } |
3944 | /* The worst case is a non-blank character, then one blank, then a | |
3945 | tab stop, then MAX_COLUMN_WIDTH - 1 blanks, then a non-blank; so | |
3946 | allocate MAX_COLUMN_WIDTH bytes to store the blanks. */ | |
3947 | - pending_blank = xmalloc (max_column_width); | |
3948 | + pending_blank = xmalloc (max_column_width * sizeof (mbf_char_t)); | |
7cf3a80b | 3949 | + |
e1fb4052 MF |
3950 | + if (found_bom == true) |
3951 | + { | |
3952 | + print_bom(); | |
3953 | + } | |
3954 | ||
3955 | while (true) | |
3956 | { | |
3957 | /* Input character, or EOF. */ | |
3958 | - int c; | |
3959 | + mbf_char_t c; | |
3960 | ||
3961 | /* If true, perform translations. */ | |
3962 | bool convert = true; | |
3963 | @@ -158,12 +184,44 @@ unexpand (void) | |
3964 | ||
3965 | do | |
3966 | { | |
3967 | - while ((c = getc (fp)) < 0 && (fp = next_file (fp))) | |
3968 | - continue; | |
3969 | + while (true) { | |
3970 | + mbf_getc (c, mbf); | |
3971 | + if ((mb_iseof (c)) && (fp = next_file (fp))) | |
3972 | + { | |
3973 | + mbf_init (mbf, fp); | |
3974 | + if (fp!=NULL) | |
3975 | + { | |
3976 | + if (check_bom(fp,&mbf)==true) | |
3977 | + { | |
3978 | + /*Not the first file - check BOM header*/ | |
3979 | + if (using_utf_locale==false && found_bom==false) | |
3980 | + { | |
3981 | + /*BOM header in subsequent file but not in the first one. */ | |
3982 | + error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); | |
3983 | + } | |
3984 | + } | |
3985 | + else | |
3986 | + { | |
3987 | + if(using_utf_locale==false && found_bom==true) | |
3988 | + { | |
3989 | + /*First file conatined BOM header - locale was switched to UTF | |
3990 | + /*all subsequent files should contain BOM. */ | |
3991 | + error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); | |
3992 | + } | |
3993 | + } | |
3994 | + } | |
3995 | + continue; | |
3996 | + } | |
3997 | + else | |
3998 | + { | |
3999 | + break; | |
4000 | + } | |
4001 | + } | |
7cf3a80b | 4002 | + |
7cf3a80b | 4003 | |
e1fb4052 MF |
4004 | if (convert) |
4005 | { | |
4006 | - bool blank = !! isblank (c); | |
4007 | + bool blank = mb_isblank (c); | |
7cf3a80b | 4008 | |
e1fb4052 MF |
4009 | if (blank) |
4010 | { | |
4011 | @@ -180,16 +238,16 @@ unexpand (void) | |
4012 | if (next_tab_column < column) | |
4013 | die (EXIT_FAILURE, 0, _("input line is too long")); | |
4014 | ||
4015 | - if (c == '\t') | |
4016 | + if (mb_iseq (c, '\t')) | |
4017 | { | |
4018 | column = next_tab_column; | |
4019 | ||
4020 | if (pending) | |
4021 | - pending_blank[0] = '\t'; | |
4022 | + mb_setascii (&pending_blank[0], '\t'); | |
4023 | } | |
4024 | else | |
4025 | { | |
4026 | - column++; | |
4027 | + column += mb_width (c); | |
4028 | ||
4029 | if (! (prev_blank && column == next_tab_column)) | |
4030 | { | |
4031 | @@ -197,13 +255,14 @@ unexpand (void) | |
4032 | will be replaced by tabs. */ | |
4033 | if (column == next_tab_column) | |
4034 | one_blank_before_tab_stop = true; | |
4035 | - pending_blank[pending++] = c; | |
4036 | + mb_copy (&pending_blank[pending++], &c); | |
4037 | prev_blank = true; | |
4038 | continue; | |
4039 | } | |
4040 | ||
4041 | /* Replace the pending blanks by a tab or two. */ | |
4042 | - pending_blank[0] = c = '\t'; | |
4043 | + mb_setascii (&c, '\t'); | |
4044 | + mb_setascii (&pending_blank[0], '\t'); | |
4045 | } | |
4046 | ||
4047 | /* Discard pending blanks, unless it was a single | |
4048 | @@ -211,7 +270,7 @@ unexpand (void) | |
4049 | pending = one_blank_before_tab_stop; | |
4050 | } | |
4051 | } | |
4052 | - else if (c == '\b') | |
4053 | + else if (mb_iseq (c, '\b')) | |
4054 | { | |
4055 | /* Go back one column, and force recalculation of the | |
4056 | next tab stop. */ | |
4057 | @@ -219,9 +278,9 @@ unexpand (void) | |
4058 | next_tab_column = column; | |
4059 | tab_index -= !!tab_index; | |
4060 | } | |
4061 | - else | |
4062 | + else if (!mb_iseq (c, '\n')) | |
4063 | { | |
4064 | - column++; | |
4065 | + column += mb_width (c); | |
4066 | if (!column) | |
4067 | die (EXIT_FAILURE, 0, _("input line is too long")); | |
4068 | } | |
4069 | @@ -229,8 +288,11 @@ unexpand (void) | |
4070 | if (pending) | |
4071 | { | |
4072 | if (pending > 1 && one_blank_before_tab_stop) | |
4073 | - pending_blank[0] = '\t'; | |
4074 | - if (fwrite (pending_blank, 1, pending, stdout) != pending) | |
4075 | + mb_setascii (&pending_blank[0], '\t'); | |
4076 | + | |
4077 | + for (int n = 0; n < pending; ++n) | |
4078 | + mb_putc (pending_blank[n], stdout); | |
4079 | + if (ferror (stdout)) | |
4080 | die (EXIT_FAILURE, errno, _("write error")); | |
4081 | pending = 0; | |
4082 | one_blank_before_tab_stop = false; | |
4083 | @@ -240,16 +302,17 @@ unexpand (void) | |
4084 | convert &= convert_entire_line || blank; | |
4085 | } | |
4086 | ||
4087 | - if (c < 0) | |
4088 | + if (mb_iseof (c)) | |
4089 | { | |
4090 | free (pending_blank); | |
4091 | return; | |
4092 | } | |
4093 | ||
4094 | - if (putchar (c) < 0) | |
4095 | + mb_putc (c, stdout); | |
4096 | + if (ferror (stdout)) | |
4097 | die (EXIT_FAILURE, errno, _("write error")); | |
4098 | } | |
4099 | - while (c != '\n'); | |
4100 | + while (!mb_iseq (c, '\n')); | |
4101 | } | |
4102 | } | |
7cf3a80b | 4103 | |
e1fb4052 MF |
4104 | diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c |
4105 | --- coreutils-8.27-orig/src/uniq.c 2017-01-01 16:34:24.000000000 -0600 | |
4106 | +++ coreutils-8.27/src/uniq.c 2017-03-11 23:47:13.098285938 -0600 | |
7cf3a80b ML |
4107 | @@ -21,6 +21,17 @@ |
4108 | #include <getopt.h> | |
4109 | #include <sys/types.h> | |
4110 | ||
4111 | +/* Get mbstate_t, mbrtowc(). */ | |
4112 | +#if HAVE_WCHAR_H | |
4113 | +# include <wchar.h> | |
4114 | +#endif | |
4115 | + | |
4116 | +/* Get isw* functions. */ | |
4117 | +#if HAVE_WCTYPE_H | |
4118 | +# include <wctype.h> | |
4119 | +#endif | |
4120 | +#include <assert.h> | |
4121 | + | |
4122 | #include "system.h" | |
4123 | #include "argmatch.h" | |
4124 | #include "linebuffer.h" | |
e1fb4052 MF |
4125 | @@ -32,9 +43,21 @@ |
4126 | #include "stdio--.h" | |
4127 | #include "xmemcoll.h" | |
7cf3a80b | 4128 | #include "xstrtol.h" |
e1fb4052 | 4129 | -#include "memcasecmp.h" |
7cf3a80b | 4130 | +#include "xmemcoll.h" |
e1fb4052 MF |
4131 | #include "quote.h" |
4132 | ||
7cf3a80b ML |
4133 | +/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC |
4134 | + installation; work around this configuration error. */ | |
4135 | +#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 | |
4136 | +# define MB_LEN_MAX 16 | |
4137 | +#endif | |
4138 | + | |
4139 | +/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ | |
4140 | +#if HAVE_MBRTOWC && defined mbstate_t | |
4141 | +# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) | |
4142 | +#endif | |
e1fb4052 MF |
4143 | + |
4144 | + | |
7cf3a80b ML |
4145 | /* The official name of this program (e.g., no 'g' prefix). */ |
4146 | #define PROGRAM_NAME "uniq" | |
e1fb4052 MF |
4147 | |
4148 | @@ -144,6 +167,10 @@ enum | |
7cf3a80b ML |
4149 | GROUP_OPTION = CHAR_MAX + 1 |
4150 | }; | |
4151 | ||
4152 | +/* Function pointers. */ | |
4153 | +static char * | |
4154 | +(*find_field) (struct linebuffer *line); | |
4155 | + | |
4156 | static struct option const longopts[] = | |
4157 | { | |
4158 | {"count", no_argument, NULL, 'c'}, | |
e1fb4052 | 4159 | @@ -260,7 +287,7 @@ size_opt (char const *opt, char const *m |
7cf3a80b ML |
4160 | return a pointer to the beginning of the line's field to be compared. */ |
4161 | ||
4162 | static char * _GL_ATTRIBUTE_PURE | |
4163 | -find_field (struct linebuffer const *line) | |
4164 | +find_field_uni (struct linebuffer *line) | |
4165 | { | |
4166 | size_t count; | |
4167 | char const *lp = line->buffer; | |
e1fb4052 | 4168 | @@ -280,6 +307,83 @@ find_field (struct linebuffer const *lin |
7cf3a80b ML |
4169 | return line->buffer + i; |
4170 | } | |
4171 | ||
4172 | +#if HAVE_MBRTOWC | |
4173 | + | |
4174 | +# define MBCHAR_TO_WCHAR(WC, MBLENGTH, LP, POS, SIZE, STATEP, CONVFAIL) \ | |
4175 | + do \ | |
4176 | + { \ | |
4177 | + mbstate_t state_bak; \ | |
4178 | + \ | |
4179 | + CONVFAIL = 0; \ | |
4180 | + state_bak = *STATEP; \ | |
4181 | + \ | |
4182 | + MBLENGTH = mbrtowc (&WC, LP + POS, SIZE - POS, STATEP); \ | |
4183 | + \ | |
4184 | + switch (MBLENGTH) \ | |
4185 | + { \ | |
4186 | + case (size_t)-2: \ | |
4187 | + case (size_t)-1: \ | |
4188 | + *STATEP = state_bak; \ | |
4189 | + CONVFAIL++; \ | |
4190 | + /* Fall through */ \ | |
4191 | + case 0: \ | |
4192 | + MBLENGTH = 1; \ | |
4193 | + } \ | |
4194 | + } \ | |
4195 | + while (0) | |
4196 | + | |
4197 | +static char * | |
4198 | +find_field_multi (struct linebuffer *line) | |
4199 | +{ | |
4200 | + size_t count; | |
4201 | + char *lp = line->buffer; | |
4202 | + size_t size = line->length - 1; | |
4203 | + size_t pos; | |
4204 | + size_t mblength; | |
4205 | + wchar_t wc; | |
4206 | + mbstate_t *statep; | |
4207 | + int convfail = 0; | |
4208 | + | |
4209 | + pos = 0; | |
4210 | + statep = &(line->state); | |
4211 | + | |
4212 | + /* skip fields. */ | |
4213 | + for (count = 0; count < skip_fields && pos < size; count++) | |
4214 | + { | |
4215 | + while (pos < size) | |
4216 | + { | |
4217 | + MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); | |
4218 | + | |
4219 | + if (convfail || !(iswblank (wc) || wc == '\n')) | |
4220 | + { | |
4221 | + pos += mblength; | |
4222 | + break; | |
4223 | + } | |
4224 | + pos += mblength; | |
4225 | + } | |
4226 | + | |
4227 | + while (pos < size) | |
4228 | + { | |
4229 | + MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); | |
4230 | + | |
4231 | + if (!convfail && (iswblank (wc) || wc == '\n')) | |
4232 | + break; | |
4233 | + | |
4234 | + pos += mblength; | |
4235 | + } | |
4236 | + } | |
4237 | + | |
4238 | + /* skip fields. */ | |
4239 | + for (count = 0; count < skip_chars && pos < size; count++) | |
4240 | + { | |
4241 | + MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); | |
4242 | + pos += mblength; | |
4243 | + } | |
4244 | + | |
4245 | + return lp + pos; | |
4246 | +} | |
4247 | +#endif | |
4248 | + | |
4249 | /* Return false if two strings OLD and NEW match, true if not. | |
4250 | OLD and NEW point not to the beginnings of the lines | |
4251 | but rather to the beginnings of the fields to compare. | |
e1fb4052 | 4252 | @@ -288,6 +392,8 @@ find_field (struct linebuffer const *lin |
7cf3a80b ML |
4253 | static bool |
4254 | different (char *old, char *new, size_t oldlen, size_t newlen) | |
4255 | { | |
4256 | + char *copy_old, *copy_new; | |
4257 | + | |
4258 | if (check_chars < oldlen) | |
4259 | oldlen = check_chars; | |
4260 | if (check_chars < newlen) | |
e1fb4052 | 4261 | @@ -295,14 +401,103 @@ different (char *old, char *new, size_t |
7cf3a80b ML |
4262 | |
4263 | if (ignore_case) | |
4264 | { | |
4265 | - /* FIXME: This should invoke strcoll somehow. */ | |
4266 | - return oldlen != newlen || memcasecmp (old, new, oldlen); | |
4267 | + size_t i; | |
4268 | + | |
4269 | + copy_old = xmalloc (oldlen + 1); | |
4270 | + copy_new = xmalloc (oldlen + 1); | |
4271 | + | |
4272 | + for (i = 0; i < oldlen; i++) | |
4273 | + { | |
4274 | + copy_old[i] = toupper (old[i]); | |
4275 | + copy_new[i] = toupper (new[i]); | |
4276 | + } | |
4277 | + bool rc = xmemcoll (copy_old, oldlen, copy_new, newlen); | |
4278 | + free (copy_old); | |
4279 | + free (copy_new); | |
4280 | + return rc; | |
4281 | } | |
4282 | - else if (hard_LC_COLLATE) | |
4283 | - return xmemcoll (old, oldlen, new, newlen) != 0; | |
4284 | else | |
4285 | - return oldlen != newlen || memcmp (old, new, oldlen); | |
4286 | + { | |
4287 | + copy_old = (char *)old; | |
4288 | + copy_new = (char *)new; | |
4289 | + } | |
4290 | + | |
4291 | + return xmemcoll (copy_old, oldlen, copy_new, newlen); | |
4292 | + | |
e1fb4052 MF |
4293 | +} |
4294 | + | |
7cf3a80b ML |
4295 | +#if HAVE_MBRTOWC |
4296 | +static int | |
4297 | +different_multi (const char *old, const char *new, size_t oldlen, size_t newlen, mbstate_t oldstate, mbstate_t newstate) | |
4298 | +{ | |
4299 | + size_t i, j, chars; | |
4300 | + const char *str[2]; | |
4301 | + char *copy[2]; | |
4302 | + size_t len[2]; | |
4303 | + mbstate_t state[2]; | |
4304 | + size_t mblength; | |
4305 | + wchar_t wc, uwc; | |
4306 | + mbstate_t state_bak; | |
4307 | + | |
4308 | + str[0] = old; | |
4309 | + str[1] = new; | |
4310 | + len[0] = oldlen; | |
4311 | + len[1] = newlen; | |
4312 | + state[0] = oldstate; | |
4313 | + state[1] = newstate; | |
4314 | + | |
4315 | + for (i = 0; i < 2; i++) | |
4316 | + { | |
4317 | + copy[i] = xmalloc (len[i] + 1); | |
4318 | + memset (copy[i], '\0', len[i] + 1); | |
4319 | + | |
4320 | + for (j = 0, chars = 0; j < len[i] && chars < check_chars; chars++) | |
4321 | + { | |
4322 | + state_bak = state[i]; | |
4323 | + mblength = mbrtowc (&wc, str[i] + j, len[i] - j, &(state[i])); | |
4324 | + | |
4325 | + switch (mblength) | |
4326 | + { | |
4327 | + case (size_t)-1: | |
4328 | + case (size_t)-2: | |
4329 | + state[i] = state_bak; | |
4330 | + /* Fall through */ | |
4331 | + case 0: | |
4332 | + mblength = 1; | |
4333 | + break; | |
4334 | + | |
4335 | + default: | |
4336 | + if (ignore_case) | |
4337 | + { | |
4338 | + uwc = towupper (wc); | |
4339 | + | |
4340 | + if (uwc != wc) | |
4341 | + { | |
4342 | + mbstate_t state_wc; | |
4343 | + size_t mblen; | |
4344 | + | |
4345 | + memset (&state_wc, '\0', sizeof(mbstate_t)); | |
4346 | + mblen = wcrtomb (copy[i] + j, uwc, &state_wc); | |
4347 | + assert (mblen != (size_t)-1); | |
4348 | + } | |
4349 | + else | |
4350 | + memcpy (copy[i] + j, str[i] + j, mblength); | |
4351 | + } | |
4352 | + else | |
4353 | + memcpy (copy[i] + j, str[i] + j, mblength); | |
4354 | + } | |
4355 | + j += mblength; | |
4356 | + } | |
4357 | + copy[i][j] = '\0'; | |
4358 | + len[i] = j; | |
4359 | + } | |
4360 | + int rc = xmemcoll (copy[0], len[0], copy[1], len[1]); | |
4361 | + free (copy[0]); | |
4362 | + free (copy[1]); | |
4363 | + return rc; | |
4364 | + | |
e1fb4052 | 4365 | } |
7cf3a80b | 4366 | +#endif |
e1fb4052 | 4367 | |
7cf3a80b ML |
4368 | /* Output the line in linebuffer LINE to standard output |
4369 | provided that the switches say it should be output. | |
e1fb4052 | 4370 | @@ -367,19 +562,38 @@ check_file (const char *infile, const ch |
7cf3a80b ML |
4371 | char *prevfield IF_LINT ( = NULL); |
4372 | size_t prevlen IF_LINT ( = 0); | |
4373 | bool first_group_printed = false; | |
4374 | +#if HAVE_MBRTOWC | |
4375 | + mbstate_t prevstate; | |
4376 | + | |
4377 | + memset (&prevstate, '\0', sizeof (mbstate_t)); | |
4378 | +#endif | |
4379 | ||
4380 | while (!feof (stdin)) | |
4381 | { | |
4382 | char *thisfield; | |
4383 | size_t thislen; | |
4384 | bool new_group; | |
4385 | +#if HAVE_MBRTOWC | |
4386 | + mbstate_t thisstate; | |
4387 | +#endif | |
4388 | ||
4389 | if (readlinebuffer_delim (thisline, stdin, delimiter) == 0) | |
4390 | break; | |
4391 | ||
4392 | thisfield = find_field (thisline); | |
4393 | thislen = thisline->length - 1 - (thisfield - thisline->buffer); | |
4394 | +#if HAVE_MBRTOWC | |
4395 | + if (MB_CUR_MAX > 1) | |
4396 | + { | |
4397 | + thisstate = thisline->state; | |
4398 | ||
4399 | + new_group = (prevline->length == 0 | |
4400 | + || different_multi (thisfield, prevfield, | |
4401 | + thislen, prevlen, | |
4402 | + thisstate, prevstate)); | |
4403 | + } | |
4404 | + else | |
4405 | +#endif | |
4406 | new_group = (prevline->length == 0 | |
4407 | || different (thisfield, prevfield, thislen, prevlen)); | |
4408 | ||
e1fb4052 | 4409 | @@ -397,6 +611,10 @@ check_file (const char *infile, const ch |
7cf3a80b ML |
4410 | SWAP_LINES (prevline, thisline); |
4411 | prevfield = thisfield; | |
4412 | prevlen = thislen; | |
4413 | +#if HAVE_MBRTOWC | |
4414 | + if (MB_CUR_MAX > 1) | |
4415 | + prevstate = thisstate; | |
4416 | +#endif | |
4417 | first_group_printed = true; | |
4418 | } | |
4419 | } | |
e1fb4052 | 4420 | @@ -409,17 +627,26 @@ check_file (const char *infile, const ch |
7cf3a80b ML |
4421 | size_t prevlen; |
4422 | uintmax_t match_count = 0; | |
4423 | bool first_delimiter = true; | |
4424 | +#if HAVE_MBRTOWC | |
4425 | + mbstate_t prevstate; | |
4426 | +#endif | |
4427 | ||
4428 | if (readlinebuffer_delim (prevline, stdin, delimiter) == 0) | |
4429 | goto closefiles; | |
4430 | prevfield = find_field (prevline); | |
4431 | prevlen = prevline->length - 1 - (prevfield - prevline->buffer); | |
4432 | +#if HAVE_MBRTOWC | |
4433 | + prevstate = prevline->state; | |
4434 | +#endif | |
4435 | ||
4436 | while (!feof (stdin)) | |
4437 | { | |
4438 | bool match; | |
4439 | char *thisfield; | |
4440 | size_t thislen; | |
4441 | +#if HAVE_MBRTOWC | |
4442 | + mbstate_t thisstate = thisline->state; | |
4443 | +#endif | |
4444 | if (readlinebuffer_delim (thisline, stdin, delimiter) == 0) | |
4445 | { | |
4446 | if (ferror (stdin)) | |
e1fb4052 | 4447 | @@ -428,6 +655,14 @@ check_file (const char *infile, const ch |
7cf3a80b ML |
4448 | } |
4449 | thisfield = find_field (thisline); | |
4450 | thislen = thisline->length - 1 - (thisfield - thisline->buffer); | |
4451 | +#if HAVE_MBRTOWC | |
4452 | + if (MB_CUR_MAX > 1) | |
4453 | + { | |
4454 | + match = !different_multi (thisfield, prevfield, | |
4455 | + thislen, prevlen, thisstate, prevstate); | |
4456 | + } | |
4457 | + else | |
4458 | +#endif | |
4459 | match = !different (thisfield, prevfield, thislen, prevlen); | |
4460 | match_count += match; | |
4461 | ||
e1fb4052 | 4462 | @@ -460,6 +695,9 @@ check_file (const char *infile, const ch |
7cf3a80b ML |
4463 | SWAP_LINES (prevline, thisline); |
4464 | prevfield = thisfield; | |
4465 | prevlen = thislen; | |
4466 | +#if HAVE_MBRTOWC | |
4467 | + prevstate = thisstate; | |
4468 | +#endif | |
4469 | if (!match) | |
4470 | match_count = 0; | |
4471 | } | |
e1fb4052 | 4472 | @@ -506,6 +744,19 @@ main (int argc, char **argv) |
7cf3a80b ML |
4473 | |
4474 | atexit (close_stdout); | |
4475 | ||
4476 | +#if HAVE_MBRTOWC | |
4477 | + if (MB_CUR_MAX > 1) | |
4478 | + { | |
4479 | + find_field = find_field_multi; | |
4480 | + } | |
4481 | + else | |
4482 | +#endif | |
4483 | + { | |
4484 | + find_field = find_field_uni; | |
4485 | + } | |
4486 | + | |
4487 | + | |
4488 | + | |
4489 | skip_chars = 0; | |
4490 | skip_fields = 0; | |
4491 | check_chars = SIZE_MAX; | |
e1fb4052 MF |
4492 | diff -Naurp coreutils-8.27-orig/tests/expand/mb.sh coreutils-8.27/tests/expand/mb.sh |
4493 | --- coreutils-8.27-orig/tests/expand/mb.sh 1969-12-31 18:00:00.000000000 -0600 | |
4494 | +++ coreutils-8.27/tests/expand/mb.sh 2017-03-11 23:49:06.759133489 -0600 | |
4495 | @@ -0,0 +1,183 @@ | |
7cf3a80b | 4496 | +#!/bin/sh |
7cf3a80b | 4497 | + |
e1fb4052 | 4498 | +# Copyright (C) 2012-2017 Free Software Foundation, Inc. |
7cf3a80b | 4499 | + |
e1fb4052 MF |
4500 | +# This program is free software: you can redistribute it and/or modify |
4501 | +# it under the terms of the GNU General Public License as published by | |
4502 | +# the Free Software Foundation, either version 3 of the License, or | |
4503 | +# (at your option) any later version. | |
4504 | + | |
4505 | +# This program is distributed in the hope that it will be useful, | |
4506 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | |
4507 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
4508 | +# GNU General Public License for more details. | |
4509 | + | |
4510 | +# You should have received a copy of the GNU General Public License | |
4511 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. | |
4512 | + | |
4513 | +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src | |
4514 | +print_ver_ expand | |
7cf3a80b ML |
4515 | + |
4516 | +export LC_ALL=en_US.UTF-8 | |
7cf3a80b | 4517 | + |
e1fb4052 MF |
4518 | +#input containing multibyte characters |
4519 | +cat <<\EOF > in || framework_failure_ | |
4520 | +1234567812345678123456781 | |
4521 | +. . . . | |
4522 | +a b c d | |
4523 | +. . . . | |
4524 | +ä ö ü ß | |
4525 | +. . . . | |
4526 | +EOF | |
4527 | +env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ | |
4528 | + | |
4529 | +cat <<\EOF > exp || framework_failure_ | |
4530 | +1234567812345678123456781 | |
4531 | +. . . . | |
4532 | +a b c d | |
4533 | +. . . . | |
4534 | +ä ö ü ß | |
4535 | +. . . . | |
4536 | + äöü . öüä. ä xx | |
7cf3a80b ML |
4537 | +EOF |
4538 | + | |
e1fb4052 MF |
4539 | +expand < in > out || fail=1 |
4540 | +compare exp out > /dev/null 2>&1 || fail=1 | |
4541 | + | |
4542 | +#multiple files as an input | |
4543 | +cat <<\EOF >> exp || framework_failure_ | |
4544 | +1234567812345678123456781 | |
4545 | +. . . . | |
4546 | +a b c d | |
4547 | +. . . . | |
4548 | +ä ö ü ß | |
4549 | +. . . . | |
4550 | + äöü . öüä. ä xx | |
4551 | +EOF | |
7cf3a80b | 4552 | + |
e1fb4052 MF |
4553 | +expand ./in ./in > out || fail=1 |
4554 | +compare exp out > /dev/null 2>&1 || fail=1 | |
4555 | + | |
4556 | +#test characters with display widths != 1 | |
4557 | +env printf '12345678 | |
4558 | +e\t|ascii(1) | |
4559 | +\u00E9\t|composed(1) | |
4560 | +e\u0301\t|decomposed(1) | |
4561 | +\u3000\t|ideo-space(2) | |
4562 | +\uFF0D\t|full-hypen(2) | |
4563 | +' > in || framework_failure_ | |
4564 | + | |
4565 | +env printf '12345678 | |
4566 | +e |ascii(1) | |
4567 | +\u00E9 |composed(1) | |
4568 | +e\u0301 |decomposed(1) | |
4569 | +\u3000 |ideo-space(2) | |
4570 | +\uFF0D |full-hypen(2) | |
4571 | +' > exp || framework_failure_ | |
4572 | + | |
4573 | +expand < in > out || fail=1 | |
4574 | +compare exp out > /dev/null 2>&1 || fail=1 | |
4575 | + | |
4576 | +#shouldn't fail with "input line too long" | |
4577 | +#when a line starts with a control character | |
4578 | +env printf '\n' > in || framework_failure_ | |
4579 | + | |
4580 | +expand < in > out || fail=1 | |
4581 | +compare in out > /dev/null 2>&1 || fail=1 | |
4582 | + | |
4583 | +#non-Unicode characters interspersed between Unicode ones | |
4584 | +env printf '12345678 | |
4585 | +\t\xFF| | |
4586 | +\xFF\t| | |
4587 | +\t\xFFä| | |
4588 | +ä\xFF\t| | |
4589 | +\tä\xFF| | |
4590 | +\xFF\tä| | |
4591 | +äbcdef\xFF\t| | |
4592 | +' > in || framework_failure_ | |
4593 | + | |
4594 | +env printf '12345678 | |
4595 | + \xFF| | |
4596 | +\xFF | | |
4597 | + \xFFä| | |
4598 | +ä\xFF | | |
4599 | + ä\xFF| | |
4600 | +\xFF ä| | |
4601 | +äbcdef\xFF | | |
4602 | +' > exp || framework_failure_ | |
4603 | + | |
4604 | +expand < in > out || fail=1 | |
4605 | +compare exp out > /dev/null 2>&1 || fail=1 | |
4606 | + | |
4607 | + | |
4608 | + | |
4609 | +#BOM header test 1 | |
4610 | +printf "\xEF\xBB\xBF" > in; cat <<\EOF >> in || framework_failure_ | |
4611 | +1234567812345678123456781 | |
4612 | +. . . . | |
4613 | +a b c d | |
4614 | +. . . . | |
4615 | +ä ö ü ß | |
4616 | +. . . . | |
4617 | +EOF | |
4618 | +env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ | |
4619 | + | |
4620 | +printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ | |
4621 | +1234567812345678123456781 | |
4622 | +. . . . | |
4623 | +a b c d | |
4624 | +. . . . | |
4625 | +ä ö ü ß | |
4626 | +. . . . | |
4627 | + äöü . öüä. ä xx | |
4628 | +EOF | |
7cf3a80b ML |
4629 | + |
4630 | + | |
e1fb4052 MF |
4631 | +expand < in > out || fail=1 |
4632 | +compare exp out > /dev/null 2>&1 || fail=1 | |
4633 | + | |
4634 | +LANG=C expand < in > out || fail=1 | |
4635 | +compare exp out > /dev/null 2>&1 || fail=1 | |
4636 | + | |
4637 | +LC_ALL=C expand < in > out || fail=1 | |
4638 | +compare exp out > /dev/null 2>&1 || fail=1 | |
4639 | + | |
4640 | + | |
4641 | +printf '\xEF\xBB\xBF' > in1; cat <<\EOF >> in1 || framework_failure_ | |
4642 | +1234567812345678123456781 | |
4643 | +. . . . | |
4644 | +a b c d | |
4645 | +. . . . | |
4646 | +ä ö ü ß | |
4647 | +. . . . | |
4648 | +EOF | |
4649 | +env printf ' äöü\t. öüä. \tä xx\n' >> in1 || framework_failure_ | |
4650 | + | |
4651 | + | |
4652 | +printf '\xEF\xBB\xBF' > exp; cat <<\EOF >> exp || framework_failure_ | |
4653 | +1234567812345678123456781 | |
4654 | +. . . . | |
4655 | +a b c d | |
4656 | +. . . . | |
4657 | +ä ö ü ß | |
4658 | +. . . . | |
4659 | + äöü . öüä. ä xx | |
4660 | +1234567812345678123456781 | |
4661 | +. . . . | |
4662 | +a b c d | |
4663 | +. . . . | |
4664 | +ä ö ü ß | |
4665 | +. . . . | |
4666 | + äöü . öüä. ä xx | |
4667 | +EOF | |
4668 | + | |
4669 | +expand in1 in1 > out || fail=1 | |
4670 | +compare exp out > /dev/null 2>&1 || fail=1 | |
4671 | + | |
4672 | +LANG=C expand in1 in1 > out || fail=1 | |
4673 | +compare exp out > /dev/null 2>&1 || fail=1 | |
4674 | + | |
4675 | +LC_ALL=C expand in1 in1 > out || fail=1 | |
4676 | +compare exp out > /dev/null 2>&1 || fail=1 | |
4677 | + | |
4678 | +exit $fail | |
4679 | diff -Naurp coreutils-8.27-orig/tests/i18n/sort.sh coreutils-8.27/tests/i18n/sort.sh | |
4680 | --- coreutils-8.27-orig/tests/i18n/sort.sh 1969-12-31 18:00:00.000000000 -0600 | |
4681 | +++ coreutils-8.27/tests/i18n/sort.sh 2017-03-11 23:47:13.100285838 -0600 | |
7cf3a80b ML |
4682 | @@ -0,0 +1,29 @@ |
4683 | +#!/bin/sh | |
4684 | +# Verify sort's multi-byte support. | |
4685 | + | |
4686 | +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src | |
4687 | +print_ver_ sort | |
4688 | + | |
4689 | +export LC_ALL=en_US.UTF-8 | |
4690 | +locale -k LC_CTYPE | grep -q "charmap.*UTF-8" \ | |
4691 | + || skip_ "No UTF-8 locale available" | |
4692 | + | |
4693 | +# Enable heap consistency checkng on older systems | |
4694 | +export MALLOC_CHECK_=2 | |
4695 | + | |
4696 | + | |
4697 | +# check buffer overflow issue due to | |
4698 | +# expanding multi-byte representation due to case conversion | |
4699 | +# https://bugzilla.suse.com/show_bug.cgi?id=928749 | |
4700 | +cat <<EOF > exp | |
4701 | +. | |
4702 | +ɑ | |
4703 | +EOF | |
4704 | +cat <<EOF | sort -f > out || fail=1 | |
4705 | +. | |
4706 | +ɑ | |
4707 | +EOF | |
4708 | +compare exp out || { fail=1; cat out; } | |
4709 | + | |
4710 | + | |
4711 | +Exit $fail | |
e1fb4052 MF |
4712 | diff -Naurp coreutils-8.27-orig/tests/local.mk coreutils-8.27/tests/local.mk |
4713 | --- coreutils-8.27-orig/tests/local.mk 2017-02-28 22:25:37.000000000 -0600 | |
4714 | +++ coreutils-8.27/tests/local.mk 2017-03-11 23:47:38.072058253 -0600 | |
4715 | @@ -352,6 +352,8 @@ all_tests = \ | |
7cf3a80b ML |
4716 | tests/misc/sort-discrim.sh \ |
4717 | tests/misc/sort-files0-from.pl \ | |
4718 | tests/misc/sort-float.sh \ | |
4719 | + tests/misc/sort-mb-tests.sh \ | |
4720 | + tests/i18n/sort.sh \ | |
e1fb4052 | 4721 | tests/misc/sort-h-thousands-sep.sh \ |
7cf3a80b ML |
4722 | tests/misc/sort-merge.pl \ |
4723 | tests/misc/sort-merge-fdlimit.sh \ | |
e1fb4052 MF |
4724 | @@ -544,6 +546,7 @@ all_tests = \ |
4725 | tests/du/threshold.sh \ | |
4726 | tests/du/trailing-slash.sh \ | |
4727 | tests/du/two-args.sh \ | |
4728 | + tests/expand/mb.sh \ | |
4729 | tests/id/gnu-zero-uids.sh \ | |
4730 | tests/id/no-context.sh \ | |
4731 | tests/id/context.sh \ | |
4732 | @@ -684,6 +687,7 @@ all_tests = \ | |
4733 | tests/touch/read-only.sh \ | |
4734 | tests/touch/relative.sh \ | |
4735 | tests/touch/trailing-slash.sh \ | |
4736 | + tests/unexpand/mb.sh \ | |
4737 | $(all_root_tests) | |
4738 | ||
4739 | # See tests/factor/create-test.sh. | |
4740 | diff -Naurp coreutils-8.27-orig/tests/misc/cut.pl coreutils-8.27/tests/misc/cut.pl | |
4741 | --- coreutils-8.27-orig/tests/misc/cut.pl 2017-01-01 16:34:24.000000000 -0600 | |
4742 | +++ coreutils-8.27/tests/misc/cut.pl 2017-03-11 23:47:13.100285838 -0600 | |
7cf3a80b ML |
4743 | @@ -23,9 +23,11 @@ use strict; |
4744 | # Turn off localization of executable's output. | |
4745 | @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; | |
4746 | ||
4747 | -my $mb_locale = $ENV{LOCALE_FR_UTF8}; | |
4748 | +my $mb_locale; | |
4749 | +# uncommented enable multibyte paths | |
4750 | +$mb_locale = $ENV{LOCALE_FR_UTF8}; | |
4751 | ! defined $mb_locale || $mb_locale eq 'none' | |
4752 | - and $mb_locale = 'C'; | |
4753 | + and $mb_locale = 'C'; | |
4754 | ||
4755 | my $prog = 'cut'; | |
4756 | my $try = "Try '$prog --help' for more information.\n"; | |
4757 | @@ -240,6 +242,7 @@ if ($mb_locale ne 'C') | |
4758 | my @new_t = @$t; | |
4759 | my $test_name = shift @new_t; | |
4760 | ||
4761 | + next if ($test_name =~ "newline-[12][0-9]"); | |
4762 | push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; | |
4763 | } | |
4764 | push @Tests, @new; | |
e1fb4052 MF |
4765 | diff -Naurp coreutils-8.27-orig/tests/misc/expand.pl coreutils-8.27/tests/misc/expand.pl |
4766 | --- coreutils-8.27-orig/tests/misc/expand.pl 2017-03-01 11:16:46.000000000 -0600 | |
4767 | +++ coreutils-8.27/tests/misc/expand.pl 2017-03-11 23:47:13.101285788 -0600 | |
4768 | @@ -27,6 +27,15 @@ my $prog = 'expand'; | |
7cf3a80b ML |
4769 | # Turn off localization of executable's output. |
4770 | @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; | |
4771 | ||
4772 | +#comment out next line to disable multibyte tests | |
4773 | +my $mb_locale = $ENV{LOCALE_FR_UTF8}; | |
4774 | +! defined $mb_locale || $mb_locale eq 'none' | |
4775 | + and $mb_locale = 'C'; | |
4776 | + | |
4777 | +my $prog = 'expand'; | |
4778 | +my $try = "Try \`$prog --help' for more information.\n"; | |
4779 | +my $inval = "$prog: invalid byte, character or field list\n$try"; | |
4780 | + | |
4781 | my @Tests = | |
4782 | ( | |
4783 | ['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}], | |
e1fb4052 MF |
4784 | @@ -152,6 +161,8 @@ my @Tests = |
4785 | ['trail9', '--tab=1,2 -t/5',{IN=>"\ta\tb\tc"}, {OUT=>" a b c"}], | |
4786 | ||
4787 | # Test errors | |
4788 | + # FIXME: The following tests contain ‘quoting’ specific to LC_MESSAGES | |
4789 | + # So we force LC_MESSAGES=C to make them pass. | |
4790 | ['e1', '--tabs="a"', {IN=>''}, {OUT=>''}, {EXIT=>1}, | |
4791 | {ERR => "$prog: tab size contains invalid character(s): 'a'\n"}], | |
4792 | ['e2', "-t $UINTMAX_OFLOW", {IN=>''}, {OUT=>''}, {EXIT=>1}, | |
4793 | @@ -168,6 +179,37 @@ my @Tests = | |
4794 | {ERR => "$prog: '/' specifier not at start of number: '/'\n"}], | |
7cf3a80b ML |
4795 | ); |
4796 | ||
4797 | +if ($mb_locale ne 'C') | |
4798 | + { | |
4799 | + # Duplicate each test vector, appending "-mb" to the test name and | |
4800 | + # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we | |
4801 | + # provide coverage for the distro-added multi-byte code paths. | |
4802 | + my @new; | |
4803 | + foreach my $t (@Tests) | |
4804 | + { | |
4805 | + my @new_t = @$t; | |
4806 | + my $test_name = shift @new_t; | |
4807 | + | |
4808 | + # Depending on whether expand is multi-byte-patched, | |
4809 | + # it emits different diagnostics: | |
4810 | + # non-MB: invalid byte or field list | |
4811 | + # MB: invalid byte, character or field list | |
4812 | + # Adjust the expected error output accordingly. | |
4813 | + if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} | |
4814 | + (@new_t)) | |
4815 | + { | |
4816 | + my $sub = {ERR_SUBST => 's/, character//'}; | |
4817 | + push @new_t, $sub; | |
4818 | + push @$t, $sub; | |
4819 | + } | |
e1fb4052 | 4820 | + push @new, ["$test_name-mb", @new_t, {ENV => "LANG=$mb_locale LC_MESSAGES=C"}]; |
7cf3a80b ML |
4821 | + } |
4822 | + push @Tests, @new; | |
4823 | + } | |
4824 | + | |
4825 | + | |
4826 | +@Tests = triple_test \@Tests; | |
4827 | + | |
4828 | my $save_temps = $ENV{DEBUG}; | |
4829 | my $verbose = $ENV{VERBOSE}; | |
4830 | ||
e1fb4052 MF |
4831 | diff -Naurp coreutils-8.27-orig/tests/misc/fold.pl coreutils-8.27/tests/misc/fold.pl |
4832 | --- coreutils-8.27-orig/tests/misc/fold.pl 2017-01-01 16:34:24.000000000 -0600 | |
4833 | +++ coreutils-8.27/tests/misc/fold.pl 2017-03-11 23:47:13.101285788 -0600 | |
7cf3a80b ML |
4834 | @@ -20,9 +20,18 @@ use strict; |
4835 | ||
4836 | (my $program_name = $0) =~ s|.*/||; | |
4837 | ||
4838 | +my $prog = 'fold'; | |
4839 | +my $try = "Try \`$prog --help' for more information.\n"; | |
4840 | +my $inval = "$prog: invalid byte, character or field list\n$try"; | |
4841 | + | |
4842 | # Turn off localization of executable's output. | |
4843 | @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; | |
4844 | ||
4845 | +# uncommented to enable multibyte paths | |
4846 | +my $mb_locale = $ENV{LOCALE_FR_UTF8}; | |
4847 | +! defined $mb_locale || $mb_locale eq 'none' | |
4848 | + and $mb_locale = 'C'; | |
4849 | + | |
4850 | my @Tests = | |
4851 | ( | |
4852 | ['s1', '-w2 -s', {IN=>"a\t"}, {OUT=>"a\n\t"}], | |
4853 | @@ -31,9 +40,48 @@ my @Tests = | |
4854 | ['s4', '-w4 -s', {IN=>"abc ef\n"}, {OUT=>"abc \nef\n"}], | |
4855 | ); | |
4856 | ||
4857 | +# Add _POSIX2_VERSION=199209 to the environment of each test | |
4858 | +# that uses an old-style option like +1. | |
4859 | +if ($mb_locale ne 'C') | |
4860 | + { | |
4861 | + # Duplicate each test vector, appending "-mb" to the test name and | |
4862 | + # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we | |
4863 | + # provide coverage for the distro-added multi-byte code paths. | |
4864 | + my @new; | |
4865 | + foreach my $t (@Tests) | |
4866 | + { | |
4867 | + my @new_t = @$t; | |
4868 | + my $test_name = shift @new_t; | |
4869 | + | |
4870 | + # Depending on whether fold is multi-byte-patched, | |
4871 | + # it emits different diagnostics: | |
4872 | + # non-MB: invalid byte or field list | |
4873 | + # MB: invalid byte, character or field list | |
4874 | + # Adjust the expected error output accordingly. | |
4875 | + if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} | |
4876 | + (@new_t)) | |
4877 | + { | |
4878 | + my $sub = {ERR_SUBST => 's/, character//'}; | |
4879 | + push @new_t, $sub; | |
4880 | + push @$t, $sub; | |
4881 | + } | |
4882 | + push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; | |
4883 | + } | |
4884 | + push @Tests, @new; | |
4885 | + } | |
4886 | + | |
4887 | +@Tests = triple_test \@Tests; | |
4888 | + | |
4889 | +# Remember that triple_test creates from each test with exactly one "IN" | |
4890 | +# file two more tests (.p and .r suffix on name) corresponding to reading | |
4891 | +# input from a file and from a pipe. The pipe-reading test would fail | |
4892 | +# due to a race condition about 1 in 20 times. | |
4893 | +# Remove the IN_PIPE version of the "output-is-input" test above. | |
4894 | +# The others aren't susceptible because they have three inputs each. | |
4895 | +@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; | |
4896 | + | |
4897 | my $save_temps = $ENV{DEBUG}; | |
4898 | my $verbose = $ENV{VERBOSE}; | |
4899 | ||
4900 | -my $prog = 'fold'; | |
4901 | my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); | |
4902 | exit $fail; | |
e1fb4052 MF |
4903 | diff -Naurp coreutils-8.27-orig/tests/misc/join.pl coreutils-8.27/tests/misc/join.pl |
4904 | --- coreutils-8.27-orig/tests/misc/join.pl 2017-01-01 16:34:24.000000000 -0600 | |
4905 | +++ coreutils-8.27/tests/misc/join.pl 2017-03-11 23:47:13.102285737 -0600 | |
7cf3a80b ML |
4906 | @@ -25,6 +25,15 @@ my $limits = getlimits (); |
4907 | ||
4908 | my $prog = 'join'; | |
4909 | ||
4910 | +my $try = "Try \`$prog --help' for more information.\n"; | |
4911 | +my $inval = "$prog: invalid byte, character or field list\n$try"; | |
4912 | + | |
4913 | +my $mb_locale; | |
4914 | +#Comment out next line to disable multibyte tests | |
4915 | +$mb_locale = $ENV{LOCALE_FR_UTF8}; | |
4916 | +! defined $mb_locale || $mb_locale eq 'none' | |
4917 | + and $mb_locale = 'C'; | |
4918 | + | |
4919 | my $delim = chr 0247; | |
4920 | sub t_subst ($) | |
4921 | { | |
4922 | @@ -329,8 +338,49 @@ foreach my $t (@tv) | |
4923 | push @Tests, $new_ent; | |
4924 | } | |
4925 | ||
4926 | +# Add _POSIX2_VERSION=199209 to the environment of each test | |
4927 | +# that uses an old-style option like +1. | |
4928 | +if ($mb_locale ne 'C') | |
4929 | + { | |
4930 | + # Duplicate each test vector, appending "-mb" to the test name and | |
4931 | + # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we | |
4932 | + # provide coverage for the distro-added multi-byte code paths. | |
4933 | + my @new; | |
4934 | + foreach my $t (@Tests) | |
4935 | + { | |
4936 | + my @new_t = @$t; | |
4937 | + my $test_name = shift @new_t; | |
4938 | + | |
4939 | + # Depending on whether join is multi-byte-patched, | |
4940 | + # it emits different diagnostics: | |
4941 | + # non-MB: invalid byte or field list | |
4942 | + # MB: invalid byte, character or field list | |
4943 | + # Adjust the expected error output accordingly. | |
4944 | + if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} | |
4945 | + (@new_t)) | |
4946 | + { | |
4947 | + my $sub = {ERR_SUBST => 's/, character//'}; | |
4948 | + push @new_t, $sub; | |
4949 | + push @$t, $sub; | |
4950 | + } | |
4951 | + #Adjust the output some error messages including test_name for mb | |
4952 | + if (grep {ref $_ eq 'HASH' && exists $_->{ERR}} | |
4953 | + (@new_t)) | |
4954 | + { | |
4955 | + my $sub2 = {ERR_SUBST => "s/$test_name-mb/$test_name/"}; | |
4956 | + push @new_t, $sub2; | |
4957 | + push @$t, $sub2; | |
4958 | + } | |
4959 | + push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; | |
4960 | + } | |
4961 | + push @Tests, @new; | |
4962 | + } | |
4963 | + | |
4964 | @Tests = triple_test \@Tests; | |
4965 | ||
4966 | +#skip invalid-j-mb test, it is failing because of the format | |
4967 | +@Tests = grep {$_->[0] ne 'invalid-j-mb'} @Tests; | |
4968 | + | |
4969 | my $save_temps = $ENV{DEBUG}; | |
4970 | my $verbose = $ENV{VERBOSE}; | |
4971 | ||
e1fb4052 MF |
4972 | diff -Naurp coreutils-8.27-orig/tests/misc/sort-mb-tests.sh coreutils-8.27/tests/misc/sort-mb-tests.sh |
4973 | --- coreutils-8.27-orig/tests/misc/sort-mb-tests.sh 1969-12-31 18:00:00.000000000 -0600 | |
4974 | +++ coreutils-8.27/tests/misc/sort-mb-tests.sh 2017-03-11 23:47:13.102285737 -0600 | |
7cf3a80b ML |
4975 | @@ -0,0 +1,45 @@ |
4976 | +#!/bin/sh | |
4977 | +# Verify sort's multi-byte support. | |
4978 | + | |
4979 | +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src | |
4980 | +print_ver_ sort | |
4981 | + | |
4982 | +export LC_ALL=en_US.UTF-8 | |
4983 | +locale -k LC_CTYPE | grep -q "charmap.*UTF-8" \ | |
4984 | + || skip_ "No UTF-8 locale available" | |
4985 | + | |
4986 | + | |
4987 | +cat <<EOF > exp | |
4988 | +Banana@5 | |
4989 | +Apple@10 | |
4990 | +Citrus@20 | |
4991 | +Cherry@30 | |
4992 | +EOF | |
4993 | + | |
4994 | +cat <<EOF | sort -t @ -k2 -n > out || fail=1 | |
4995 | +Apple@10 | |
4996 | +Banana@5 | |
4997 | +Citrus@20 | |
4998 | +Cherry@30 | |
4999 | +EOF | |
5000 | + | |
5001 | +compare exp out || { fail=1; cat out; } | |
5002 | + | |
5003 | + | |
5004 | +cat <<EOF > exp | |
5005 | +Citrus@AA20@@5 | |
5006 | +Cherry@AA30@@10 | |
5007 | +Apple@AA10@@20 | |
5008 | +Banana@AA5@@30 | |
5009 | +EOF | |
5010 | + | |
5011 | +cat <<EOF | sort -t @ -k4 -n > out || fail=1 | |
5012 | +Apple@AA10@@20 | |
5013 | +Banana@AA5@@30 | |
5014 | +Citrus@AA20@@5 | |
5015 | +Cherry@AA30@@10 | |
5016 | +EOF | |
5017 | + | |
5018 | +compare exp out || { fail=1; cat out; } | |
5019 | + | |
5020 | +Exit $fail | |
e1fb4052 MF |
5021 | diff -Naurp coreutils-8.27-orig/tests/misc/sort-merge.pl coreutils-8.27/tests/misc/sort-merge.pl |
5022 | --- coreutils-8.27-orig/tests/misc/sort-merge.pl 2017-01-01 16:34:24.000000000 -0600 | |
5023 | +++ coreutils-8.27/tests/misc/sort-merge.pl 2017-03-11 23:47:13.102285737 -0600 | |
7cf3a80b ML |
5024 | @@ -26,6 +26,15 @@ my $prog = 'sort'; |
5025 | # Turn off localization of executable's output. | |
5026 | @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; | |
5027 | ||
5028 | +my $mb_locale; | |
5029 | +# uncommented according to upstream commit enabling multibyte paths | |
5030 | +$mb_locale = $ENV{LOCALE_FR_UTF8}; | |
5031 | +! defined $mb_locale || $mb_locale eq 'none' | |
5032 | + and $mb_locale = 'C'; | |
5033 | + | |
5034 | +my $try = "Try \`$prog --help' for more information.\n"; | |
5035 | +my $inval = "$prog: invalid byte, character or field list\n$try"; | |
5036 | + | |
5037 | # three empty files and one that says 'foo' | |
5038 | my @inputs = (+(map{{IN=> {"empty$_"=> ''}}}1..3), {IN=> {foo=> "foo\n"}}); | |
5039 | ||
5040 | @@ -77,6 +86,39 @@ my @Tests = | |
5041 | {OUT=>$big_input}], | |
5042 | ); | |
5043 | ||
5044 | +# Add _POSIX2_VERSION=199209 to the environment of each test | |
5045 | +# that uses an old-style option like +1. | |
5046 | +if ($mb_locale ne 'C') | |
5047 | + { | |
5048 | + # Duplicate each test vector, appending "-mb" to the test name and | |
5049 | + # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we | |
5050 | + # provide coverage for the distro-added multi-byte code paths. | |
5051 | + my @new; | |
5052 | + foreach my $t (@Tests) | |
5053 | + { | |
5054 | + my @new_t = @$t; | |
5055 | + my $test_name = shift @new_t; | |
5056 | + | |
5057 | + # Depending on whether sort is multi-byte-patched, | |
5058 | + # it emits different diagnostics: | |
5059 | + # non-MB: invalid byte or field list | |
5060 | + # MB: invalid byte, character or field list | |
5061 | + # Adjust the expected error output accordingly. | |
5062 | + if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} | |
5063 | + (@new_t)) | |
5064 | + { | |
5065 | + my $sub = {ERR_SUBST => 's/, character//'}; | |
5066 | + push @new_t, $sub; | |
5067 | + push @$t, $sub; | |
5068 | + } | |
5069 | + next if ($test_name =~ "nmerge-."); | |
5070 | + push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; | |
5071 | + } | |
5072 | + push @Tests, @new; | |
5073 | + } | |
5074 | + | |
5075 | +@Tests = triple_test \@Tests; | |
5076 | + | |
5077 | my $save_temps = $ENV{DEBUG}; | |
5078 | my $verbose = $ENV{VERBOSE}; | |
5079 | ||
e1fb4052 MF |
5080 | diff -Naurp coreutils-8.27-orig/tests/misc/sort.pl coreutils-8.27/tests/misc/sort.pl |
5081 | --- coreutils-8.27-orig/tests/misc/sort.pl 2017-01-21 08:53:43.000000000 -0600 | |
5082 | +++ coreutils-8.27/tests/misc/sort.pl 2017-03-11 23:47:13.103285687 -0600 | |
7cf3a80b ML |
5083 | @@ -24,10 +24,15 @@ my $prog = 'sort'; |
5084 | # Turn off localization of executable's output. | |
5085 | @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; | |
5086 | ||
5087 | -my $mb_locale = $ENV{LOCALE_FR_UTF8}; | |
5088 | +my $mb_locale; | |
5089 | +#Comment out next line to disable multibyte tests | |
5090 | +$mb_locale = $ENV{LOCALE_FR_UTF8}; | |
5091 | ! defined $mb_locale || $mb_locale eq 'none' | |
5092 | and $mb_locale = 'C'; | |
5093 | ||
5094 | +my $try = "Try \`$prog --help' for more information.\n"; | |
5095 | +my $inval = "$prog: invalid byte, character or field list\n$try"; | |
5096 | + | |
5097 | # Since each test is run with a file name and with redirected stdin, | |
5098 | # the name in the diagnostic is either the file name or "-". | |
5099 | # Normalize each diagnostic to use '-'. | |
e1fb4052 | 5100 | @@ -423,6 +428,38 @@ foreach my $t (@Tests) |
7cf3a80b ML |
5101 | } |
5102 | } | |
5103 | ||
5104 | +if ($mb_locale ne 'C') | |
5105 | + { | |
5106 | + # Duplicate each test vector, appending "-mb" to the test name and | |
5107 | + # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we | |
5108 | + # provide coverage for the distro-added multi-byte code paths. | |
5109 | + my @new; | |
5110 | + foreach my $t (@Tests) | |
5111 | + { | |
5112 | + my @new_t = @$t; | |
5113 | + my $test_name = shift @new_t; | |
5114 | + | |
5115 | + # Depending on whether sort is multi-byte-patched, | |
5116 | + # it emits different diagnostics: | |
5117 | + # non-MB: invalid byte or field list | |
5118 | + # MB: invalid byte, character or field list | |
5119 | + # Adjust the expected error output accordingly. | |
5120 | + if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} | |
5121 | + (@new_t)) | |
5122 | + { | |
5123 | + my $sub = {ERR_SUBST => 's/, character//'}; | |
5124 | + push @new_t, $sub; | |
5125 | + push @$t, $sub; | |
5126 | + } | |
5127 | + #disable several failing tests until investigation, disable all tests with envvars set | |
5128 | + next if (grep {ref $_ eq 'HASH' && exists $_->{ENV}} (@new_t)); | |
5129 | + next if ($test_name =~ "18g" or $test_name =~ "sort-numeric" or $test_name =~ "08[ab]" or $test_name =~ "03[def]" or $test_name =~ "h4" or $test_name =~ "n1" or $test_name =~ "2[01]a"); | |
5130 | + next if ($test_name =~ "11[ab]"); # avoid FP: expected result differs to MB result due to collation rules. | |
5131 | + push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; | |
5132 | + } | |
5133 | + push @Tests, @new; | |
5134 | + } | |
5135 | + | |
5136 | @Tests = triple_test \@Tests; | |
5137 | ||
5138 | # Remember that triple_test creates from each test with exactly one "IN" | |
e1fb4052 | 5139 | @@ -432,6 +469,7 @@ foreach my $t (@Tests) |
7cf3a80b ML |
5140 | # Remove the IN_PIPE version of the "output-is-input" test above. |
5141 | # The others aren't susceptible because they have three inputs each. | |
5142 | @Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; | |
5143 | +@Tests = grep {$_->[0] ne 'output-is-input-mb.p'} @Tests; | |
5144 | ||
5145 | my $save_temps = $ENV{DEBUG}; | |
5146 | my $verbose = $ENV{VERBOSE}; | |
e1fb4052 MF |
5147 | diff -Naurp coreutils-8.27-orig/tests/misc/unexpand.pl coreutils-8.27/tests/misc/unexpand.pl |
5148 | --- coreutils-8.27-orig/tests/misc/unexpand.pl 2017-01-01 16:34:24.000000000 -0600 | |
5149 | +++ coreutils-8.27/tests/misc/unexpand.pl 2017-03-11 23:47:13.103285687 -0600 | |
7cf3a80b ML |
5150 | @@ -27,6 +27,14 @@ my $limits = getlimits (); |
5151 | ||
5152 | my $prog = 'unexpand'; | |
5153 | ||
5154 | +# comment out next line to disable multibyte tests | |
5155 | +my $mb_locale = $ENV{LOCALE_FR_UTF8}; | |
5156 | +! defined $mb_locale || $mb_locale eq 'none' | |
5157 | + and $mb_locale = 'C'; | |
5158 | + | |
5159 | +my $try = "Try \`$prog --help' for more information.\n"; | |
5160 | +my $inval = "$prog: invalid byte, character or field list\n$try"; | |
5161 | + | |
5162 | my @Tests = | |
5163 | ( | |
5164 | ['a1', {IN=> ' 'x 1 ."y\n"}, {OUT=> ' 'x 1 ."y\n"}], | |
e1fb4052 MF |
5165 | @@ -128,6 +136,37 @@ my @Tests = |
5166 | ['ts2', '-t5,8', {IN=>"x\t \t y\n"}, {OUT=>"x\t\t y\n"}], | |
7cf3a80b ML |
5167 | ); |
5168 | ||
5169 | +if ($mb_locale ne 'C') | |
5170 | + { | |
5171 | + # Duplicate each test vector, appending "-mb" to the test name and | |
5172 | + # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we | |
5173 | + # provide coverage for the distro-added multi-byte code paths. | |
5174 | + my @new; | |
5175 | + foreach my $t (@Tests) | |
5176 | + { | |
5177 | + my @new_t = @$t; | |
5178 | + my $test_name = shift @new_t; | |
5179 | + | |
5180 | + # Depending on whether unexpand is multi-byte-patched, | |
5181 | + # it emits different diagnostics: | |
5182 | + # non-MB: invalid byte or field list | |
5183 | + # MB: invalid byte, character or field list | |
5184 | + # Adjust the expected error output accordingly. | |
5185 | + if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} | |
5186 | + (@new_t)) | |
5187 | + { | |
5188 | + my $sub = {ERR_SUBST => 's/, character//'}; | |
5189 | + push @new_t, $sub; | |
5190 | + push @$t, $sub; | |
5191 | + } | |
5192 | + next if ($test_name =~ 'b-1'); | |
5193 | + push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; | |
5194 | + } | |
5195 | + push @Tests, @new; | |
5196 | + } | |
5197 | + | |
5198 | +@Tests = triple_test \@Tests; | |
5199 | + | |
5200 | my $save_temps = $ENV{DEBUG}; | |
5201 | my $verbose = $ENV{VERBOSE}; | |
5202 | ||
e1fb4052 MF |
5203 | diff -Naurp coreutils-8.27-orig/tests/misc/uniq.pl coreutils-8.27/tests/misc/uniq.pl |
5204 | --- coreutils-8.27-orig/tests/misc/uniq.pl 2017-01-01 16:34:24.000000000 -0600 | |
5205 | +++ coreutils-8.27/tests/misc/uniq.pl 2017-03-11 23:47:13.103285687 -0600 | |
7cf3a80b ML |
5206 | @@ -23,9 +23,17 @@ my $limits = getlimits (); |
5207 | my $prog = 'uniq'; | |
5208 | my $try = "Try '$prog --help' for more information.\n"; | |
5209 | ||
5210 | +my $inval = "$prog: invalid byte, character or field list\n$try"; | |
5211 | + | |
5212 | # Turn off localization of executable's output. | |
5213 | @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; | |
5214 | ||
5215 | +my $mb_locale; | |
5216 | +#Comment out next line to disable multibyte tests | |
5217 | +$mb_locale = $ENV{LOCALE_FR_UTF8}; | |
5218 | +! defined $mb_locale || $mb_locale eq 'none' | |
5219 | + and $mb_locale = 'C'; | |
5220 | + | |
5221 | # When possible, create a "-z"-testing variant of each test. | |
5222 | sub add_z_variants($) | |
5223 | { | |
5224 | @@ -262,6 +270,53 @@ foreach my $t (@Tests) | |
5225 | and push @$t, {ENV=>'_POSIX2_VERSION=199209'}; | |
5226 | } | |
5227 | ||
5228 | +if ($mb_locale ne 'C') | |
5229 | + { | |
5230 | + # Duplicate each test vector, appending "-mb" to the test name and | |
5231 | + # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we | |
5232 | + # provide coverage for the distro-added multi-byte code paths. | |
5233 | + my @new; | |
5234 | + foreach my $t (@Tests) | |
5235 | + { | |
5236 | + my @new_t = @$t; | |
5237 | + my $test_name = shift @new_t; | |
5238 | + | |
5239 | + # Depending on whether uniq is multi-byte-patched, | |
5240 | + # it emits different diagnostics: | |
5241 | + # non-MB: invalid byte or field list | |
5242 | + # MB: invalid byte, character or field list | |
5243 | + # Adjust the expected error output accordingly. | |
5244 | + if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} | |
5245 | + (@new_t)) | |
5246 | + { | |
5247 | + my $sub = {ERR_SUBST => 's/, character//'}; | |
5248 | + push @new_t, $sub; | |
5249 | + push @$t, $sub; | |
5250 | + } | |
5251 | + # In test #145, replace the each ‘...’ by '...'. | |
5252 | + if ($test_name =~ "145") | |
5253 | + { | |
5254 | + my $sub = { ERR_SUBST => "s/‘([^’]+)’/'\$1'/g"}; | |
5255 | + push @new_t, $sub; | |
5256 | + push @$t, $sub; | |
5257 | + } | |
5258 | + next if ( $test_name =~ "schar" | |
5259 | + or $test_name =~ "^obs-plus" | |
5260 | + or $test_name =~ "119"); | |
5261 | + push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; | |
5262 | + } | |
5263 | + push @Tests, @new; | |
5264 | + } | |
5265 | + | |
5266 | +# Remember that triple_test creates from each test with exactly one "IN" | |
5267 | +# file two more tests (.p and .r suffix on name) corresponding to reading | |
5268 | +# input from a file and from a pipe. The pipe-reading test would fail | |
5269 | +# due to a race condition about 1 in 20 times. | |
5270 | +# Remove the IN_PIPE version of the "output-is-input" test above. | |
5271 | +# The others aren't susceptible because they have three inputs each. | |
5272 | + | |
5273 | +@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; | |
5274 | + | |
5275 | @Tests = add_z_variants \@Tests; | |
5276 | @Tests = triple_test \@Tests; | |
5277 | ||
e1fb4052 MF |
5278 | diff -Naurp coreutils-8.27-orig/tests/pr/pr-tests.pl coreutils-8.27/tests/pr/pr-tests.pl |
5279 | --- coreutils-8.27-orig/tests/pr/pr-tests.pl 2017-01-01 16:34:24.000000000 -0600 | |
5280 | +++ coreutils-8.27/tests/pr/pr-tests.pl 2017-03-11 23:47:13.103285687 -0600 | |
7cf3a80b ML |
5281 | @@ -24,6 +24,15 @@ use strict; |
5282 | my $prog = 'pr'; | |
5283 | my $normalize_strerror = "s/': .*/'/"; | |
5284 | ||
5285 | +my $mb_locale; | |
5286 | +#Uncomment the following line to enable multibyte tests | |
5287 | +$mb_locale = $ENV{LOCALE_FR_UTF8}; | |
5288 | +! defined $mb_locale || $mb_locale eq 'none' | |
5289 | + and $mb_locale = 'C'; | |
5290 | + | |
5291 | +my $try = "Try \`$prog --help' for more information.\n"; | |
5292 | +my $inval = "$prog: invalid byte, character or field list\n$try"; | |
5293 | + | |
5294 | my @tv = ( | |
5295 | ||
5296 | # -b option is no longer an official option. But it's still working to | |
e1fb4052 MF |
5297 | @@ -474,8 +483,48 @@ push @Tests, |
5298 | {IN=>{2=>"a\n"}}, | |
5299 | {OUT=>"a\t\t\t\t \t\t\ta\n"} ]; | |
7cf3a80b ML |
5300 | |
5301 | +# Add _POSIX2_VERSION=199209 to the environment of each test | |
5302 | +# that uses an old-style option like +1. | |
5303 | +if ($mb_locale ne 'C') | |
5304 | + { | |
5305 | + # Duplicate each test vector, appending "-mb" to the test name and | |
5306 | + # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we | |
5307 | + # provide coverage for the distro-added multi-byte code paths. | |
5308 | + my @new; | |
5309 | + foreach my $t (@Tests) | |
5310 | + { | |
5311 | + my @new_t = @$t; | |
5312 | + my $test_name = shift @new_t; | |
5313 | + | |
5314 | + # Depending on whether pr is multi-byte-patched, | |
5315 | + # it emits different diagnostics: | |
5316 | + # non-MB: invalid byte or field list | |
5317 | + # MB: invalid byte, character or field list | |
5318 | + # Adjust the expected error output accordingly. | |
5319 | + if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} | |
5320 | + (@new_t)) | |
5321 | + { | |
5322 | + my $sub = {ERR_SUBST => 's/, character//'}; | |
5323 | + push @new_t, $sub; | |
5324 | + push @$t, $sub; | |
5325 | + } | |
5326 | + #temporarily skip some failing tests | |
e1fb4052 | 5327 | + next if ($test_name =~ "col-0" or $test_name =~ "col-inval" or $test_name =~ "asan1"); |
7cf3a80b ML |
5328 | + push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; |
5329 | + } | |
5330 | + push @Tests, @new; | |
5331 | + } | |
5332 | + | |
5333 | @Tests = triple_test \@Tests; | |
5334 | ||
5335 | +# Remember that triple_test creates from each test with exactly one "IN" | |
5336 | +# file two more tests (.p and .r suffix on name) corresponding to reading | |
5337 | +# input from a file and from a pipe. The pipe-reading test would fail | |
5338 | +# due to a race condition about 1 in 20 times. | |
5339 | +# Remove the IN_PIPE version of the "output-is-input" test above. | |
5340 | +# The others aren't susceptible because they have three inputs each. | |
5341 | +@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; | |
5342 | + | |
5343 | my $save_temps = $ENV{DEBUG}; | |
5344 | my $verbose = $ENV{VERBOSE}; | |
5345 | ||
e1fb4052 MF |
5346 | diff -Naurp coreutils-8.27-orig/tests/unexpand/mb.sh coreutils-8.27/tests/unexpand/mb.sh |
5347 | --- coreutils-8.27-orig/tests/unexpand/mb.sh 1969-12-31 18:00:00.000000000 -0600 | |
5348 | +++ coreutils-8.27/tests/unexpand/mb.sh 2017-03-11 23:49:06.759133489 -0600 | |
5349 | @@ -0,0 +1,172 @@ | |
5350 | +#!/bin/sh | |
5351 | + | |
5352 | +# Copyright (C) 2012-2017 Free Software Foundation, Inc. | |
5353 | + | |
5354 | +# This program is free software: you can redistribute it and/or modify | |
5355 | +# it under the terms of the GNU General Public License as published by | |
5356 | +# the Free Software Foundation, either version 3 of the License, or | |
5357 | +# (at your option) any later version. | |
5358 | + | |
5359 | +# This program is distributed in the hope that it will be useful, | |
5360 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | |
5361 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
5362 | +# GNU General Public License for more details. | |
5363 | + | |
5364 | +# You should have received a copy of the GNU General Public License | |
5365 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. | |
5366 | + | |
5367 | +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src | |
5368 | +print_ver_ unexpand | |
5369 | + | |
5370 | +export LC_ALL=en_US.UTF-8 | |
5371 | + | |
5372 | +#input containing multibyte characters | |
5373 | +cat > in <<\EOF | |
5374 | +1234567812345678123456781 | |
5375 | +. . . . | |
5376 | +a b c d | |
5377 | +. . . . | |
5378 | +ä ö ü ß | |
5379 | +. . . . | |
5380 | + äöü . öüä. ä xx | |
5381 | +EOF | |
5382 | + | |
5383 | +cat > exp <<\EOF | |
5384 | +1234567812345678123456781 | |
5385 | +. . . . | |
5386 | +a b c d | |
5387 | +. . . . | |
5388 | +ä ö ü ß | |
5389 | +. . . . | |
5390 | + äöü . öüä. ä xx | |
5391 | +EOF | |
5392 | + | |
5393 | +unexpand -a < in > out || fail=1 | |
5394 | +compare exp out > /dev/null 2>&1 || fail=1 | |
5395 | + | |
5396 | + | |
5397 | +#multiple files as an input | |
5398 | +cat >> exp <<\EOF | |
5399 | +1234567812345678123456781 | |
5400 | +. . . . | |
5401 | +a b c d | |
5402 | +. . . . | |
5403 | +ä ö ü ß | |
5404 | +. . . . | |
5405 | + äöü . öüä. ä xx | |
5406 | +EOF | |
5407 | + | |
5408 | + | |
5409 | +unexpand -a ./in ./in > out || fail=1 | |
5410 | +compare exp out > /dev/null 2>&1 || fail=1 | |
5411 | + | |
5412 | +#test characters with a display width larger than 1 | |
5413 | + | |
5414 | +env printf '12345678 | |
5415 | +e |ascii(1) | |
5416 | +\u00E9 |composed(1) | |
5417 | +e\u0301 |decomposed(1) | |
5418 | +\u3000 |ideo-space(2) | |
5419 | +\uFF0D |full-hypen(2) | |
5420 | +' > in || framework_failure_ | |
5421 | + | |
5422 | +env printf '12345678 | |
5423 | +e\t|ascii(1) | |
5424 | +\u00E9\t|composed(1) | |
5425 | +e\u0301\t|decomposed(1) | |
5426 | +\u3000\t|ideo-space(2) | |
5427 | +\uFF0D\t|full-hypen(2) | |
5428 | +' > exp || framework_failure_ | |
5429 | + | |
5430 | +unexpand -a < in > out || fail=1 | |
5431 | +compare exp out > /dev/null 2>&1 || fail=1 | |
5432 | + | |
5433 | +#test input where a blank of width > 1 is not being substituted | |
5434 | +in="$(LC_ALL=en_US.UTF-8 printf ' \u3000 ö ü ß')" | |
5435 | +exp=' ö ü ß' | |
5436 | + | |
5437 | +unexpand -a < in > out || fail=1 | |
5438 | +compare exp out > /dev/null 2>&1 || fail=1 | |
5439 | + | |
5440 | +#non-Unicode characters interspersed between Unicode ones | |
5441 | +env printf '12345678 | |
5442 | + \xFF| | |
5443 | +\xFF | | |
5444 | + \xFFä| | |
5445 | +ä\xFF | | |
5446 | + ä\xFF| | |
5447 | +\xFF ä| | |
5448 | +äbcdef\xFF | | |
5449 | +' > in || framework_failure_ | |
5450 | + | |
5451 | +env printf '12345678 | |
5452 | +\t\xFF| | |
5453 | +\xFF\t| | |
5454 | +\t\xFFä| | |
5455 | +ä\xFF\t| | |
5456 | +\tä\xFF| | |
5457 | +\xFF\tä| | |
5458 | +äbcdef\xFF\t| | |
5459 | +' > exp || framework_failure_ | |
5460 | + | |
5461 | +unexpand -a < in > out || fail=1 | |
5462 | +compare exp out > /dev/null 2>&1 || fail=1 | |
5463 | + | |
5464 | +#BOM header test 1 | |
5465 | +printf "\xEF\xBB\xBF" > in; cat <<\EOF >> in || framework_failure_ | |
5466 | +1234567812345678123456781 | |
5467 | +. . . . | |
5468 | +a b c d | |
5469 | +. . . . | |
5470 | +ä ö ü ß | |
5471 | +. . . . | |
5472 | + äöü . öüä. ä xx | |
5473 | +EOF | |
5474 | +env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ | |
5475 | + | |
5476 | +printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ | |
5477 | +1234567812345678123456781 | |
5478 | +. . . . | |
5479 | +a b c d | |
5480 | +. . . . | |
5481 | +ä ö ü ß | |
5482 | +. . . . | |
5483 | + äöü . öüä. ä xx | |
5484 | +EOF | |
5485 | + | |
5486 | +unexpand < in > out || fail=1 | |
5487 | +compare exp out > /dev/null 2>&1 || fail=1 | |
5488 | + | |
5489 | +LANG=C unexpand < in > out || fail=1 | |
5490 | +compare exp out > /dev/null 2>&1 || fail=1 | |
5491 | + | |
5492 | +LC_ALL=C unexpand < in > out || fail=1 | |
5493 | +compare exp out > /dev/null 2>&1 || fail=1 | |
5494 | + | |
5495 | + | |
5496 | +printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ | |
5497 | +1234567812345678123456781 | |
5498 | +. . . . | |
5499 | +a b c d | |
5500 | +. . . . | |
5501 | +ä ö ü ß | |
5502 | +. . . . | |
5503 | + äöü . öüä. ä xx | |
5504 | +1234567812345678123456781 | |
5505 | +. . . . | |
5506 | +a b c d | |
5507 | +. . . . | |
5508 | +ä ö ü ß | |
5509 | +. . . . | |
5510 | + äöü . öüä. ä xx | |
5511 | +EOF | |
5512 | + | |
5513 | + | |
5514 | +unexpand in in > out || fail=1 | |
5515 | +compare exp out > /dev/null 2>&1 || fail=1 | |
5516 | + | |
5517 | +LANG=C unexpand in in > out || fail=1 | |
5518 | +compare exp out > /dev/null 2>&1 || fail=1 | |
5519 | + | |
5520 | +LC_ALL=C unexpand in in > out || fail=1 | |
5521 | +compare exp out > /dev/null 2>&1 || fail=1 |