diff options
| author | dim <dim@FreeBSD.org> | 2014-12-11 19:27:27 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-12-11 19:27:27 +0000 |
| commit | da65ea02a341dd797c46b6987753bc1453982b36 (patch) | |
| tree | d9a72217c1d2c4dcfef27a2fd2078dd4b3f69a64 /contrib/file/src/getline.c | |
| parent | 4cba228708753c1128b75a2c25c0dda582a9913a (diff) | |
| parent | dc1c036751105b0a801375ba642278a13543bf7c (diff) | |
| download | FreeBSD-src-da65ea02a341dd797c46b6987753bc1453982b36.zip FreeBSD-src-da65ea02a341dd797c46b6987753bc1453982b36.tar.gz | |
Merge ^/head r275685 through r275714.
Diffstat (limited to 'contrib/file/src/getline.c')
| -rw-r--r-- | contrib/file/src/getline.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/contrib/file/src/getline.c b/contrib/file/src/getline.c index 99cd150..ab5e115 100644 --- a/contrib/file/src/getline.c +++ b/contrib/file/src/getline.c @@ -1,4 +1,4 @@ -/* $NetBSD: fgetln.c,v 1.9 2008/04/29 06:53:03 martin Exp $ */ +/* $NetBSD: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -52,10 +52,14 @@ getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) for (ptr = *buf, eptr = *buf + *bufsiz;;) { int c = fgetc(fp); if (c == -1) { - if (feof(fp)) - return ptr == *buf ? -1 : ptr - *buf; - else - return -1; + if (feof(fp)) { + ssize_t diff = (ssize_t)(ptr - *buf); + if (diff != 0) { + *ptr = '\0'; + return diff; + } + } + return -1; } *ptr++ = c; if (c == delimiter) { @@ -93,7 +97,7 @@ main(int argc, char *argv[]) size_t n = 0; while ((len = getline(&p, &n, stdin)) != -1) - (void)printf("%zd %s", len, p); + (void)printf("%" SIZE_T_FORMAT "d %s", len, p); free(p); return 0; } |
