oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
kadmin/add-random-users.c
View File

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

6
kdc/string2key.c
View File

@@ -161,16 +161,14 @@ main(int argc, char **argv)
printf("Kerberos v5 principal: "); printf("Kerberos v5 principal: ");
if(fgets(buf, sizeof(buf), stdin) == NULL) if(fgets(buf, sizeof(buf), stdin) == NULL)
return 1; return 1;
if(buf[strlen(buf) - 1] == '\n') buf[strcspn(buf, "\r\n")] = '\0';
buf[strlen(buf) - 1] = '\0';
principal = estrdup(buf); principal = estrdup(buf);
} }
if(afs && cell == NULL){ if(afs && cell == NULL){
printf("AFS cell: "); printf("AFS cell: ");
if(fgets(buf, sizeof(buf), stdin) == NULL) if(fgets(buf, sizeof(buf), stdin) == NULL)
return 1; return 1;
if(buf[strlen(buf) - 1] == '\n') buf[strcspn(buf, "\r\n")] = '\0';
buf[strlen(buf) - 1] = '\0';
cell = estrdup(buf); cell = estrdup(buf);
} }
if(argv[0]) if(argv[0])

6
lib/krb5/config_file.c
View File

@@ -158,8 +158,7 @@ parse_list(struct fileptr *f, unsigned *lineno, krb5_config_binding **parent,
char *p; char *p;
++*lineno; ++*lineno;
if (buf[strlen(buf) - 1] == '\n') buf[strcspn(buf, "\r\n")] = '\0';
buf[strlen(buf) - 1] = '\0';
p = buf; p = buf;
while(isspace((unsigned char)*p)) while(isspace((unsigned char)*p))
++p; ++p;
@@ -255,8 +254,7 @@ krb5_config_parse_debug (struct fileptr *f,
char *p; char *p;
++*lineno; ++*lineno;
if(buf[strlen(buf) - 1] == '\n') buf[strcspn(buf, "\r\n")] = '\0';
buf[strlen(buf) - 1] = '\0';
p = buf; p = buf;
while(isspace((unsigned char)*p)) while(isspace((unsigned char)*p))
++p; ++p;

3
lib/sl/sl.c
View File

@@ -191,8 +191,7 @@ readline(char *prompt)
fflush (stdout); fflush (stdout);
if(fgets(buf, sizeof(buf), stdin) == NULL) if(fgets(buf, sizeof(buf), stdin) == NULL)
return NULL; return NULL;
if (buf[strlen(buf) - 1] == '\n') buf[strcspn(buf, "\r\n")] = '\0';
buf[strlen(buf) - 1] = '\0';
return strdup(buf); return strdup(buf);
} }