Пример #1
0
void
c_regular(int fd1, const char *file1, off_t skip1, off_t len1,
    int fd2, const char *file2, off_t skip2, off_t len2)
{
	u_char ch, *p1, *p2, *m1, *m2, *e1, *e2;
	off_t byte, length, line;
	int dfound;
	off_t pagemask, off1, off2;
	size_t pagesize;
	struct sigaction act, oact;

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

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

	sigemptyset(&act.sa_mask);
	act.sa_flags = SA_NODEFER;
	act.sa_handler = segv_handler;
	if (sigaction(SIGSEGV, &act, &oact))
		err(ERR_EXIT, "sigaction()");

	pagesize = getpagesize();
	pagemask = (off_t)pagesize - 1;
	off1 = ROUNDPAGE(skip1);
	off2 = ROUNDPAGE(skip2);

	length = MIN(len1, len2);

	if ((m1 = remmap(NULL, fd1, off1)) == NULL) {
		c_special(fd1, file1, skip1, fd2, file2, skip2);
		return;
	}

	if ((m2 = remmap(NULL, fd2, off2)) == NULL) {
		munmap(m1, MMAP_CHUNK);
		c_special(fd1, file1, skip1, fd2, file2, skip2);
		return;
	}

	dfound = 0;
	e1 = m1 + MMAP_CHUNK;
	e2 = m2 + MMAP_CHUNK;
	p1 = m1 + (skip1 - off1);
	p2 = m2 + (skip2 - off2);

	for (byte = line = 1; length--; ++byte) {
		if ((ch = *p1) != *p2) {
			if (xflag) {
				dfound = 1;
				(void)printf("%08llx %02x %02x\n",
				    (long long)byte - 1, ch, *p2);
			} else if (lflag) {
				dfound = 1;
				(void)printf("%6lld %3o %3o\n",
				    (long long)byte, ch, *p2);
			} else
				diffmsg(file1, file2, byte, line);
				/* NOTREACHED */
		}
		if (ch == '\n')
			++line;
		if (++p1 == e1) {
			off1 += MMAP_CHUNK;
			if ((p1 = m1 = remmap(m1, fd1, off1)) == NULL) {
				munmap(m2, MMAP_CHUNK);
				err(ERR_EXIT, "remmap %s", file1);
			}
			e1 = m1 + MMAP_CHUNK;
		}
		if (++p2 == e2) {
			off2 += MMAP_CHUNK;
			if ((p2 = m2 = remmap(m2, fd2, off2)) == NULL) {
				munmap(m1, MMAP_CHUNK);
				err(ERR_EXIT, "remmap %s", file2);
			}
			e2 = m2 + MMAP_CHUNK;
		}
	}
	munmap(m1, MMAP_CHUNK);
	munmap(m2, MMAP_CHUNK);

	if (sigaction(SIGSEGV, &oact, NULL))
		err(ERR_EXIT, "sigaction()");

	if (len1 != len2)
		eofmsg (len1 > len2 ? file2 : file1);
	if (dfound)
		exit(DIFF_EXIT);
}
Пример #2
0
void
c_regular(int fd1, const char *file1, off_t skip1, off_t len1, int fd2,
          const char *file2, off_t skip2, off_t len2)
{
	u_char ch, *p1, *p2, *m1, *m2, *e1, *e2;
	off_t byte, length, line;
	int dfound;
	off_t pagemask, off1, off2;
	size_t pagesize;

	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;
	off1 = ROUNDPAGE(skip1);
	off2 = ROUNDPAGE(skip2);

	length = MIN(len1, len2);

	if ((m1 = remmap(NULL, fd1, off1)) == NULL) {
		c_special(fd1, file1, skip1, fd2, file2, skip2);
		return;
	}

	if ((m2 = remmap(NULL, fd2, off2)) == NULL) {
		munmap(m1, MMAP_CHUNK);
		c_special(fd1, file1, skip1, fd2, file2, skip2);
		return;
	}

	dfound = 0;
	e1 = m1 + MMAP_CHUNK;
	e2 = m2 + MMAP_CHUNK;
	p1 = m1 + (skip1 - off1);
	p2 = m2 + (skip2 - off2);

	for (byte = line = 1; length--; ++byte) {
		if ((ch = *p1) != *p2) {
			if (xflag) {
				dfound = 1;
				printf("%08jx %02x %02x\n",
				       (intmax_t)byte - 1, ch, *p2);
			} else if (lflag) {
				dfound = 1;
				printf("%6jd %3o %3o\n",
				       (intmax_t)byte, ch, *p2);
			} else {
				diffmsg(file1, file2, byte, line);
				/* NOTREACHED */
			}
		}
		if (ch == '\n')
			++line;
		if (++p1 == e1) {
			off1 += MMAP_CHUNK;
			if ((p1 = m1 = remmap(m1, fd1, off1)) == NULL) {
				munmap(m2, MMAP_CHUNK);
				err(ERR_EXIT, "remmap %s", file1);
			}
			e1 = m1 + MMAP_CHUNK;
		}
		if (++p2 == e2) {
			off2 += MMAP_CHUNK;
			if ((p2 = m2 = remmap(m2, fd2, off2)) == NULL) {
				munmap(m1, MMAP_CHUNK);
				err(ERR_EXIT, "remmap %s", file2);
			}
			e2 = m2 + MMAP_CHUNK;
		}
	}
	munmap(m1, MMAP_CHUNK);
	munmap(m2, MMAP_CHUNK);

	if (len1 != len2)
		eofmsg (len1 > len2 ? file2 : file1);
	if (dfound)
		exit(DIFF_EXIT);
}
Пример #3
0
int
c_regular(struct finfo *f0, struct finfo *f1, int opts)
{
  u_char ch, *p1, *p2, *m1, *m2, *e1, *e2;
  off_t byte, length, line;
  int dfound;
  off_t pagemask, off1, off2;
  struct sigaction act, oact;

  off_t len1 = f0->st->st_size;
  off_t len2 = f1->st->st_size;

  if ((opts & CMP_SIZEFIRST) && CMP_TAILLEN(f0) != CMP_TAILLEN(f1)) {
    if (!(opts & CMP_SILENT))
      (void) printf("%s %s differ: size\n",
          f0->path, f1->path);
    return DIFF_EXIT;
  }

  if (f0->skip > len1)
    return eofmsg(f0, opts);
  len1 -= f0->skip;
  if (f1->skip > len2)
    return eofmsg(f1, opts);
  len2 -= f1->skip;

  if ((opts & CMP_SILENT) && len1 != len2)
    return DIFF_EXIT;

  sigemptyset(&act.sa_mask);
  act.sa_flags = SA_NODEFER;
  act.sa_handler = segv_handler;
  if (sigaction(SIGSEGV, &act, &oact))
    err(ERR_EXIT, "sigaction()");

  /* floor skips to pagesize multiples */
  pagemask = (off_t)getpagesize() - 1;
  off1 = f0->skip & ~pagemask;
  off2 = f1->skip & ~pagemask;

  length = MIN(len1, len2);

  if ((m1 = remmap(NULL, f0->fd, off1)) == NULL) {
    return c_special(f0, f1, opts);
  }

  if ((m2 = remmap(NULL, f1->fd, off2)) == NULL) {
    munmap(m1, MMAP_CHUNK);
    return c_special(f0, f1, opts);
  }

  dfound = 0;
  e1 = m1 + MMAP_CHUNK;
  e2 = m2 + MMAP_CHUNK;
  p1 = m1 + (f0->skip - off1);
  p2 = m2 + (f1->skip - off2);

  for (byte = line = 1; length--; ++byte) {
    if ((ch = *p1) != *p2) {
      if (opts & CMP_ALLHEXES) {
        dfound = 1;
        (void)printf("%08llx %02x %02x\n",
            (long long)byte - 1, ch, *p2);
      } else if (opts & CMP_ALLDIFFS) {
        dfound = 1;
        (void)printf("%6lld %3o %3o\n",
            (long long)byte, ch, *p2);
      } else
        return diffmsg(f0, f1, byte, line, opts);
    }
    if (ch == '\n')
      ++line;
    if (++p1 == e1) {
      off1 += MMAP_CHUNK;
      if ((p1 = m1 = remmap(m1, f0->fd, off1)) == NULL) {
        munmap(m2, MMAP_CHUNK);
        err(ERR_EXIT, "remmap %s", f0->path);
      }
      e1 = m1 + MMAP_CHUNK;
    }
    if (++p2 == e2) {
      off2 += MMAP_CHUNK;
      if ((p2 = m2 = remmap(m2, f1->fd, off2)) == NULL) {
        munmap(m1, MMAP_CHUNK);
        err(ERR_EXIT, "remmap %s", f1->path);
      }
      e2 = m2 + MMAP_CHUNK;
    }
  }
  munmap(m1, MMAP_CHUNK);
  munmap(m2, MMAP_CHUNK);

  if (sigaction(SIGSEGV, &oact, NULL))
    err(ERR_EXIT, "sigaction()");

  if (len1 != len2)
    return eofmsg (len1 > len2 ? f1 : f0, opts);
  if (dfound)
    return DIFF_EXIT;
  return OK_EXIT;
}