Use strlcpy() in preference to strncpy().

Mikhail says the reverse change (git show -b af216a39) was a merge
conflict mistake, so let's put it back again !
Merge pull request #1193 from ediosyncratic/merge-oops-restore

Use strlcpy() in preference to strncpy().