Don't change calls to strcpy() to strncpy(); use strlcpy() instead.