diff options
Diffstat (limited to 'src/expand.c')
| -rw-r--r-- | src/expand.c | 212 |
1 files changed, 11 insertions, 201 deletions
diff --git a/src/expand.c b/src/expand.c index e11f1afc7..9f84de825 100644 --- a/src/expand.c +++ b/src/expand.c @@ -39,49 +39,15 @@ #include <sys/types.h> #include "system.h" #include "error.h" -#include "fadvise.h" -#include "quote.h" #include "xstrndup.h" +#include "expand-common.h" + /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "expand" #define AUTHORS proper_name ("David MacKenzie") -/* If true, convert blanks even after nonblank characters have been - read on the line. */ -static bool convert_entire_line; - -/* If nonzero, the size of all tab stops. If zero, use 'tab_list' instead. */ -static uintmax_t tab_size; - -/* Array of the explicit column numbers of the tab stops; - after 'tab_list' is exhausted, each additional tab is replaced - by a space. The first column is column 0. */ -static uintmax_t *tab_list; - -/* The number of allocated entries in 'tab_list'. */ -static size_t n_tabs_allocated; - -/* The index of the first invalid element of 'tab_list', - where the next element can be added. */ -static size_t first_free_tab; - -/* Null-terminated array of input filenames. */ -static char **file_list; - -/* Default for 'file_list' if no files are given on the command line. */ -static char *stdin_argv[] = -{ - (char *) "-", NULL -}; - -/* True if we have ever read standard input. */ -static bool have_read_stdin; - -/* The desired exit status. */ -static int exit_status; - static char const shortopts[] = "it:0::1::2::3::4::5::6::7::8::9::"; static struct option const longopts[] = @@ -125,137 +91,6 @@ Convert tabs in each FILE to spaces, writing to standard output.\n\ exit (status); } -/* Add tab stop TABVAL to the end of 'tab_list'. */ - -static void -add_tab_stop (uintmax_t tabval) -{ - if (first_free_tab == n_tabs_allocated) - tab_list = X2NREALLOC (tab_list, &n_tabs_allocated); - tab_list[first_free_tab++] = tabval; -} - -/* Add the comma or blank separated list of tab stops STOPS - to the list of tab stops. */ - -static void -parse_tab_stops (char const *stops) -{ - bool have_tabval = false; - uintmax_t tabval IF_LINT ( = 0); - char const *num_start IF_LINT ( = NULL); - bool ok = true; - - for (; *stops; stops++) - { - if (*stops == ',' || isblank (to_uchar (*stops))) - { - if (have_tabval) - add_tab_stop (tabval); - have_tabval = false; - } - else if (ISDIGIT (*stops)) - { - if (!have_tabval) - { - tabval = 0; - have_tabval = true; - num_start = stops; - } - - /* Detect overflow. */ - if (!DECIMAL_DIGIT_ACCUMULATE (tabval, *stops - '0', uintmax_t)) - { - size_t len = strspn (num_start, "0123456789"); - char *bad_num = xstrndup (num_start, len); - error (0, 0, _("tab stop is too large %s"), quote (bad_num)); - free (bad_num); - ok = false; - stops = num_start + len - 1; - } - } - else - { - error (0, 0, _("tab size contains invalid character(s): %s"), - quote (stops)); - ok = false; - break; - } - } - - if (!ok) - exit (EXIT_FAILURE); - - if (have_tabval) - add_tab_stop (tabval); -} - -/* Check that the list of tab stops TABS, with ENTRIES entries, - contains only nonzero, ascending values. */ - -static void -validate_tab_stops (uintmax_t const *tabs, size_t entries) -{ - uintmax_t prev_tab = 0; - size_t i; - - for (i = 0; i < entries; i++) - { - if (tabs[i] == 0) - error (EXIT_FAILURE, 0, _("tab size cannot be 0")); - if (tabs[i] <= prev_tab) - error (EXIT_FAILURE, 0, _("tab sizes must be ascending")); - prev_tab = tabs[i]; - } -} - -/* Close the old stream pointer FP if it is non-NULL, - and return a new one opened to read the next input file. - Open a filename of '-' as the standard input. - Return NULL if there are no more input files. */ - -static FILE * -next_file (FILE *fp) -{ - static char *prev_file; - char *file; - - if (fp) - { - if (ferror (fp)) - { - error (0, errno, "%s", quotef (prev_file)); - exit_status = EXIT_FAILURE; - } - if (STREQ (prev_file, "-")) - clearerr (fp); /* Also clear EOF. */ - else if (fclose (fp) != 0) - { - error (0, errno, "%s", quotef (prev_file)); - exit_status = EXIT_FAILURE; - } - } - - while ((file = *file_list++) != NULL) - { - if (STREQ (file, "-")) - { - have_read_stdin = true; - fp = stdin; - } - else - fp = fopen (file, "r"); - if (fp) - { - prev_file = file; - fadvise (fp, FADVISE_SEQUENTIAL); - return fp; - } - error (0, errno, "%s", quotef (file)); - exit_status = EXIT_FAILURE; - } - return NULL; -} /* Change tabs to spaces, writing to stdout. Read each file in 'file_list', in order. */ @@ -301,25 +136,13 @@ expand (void) { /* Column the next input tab stop is on. */ uintmax_t next_tab_column; + bool last_tab IF_LINT (=0); - if (tab_size) - next_tab_column = column + (tab_size - column % tab_size); - else - while (true) - if (tab_index == first_free_tab) - { - next_tab_column = column + 1; - break; - } - else - { - uintmax_t tab = tab_list[tab_index++]; - if (column < tab) - { - next_tab_column = tab; - break; - } - } + next_tab_column = get_next_tab_column (column, &tab_index, + &last_tab); + + if (last_tab) + next_tab_column = column + 1; if (next_tab_column < column) error (EXIT_FAILURE, 0, _("input line is too long")); @@ -369,12 +192,7 @@ main (int argc, char **argv) textdomain (PACKAGE); atexit (close_stdout); - - have_read_stdin = false; - exit_status = EXIT_SUCCESS; convert_entire_line = true; - tab_list = NULL; - first_free_tab = 0; while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) { @@ -410,21 +228,13 @@ main (int argc, char **argv) } } - validate_tab_stops (tab_list, first_free_tab); - - if (first_free_tab == 0) - tab_size = 8; - else if (first_free_tab == 1) - tab_size = tab_list[0]; - else - tab_size = 0; + finalize_tab_stops (); - file_list = (optind < argc ? &argv[optind] : stdin_argv); + set_file_list ( (optind < argc) ? &argv[optind] : NULL); expand (); - if (have_read_stdin && fclose (stdin) != 0) - error (EXIT_FAILURE, errno, "-"); + cleanup_file_list_stdin (); return exit_status; } |