Use strcspn to remove \n from fgets result. Prompted by change by Ray

Lai of OpenBSD via Björn Sandell.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19213 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-04 23:36:36 +00:00
parent 63579afa99
commit 487bcca4e2
4 changed files with 6 additions and 12 deletions

View File

@@ -57,8 +57,7 @@ read_words (const char *filename, char ***ret_w)
while (fgets (buf, sizeof(buf), f) != NULL) {
size_t len;
if (buf[strlen (buf) - 1] == '\n')
buf[strlen (buf) - 1] = '\0';
buf[strcspn(buf, "\r\n")] = '\0';
if (n >= alloc) {
alloc = max(alloc + 16, alloc * 2);
w = erealloc (w, alloc * sizeof(char **));