X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_termcap.c;h=5e7430733b5de2a6b1e148faab0ad1a4e875eac5;hb=173dd870810c8b85baa31f9a272d15f96a8f9ff4;hp=0349c9408a8eb04b05616d265d27df6534d9dc98;hpb=af4c589f0c605e1a1dd3825678a0b1a97df02d37;p=ncurses.git diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c index 0349c940..5e743073 100644 --- a/ncurses/tinfo/lib_termcap.c +++ b/ncurses/tinfo/lib_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 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 * @@ -48,7 +48,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_termcap.c,v 1.75 2011/09/26 22:44:30 tom Exp $") +MODULE_ID("$Id: lib_termcap.c,v 1.78 2012/02/22 22:34:31 tom Exp $") NCURSES_EXPORT_VAR(char *) UP = 0; NCURSES_EXPORT_VAR(char *) BC = 0; @@ -203,10 +203,11 @@ static bool same_tcname(const char *a, const char *b) { fprintf(stderr, "compare(%s,%s)\n", a, b); - return !strncmp(a, b, 2); + return !strncmp(a, b, (size_t) 2); } + #else -#define same_tcname(a,b) !strncmp(a,b,2) +#define same_tcname(a,b) !strncmp(a, b, (size_t) 2) #endif /*************************************************************************** @@ -361,7 +362,7 @@ NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area) } if (area != 0 && *area != 0) { - (void) strcpy(*area, result); + _nc_STRCPY(*area, result, 1024); result = *area; *area += strlen(*area) + 1; }