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); }
int main(int argc, char *argv[]) { struct stat sb1, sb2; off_t skip1, skip2; int ch, fd1, fd2, special; char *file1, *file2; setlocale(LC_ALL, ""); while ((ch = getopt(argc, argv, "ls")) != -1) switch (ch) { case 'l': /* print all differences */ lflag = 1; break; case 's': /* silent run */ sflag = 1; break; case '?': default: usage(); } argv += optind; argc -= optind; if (lflag && sflag) errx(ERR_EXIT, "only one of -l and -s may be specified"); if (argc < 2 || argc > 4) usage(); /* Backward compatibility -- handle "-" meaning stdin. */ special = 0; if (strcmp(file1 = argv[0], "-") == 0) { special = 1; fd1 = 0; file1 = "stdin"; } else if ((fd1 = open(file1, O_RDONLY, 0)) < 0) { if (sflag) exit(ERR_EXIT); else err(ERR_EXIT, "%s", file1); } if (strcmp(file2 = argv[1], "-") == 0) { if (special) { if (sflag) exit(ERR_EXIT); else errx(ERR_EXIT, "standard input may only be specified once"); } special = 1; fd2 = 0; file2 = "stdin"; } else if ((fd2 = open(file2, O_RDONLY, 0)) < 0) { if (sflag) exit(ERR_EXIT); else err(ERR_EXIT, "%s", file2); } skip1 = argc > 2 ? strtoq(argv[2], NULL, 0) : 0; skip2 = argc == 4 ? strtoq(argv[3], NULL, 0) : 0; if (!special) { if (fstat(fd1, &sb1)) { if (sflag) exit(ERR_EXIT); else err(ERR_EXIT, "%s", file1); } if (!S_ISREG(sb1.st_mode)) special = 1; else { if (fstat(fd2, &sb2)) { if (sflag) exit(ERR_EXIT); else err(ERR_EXIT, "%s", file2); } if (!S_ISREG(sb2.st_mode)) special = 1; } } if (special) c_special(fd1, file1, skip1, fd2, file2, skip2); else c_regular(fd1, file1, skip1, sb1.st_size, fd2, file2, skip2, sb2.st_size); return 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); }
c_regular(int fd1, char *file1, off_t skip1, off_t len1, int fd2, char *file2, off_t skip2, off_t len2) #endif { #ifndef __GNO__ u_char ch, *p1, *p2; #else u_char ch, p1, p2; #endif off_t byte, length, line; int dfound; off_t pagemask, off1, off2; if (sflag && len1 != len2) exit(1); if (skip1 > len1) eofmsg(file1); len1 -= skip1; if (skip2 > len2) eofmsg(file2); len2 -= skip2; pagemask = (off_t)getpagesize() - 1; off1 = ROUNDPAGE(skip1); off2 = ROUNDPAGE(skip2); length = MIN(len1, len2); #ifndef __ORCAC__ if (length > SIZE_T_MAX) return (c_special(fd1, file1, skip1, fd2, file2, skip2)); #else if (length > SIZE_T_MAX) { c_special(fd1, file1, skip1, fd2, file2, skip2); return; } #endif #ifndef __GNO__ if ((p1 = (u_char *)mmap(NULL, (size_t)length, PROT_READ, MAP_SHARED, fd1, off1)) == (u_char *)MAP_FAILED) err(ERR_EXIT, "%s", file1); madvise(p1, length, MADV_SEQUENTIAL); if ((p2 = (u_char *)mmap(NULL, (size_t)length, PROT_READ, MAP_SHARED, fd2, off2)) == (u_char *)MAP_FAILED) err(ERR_EXIT, "%s", file2); madvise(p2, length, MADV_SEQUENTIAL); dfound = 0; p1 += skip1 - off1; p2 += skip2 - off2; for (byte = line = 1; length--; ++p1, ++p2, ++byte) { if ((ch = *p1) != *p2) if (lflag) { dfound = 1; (void)printf("%6qd %3o %3o\n", byte, ch, *p2); } else diffmsg(file1, file2, byte, line); /* NOTREACHED */ if (ch == '\n') ++line; } if (len1 != len2) eofmsg (len1 > len2 ? file2 : file1); if (dfound) exit(DIFF_EXIT); #else dfound = 0; lseek(fd1, skip1, SEEK_SET); lseek(fd2, skip2, SEEK_SET); for (byte = line = 1; length--; ++byte) { read(fd1, (void *) &p1, 1); read(fd2, (void *) &p2, 1); if (p1 != p2) if (lflag) { dfound = 1; (void)printf("%6qd %3o %3o\n", byte, ch, p2); } else diffmsg(file1, file2, byte, line); /* NOTREACHED */ if (p1 == '\n') ++line; } if (len1 != len2) eofmsg (len1 > len2 ? file2 : file1); if (dfound) exit(DIFF_EXIT); #endif }
int main(int argc, char *argv[]) { struct stat sb1, sb2; off_t skip1, skip2; int ch, fd1, fd2, oflag, special; const char *file1, *file2; cap_rights_t rights; uint32_t fcntls; oflag = O_RDONLY; while ((ch = getopt(argc, argv, "hlsxz")) != -1) switch (ch) { case 'h': /* Don't follow symlinks */ oflag |= O_NOFOLLOW; break; case 'l': /* print all differences */ lflag = 1; break; case 's': /* silent run */ sflag = 1; zflag = 1; break; case 'x': /* hex output */ lflag = 1; xflag = 1; break; case 'z': /* compare size first */ zflag = 1; break; case '?': default: usage(); } argv += optind; argc -= optind; if (lflag && sflag) errx(ERR_EXIT, "specifying -s with -l or -x is not permitted"); if (argc < 2 || argc > 4) usage(); /* Backward compatibility -- handle "-" meaning stdin. */ special = 0; if (strcmp(file1 = argv[0], "-") == 0) { special = 1; fd1 = 0; file1 = "stdin"; } else if ((fd1 = open(file1, oflag, 0)) < 0 && errno != EMLINK) { if (!sflag) err(ERR_EXIT, "%s", file1); else exit(ERR_EXIT); } if (strcmp(file2 = argv[1], "-") == 0) { if (special) errx(ERR_EXIT, "standard input may only be specified once"); special = 1; fd2 = 0; file2 = "stdin"; } else if ((fd2 = open(file2, oflag, 0)) < 0 && errno != EMLINK) { if (!sflag) err(ERR_EXIT, "%s", file2); else exit(ERR_EXIT); } skip1 = argc > 2 ? strtol(argv[2], NULL, 0) : 0; skip2 = argc == 4 ? strtol(argv[3], NULL, 0) : 0; if (fd1 == -1) { if (fd2 == -1) { c_link(file1, skip1, file2, skip2); exit(0); } else if (!sflag) errx(ERR_EXIT, "%s: Not a symbolic link", file2); else exit(ERR_EXIT); } else if (fd2 == -1) { if (!sflag) errx(ERR_EXIT, "%s: Not a symbolic link", file1); else exit(ERR_EXIT); } cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_MMAP_R); if (cap_rights_limit(fd1, &rights) < 0 && errno != ENOSYS) err(ERR_EXIT, "unable to limit rights for %s", file1); if (cap_rights_limit(fd2, &rights) < 0 && errno != ENOSYS) err(ERR_EXIT, "unable to limit rights for %s", file2); /* Required for fdopen(3). */ fcntls = CAP_FCNTL_GETFL; if (cap_fcntls_limit(fd1, fcntls) < 0 && errno != ENOSYS) err(ERR_EXIT, "unable to limit fcntls for %s", file1); if (cap_fcntls_limit(fd2, fcntls) < 0 && errno != ENOSYS) err(ERR_EXIT, "unable to limit fcntls for %s", file2); if (!special) { cap_rights_init(&rights); if (cap_rights_limit(STDIN_FILENO, &rights) < 0 && errno != ENOSYS) { err(ERR_EXIT, "unable to limit stdio"); } } if (caph_limit_stdout() == -1 || caph_limit_stderr() == -1) err(ERR_EXIT, "unable to limit stdio"); caph_cache_catpages(); if (cap_enter() < 0 && errno != ENOSYS) err(ERR_EXIT, "unable to enter capability mode"); if (!special) { if (fstat(fd1, &sb1)) { if (!sflag) err(ERR_EXIT, "%s", file1); else exit(ERR_EXIT); } if (!S_ISREG(sb1.st_mode)) special = 1; else { if (fstat(fd2, &sb2)) { if (!sflag) err(ERR_EXIT, "%s", file2); else exit(ERR_EXIT); } if (!S_ISREG(sb2.st_mode)) special = 1; } } if (special) c_special(fd1, file1, skip1, fd2, file2, skip2); else { if (zflag && sb1.st_size != sb2.st_size) { if (!sflag) (void) printf("%s %s differ: size\n", file1, file2); exit(DIFF_EXIT); } c_regular(fd1, file1, skip1, sb1.st_size, fd2, file2, skip2, sb2.st_size); } exit(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; }
main(int argc, char *argv[]) #endif { struct stat sb1, sb2; off_t skip1, skip2; int ch, fd1, fd2, special; char *file1, *file2; #ifdef __STACK_CHECK__ atexit(cleanup); _beginStackCheck(); #endif #ifdef __GNO__ while ((ch = getopt(argc, argv, "-lsr")) != -1) #else while ((ch = getopt(argc, argv, "-ls")) != -1) #endif switch (ch) { case 'l': /* print all differences */ lflag = 1; break; case 's': /* silent run */ sflag = 1; break; #ifdef __GNO__ case 'r': rflag = 1; /* ignore resource fork */ break; #endif case '-': /* stdin (must be after options) */ --optind; goto endargs; case '?': default: usage(); } endargs: #ifndef __ORCAC__ argv += optind; #else argv = argv + optind; #endif argc -= optind; if (lflag && sflag) errx(ERR_EXIT, "only one of -l and -s may be specified"); if (argc < 2 || argc > 4) usage(); /* Backward compatibility -- handle "-" meaning stdin. */ special = 0; if (strcmp(file1 = argv[0], "-") == 0) { special = 1; fd1 = 0; file1 = "stdin"; } #ifndef __GNO__ else if ((fd1 = open(file1, O_RDONLY, 0)) < 0) { #else /* open() for GNO/ME requires 3rd arg iff creating file */ else if ((fd1 = open(file1, O_RDONLY)) < 0) { #endif if (!sflag) err(ERR_EXIT, "%s", file1); else exit(1); } if (strcmp(file2 = argv[1], "-") == 0) { if (special) errx(ERR_EXIT, "standard input may only be specified once"); special = 1; fd2 = 0; file2 = "stdin"; } #ifndef __GNO__ else if ((fd2 = open(file2, O_RDONLY, 0)) < 0) { #else else if ((fd2 = open(file2, O_RDONLY)) < 0) { #endif if (!sflag) err(ERR_EXIT, "%s", file2); else exit(1); } skip1 = argc > 2 ? strtol(argv[2], NULL, 10) : 0; skip2 = argc == 4 ? strtol(argv[3], NULL, 10) : 0; #ifndef __GNO__ if (!special) { if (fstat(fd1, &sb1)) { if (!sflag) err(ERR_EXIT, "%s", file1); else exit(1); } if (!S_ISREG(sb1.st_mode)) special = 1; else { if (fstat(fd2, &sb2)) { if (!sflag) err(ERR_EXIT, "%s", file2); else exit(1); } if (!S_ISREG(sb2.st_mode)) special = 1; } } #else special = 1; /* GNO doesn't have mmap.h, so treat every file as a special file and process byte by byte */ #endif if (special) #ifdef __GNO__ { #endif c_special(fd1, file1, skip1, fd2, file2, skip2); #ifdef __GNO__ close(fd1); close(fd2); } if (rflag != 1) { rflag = 2; rcmp(&fd1, &fd2, file1, file2); close(fd1); close(fd2); } #else else c_regular(fd1, file1, skip1, sb1.st_size, fd2, file2, skip2, sb2.st_size); #endif /* exit(0); */ } static void #ifndef __STDC__ usage() #else usage(void) #endif { (void)fprintf(stderr, #ifndef __GNO__ "usage: cmp [-l | -s] file1 file2 [skip1 [skip2]]\n"); #else "usage: cmp [-l | -s] [-r] file1 file2 [skip1 [skip2]]\n"); #endif exit(ERR_EXIT); }