diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2003-08-12 21:13:11 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2003-08-12 21:13:11 +0000 |
| commit | 97314a59e88b8f6cd06d1aaf484dba3fd2a2216c (patch) | |
| tree | 154e3da56051456b0bc10df615137d43f11f633a /usr.bin | |
| parent | 7d11df73d837d0059d8c448e1538ed4f0561fa4c (diff) | |
Fix no newline at end of file case for Plan B.
ok millert@ tedu@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/patch/inp.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c index 87d560b5630..20da97b66c7 100644 --- a/usr.bin/patch/inp.c +++ b/usr.bin/patch/inp.c @@ -1,7 +1,7 @@ -/* $OpenBSD: inp.c,v 1.26 2003/08/10 21:28:48 otto Exp $ */ +/* $OpenBSD: inp.c,v 1.27 2003/08/12 21:13:10 otto Exp $ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: inp.c,v 1.26 2003/08/10 21:28:48 otto Exp $"; +static const char rcsid[] = "$OpenBSD: inp.c,v 1.27 2003/08/12 21:13:10 otto Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -307,7 +307,8 @@ static void plan_b(const char *filename) { FILE *ifp; - int i = 0, maxlen = 1; + int i = 0, j, maxlen = 1; + char *p; bool found_revision = (revision == NULL); using_plan_a = false; @@ -322,6 +323,10 @@ plan_b(const char *filename) if ((i = strlen(buf)) > maxlen) maxlen = i; /* find longest line */ } + last_line_missing_eol = i > 0 && buf[i - 1] != '\n'; + if (last_line_missing_eol && maxlen == i) + maxlen++; + if (revision != NULL) { if (!found_revision) { if (force) { @@ -354,17 +359,21 @@ plan_b(const char *filename) if (tibuf[1] == NULL) fatal("out of memory\n"); for (i = 1;; i++) { - if (!(i % lines_per_buf)) /* new block */ + p = tibuf[0] + maxlen * (i % lines_per_buf); + if (i % lines_per_buf == 0) /* new block */ if (write(tifd, tibuf[0], BUFFERSIZE) < BUFFERSIZE) pfatal("can't write temp file"); - if (fgets(tibuf[0] + maxlen * (i % lines_per_buf), - maxlen + 1, ifp) == NULL) { + if (fgets(p, maxlen + 1, ifp) == NULL) { input_lines = i - 1; - if (i % lines_per_buf) + if (i % lines_per_buf != 0) if (write(tifd, tibuf[0], BUFFERSIZE) < BUFFERSIZE) pfatal("can't write temp file"); break; } + j = strlen(p); + /* These are '\n' terminated strings, so no need to add a NUL */ + if (j == 0 || p[j - 1] != '\n') + p[j] = '\n'; } fclose(ifp); close(tifd); |