From 53d1c3f117142dd3ecae23c5fcdc069f393f1703 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 23 Jan 2005 15:16:47 +0000 Subject: (svn r1616) Introduce ttd_strlcat() and use it to de-uglify some piece of code in misc_cmd. While here rename the len parameter of ttd_strlcpy() to size, because it is a buffer size and not a string length. Also add -Wwrite-strings to the Makefile, because the above mentioned piece of code was the only part which triggered this warning. --- ttd.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'ttd.c') diff --git a/ttd.c b/ttd.c index 68b423d1d..70e8e6722 100644 --- a/ttd.c +++ b/ttd.c @@ -203,12 +203,20 @@ static const DriverDesc *ChooseDefaultDriver(const DriverDesc *dd) return best; } -void ttd_strlcpy(char *dst, const char *src, size_t len) +void ttd_strlcpy(char *dst, const char *src, size_t size) { - assert(len > 0); - while (--len && *src) - *dst++=*src++; - *dst = 0; + assert(size > 0); + while (--size > 0 && *src != '\0') *dst++ = *src++; + *dst = '\0'; +} + +void ttd_strlcat(char *dst, const char *src, size_t size) +{ + assert(size > 0); + for (; size > 0 && *dst != '\0'; --size, ++dst) {} + assert(size > 0); + while (--size > 0 && *src != '\0') *dst++ = *src++; + *dst = '\0'; } static char *strecpy(char *dst, const char *src) -- cgit v1.2.3-54-g00ecf