From b216b412fdb7917b4ab7d4c73215272ff29047c7 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 21 Mar 2010 20:22:53 +0000 Subject: [PATCH] concatstring fixes git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4795 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/tools.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/src/tools.h b/source/src/tools.h index b5d52c58..a8c33862 100644 --- a/source/src/tools.h +++ b/source/src/tools.h @@ -106,7 +106,7 @@ typedef char string[MAXSTRLEN]; inline void vformatstring(char *d, const char *fmt, va_list v, int len = MAXSTRLEN) { _vsnprintf(d, len, fmt, v); d[len-1] = 0; } inline char *copystring(char *d, const char *s, size_t len = MAXSTRLEN) { strncpy(d, s, len); d[len-1] = 0; return d; } -inline char *concatstring(char *d, const char *s) { size_t len = strlen(d); return copystring(d+len, s, MAXSTRLEN-len); } +inline char *concatstring(char *d, const char *s, size_t len = MAXSTRLEN) { size_t used = strlen(d); return used < len ? copystring(d+used, s, len-used) : d; } extern char *concatformatstring(char *d, const char *s, ...); struct stringformatter