Merge "string: tidy up strndup()"