-#define SCAT(dst, src) scat(dst, src, sizeof(dst))
-extern __inline__ void scat(char *dst, char *src, unsigned int siz)
+#define SCAT(dst, src) scat(dst, src, sizeof(dst)-strlen(dst)-1)
+static inline void scat(char *dst, const char *src, unsigned int siz)