X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftabs.c;h=88bbf2edb92cfc964de86c9c7cb44e43562682b9;hp=2f6915de9c468b9e20a021681d8d212fbd74997e;hb=beb0f0c6911096ee19815bdf2601c4317d80341f;hpb=c120fddebe9e9c1e2b29dbd744a6b1d03652bf8b diff --git a/progs/tabs.c b/progs/tabs.c index 2f6915de..88bbf2ed 100644 --- a/progs/tabs.c +++ b/progs/tabs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2008-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 2008-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 * @@ -37,7 +37,7 @@ #define USE_LIBTINFO #include -MODULE_ID("$Id: tabs.c,v 1.21 2011/05/21 18:31:21 tom Exp $") +MODULE_ID("$Id: tabs.c,v 1.23 2012/02/22 23:57:44 tom Exp $") static void usage(void) GCC_NORETURN; @@ -140,10 +140,11 @@ print_ruler(int *tab_list) for (n = 0; n < max_cols; n += 10) { int ch = 1 + (n / 10); char buffer[20]; - sprintf(buffer, "----+----%c", - ((ch < 10) - ? (ch + '0') - : (ch + 'A' - 10))); + _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) + "----+----%c", + ((ch < 10) + ? (ch + '0') + : (ch + 'A' - 10))); printf("%.*s", ((max_cols - n) > 10) ? 10 : (max_cols - n), buffer); } putchar('\n'); @@ -266,11 +267,11 @@ add_to_tab_list(char **append, const char *value) if (result != 0) { *result = '\0'; if (*append != 0) { - strcpy(result, *append); + _nc_STRCPY(result, *append, need); free(*append); } - strcat(result, comma); - strcat(result, copied); + _nc_STRCAT(result, comma, need); + _nc_STRCAT(result, copied, need); } *append = result;