Avoid the use of for loop declarations.

[cdecl99.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 047fc64ed087138d0d0ceb305485a54d88b0c89d..c0438e602753fb0b37c4bdaeaba0be457481b5da 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -25,8 +25,6 @@
 #include "parse.h"
 #include "specstr.h"
 
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
 size_t cdecl__advance(struct output_state *dst, size_t amount)
 {
        size_t x = MIN(amount, dst->dstlen);
@@ -40,9 +38,15 @@ size_t cdecl__advance(struct output_state *dst, size_t amount)
 
 size_t cdecl__strlcpy(char *dst, const char *src, size_t dstlen)
 {
-       if (dst)
-               snprintf(dst, dstlen, "%s", src);
-       return strlen(src);
+       size_t srclen = strlen(src);
+
+       if (dstlen > 0) {
+               memcpy(dst, src, MIN(dstlen, srclen+1));
+               if (dstlen <= srclen)
+                       dst[dstlen-1] = 0;
+       }
+
+       return srclen;
 }
 
 size_t cdecl__emit(struct output_state *dst, const char *src)