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

diff3: seperate old and new markers from file markers

Browse Source 
With -A and -m output the conflict markers are not tied to the file
name. Seperate out these markers.

Sponsored by:	Klara, Inc.
This commit is contained in:
Tom Jones 2022-04-19 15:38:30 +01:00
parent 1978059263
commit df092859b4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,6 +128,8 @@ static int Aflag, eflag, iflag, mflag, Tflag;
static int oflag; /* indicates whether to mark overlaps (-E or -X) */
static int strip_cr;
static char *f1mark, *f2mark, *f3mark;
static const char *oldmark = "<<<<<<<";
static const char *newmark = ">>>>>>>";
static bool duplicate(struct range *, struct range *);
static int edit(struct diff *, bool, int);
@ -561,8 +563,9 @@ edscript(int n)
if (!delete)
printf(".\n");
} else {
printf("%s\n.\n", f3mark);
printf("%da\n%s\n.\n", de[n].old.from - 1, f1mark);
printf("%s %s\n.\n", newmark, f3mark);
printf("%da\n%s %s\n.\n", de[n].old.from - 1,
oldmark, f1mark);
}
}
if (iflag)
@ -705,15 +708,15 @@ main(int argc, char **argv)
file3 = argv[2];
if (oflag) {
asprintf(&f1mark, "<<<<<<< %s",
asprintf(&f1mark, "%s",
labels[0] != NULL ? labels[0] : file1);
if (f1mark == NULL)
err(2, "asprintf");
asprintf(&f2mark, "||||||| %s",
asprintf(&f2mark, "%s",
labels[1] != NULL ? labels[1] : file2);
if (f2mark == NULL)
err(2, "asprintf");
asprintf(&f3mark, ">>>>>>> %s",
asprintf(&f3mark, "%s",
labels[2] != NULL ? labels[2] : file3);
if (f3mark == NULL)
err(2, "asprintf");