Attachment #8976 for bug #18597

View | Details | Raw Unified | Return to bug 18597
Collapse All | Expand All




	off_t pagemask, off1, off2;
	size_t pagesize;

	if (sflag && len1 != len2)
		exit(1);

	if (skip1 > len1)
		eofmsg(file1);
	len1 -= skip1;
	if (skip2 > len2)
		eofmsg(file2);
	len2 -= skip2;

	if(sflag && len1 != len2)
		exit(DIFF_EXIT);

	pagesize = getpagesize();
	pagemask = (off_t)pagesize - 1;

Return to bug 18597

Lines 65-79 Link Here

(-)regular.c (-3 / +3 lines)
65	off_t pagemask, off1, off2;	65	off_t pagemask, off1, off2;
66	size_t pagesize;	66	size_t pagesize;
67		67
68	if (sflag && len1 != len2)
69	exit(1);
70
71	if (skip1 > len1)	68	if (skip1 > len1)
72	eofmsg(file1);	69	eofmsg(file1);
73	len1 -= skip1;	70	len1 -= skip1;
74	if (skip2 > len2)	71	if (skip2 > len2)
75	eofmsg(file2);	72	eofmsg(file2);
76	len2 -= skip2;	73	len2 -= skip2;
		74
		75	if(sflag && len1 != len2)
		76	exit(DIFF_EXIT);
77		77
78	pagesize = getpagesize();	78	pagesize = getpagesize();
79	pagemask = (off_t)pagesize - 1;	79	pagemask = (off_t)pagesize - 1;