I switched to use strncat instead of strcat for all instances where the string was not a literal.  I kept the strcat() for the literal strings.