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

diff3: Use ranges for new and old diffedits in ed scripts

Browse Source 
This should make the output logic easier to read. No functional change
intended.

Sponsored by:	Klara, Inc.
This commit is contained in:
Tom Jones 2022-08-02 14:33:17 +01:00
parent c0e6ccb12a
commit 190c4c2499
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -593,22 +593,26 @@ static void
edscript(int n)
{
bool delete;
struct range *new, *old;
for (; n > 0; n--) {
delete = (de[n].new.from == de[n].new.to);
new = &de[n].new;
old = &de[n].old;
delete = (new->from == new->to);
if (!oflag || !overlap[n]) {
prange(&de[n].old, delete);
prange(old, delete);
} else {
printf("%da\n", de[n].old.to - 1);
printf("%da\n", old->to - 1);
printf("%s\n", divider);
}
printrange(fp[2], &de[n].new);
printrange(fp[2], new);
if (!oflag || !overlap[n]) {
if (!delete)
printf(".\n");
} else {
printf("%s %s\n.\n", newmark, f3mark);
printf("%da\n%s %s\n.\n", de[n].old.from - 1,
printf("%da\n%s %s\n.\n", old->from - 1,
oldmark, f1mark);
}
}