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 !

I have built and tested this on x86_64 Debian jessie/sid.