X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fread_entry.c;h=81b8180d54854099f936c8bb8a2dcb492e75fac1;hp=a14bad68d9268fa5beb9020a47cb69456ac286ba;hb=63e3cafac136d773331dee15633f1c9ef08c5493;hpb=91fa4688e82518794fcf0c32a36f3fcca5e4c2d5 diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c index a14bad68..81b8180d 100644 --- a/ncurses/tinfo/read_entry.c +++ b/ncurses/tinfo/read_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * Copyright (c) 1998-2013,2014 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 * @@ -41,11 +41,11 @@ #include -MODULE_ID("$Id: read_entry.c,v 1.120 2012/10/27 21:51:07 tom Exp $") +MODULE_ID("$Id: read_entry.c,v 1.127 2014/03/08 22:07:31 Xin.Li Exp $") #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts)) -#if USE_DATABASE +#if NCURSES_USE_DATABASE static void convert_shorts(char *buf, short *Numbers, int count) { @@ -107,14 +107,46 @@ fake_read(char *src, int *offset, int limit, char *dst, unsigned want) return (int) want; } -#define Read(buf, count) fake_read(buffer, &offset, limit, buf, (unsigned) count) +#define Read(buf, count) fake_read(buffer, &offset, limit, (char *) buf, (unsigned) count) #define read_shorts(buf, count) \ (Read(buf, (count)*2) == (int) (count)*2) #define even_boundary(value) \ if ((value) % 2 != 0) Read(buf, 1) +#endif + +NCURSES_EXPORT(void) +_nc_init_termtype(TERMTYPE *const tp) +{ + unsigned i; + +#if NCURSES_XNAMES + tp->num_Booleans = BOOLCOUNT; + tp->num_Numbers = NUMCOUNT; + tp->num_Strings = STRCOUNT; + tp->ext_Booleans = 0; + tp->ext_Numbers = 0; + tp->ext_Strings = 0; +#endif + if (tp->Booleans == 0) + TYPE_MALLOC(NCURSES_SBOOL, BOOLCOUNT, tp->Booleans); + if (tp->Numbers == 0) + TYPE_MALLOC(short, NUMCOUNT, tp->Numbers); + if (tp->Strings == 0) + TYPE_MALLOC(char *, STRCOUNT, tp->Strings); + for_each_boolean(i, tp) + tp->Booleans[i] = FALSE; + + for_each_number(i, tp) + tp->Numbers[i] = ABSENT_NUMERIC; + + for_each_string(i, tp) + tp->Strings[i] = ABSENT_STRING; +} + +#if NCURSES_USE_DATABASE /* * Return TGETENT_YES if read, TGETENT_NO if not found or garbled. */ @@ -124,7 +156,7 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit) int offset = 0; int name_size, bool_count, num_count, str_count, str_size; int i; - char buf[MAX_ENTRY_SIZE + 1]; + char buf[MAX_ENTRY_SIZE + 2]; char *string_table; unsigned want, have; @@ -159,7 +191,7 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit) want = (unsigned) (str_size + name_size + 1); if (str_size) { /* try to allocate space for the string table */ - if (str_count * 2 >= (int) sizeof(buf) + if (str_count * 2 >= MAX_ENTRY_SIZE || (string_table = typeMalloc(char, want)) == 0) { return (TGETENT_NO); } @@ -238,9 +270,9 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit) unsigned need = (unsigned) (ext_bool_count + ext_num_count + ext_str_count); int base = 0; - if (need >= sizeof(buf) - || ext_str_size >= (int) sizeof(buf) - || ext_str_limit >= (int) sizeof(buf) + if (need >= (MAX_ENTRY_SIZE / 2) + || ext_str_size >= MAX_ENTRY_SIZE + || ext_str_limit >= MAX_ENTRY_SIZE || ext_bool_count < 0 || ext_num_count < 0 || ext_str_count < 0 @@ -279,6 +311,8 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit) } TR(TRACE_DATABASE, ("READ extended-offsets @%d", offset)); + if ((unsigned) (ext_str_count + (int) need) >= (MAX_ENTRY_SIZE / 2)) + return (TGETENT_NO); if ((ext_str_count || need) && !read_shorts(buf, ext_str_count + (int) need)) return (TGETENT_NO); @@ -315,7 +349,7 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit) } if (need) { - if (ext_str_count >= (MAX_ENTRY_SIZE * 2)) + if (ext_str_count >= (MAX_ENTRY_SIZE / 2)) return (TGETENT_NO); if ((ptr->ext_Names = TYPE_CALLOC(char *, need)) == 0) return (TGETENT_NO); @@ -402,9 +436,9 @@ make_db_filename(char *filename, unsigned limit, const char *const path) { static const char suffix[] = DBM_SUFFIX; - unsigned lens = sizeof(suffix) - 1; - unsigned size = strlen(path); - unsigned test = lens + size; + size_t lens = sizeof(suffix) - 1; + size_t size = strlen(path); + size_t test = lens + size; bool result = FALSE; if (test < limit) { @@ -430,7 +464,7 @@ make_dir_filename(char *filename, { bool result = FALSE; -#if USE_TERMCAP +#if NCURSES_USE_TERMCAP if (_nc_is_dir_path(path)) #endif { @@ -488,7 +522,7 @@ _nc_read_tic_entry(char *filename, * (source/binary) by checking the lengths. */ while (_nc_db_get(capdbp, &key, &data) == 0) { - int used = data.size - 1; + int used = (int) data.size - 1; char *have = (char *) data.data; if (*have++ == 0) { @@ -522,7 +556,7 @@ _nc_read_tic_entry(char *filename, if (make_dir_filename(filename, limit, path, name)) { code = _nc_read_file_entry(filename, tp); } -#if USE_TERMCAP +#if NCURSES_USE_TERMCAP else if (code != TGETENT_YES) { code = _nc_read_termcap_entry(name, tp); _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX) @@ -531,7 +565,7 @@ _nc_read_tic_entry(char *filename, #endif return code; } -#endif /* USE_DATABASE */ +#endif /* NCURSES_USE_DATABASE */ /* * _nc_read_entry(char *name, char *filename, TERMTYPE *tp) @@ -557,7 +591,7 @@ _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp) || strchr(name, NCURSES_PATHSEP) != 0) { TR(TRACE_DATABASE, ("illegal or missing entry name '%s'", name)); } else { -#if USE_DATABASE +#if NCURSES_USE_DATABASE DBDIRS state; int offset; const char *path; @@ -571,7 +605,7 @@ _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp) break; } } -#elif USE_TERMCAP +#elif NCURSES_USE_TERMCAP if (code != TGETENT_YES) { code = _nc_read_termcap_entry(name, tp); _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)