usr.bin/rcs/diff3.c

20  *    contributors may be used to endorse or promote products derived from
49  *    may be used to endorse or promote products derived from this software
91  * "from" is first in range of changed lines; "to" is last+1
92  * from=to=line after point of insertion for added lines.
95 	int from;
528  * Pick up the line numbers of all changes from one change file.
563 		(*dd)[i].old.from = a;
565 		(*dd)[i].new.from = c;
570 		(*dd)[i].old.from = (*dd)[i-1].old.to;
571 		(*dd)[i].new.from = (*dd)[i-1].new.to;
649 			d1->old.from, d1->old.to,
650 			d1->new.from, d1->new.to,
651 			d2->old.from, d2->old.to,
652 			d2->new.from, d2->new.to);
655 		/* first file is different from others */
656 		if (!t2 || (t1 && d1->new.to < d2->new.from)) {
668 		/* second file is different from others */
669 		if (!t1 || (t2 && d2->new.to < d1->new.from)) {
684 		if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) {
685 			d1[1].old.from = d1->old.from;
686 			d1[1].new.from = d1->new.from;
692 		if (d2 + 1 < d23 + m2 && d2->new.to >= d2[1].new.from) {
693 			d2[1].old.from = d2->old.from;
694 			d2[1].new.from = d2->new.from;
699 		if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
712 				d3 = d1->old.to > d1->old.from ? d1 : d2;
722 		 * Overlapping changes from file 1 and 2; extend changes
725 		if (d1->new.from < d2->new.from) {
726 			d2->old.from -= d2->new.from-d1->new.from;
727 			d2->new.from = d1->new.from;
728 		} else if (d2->new.from < d1->new.from) {
729 			d1->old.from -= d1->new.from-d2->new.from;
730 			d1->new.from = d2->new.from;
751  * The range of lines rold.from thru rold.to in file i is to be changed.
764 	(void)skip(i, rold->from, NULL);
769  * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
774 	if (rold->to <= rold->from)
775 		diff_output("%da\n", rold->from - 1);
777 		diff_output("%d", rold->from);
778 		if (rold->to > rold->from+1)
796 	trange.from = rnew->from - delta;
802  * skip to just before line number from in file "i".  If "pr" is non-NULL,
806 skip(int i, int from, char *pr)
811 	for (n = 0; cline[i] < from - 1; n += j) {
832 	if (r1->to-r1->from != r2->to-r2->from)
834 	(void)skip(0, r1->from, NULL);
835 	(void)skip(1, r2->from, NULL);
837 	for (nline=0; nline < r1->to - r1->from; nline++) {
877 	de[j].old.from = diff->old.from;
879 	de[j].new.from = de[j-1].new.to + skip(2, diff->new.from, NULL);
880 	de[j].new.to = de[j].new.from + skip(2, diff->new.to, NULL);
896 		(void)fseek(fp[2], (long)de[n].new.from, SEEK_SET);
897 		for (k = de[n].new.to-de[n].new.from; k > 0; k-= j) {
916 			diff_output("%da\n%s\n.\n", de[n].old.from - 1, f1mark);