From 3154e1056e75e0a5960e340a1b33771371ff7653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Wed, 6 Dec 2006 08:04:05 +0000 Subject: [PATCH] =?UTF-8?q?Use=20strcspn=20to=20remove=20\n=20from=20strin?= =?UTF-8?q?g=20returned=20by=20fgets.=20From=20Bj=C3=B6rn=20Sandell?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19233 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kpasswd/kpasswd-generator.c | 3 +-- kuser/generate-requests.c | 3 +-- lib/kadm5/ipropd_master.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kpasswd/kpasswd-generator.c b/kpasswd/kpasswd-generator.c index cff60713b..dade24f6c 100644 --- a/kpasswd/kpasswd-generator.c +++ b/kpasswd/kpasswd-generator.c @@ -48,8 +48,7 @@ read_words (const char *filename, char ***ret_w) err (1, "cannot open %s", filename); alloc = n = 0; while (fgets (buf, sizeof(buf), f) != NULL) { - if (buf[strlen (buf) - 1] == '\n') - buf[strlen (buf) - 1] = '\0'; + buf[strcspn(buf, "\r\n")] = '\0'; if (n >= alloc) { alloc += 16; w = erealloc (w, alloc * sizeof(char **)); diff --git a/kuser/generate-requests.c b/kuser/generate-requests.c index b18dfda8b..3691a6431 100644 --- a/kuser/generate-requests.c +++ b/kuser/generate-requests.c @@ -58,8 +58,7 @@ read_words (const char *filename, char ***ret_w) err (1, "cannot open %s", filename); alloc = n = 0; while (fgets (buf, sizeof(buf), f) != NULL) { - if (buf[strlen (buf) - 1] == '\n') - buf[strlen (buf) - 1] = '\0'; + buf[strcspn(buf, "\r\n")] = '\0'; if (n >= alloc) { alloc += 16; w = erealloc (w, alloc * sizeof(char **)); diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c index ad3a8f300..22cc3b9e9 100644 --- a/lib/kadm5/ipropd_master.c +++ b/lib/kadm5/ipropd_master.c @@ -127,8 +127,7 @@ check_acl (krb5_context context, const char *name) if (fp == NULL) return 1; while (fgets(buf, sizeof(buf), fp) != NULL) { - if (buf[strlen(buf) - 1 ] == '\n') - buf[strlen(buf) - 1 ] = '\0'; + buf[strcspn(buf, "\r\n")] = '\0'; if (strcmp (buf, name) == 0) { ret = 0; break;