X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftabs.c;h=0539e85653ea5985f3a4440d83eb1a0e529a24fa;hp=bded0b04b259812db51be662d6305ac4a7dbc00c;hb=73dd18dba5148d708638caa25c085d82f704e972;hpb=98d8891f42d8acac5c2ade39d163f386057a22e4 diff --git a/progs/tabs.c b/progs/tabs.c index bded0b04..0539e856 100644 --- a/progs/tabs.c +++ b/progs/tabs.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2008-2011,2012 Free Software Foundation, Inc. * + * Copyright 2020 Thomas E. Dickey * + * Copyright 2008-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -36,11 +37,13 @@ #define USE_LIBTINFO #include +#include -MODULE_ID("$Id: tabs.c,v 1.25 2012/11/18 01:21:47 tom Exp $") +MODULE_ID("$Id: tabs.c,v 1.45 2020/05/27 23:47:22 tom Exp $") static void usage(void) GCC_NORETURN; +const char *_nc_progname; static int max_cols; static void @@ -72,13 +75,13 @@ do_tabs(int *tab_list) } } if (stop <= max_cols) { - tputs(tparm(set_tab, stop), 1, putch); + tputs(TIPARM_1(set_tab, stop), 1, putch); last = stop; } else { break; } } - putchar('\n'); + putchar('\r'); } static int * @@ -101,8 +104,8 @@ decode_tabs(const char *tab_list) result[n] = value + prior; if (n > 0 && result[n] <= result[n - 1]) { fprintf(stderr, - "tab-stops are not in increasing order: %d %d\n", - value, result[n - 1]); + "%s: tab-stops are not in increasing order: %d %d\n", + _nc_progname, value, result[n - 1]); free(result); result = 0; break; @@ -122,6 +125,7 @@ decode_tabs(const char *tab_list) */ if ((n == 0) && (value > 0)) { int step = value; + value = 1; while (n < max_cols - 1) { result[n++] = value; value += step; @@ -286,6 +290,7 @@ add_to_tab_list(char **append, const char *value) *append = result; } + free(copied); return result; } @@ -293,7 +298,7 @@ add_to_tab_list(char **append, const char *value) * Check for illegal characters in the tab-list. */ static bool -legal_tab_list(const char *program, const char *tab_list) +legal_tab_list(const char *tab_list) { bool result = TRUE; @@ -305,54 +310,66 @@ legal_tab_list(const char *program, const char *tab_list) if (!(isdigit(ch) || ch == ',' || ch == '+')) { fprintf(stderr, "%s: unexpected character found '%c'\n", - program, ch); + _nc_progname, ch); result = FALSE; break; } } } else { - fprintf(stderr, "%s: trailing comma found '%s'\n", program, tab_list); + fprintf(stderr, "%s: trailing comma found '%s'\n", _nc_progname, tab_list); result = FALSE; } } else { - fprintf(stderr, "%s: no tab-list given\n", program); + fprintf(stderr, "%s: no tab-list given\n", _nc_progname); result = FALSE; } return result; } +static char * +skip_list(char *value) +{ + while (*value != '\0' && + (isdigit(UChar(*value)) || + isspace(UChar(*value)) || + strchr("+,", UChar(*value)) != 0)) { + ++value; + } + return value; +} + static void usage(void) { - static const char *msg[] = +#define DATA(s) s "\n" + static const char msg[] = { - "Usage: tabs [options] [tabstop-list]" - ,"" - ,"Options:" - ," -0 reset tabs" - ," -8 set tabs to standard interval" - ," -a Assembler, IBM S/370, first format" - ," -a2 Assembler, IBM S/370, second format" - ," -c COBOL, normal format" - ," -c2 COBOL compact format" - ," -c3 COBOL compact format extended" - ," -d debug (show ruler with expected/actual tab positions)" - ," -f FORTRAN" - ," -n no-op (do not modify terminal settings)" - ," -p PL/I" - ," -s SNOBOL" - ," -u UNIVAC 1100 Assembler" - ," -T name use terminal type 'name'" - ,"" - ,"A tabstop-list is an ordered list of column numbers, e.g., 1,11,21" - ,"or 1,+10,+10 which is the same." + DATA("Usage: tabs [options] [tabstop-list]") + DATA("") + DATA("Options:") + DATA(" -0 reset tabs") + DATA(" -8 set tabs to standard interval") + DATA(" -a Assembler, IBM S/370, first format") + DATA(" -a2 Assembler, IBM S/370, second format") + DATA(" -c COBOL, normal format") + DATA(" -c2 COBOL compact format") + DATA(" -c3 COBOL compact format extended") + DATA(" -d debug (show ruler with expected/actual tab positions)") + DATA(" -f FORTRAN") + DATA(" -n no-op (do not modify terminal settings)") + DATA(" -p PL/I") + DATA(" -s SNOBOL") + DATA(" -u UNIVAC 1100 Assembler") + DATA(" -T name use terminal type 'name'") + DATA(" -V print version") + DATA("") + DATA("A tabstop-list is an ordered list of column numbers, e.g., 1,11,21") + DATA("or 1,+10,+10 which is the same.") }; - unsigned n; +#undef DATA fflush(stdout); - for (n = 0; n < SIZEOF(msg); ++n) { - fprintf(stderr, "%s\n", msg[n]); - } + fputs(msg, stderr); ExitProgram(EXIT_FAILURE); } @@ -366,6 +383,12 @@ main(int argc, char *argv[]) NCURSES_CONST char *term_name = 0; char *append = 0; const char *tab_list = 0; + TTY tty_settings; + int fd; + + _nc_progname = _nc_rootname(argv[0]); + + fd = save_tty_settings(&tty_settings, FALSE); if ((term_name = getenv("TERM")) == 0) term_name = "ansi+tabs"; @@ -378,23 +401,25 @@ main(int argc, char *argv[]) while ((ch = *++option) != '\0') { switch (ch) { case 'a': - switch (*option) { + switch (*++option) { + default: case '\0': tab_list = "1,10,16,36,72"; + option--; /* Assembler, IBM S/370, first format */ break; case '2': tab_list = "1,10,16,40,72"; /* Assembler, IBM S/370, second format */ break; - default: - usage(); } break; case 'c': - switch (*option) { + switch (*++option) { + default: case '\0': tab_list = "1,8,12,16,20,55"; + option--; /* COBOL, normal format */ break; case '2': @@ -405,8 +430,6 @@ main(int argc, char *argv[]) tab_list = "1,6,10,14,18,22,26,30,34,38,42,46,50,54,58,62,67"; /* COBOL compact format extended */ break; - default: - usage(); } break; case 'd': /* ncurses extension */ @@ -436,18 +459,23 @@ main(int argc, char *argv[]) if (*++option != '\0') { term_name = option; } else { - term_name = argv[n++]; + term_name = argv[n]; + option--; } option += ((int) strlen(option)) - 1; continue; + case 'V': + puts(curses_version()); + ExitProgram(EXIT_SUCCESS); default: if (isdigit(UChar(*option))) { - tab_list = option; - ++n; + char *copy = strdup(option); + *skip_list(copy) = '\0'; + tab_list = copy; + option = skip_list(option) - 1; } else { usage(); } - option += ((int) strlen(option)) - 1; break; } } @@ -484,19 +512,19 @@ main(int argc, char *argv[]) } } - setupterm(term_name, STDOUT_FILENO, (int *) 0); + setupterm(term_name, fd, (int *) 0); max_cols = (columns > 0) ? columns : 80; if (!VALID_STRING(clear_all_tabs)) { fprintf(stderr, "%s: terminal type '%s' cannot reset tabs\n", - argv[0], term_name); + _nc_progname, term_name); } else if (!VALID_STRING(set_tab)) { fprintf(stderr, "%s: terminal type '%s' cannot set tabs\n", - argv[0], term_name); - } else if (legal_tab_list(argv[0], tab_list)) { + _nc_progname, term_name); + } else if (legal_tab_list(tab_list)) { int *list = decode_tabs(tab_list); if (!no_op)