diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 83aa20c52cf3..1aba09f7a5f7 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -1,689 +1,690 @@ /* $OpenBSD: diff.c,v 1.67 2019/06/28 13:35:00 deraadt Exp $ */ /* * Copyright (c) 2003 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Sponsored in part by the Defense Advanced Research Projects * Agency (DARPA) and Air Force Research Laboratory, Air Force * Materiel Command, USAF, under agreement number F39502-99-1-0512. */ #include #include #include #include #include #include #include #include #include #include #include "diff.h" #include "xmalloc.h" static const char diff_version[] = "FreeBSD diff 20240307"; bool lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag; bool ignore_file_case, suppress_common, color, noderef; static bool help = false; int diff_format, diff_context, diff_algorithm, status; bool diff_algorithm_set; int tabsize = 8, width = 130; static int colorflag = COLORFLAG_NEVER; char *start, *ifdefname, *diffargs, *label[2]; char *ignore_pats, *most_recent_pat; char *group_format = NULL; const char *add_code, *del_code; struct stat stb1, stb2; struct excludes *excludes_list; regex_t ignore_re, most_recent_re; static struct algorithm { const char *name; int id; } algorithms[] = { {"stone", D_DIFFSTONE}, {"myers", D_DIFFMYERS}, {"patience", D_DIFFPATIENCE}, {NULL, D_DIFFNONE} }; #define OPTIONS "0123456789A:aBbC:cdD:efF:HhI:iL:lnNPpqrS:sTtU:uwW:X:x:y" enum { OPT_TSIZE = CHAR_MAX + 1, OPT_STRIPCR, OPT_IGN_FN_CASE, OPT_NO_IGN_FN_CASE, OPT_NORMAL, OPT_HELP, OPT_HORIZON_LINES, OPT_CHANGED_GROUP_FORMAT, OPT_SUPPRESS_COMMON, OPT_COLOR, OPT_NO_DEREFERENCE, OPT_VERSION, }; static struct option longopts[] = { { "algorithm", required_argument, 0, 'A' }, { "text", no_argument, 0, 'a' }, { "ignore-space-change", no_argument, 0, 'b' }, { "context", optional_argument, 0, 'C' }, { "ifdef", required_argument, 0, 'D' }, { "minimal", no_argument, 0, 'd' }, { "ed", no_argument, 0, 'e' }, { "forward-ed", no_argument, 0, 'f' }, { "show-function-line", required_argument, 0, 'F' }, { "speed-large-files", no_argument, NULL, 'H' }, { "ignore-blank-lines", no_argument, 0, 'B' }, { "ignore-matching-lines", required_argument, 0, 'I' }, { "ignore-case", no_argument, 0, 'i' }, { "paginate", no_argument, NULL, 'l' }, { "label", required_argument, 0, 'L' }, { "new-file", no_argument, 0, 'N' }, { "rcs", no_argument, 0, 'n' }, { "unidirectional-new-file", no_argument, 0, 'P' }, { "show-c-function", no_argument, 0, 'p' }, { "brief", no_argument, 0, 'q' }, { "recursive", no_argument, 0, 'r' }, { "report-identical-files", no_argument, 0, 's' }, { "starting-file", required_argument, 0, 'S' }, { "expand-tabs", no_argument, 0, 't' }, { "initial-tab", no_argument, 0, 'T' }, { "unified", optional_argument, 0, 'U' }, { "ignore-all-space", no_argument, 0, 'w' }, { "width", required_argument, 0, 'W' }, { "exclude", required_argument, 0, 'x' }, { "exclude-from", required_argument, 0, 'X' }, { "side-by-side", no_argument, NULL, 'y' }, { "ignore-file-name-case", no_argument, NULL, OPT_IGN_FN_CASE }, { "help", no_argument, NULL, OPT_HELP}, { "horizon-lines", required_argument, NULL, OPT_HORIZON_LINES }, { "no-dereference", no_argument, NULL, OPT_NO_DEREFERENCE}, { "no-ignore-file-name-case", no_argument, NULL, OPT_NO_IGN_FN_CASE }, { "normal", no_argument, NULL, OPT_NORMAL }, { "strip-trailing-cr", no_argument, NULL, OPT_STRIPCR }, { "tabsize", required_argument, NULL, OPT_TSIZE }, { "changed-group-format", required_argument, NULL, OPT_CHANGED_GROUP_FORMAT}, { "suppress-common-lines", no_argument, NULL, OPT_SUPPRESS_COMMON }, { "color", optional_argument, NULL, OPT_COLOR }, { "version", no_argument, NULL, OPT_VERSION}, { NULL, 0, 0, '\0'} }; static void checked_regcomp(char const *, regex_t *); static void usage(void) __dead2; static void conflicting_format(void) __dead2; static void push_excludes(char *); static void push_ignore_pats(char *); static void read_excludes_file(char *file); static void set_argstr(char **, char **); static char *splice(char *, char *); static bool do_color(void); int main(int argc, char **argv) { const char *errstr = NULL; char *ep, **oargv; long l; int ch, dflags, lastch, gotstdin, prevoptind, newarg; oargv = argv; gotstdin = 0; dflags = 0; lastch = '\0'; prevoptind = 1; newarg = 1; diff_context = 3; diff_format = D_UNSET; diff_algorithm = D_DIFFMYERS; diff_algorithm_set = false; #define FORMAT_MISMATCHED(type) \ (diff_format != D_UNSET && diff_format != (type)) while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) { switch (ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': if (newarg) usage(); /* disallow -[0-9]+ */ else if (lastch == 'c' || lastch == 'u') diff_context = 0; else if (!isdigit(lastch) || diff_context > INT_MAX / 10) usage(); diff_context = (diff_context * 10) + (ch - '0'); break; case 'A': diff_algorithm = D_DIFFNONE; for (struct algorithm *a = algorithms; a->name;a++) { if(strcasecmp(optarg, a->name) == 0) { diff_algorithm = a->id; diff_algorithm_set = true; break; } } if (diff_algorithm == D_DIFFNONE) { printf("unknown algorithm: %s\n", optarg); usage(); } break; case 'a': dflags |= D_FORCEASCII; break; case 'b': dflags |= D_FOLDBLANKS; break; case 'C': case 'c': if (FORMAT_MISMATCHED(D_CONTEXT)) conflicting_format(); cflag = true; diff_format = D_CONTEXT; if (optarg != NULL) { l = strtol(optarg, &ep, 10); if (*ep != '\0' || l < 0 || l >= INT_MAX) usage(); diff_context = (int)l; } break; case 'd': dflags |= D_MINIMAL; break; case 'D': if (FORMAT_MISMATCHED(D_IFDEF)) conflicting_format(); diff_format = D_IFDEF; ifdefname = optarg; break; case 'e': if (FORMAT_MISMATCHED(D_EDIT)) conflicting_format(); diff_format = D_EDIT; break; case 'f': if (FORMAT_MISMATCHED(D_REVERSE)) conflicting_format(); diff_format = D_REVERSE; break; case 'H': /* ignore but needed for compatibility with GNU diff */ break; case 'h': /* silently ignore for backwards compatibility */ break; case 'B': dflags |= D_SKIPBLANKLINES; break; case 'F': if (dflags & D_PROTOTYPE) conflicting_format(); dflags |= D_MATCHLAST; most_recent_pat = xstrdup(optarg); break; case 'I': push_ignore_pats(optarg); break; case 'i': dflags |= D_IGNORECASE; break; case 'L': if (label[0] == NULL) label[0] = optarg; else if (label[1] == NULL) label[1] = optarg; else usage(); break; case 'l': + dflags |= D_PAGINATION; lflag = true; break; case 'N': Nflag = true; break; case 'n': if (FORMAT_MISMATCHED(D_NREVERSE)) conflicting_format(); diff_format = D_NREVERSE; break; case 'p': if (dflags & D_MATCHLAST) conflicting_format(); dflags |= D_PROTOTYPE; break; case 'P': Pflag = true; break; case 'r': rflag = true; break; case 'q': if (FORMAT_MISMATCHED(D_BRIEF)) conflicting_format(); diff_format = D_BRIEF; break; case 'S': start = optarg; break; case 's': sflag = true; break; case 'T': Tflag = true; break; case 't': dflags |= D_EXPANDTABS; break; case 'U': case 'u': if (FORMAT_MISMATCHED(D_UNIFIED)) conflicting_format(); diff_format = D_UNIFIED; if (optarg != NULL) { l = strtol(optarg, &ep, 10); if (*ep != '\0' || l < 0 || l >= INT_MAX) usage(); diff_context = (int)l; } break; case 'w': dflags |= D_IGNOREBLANKS; break; case 'W': width = (int) strtonum(optarg, 1, INT_MAX, &errstr); if (errstr) { warnx("Invalid argument for width"); usage(); } break; case 'X': read_excludes_file(optarg); break; case 'x': push_excludes(optarg); break; case 'y': if (FORMAT_MISMATCHED(D_SIDEBYSIDE)) conflicting_format(); diff_format = D_SIDEBYSIDE; break; case OPT_CHANGED_GROUP_FORMAT: if (FORMAT_MISMATCHED(D_GFORMAT)) conflicting_format(); diff_format = D_GFORMAT; group_format = optarg; break; case OPT_HELP: help = true; usage(); break; case OPT_HORIZON_LINES: break; /* XXX TODO for compatibility with GNU diff3 */ case OPT_IGN_FN_CASE: ignore_file_case = true; break; case OPT_NO_IGN_FN_CASE: ignore_file_case = false; break; case OPT_NORMAL: if (FORMAT_MISMATCHED(D_NORMAL)) conflicting_format(); diff_format = D_NORMAL; break; case OPT_TSIZE: tabsize = (int) strtonum(optarg, 1, INT_MAX, &errstr); if (errstr) { warnx("Invalid argument for tabsize"); usage(); } break; case OPT_STRIPCR: dflags |= D_STRIPCR; break; case OPT_SUPPRESS_COMMON: suppress_common = 1; break; case OPT_COLOR: if (optarg == NULL || strncmp(optarg, "auto", 4) == 0) colorflag = COLORFLAG_AUTO; else if (strncmp(optarg, "always", 6) == 0) colorflag = COLORFLAG_ALWAYS; else if (strncmp(optarg, "never", 5) == 0) colorflag = COLORFLAG_NEVER; else errx(2, "unsupported --color value '%s' (must be always, auto, or never)", optarg); break; case OPT_NO_DEREFERENCE: noderef = true; break; case OPT_VERSION: printf("%s\n", diff_version); exit(0); default: usage(); break; } lastch = ch; newarg = optind != prevoptind; prevoptind = optind; } if (diff_format == D_UNSET && (dflags & D_PROTOTYPE) != 0) diff_format = D_CONTEXT; if (diff_format == D_UNSET) diff_format = D_NORMAL; argc -= optind; argv += optind; if (do_color()) { char *p; const char *env; color = true; add_code = "32"; del_code = "31"; env = getenv("DIFFCOLORS"); if (env != NULL && *env != '\0' && (p = strdup(env))) { add_code = p; strsep(&p, ":"); if (p != NULL) del_code = p; } } #ifdef __OpenBSD__ if (pledge("stdio rpath tmppath", NULL) == -1) err(2, "pledge"); #endif /* * Do sanity checks, fill in stb1 and stb2 and call the appropriate * driver routine. Both drivers use the contents of stb1 and stb2. */ if (argc != 2) usage(); checked_regcomp(ignore_pats, &ignore_re); checked_regcomp(most_recent_pat, &most_recent_re); if (strcmp(argv[0], "-") == 0) { fstat(STDIN_FILENO, &stb1); gotstdin = 1; } else if (stat(argv[0], &stb1) != 0) { if (!Nflag || errno != ENOENT) err(2, "%s", argv[0]); dflags |= D_EMPTY1; memset(&stb1, 0, sizeof(struct stat)); } if (strcmp(argv[1], "-") == 0) { fstat(STDIN_FILENO, &stb2); gotstdin = 1; } else if (stat(argv[1], &stb2) != 0) { if (!Nflag || errno != ENOENT) err(2, "%s", argv[1]); dflags |= D_EMPTY2; memset(&stb2, 0, sizeof(stb2)); stb2.st_mode = stb1.st_mode; } if (dflags & D_EMPTY1 && dflags & D_EMPTY2){ warn("%s", argv[0]); warn("%s", argv[1]); exit(2); } if (stb1.st_mode == 0) stb1.st_mode = stb2.st_mode; if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode))) errx(2, "can't compare - to a directory"); set_argstr(oargv, argv); if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { if (diff_format == D_IFDEF) errx(2, "-D option not supported with directories"); diffdir(argv[0], argv[1], dflags); } else { if (S_ISDIR(stb1.st_mode)) { argv[0] = splice(argv[0], argv[1]); if (stat(argv[0], &stb1) == -1) err(2, "%s", argv[0]); } if (S_ISDIR(stb2.st_mode)) { argv[1] = splice(argv[1], argv[0]); if (stat(argv[1], &stb2) == -1) err(2, "%s", argv[1]); } print_status(diffreg(argv[0], argv[1], dflags, 1), argv[0], argv[1], ""); } if (fflush(stdout) != 0) err(2, "stdout"); exit(status); } static void checked_regcomp(char const *pattern, regex_t *comp) { char buf[BUFSIZ]; int error; if (pattern == NULL) return; error = regcomp(comp, pattern, REG_NEWLINE | REG_EXTENDED); if (error != 0) { regerror(error, comp, buf, sizeof(buf)); if (*pattern != '\0') errx(2, "%s: %s", pattern, buf); else errx(2, "%s", buf); } } static void set_argstr(char **av, char **ave) { size_t argsize; char **ap; argsize = 4 + *ave - *av + 1; diffargs = xmalloc(argsize); strlcpy(diffargs, "diff", argsize); for (ap = av + 1; ap < ave; ap++) { if (strcmp(*ap, "--") != 0) { strlcat(diffargs, " ", argsize); strlcat(diffargs, *ap, argsize); } } } /* * Read in an excludes file and push each line. */ static void read_excludes_file(char *file) { FILE *fp; char *pattern = NULL; size_t blen = 0; ssize_t len; if (strcmp(file, "-") == 0) fp = stdin; else if ((fp = fopen(file, "r")) == NULL) err(2, "%s", file); while ((len = getline(&pattern, &blen, fp)) >= 0) { if ((len > 0) && (pattern[len - 1] == '\n')) pattern[len - 1] = '\0'; push_excludes(pattern); /* we allocate a new string per line */ pattern = NULL; blen = 0; } free(pattern); if (strcmp(file, "-") != 0) fclose(fp); } /* * Push a pattern onto the excludes list. */ static void push_excludes(char *pattern) { struct excludes *entry; entry = xmalloc(sizeof(*entry)); entry->pattern = pattern; entry->next = excludes_list; excludes_list = entry; } static void push_ignore_pats(char *pattern) { size_t len; if (ignore_pats == NULL) ignore_pats = xstrdup(pattern); else { /* old + "|" + new + NUL */ len = strlen(ignore_pats) + strlen(pattern) + 2; ignore_pats = xreallocarray(ignore_pats, 1, len); strlcat(ignore_pats, "|", len); strlcat(ignore_pats, pattern, len); } } void print_status(int val, char *path1, char *path2, const char *entry) { if (label[0] != NULL) path1 = label[0]; if (label[1] != NULL) path2 = label[1]; switch (val) { case D_BINARY: printf("Binary files %s%s and %s%s differ\n", path1, entry, path2, entry); break; case D_DIFFER: if (diff_format == D_BRIEF) printf("Files %s%s and %s%s differ\n", path1, entry, path2, entry); break; case D_SAME: if (sflag) printf("Files %s%s and %s%s are identical\n", path1, entry, path2, entry); break; case D_MISMATCH1: printf("File %s%s is a directory while file %s%s is a regular file\n", path1, entry, path2, entry); break; case D_MISMATCH2: printf("File %s%s is a regular file while file %s%s is a directory\n", path1, entry, path2, entry); break; case D_SKIPPED1: printf("File %s%s is not a regular file or directory and was skipped\n", path1, entry); break; case D_SKIPPED2: printf("File %s%s is not a regular file or directory and was skipped\n", path2, entry); break; case D_ERROR: break; } } static void usage(void) { (void)fprintf(help ? stdout : stderr, "usage: diff [-aBbdilpTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n" " [--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]\n" " [-I pattern] [-F pattern] [-L label] file1 file2\n" " diff [-aBbdilpTtw] [-I pattern] [-L label] [--ignore-case]\n" " [--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]\n" " [-F pattern] -C number file1 file2\n" " diff [-aBbdiltw] [-I pattern] [--ignore-case] [--no-ignore-case]\n" " [--normal] [--strip-trailing-cr] [--tabsize] -D string file1 file2\n" " diff [-aBbdilpTtw] [-I pattern] [-L label] [--ignore-case]\n" " [--no-ignore-case] [--normal] [--tabsize] [--strip-trailing-cr]\n" " [-F pattern] -U number file1 file2\n" " diff [-aBbdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n" " [--no-ignore-case] [--normal] [--tabsize] [-I pattern] [-L label]\n" " [-F pattern] [-S name] [-X file] [-x pattern] dir1 dir2\n" " diff [-aBbditwW] [--expand-tabs] [--ignore-all-space]\n" " [--ignore-blank-lines] [--ignore-case] [--minimal]\n" " [--no-ignore-file-name-case] [--strip-trailing-cr]\n" " [--suppress-common-lines] [--tabsize] [--text] [--width]\n" " -y | --side-by-side file1 file2\n" " diff [--help] [--version]\n"); if (help) exit(0); else exit(2); } static void conflicting_format(void) { fprintf(stderr, "error: conflicting output format options.\n"); usage(); } static bool do_color(void) { const char *p, *p2; switch (colorflag) { case COLORFLAG_AUTO: p = getenv("CLICOLOR"); p2 = getenv("COLORTERM"); if ((p != NULL && *p != '\0') || (p2 != NULL && *p2 != '\0')) return isatty(STDOUT_FILENO); break; case COLORFLAG_ALWAYS: return (true); case COLORFLAG_NEVER: return (false); } return (false); } static char * splice(char *dir, char *path) { char *tail, *buf; size_t dirlen; dirlen = strlen(dir); while (dirlen != 0 && dir[dirlen - 1] == '/') dirlen--; if ((tail = strrchr(path, '/')) == NULL) tail = path; else tail++; xasprintf(&buf, "%.*s/%s", (int)dirlen, dir, tail); return (buf); } diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h index 74be55db8a33..4bea23db1ab8 100644 --- a/usr.bin/diff/diff.h +++ b/usr.bin/diff/diff.h @@ -1,128 +1,129 @@ /* $OpenBSD: diff.h,v 1.34 2020/11/01 18:16:08 jcs Exp $ */ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include #include #include /* * Output format options */ #define D_NORMAL 0 /* Normal output */ #define D_EDIT -1 /* Editor script out */ #define D_REVERSE 1 /* Reverse editor script */ #define D_CONTEXT 2 /* Diff with context */ #define D_UNIFIED 3 /* Unified context diff */ #define D_IFDEF 4 /* Diff with merged #ifdef's */ #define D_NREVERSE 5 /* Reverse ed script with numbered lines and no trailing . */ #define D_BRIEF 6 /* Say if the files differ */ #define D_GFORMAT 7 /* Diff with defined changed group format */ #define D_SIDEBYSIDE 8 /* Side by side */ #define D_UNSET -2 /* * Algorithms */ #define D_DIFFNONE 0 #define D_DIFFSTONE 1 /* Stone or 'old diff' algorithm */ #define D_DIFFMYERS 2 /* Myers diff algorithm */ #define D_DIFFPATIENCE 3 /* Patience diff algorithm */ /* * Output flags */ #define D_HEADER 0x001 /* Print a header/footer between files */ #define D_EMPTY1 0x002 /* Treat first file as empty (/dev/null) */ #define D_EMPTY2 0x004 /* Treat second file as empty (/dev/null) */ /* * Command line flags */ #define D_FORCEASCII 0x008 /* Treat file as ascii regardless of content */ #define D_FOLDBLANKS 0x010 /* Treat all white space as equal */ #define D_MINIMAL 0x020 /* Make diff as small as possible */ #define D_IGNORECASE 0x040 /* Case-insensitive matching */ #define D_PROTOTYPE 0x080 /* Display C function prototype */ #define D_EXPANDTABS 0x100 /* Expand tabs to spaces */ #define D_IGNOREBLANKS 0x200 /* Ignore white space changes */ #define D_STRIPCR 0x400 /* Strip trailing cr */ #define D_SKIPBLANKLINES 0x800 /* Skip blank lines */ #define D_MATCHLAST 0x1000 /* Display last line matching provided regex */ +#define D_PAGINATION 0x2000 /* Paginate via pr(1) */ /* Features supported by new algorithms */ #define D_NEWALGO_FLAGS (D_FORCEASCII | D_PROTOTYPE | D_IGNOREBLANKS) /* * Status values for print_status() and diffreg() return values */ #define D_SAME 0 /* Files are the same */ #define D_DIFFER 1 /* Files are different */ #define D_BINARY 2 /* Binary files are different */ #define D_MISMATCH1 3 /* path1 was a dir, path2 a file */ #define D_MISMATCH2 4 /* path1 was a file, path2 a dir */ #define D_SKIPPED1 5 /* path1 was a special file */ #define D_SKIPPED2 6 /* path2 was a special file */ #define D_ERROR 7 /* A file access error occurred */ /* * Color options */ #define COLORFLAG_NEVER 0 #define COLORFLAG_AUTO 1 #define COLORFLAG_ALWAYS 2 struct excludes { char *pattern; struct excludes *next; }; extern bool lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag; extern bool ignore_file_case, suppress_common, color, noderef, algorithm_set; extern int diff_format, diff_context, diff_algorithm, status; extern bool diff_algorithm_set; extern int tabsize, width; extern char *start, *ifdefname, *diffargs, *label[2]; extern char *ignore_pats, *most_recent_pat; extern char *group_format; extern const char *add_code, *del_code; extern struct stat stb1, stb2; extern struct excludes *excludes_list; extern regex_t ignore_re, most_recent_re; int diffreg(char *, char *, int, int); int diffreg_new(char *, char *, int, int); bool can_libdiff(int); void diffdir(char *, char *, int); void print_status(int, char *, char *, const char *); diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index f54cd554ccad..d932764bb6da 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -1,335 +1,342 @@ /* * Copyright (c) 2018 Martin Pieuchot * Copyright (c) 2020 Neels Hofmeyr * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include #include #ifndef DIFF_NO_MMAP #include #endif #include #include #include #include #include #include #include #include #include #include #include +#include "pr.h" #include "diff.h" #include #include #include const char *format_label(const char *, struct stat *); enum diffreg_algo { DIFFREG_ALGO_MYERS_THEN_MYERS_DIVIDE = 0, DIFFREG_ALGO_MYERS_THEN_PATIENCE = 1, DIFFREG_ALGO_PATIENCE = 2, DIFFREG_ALGO_NONE = 3, }; int diffreg_new(char *, char *, int, int); FILE * openfile(const char *, char **, struct stat *); static const struct diff_algo_config myers_then_patience; static const struct diff_algo_config myers_then_myers_divide; static const struct diff_algo_config patience; static const struct diff_algo_config myers_divide; static const struct diff_algo_config myers_then_patience = (struct diff_algo_config){ .impl = diff_algo_myers, .permitted_state_size = 1024 * 1024 * sizeof(int), .fallback_algo = &patience, }; static const struct diff_algo_config myers_then_myers_divide = (struct diff_algo_config){ .impl = diff_algo_myers, .permitted_state_size = 1024 * 1024 * sizeof(int), .fallback_algo = &myers_divide, }; static const struct diff_algo_config patience = (struct diff_algo_config){ .impl = diff_algo_patience, /* After subdivision, do Patience again: */ .inner_algo = &patience, /* If subdivision failed, do Myers Divide et Impera: */ .fallback_algo = &myers_then_myers_divide, }; static const struct diff_algo_config myers_divide = (struct diff_algo_config){ .impl = diff_algo_myers_divide, /* When division succeeded, start from the top: */ .inner_algo = &myers_then_myers_divide, /* (fallback_algo = NULL implies diff_algo_none). */ }; static const struct diff_algo_config no_algo = (struct diff_algo_config){ .impl = diff_algo_none, }; /* If the state for a forward-Myers is small enough, use Myers, otherwise first * do a Myers-divide. */ static const struct diff_config diff_config_myers_then_myers_divide = { .atomize_func = diff_atomize_text_by_line, .algo = &myers_then_myers_divide, }; /* If the state for a forward-Myers is small enough, use Myers, otherwise first * do a Patience. */ static const struct diff_config diff_config_myers_then_patience = { .atomize_func = diff_atomize_text_by_line, .algo = &myers_then_patience, }; /* Directly force Patience as a first divider of the source file. */ static const struct diff_config diff_config_patience = { .atomize_func = diff_atomize_text_by_line, .algo = &patience, }; /* Directly force Patience as a first divider of the source file. */ static const struct diff_config diff_config_no_algo = { .atomize_func = diff_atomize_text_by_line, }; const char * format_label(const char *oldlabel, struct stat *stb) { const char *time_format = "%Y-%m-%d %H:%M:%S"; char *newlabel; char buf[256]; char end[10]; struct tm tm, *tm_ptr; int nsec = stb->st_mtim.tv_nsec; size_t newlabellen, timelen, endlen; tm_ptr = localtime_r(&stb->st_mtime, &tm); timelen = strftime(buf, 256, time_format, tm_ptr); endlen = strftime(end, 10, "%z", tm_ptr); /* * The new label is the length of the time, old label, timezone, * 9 characters for nanoseconds, and 4 characters for a period * and for formatting. */ newlabellen = timelen + strlen(oldlabel) + endlen + 9 + 4; newlabel = calloc(newlabellen, sizeof(char)); snprintf(newlabel, newlabellen ,"%s\t%s.%.9d %s\n", oldlabel, buf, nsec, end); return newlabel; } int diffreg_new(char *file1, char *file2, int flags, int capsicum) { char *str1, *str2; FILE *f1, *f2; + struct pr *pr = NULL; struct stat st1, st2; struct diff_input_info info; struct diff_data left = {}, right = {}; struct diff_result *result = NULL; bool force_text, have_binary; int rc, atomizer_flags, rflags, diff_flags = 0; int context_lines = diff_context; const struct diff_config *cfg; enum diffreg_algo algo; cap_rights_t rights_ro; algo = DIFFREG_ALGO_MYERS_THEN_MYERS_DIVIDE; switch (algo) { default: case DIFFREG_ALGO_MYERS_THEN_MYERS_DIVIDE: cfg = &diff_config_myers_then_myers_divide; break; case DIFFREG_ALGO_MYERS_THEN_PATIENCE: cfg = &diff_config_myers_then_patience; break; case DIFFREG_ALGO_PATIENCE: cfg = &diff_config_patience; break; case DIFFREG_ALGO_NONE: cfg = &diff_config_no_algo; break; } f1 = openfile(file1, &str1, &st1); f2 = openfile(file2, &str2, &st2); + if (flags & D_PAGINATION) + pr = start_pr(file1, file2); + if (capsicum) { cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); if (caph_rights_limit(fileno(f1), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file1); if (caph_rights_limit(fileno(f2), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file2); if (fileno(f1) == STDIN_FILENO || fileno(f2) == STDIN_FILENO) { /* stdin has already been limited */ if (caph_limit_stderr() == -1) err(2, "unable to limit stderr"); if (caph_limit_stdout() == -1) err(2, "unable to limit stdout"); } else if (caph_limit_stdio() == -1) err(2, "unable to limit stdio"); caph_cache_catpages(); caph_cache_tzdata(); if (caph_enter() < 0) err(2, "unable to enter capability mode"); } /* * If we have been given a label use that for the paths, if not format * the path with the files modification time. */ info.flags = 0; info.left_path = (label[0] != NULL) ? label[0] : format_label(file1, &stb1); info.right_path = (label[1] != NULL) ? label[1] : format_label(file2, &stb2); if (flags & D_FORCEASCII) diff_flags |= DIFF_FLAG_FORCE_TEXT_DATA; if (flags & D_IGNOREBLANKS) diff_flags |= DIFF_FLAG_IGNORE_WHITESPACE; if (flags & D_PROTOTYPE) diff_flags |= DIFF_FLAG_SHOW_PROTOTYPES; if (diff_atomize_file(&left, cfg, f1, (uint8_t *)str1, st1.st_size, diff_flags)) { rc = D_ERROR; goto done; } if (left.atomizer_flags & DIFF_ATOMIZER_FILE_TRUNCATED) warnx("%s truncated", file1); if (diff_atomize_file(&right, cfg, f2, (uint8_t *)str2, st2.st_size, diff_flags)) { rc = D_ERROR; goto done; } if (right.atomizer_flags & DIFF_ATOMIZER_FILE_TRUNCATED) warnx("%s truncated", file2); result = diff_main(cfg, &left, &right); if (result->rc != DIFF_RC_OK) { rc = D_ERROR; status |= 2; goto done; } /* * If there wasn't an error, but we don't have any printable chunks * then the files must match. */ if (!diff_result_contains_printable_chunks(result)) { rc = D_SAME; goto done; } atomizer_flags = (result->left->atomizer_flags | result->right->atomizer_flags); rflags = (result->left->root->diff_flags | result->right->root->diff_flags); force_text = (rflags & DIFF_FLAG_FORCE_TEXT_DATA); have_binary = (atomizer_flags & DIFF_ATOMIZER_FOUND_BINARY_DATA); if (have_binary && !force_text) { rc = D_BINARY; status |= 1; goto done; } if (color) diff_output_set_colors(color, del_code, add_code); if (diff_format == D_NORMAL) { rc = diff_output_plain(NULL, stdout, &info, result, false); } else if (diff_format == D_EDIT) { rc = diff_output_edscript(NULL, stdout, &info, result); } else { rc = diff_output_unidiff(NULL, stdout, &info, result, context_lines); } if (rc != DIFF_RC_OK) { rc = D_ERROR; status |= 2; } else { rc = D_DIFFER; status |= 1; } done: + if (pr != NULL) + stop_pr(pr); diff_result_free(result); diff_data_free(&left); diff_data_free(&right); #ifndef DIFF_NO_MMAP if (str1) munmap(str1, st1.st_size); if (str2) munmap(str2, st2.st_size); #endif fclose(f1); fclose(f2); return rc; } FILE * openfile(const char *path, char **p, struct stat *st) { FILE *f = NULL; if (strcmp(path, "-") == 0) f = stdin; else f = fopen(path, "r"); if (f == NULL) err(2, "%s", path); if (fstat(fileno(f), st) == -1) err(2, "%s", path); #ifndef DIFF_NO_MMAP *p = mmap(NULL, st->st_size, PROT_READ, MAP_PRIVATE, fileno(f), 0); if (*p == MAP_FAILED) #endif *p = NULL; /* fall back on file I/O */ return f; } bool can_libdiff(int flags) { /* libdiff's atomizer can only deal with files */ if (!S_ISREG(stb1.st_mode) || !S_ISREG(stb2.st_mode)) return false; /* Is this one of the supported input/output modes for diffreg_new? */ if ((flags == 0 || !(flags & ~D_NEWALGO_FLAGS)) && ignore_pats == NULL && ( diff_format == D_NORMAL || #if 0 diff_format == D_EDIT || #endif diff_format == D_UNIFIED) && (diff_algorithm == D_DIFFMYERS || diff_algorithm == D_DIFFPATIENCE)) { return true; } /* Fallback to using stone. */ return false; }