X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ffold.c;h=0e7306377d540e761ae21cd6657bfaae892209a8;hb=d1ed3e68b8080161642cc106099c0a17ac7892e6;hp=aff7bb1d92e32521c0f4d541c9248aa4d4c52bd1;hpb=d921b2ecc0d294ad4bf8c7458fc52a60c28727d2;p=oweals%2Fbusybox.git diff --git a/coreutils/fold.c b/coreutils/fold.c index aff7bb1d9..0e7306377 100644 --- a/coreutils/fold.c +++ b/coreutils/fold.c @@ -5,150 +5,172 @@ Copyright (C) 91, 1995-2002 Free Software Foundation, Inc. Modified for busybox based on coreutils v 5.0 - Copyright (C) 2003 Glenn McGrath + Copyright (C) 2003 Glenn McGrath - Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -#include "busybox.h" +//usage:#define fold_trivial_usage +//usage: "[-bs] [-w WIDTH] [FILE]..." +//usage:#define fold_full_usage "\n\n" +//usage: "Wrap input lines in each FILE (or stdin), writing to stdout\n" +//usage: "\n -b Count bytes rather than columns" +//usage: "\n -s Break at spaces" +//usage: "\n -w Use WIDTH columns instead of 80" -static unsigned long flags; -#define FLAG_COUNT_BYTES 1 -#define FLAG_BREAK_SPACES 2 -#define FLAG_WIDTH 4 +#include "libbb.h" +#include "unicode.h" + +/* This is a NOEXEC applet. Be very careful! */ + +/* Must match getopt32 call */ +#define FLAG_COUNT_BYTES 1 +#define FLAG_BREAK_SPACES 2 +#define FLAG_WIDTH 4 /* Assuming the current column is COLUMN, return the column that printing C will move the cursor to. The first column is 0. */ - -static int adjust_column(int column, char c) +static int adjust_column(unsigned column, char c) { - if (!(flags & FLAG_COUNT_BYTES)) { - if (c == '\b') { - if (column > 0) - column--; - } else if (c == '\r') + if (option_mask32 & FLAG_COUNT_BYTES) + return ++column; + + if (c == '\t') + return column + 8 - column % 8; + + if (c == '\b') { + if ((int)--column < 0) column = 0; - else if (c == '\t') - column = column + 8 - column % 8; - else /* if (isprint (c)) */ + } + else if (c == '\r') + column = 0; + else { /* just a printable char */ + if (unicode_status != UNICODE_ON /* every byte is a new char */ + || (c & 0xc0) != 0x80 /* it isn't a 2nd+ byte of a Unicode char */ + ) { column++; - } else - column++; + } + } return column; } -int fold_main(int argc, char **argv) +/* Note that this function can write NULs, unlike fputs etc. */ +static void write2stdout(const void *buf, unsigned size) { - char *w_opt; - int width = 80; - int i; - int errs = 0; + fwrite(buf, 1, size, stdout); +} - if(!ENABLE_DEBUG_YANK_SUSv2) { - /* Turn any numeric options into -w options. */ - for (i = 1; i < argc; i++) { - char const *a = argv[i]; +int fold_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int fold_main(int argc UNUSED_PARAM, char **argv) +{ + char *line_out = NULL; + const char *w_opt = "80"; + unsigned width; + smallint exitcode = EXIT_SUCCESS; + + init_unicode(); - if (*a++ == '-') { - if (*a == '-' && !a[1]) + if (ENABLE_INCLUDE_SUSv2) { + /* Turn any numeric options into -w options. */ + int i; + for (i = 1; argv[i]; i++) { + const char *a = argv[i]; + if (*a == '-') { + a++; + if (*a == '-' && !a[1]) /* "--" */ break; - if (isdigit(*a)) { + if (isdigit(*a)) argv[i] = xasprintf("-w%s", a); - } } } } - flags = bb_getopt_ulflags(argc, argv, "bsw:", &w_opt); - if (flags & FLAG_WIDTH) - width = bb_xgetlarg(w_opt, 10, 1, 10000); + getopt32(argv, "bsw:", &w_opt); + width = xatou_range(w_opt, 1, 10000); argv += optind; - if (!*argv) { - *--argv = "-"; - } + if (!*argv) + *--argv = (char*)"-"; do { - FILE *istream = bb_wfopen_input(*argv); + FILE *istream = fopen_or_warn_stdin(*argv); int c; - int column = 0; /* Screen column where next char will go. */ - int offset_out = 0; /* Index in `line_out' for next char. */ - static char *line_out = NULL; - static int allocated_out = 0; + unsigned column = 0; /* Screen column where next char will go */ + unsigned offset_out = 0; /* Index in 'line_out' for next char */ if (istream == NULL) { - errs |= EXIT_FAILURE; + exitcode = EXIT_FAILURE; continue; } while ((c = getc(istream)) != EOF) { - if (offset_out + 1 >= allocated_out) { - allocated_out += 1024; - line_out = xrealloc(line_out, allocated_out); + /* We grow line_out in chunks of 0x1000 bytes */ + if ((offset_out & 0xfff) == 0) { + line_out = xrealloc(line_out, offset_out + 0x1000); } - + rescan: + line_out[offset_out] = c; if (c == '\n') { - line_out[offset_out++] = c; - fwrite(line_out, sizeof(char), (size_t) offset_out, stdout); + write2stdout(line_out, offset_out + 1); column = offset_out = 0; continue; } - -rescan: column = adjust_column(column, c); + if (column <= width || offset_out == 0) { + /* offset_out == 0 case happens + * with small width (say, 1) and tabs. + * The very first tab already goes to column 8, + * but we must not wrap it */ + offset_out++; + continue; + } - if (column > width) { - /* This character would make the line too long. - Print the line plus a newline, and make this character - start the next line. */ - if (flags & FLAG_BREAK_SPACES) { - /* Look for the last blank. */ - int logical_end; - - for (logical_end = offset_out - 1; logical_end >= 0; logical_end--) { - if (isblank(line_out[logical_end])) { - break; - } - } - if (logical_end >= 0) { - /* Found a blank. Don't output the part after it. */ - logical_end++; - fwrite(line_out, sizeof(char), (size_t) logical_end, stdout); - putchar('\n'); - /* Move the remainder to the beginning of the next line. - The areas being copied here might overlap. */ - memmove(line_out, line_out + logical_end, offset_out - logical_end); - offset_out -= logical_end; - for (column = i = 0; i < offset_out; i++) { - column = adjust_column(column, line_out[i]); - } - goto rescan; - } - } else { - if (offset_out == 0) { - line_out[offset_out++] = c; + /* This character would make the line too long. + * Print the line plus a newline, and make this character + * start the next line */ + if (option_mask32 & FLAG_BREAK_SPACES) { + unsigned i; + unsigned logical_end; + + /* Look for the last blank. */ + for (logical_end = offset_out - 1; (int)logical_end >= 0; logical_end--) { + if (!isblank(line_out[logical_end])) continue; + + /* Found a space or tab. + * Output up to and including it, and start a new line */ + logical_end++; + /*line_out[logical_end] = '\n'; - NO! this nukes one buffered character */ + write2stdout(line_out, logical_end); + putchar('\n'); + /* Move the remainder to the beginning of the next line. + * The areas being copied here might overlap. */ + memmove(line_out, line_out + logical_end, offset_out - logical_end); + offset_out -= logical_end; + for (column = i = 0; i < offset_out; i++) { + column = adjust_column(column, line_out[i]); } + goto rescan; } - line_out[offset_out++] = '\n'; - fwrite(line_out, sizeof(char), (size_t) offset_out, stdout); - column = offset_out = 0; - goto rescan; + /* No blank found, wrap will split the overlong word */ } - - line_out[offset_out++] = c; - } + /* Output what we accumulated up to now, and start a new line */ + line_out[offset_out] = '\n'; + write2stdout(line_out, offset_out + 1); + column = offset_out = 0; + goto rescan; + } /* while (not EOF) */ if (offset_out) { - fwrite(line_out, sizeof(char), (size_t) offset_out, stdout); + write2stdout(line_out, offset_out); } - if (ferror(istream) || bb_fclose_nonstdin(istream)) { - bb_perror_msg("%s", *argv); /* Avoid multibyte problems. */ - errs |= EXIT_FAILURE; + if (fclose_if_not_stdin(istream)) { + bb_simple_perror_msg(*argv); + exitcode = EXIT_FAILURE; } } while (*++argv); - bb_fflush_stdout_and_exit(errs); + fflush_stdout_and_exit(exitcode); }