d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff3: sync with upstream

Browse Source 
* replace realloc calls with reallocarray calls
 * fix merging of files that lack newlines

Obtained from:	OpenBSD
This commit is contained in:
Piotr Pawel Stefaniak 2021-08-20 23:35:24 +02:00
parent f8e50dd2c6
commit 7f7b03f389
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/diff3/diff3.c
View File

@ -459,6 +459,8 @@ duplicate(struct range *r1, struct range *r2)
do { do {
c = getc(fp[0]); c = getc(fp[0]);
d = getc(fp[1]); d = getc(fp[1]);
if (c == -1 && d == -1)
break;
if (c == -1 || d== -1) if (c == -1 || d== -1)
errx(EXIT_FAILURE, "logic error"); errx(EXIT_FAILURE, "logic error");
nchar++; nchar++;
@ -528,10 +530,17 @@ edscript(int n)
} }
fseek(fp[2], (long)de[n].new.from, SEEK_SET); fseek(fp[2], (long)de[n].new.from, SEEK_SET);
for (k = de[n].new.to - de[n].new.from; k > 0; k-= j) { for (k = de[n].new.to - de[n].new.from; k > 0; k-= j) {
size_t r;
j = k > BUFSIZ ? BUFSIZ : k; j = k > BUFSIZ ? BUFSIZ : k;
if (fread(block, 1, j, fp[2]) != j) r = fread(block, 1, j, fp[2]);
if (r == 0) {
if (feof(fp[2]))
break;
errx(2, "logic error"); errx(2, "logic error");
fwrite(block, 1, j, stdout); }
if (r != j)
j = r;
(void)fwrite(block, 1, j, stdout);
} }
if (!oflag || !overlap[n]) if (!oflag || !overlap[n])
printf(".\n"); printf(".\n");
@ -557,22 +566,22 @@ increase(void)
newsz = szchanges == 0 ? 64 : 2 * szchanges; newsz = szchanges == 0 ? 64 : 2 * szchanges;
incr = newsz - szchanges; incr = newsz - szchanges;
p = realloc(d13, newsz * sizeof(struct diff)); p = reallocarray(d13, newsz, sizeof(struct diff));
if (p == NULL) if (p == NULL)
err(1, NULL); err(1, NULL);
memset(p + szchanges, 0, incr * sizeof(struct diff)); memset(p + szchanges, 0, incr * sizeof(struct diff));
d13 = p; d13 = p;
p = realloc(d23, newsz * sizeof(struct diff)); p = reallocarray(d23, newsz, sizeof(struct diff));
if (p == NULL) if (p == NULL)
err(1, NULL); err(1, NULL);
memset(p + szchanges, 0, incr * sizeof(struct diff)); memset(p + szchanges, 0, incr * sizeof(struct diff));
d23 = p; d23 = p;
p = realloc(de, newsz * sizeof(struct diff)); p = reallocarray(de, newsz, sizeof(struct diff));
if (p == NULL) if (p == NULL)
err(1, NULL); err(1, NULL);
memset(p + szchanges, 0, incr * sizeof(struct diff)); memset(p + szchanges, 0, incr * sizeof(struct diff));
de = p; de = p;
q = realloc(overlap, newsz * sizeof(char)); q = reallocarray(overlap, newsz, sizeof(char));
if (q == NULL) if (q == NULL)
err(1, NULL); err(1, NULL);
memset(q + szchanges, 0, incr * sizeof(char)); memset(q + szchanges, 0, incr * sizeof(char));