X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftput.c;h=2e67cfecbef4fdb10e57aef708a3103c2aff2d1d;hp=a72a2e892fdf6095a31d4871bdfe7973061c8e6c;hb=5e36f11feab6f790e0cc6f2c882a67b7b65e3b6b;hpb=c633e5103a29a38532cf1925257b91cea33fd090 diff --git a/progs/tput.c b/progs/tput.c index a72a2e89..2e67cfec 100644 --- a/progs/tput.c +++ b/progs/tput.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * + * Copyright (c) 1998-2009,2010 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 * @@ -38,14 +38,16 @@ * Ross Ridge's mytinfo package. */ +#define USE_LIBTINFO #include #if !PURE_TERMINFO +#include #include #endif #include -MODULE_ID("$Id: tput.c,v 1.24 2000/10/05 00:05:04 tom Exp $") +MODULE_ID("$Id: tput.c,v 1.46 2010/01/09 16:53:24 tom Exp $") #define PUTS(s) fputs(s, stdout) #define PUTCHAR(c) putchar(c) @@ -67,24 +69,25 @@ quit(int status, const char *fmt,...) va_list argp; va_start(argp, fmt); + fprintf(stderr, "%s: ", prg_name); vfprintf(stderr, fmt, argp); fprintf(stderr, "\n"); va_end(argp); - exit(status); + ExitProgram(status); } static void usage(void) { fprintf(stderr, "usage: %s [-V] [-S] [-T term] capname\n", prg_name); - exit(EXIT_FAILURE); + ExitProgram(EXIT_FAILURE); } static void check_aliases(const char *name) { - is_init = (strcmp(name, PROG_INIT) == 0); - is_reset = (strcmp(name, PROG_RESET) == 0); + is_init = same_program(name, PROG_INIT); + is_reset = same_program(name, PROG_RESET); } /* @@ -96,7 +99,7 @@ check_aliases(const char *name) * in tparm() to decide how to parse the varargs list. */ static TParams -tparm_type(char *name) +tparm_type(const char *name) { #define TD(code, longname, ti, tc) {code,longname},{code,ti},{code,tc} TParams result = Numbers; @@ -123,6 +126,25 @@ tparm_type(char *name) return result; } +static int +exit_code(int token, int value) +{ + int result = 99; + + switch (token) { + case BOOLEAN: + result = !value; /* TRUE=0, FALSE=1 */ + break; + case NUMBER: + result = 0; /* always zero */ + break; + case STRING: + result = value; /* 0=normal, 1=missing */ + break; + } + return result; +} + static int tput(int argc, char *argv[]) { @@ -131,8 +153,13 @@ tput(int argc, char *argv[]) int i, j, c; int status; FILE *f; +#if !PURE_TERMINFO + bool termcap = FALSE; +#endif - check_aliases(name = argv[0]); + if ((name = argv[0]) == 0) + name = ""; + check_aliases(name); if (is_reset || is_init) { if (init_prog != 0) { system(init_prog); @@ -153,15 +180,21 @@ tput(int argc, char *argv[]) } FLUSH; +#ifdef set_lr_margin if (set_lr_margin != 0) { - PUTS(tparm(set_lr_margin, 0, columns - 1)); - } else if (set_left_margin_parm != 0 - && set_right_margin_parm != 0) { - PUTS(tparm(set_left_margin_parm, 0)); - PUTS(tparm(set_right_margin_parm, columns - 1)); - } else if (clear_margins != 0 - && set_left_margin != 0 - && set_right_margin != 0) { + PUTS(TPARM_2(set_lr_margin, 0, columns - 1)); + } else +#endif +#ifdef set_left_margin_parm + if (set_left_margin_parm != 0 + && set_right_margin_parm != 0) { + PUTS(TPARM_1(set_left_margin_parm, 0)); + PUTS(TPARM_1(set_right_margin_parm, columns - 1)); + } else +#endif + if (clear_margins != 0 + && set_left_margin != 0 + && set_right_margin != 0) { PUTS(clear_margins); if (carriage_return != 0) { PUTS(carriage_return); @@ -170,7 +203,7 @@ tput(int argc, char *argv[]) } PUTS(set_left_margin); if (parm_right_cursor) { - PUTS(tparm(parm_right_cursor, columns - 1)); + PUTS(TPARM_1(parm_right_cursor, columns - 1)); } else { for (i = 0; i < columns - 1; i++) { PUTCHAR(' '); @@ -189,7 +222,7 @@ tput(int argc, char *argv[]) if (clear_all_tabs != 0 && set_tab != 0) { for (i = 0; i < columns - 1; i += 8) { if (parm_right_cursor) { - PUTS(tparm(parm_right_cursor, 8)); + PUTS(TPARM_1(parm_right_cursor, 8)); } else { for (j = 0; j < 8; j++) PUTCHAR(' '); @@ -203,7 +236,7 @@ tput(int argc, char *argv[]) if (is_reset && reset_file != 0) { f = fopen(reset_file, "r"); if (f == 0) { - quit(errno, "Can't open reset_file: '%s'", reset_file); + quit(4 + errno, "Can't open reset_file: '%s'", reset_file); } while ((c = fgetc(f)) != EOF) { PUTCHAR(c); @@ -212,7 +245,7 @@ tput(int argc, char *argv[]) } else if (init_file != 0) { f = fopen(init_file, "r"); if (f == 0) { - quit(errno, "Can't open init_file: '%s'", init_file); + quit(4 + errno, "Can't open init_file: '%s'", init_file); } while ((c = fgetc(f)) != EOF) { PUTCHAR(c); @@ -223,8 +256,8 @@ tput(int argc, char *argv[]) if (is_reset && reset_3string != 0) { PUTS(reset_3string); - } else if (init_2string != 0) { - PUTS(init_2string); + } else if (init_3string != 0) { + PUTS(init_3string); } FLUSH; return 0; @@ -235,41 +268,48 @@ tput(int argc, char *argv[]) return 0; } #if !PURE_TERMINFO - { - const struct name_table_entry *np; - - if ((np = _nc_find_entry(name, _nc_get_hash_table(1))) != 0) - switch (np->nte_type) { - case BOOLEAN: - if (bool_from_termcap[np->nte_index]) - name = boolnames[np->nte_index]; - break; - - case NUMBER: - if (num_from_termcap[np->nte_index]) - name = numnames[np->nte_index]; - break; - - case STRING: - if (str_from_termcap[np->nte_index]) - name = strnames[np->nte_index]; - break; - } - } + retry: #endif - if ((status = tigetflag(name)) != -1) { - return (status != 0); + return exit_code(BOOLEAN, status); } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) { (void) printf("%d\n", status); - return (0); + return exit_code(NUMBER, 0); } else if ((s = tigetstr(name)) == CANCELLED_STRING) { - quit(4, "%s: unknown terminfo capability '%s'", prg_name, name); +#if !PURE_TERMINFO + if (!termcap) { + const struct name_table_entry *np; + + termcap = TRUE; + if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != 0) { + switch (np->nte_type) { + case BOOLEAN: + if (bool_from_termcap[np->nte_index]) + name = boolnames[np->nte_index]; + break; + + case NUMBER: + if (num_from_termcap[np->nte_index]) + name = numnames[np->nte_index]; + break; + + case STRING: + if (str_from_termcap[np->nte_index]) + name = strnames[np->nte_index]; + break; + } + goto retry; + } + } +#endif + quit(4, "unknown terminfo capability '%s'", name); } else if (s != ABSENT_STRING) { if (argc > 1) { int k; - int numbers[10]; - char *strings[10]; + int popcount; + long numbers[1 + NUM_PARM]; + char *strings[1 + NUM_PARM]; + char *p_is_s[NUM_PARM]; /* Nasty hack time. The tparm function needs to see numeric * parameters as numbers, not as pointers to their string @@ -283,32 +323,41 @@ tput(int argc, char *argv[]) if (tmp == 0 || *tmp != 0) numbers[k] = 0; } - for (k = argc; k <= 9; k++) { + for (k = argc; k <= NUM_PARM; k++) { numbers[k] = 0; strings[k] = 0; } switch (tparm_type(name)) { case Num_Str: - s = tparm(s, numbers[1], strings[2]); + s = TPARM_2(s, numbers[1], strings[2]); break; case Num_Str_Str: - s = tparm(s, numbers[1], strings[2], strings[3]); + s = TPARM_3(s, numbers[1], strings[2], strings[3]); break; + case Numbers: default: - s = tparm(s, - numbers[1], numbers[2], numbers[3], - numbers[4], numbers[5], numbers[6], - numbers[7], numbers[8], numbers[9]); + (void) _nc_tparm_analyze(s, p_is_s, &popcount); +#define myParam(n) (p_is_s[n - 1] != 0 ? ((long) strings[n]) : numbers[n]) + s = TPARM_9(s, + myParam(1), + myParam(2), + myParam(3), + myParam(4), + myParam(5), + myParam(6), + myParam(7), + myParam(8), + myParam(9)); break; } } /* use putp() in order to perform padding */ putp(s); - return (0); + return exit_code(STRING, 0); } - return (0); + return exit_code(STRING, 1); } int @@ -319,13 +368,13 @@ main(int argc, char **argv) bool cmdline = TRUE; int c; char buf[BUFSIZ]; - int errors = 0; + int result = 0; - check_aliases(prg_name = _nc_basename(argv[0])); + check_aliases(prg_name = _nc_rootname(argv[0])); term = getenv("TERM"); - while ((c = getopt(argc, argv, "ST:V")) != EOF) { + while ((c = getopt(argc, argv, "ST:V")) != -1) { switch (c) { case 'S': cmdline = FALSE; @@ -336,7 +385,7 @@ main(int argc, char **argv) break; case 'V': puts(curses_version()); - return EXIT_SUCCESS; + ExitProgram(EXIT_SUCCESS); default: usage(); /* NOTREACHED */ @@ -366,7 +415,7 @@ main(int argc, char **argv) if (cmdline) { if ((argc <= 0) && !is_reset && !is_init) usage(); - return tput(argc, argv); + ExitProgram(tput(argc, argv)); } while (fgets(buf, sizeof(buf), stdin) != 0) { @@ -376,16 +425,23 @@ main(int argc, char **argv) /* crack the argument list into a dope vector */ for (cp = buf; *cp; cp++) { - if (isspace(*cp)) + if (isspace(UChar(*cp))) { *cp = '\0'; - else if (cp == buf || cp[-1] == 0) + } else if (cp == buf || cp[-1] == 0) { argvec[argnum++] = cp; + if (argnum >= (int) SIZEOF(argvec) - 1) + break; + } } argvec[argnum] = 0; - if (tput(argnum, argvec) != 0) - errors++; + if (argnum != 0 + && tput(argnum, argvec) != 0) { + if (result == 0) + result = 4; /* will return value >4 */ + ++result; + } } - return errors > 0; + ExitProgram(result); }