1*998894f5Smillert /* $OpenBSD: diff.c,v 1.68 2023/01/05 00:00:44 millert Exp $ */
2d0c3f575Sderaadt
3d0c3f575Sderaadt /*
4bf198cc6Smillert * Copyright (c) 2003 Todd C. Miller <millert@openbsd.org>
5d0c3f575Sderaadt *
64ec4b3d5Smillert * Permission to use, copy, modify, and distribute this software for any
74ec4b3d5Smillert * purpose with or without fee is hereby granted, provided that the above
84ec4b3d5Smillert * copyright notice and this permission notice appear in all copies.
9d0c3f575Sderaadt *
104ec4b3d5Smillert * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
114ec4b3d5Smillert * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
124ec4b3d5Smillert * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
134ec4b3d5Smillert * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
144ec4b3d5Smillert * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
154ec4b3d5Smillert * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
164ec4b3d5Smillert * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
174ec4b3d5Smillert *
184ec4b3d5Smillert * Sponsored in part by the Defense Advanced Research Projects
194ec4b3d5Smillert * Agency (DARPA) and Air Force Research Laboratory, Air Force
204ec4b3d5Smillert * Materiel Command, USAF, under agreement number F39502-99-1-0512.
21d0c3f575Sderaadt */
22d0c3f575Sderaadt
234ec4b3d5Smillert #include <sys/stat.h>
244ec4b3d5Smillert
25cb9b5491Smillert #include <ctype.h>
264ec4b3d5Smillert #include <err.h>
2766e5764eSmillert #include <errno.h>
284ec4b3d5Smillert #include <getopt.h>
2926da422aStedu #include <stdlib.h>
304ec4b3d5Smillert #include <stdio.h>
3166e5764eSmillert #include <stdarg.h>
32e582024bSdavid #include <string.h>
3326da422aStedu #include <unistd.h>
34b9fc9a72Sderaadt #include <limits.h>
35ae8d569bSderaadt
36ae8d569bSderaadt #include "diff.h"
374a034c3aSray #include "xmalloc.h"
38ae8d569bSderaadt
3940e7295bSmillert int Nflag, Pflag, rflag, sflag, Tflag;
4057003866Sray int diff_format, diff_context, status;
417bdb251cSmillert char *start, *ifdefname, *diffargs, *label[2], *ignore_pats;
42d5d5ac6cStedu struct stat stb1, stb2;
434ec4b3d5Smillert struct excludes *excludes_list;
44ccd55a2cSotto regex_t ignore_re;
454ec4b3d5Smillert
46*998894f5Smillert #define OPTIONS "0123456789abC:cdD:efhI:iL:nNPpqrS:sTtU:uwX:x:"
474ec4b3d5Smillert static struct option longopts[] = {
484ec4b3d5Smillert { "text", no_argument, 0, 'a' },
494ec4b3d5Smillert { "ignore-space-change", no_argument, 0, 'b' },
504ec4b3d5Smillert { "context", optional_argument, 0, 'C' },
514ec4b3d5Smillert { "ifdef", required_argument, 0, 'D' },
526e18f850Sotto { "minimal", no_argument, 0, 'd' },
534ec4b3d5Smillert { "ed", no_argument, 0, 'e' },
544ec4b3d5Smillert { "forward-ed", no_argument, 0, 'f' },
55ccd55a2cSotto { "ignore-matching-lines", required_argument, 0, 'I' },
564ec4b3d5Smillert { "ignore-case", no_argument, 0, 'i' },
571f9aa9e0Smillert { "label", required_argument, 0, 'L' },
584ec4b3d5Smillert { "new-file", no_argument, 0, 'N' },
594ec4b3d5Smillert { "rcs", no_argument, 0, 'n' },
60aeb82612Smillert { "unidirectional-new-file", no_argument, 0, 'P' },
6196e45528Sotto { "show-c-function", no_argument, 0, 'p' },
62cab5d83cSmillert { "brief", no_argument, 0, 'q' },
634ec4b3d5Smillert { "recursive", no_argument, 0, 'r' },
644ec4b3d5Smillert { "report-identical-files", no_argument, 0, 's' },
654ec4b3d5Smillert { "starting-file", required_argument, 0, 'S' },
664ec4b3d5Smillert { "expand-tabs", no_argument, 0, 't' },
67049b39f6Sdavid { "initial-tab", no_argument, 0, 'T' },
684ec4b3d5Smillert { "unified", optional_argument, 0, 'U' },
694ec4b3d5Smillert { "ignore-all-space", no_argument, 0, 'w' },
704ec4b3d5Smillert { "exclude", required_argument, 0, 'x' },
714ec4b3d5Smillert { "exclude-from", required_argument, 0, 'X' },
72d6c18fb8Smillert { NULL, 0, 0, '\0'}
734ec4b3d5Smillert };
74ae8d569bSderaadt
75c42aed39Smillert __dead void usage(void);
764ec4b3d5Smillert void push_excludes(char *);
77ccd55a2cSotto void push_ignore_pats(char *);
784ec4b3d5Smillert void read_excludes_file(char *file);
794ec4b3d5Smillert void set_argstr(char **, char **);
80ae8d569bSderaadt
8126da422aStedu int
main(int argc,char ** argv)8226da422aStedu main(int argc, char **argv)
8326da422aStedu {
844ec4b3d5Smillert char *ep, **oargv;
854ec4b3d5Smillert long l;
86dba1d6eaSray int ch, dflags, lastch, gotstdin, prevoptind, newarg;
8726da422aStedu
884ec4b3d5Smillert oargv = argv;
894ec4b3d5Smillert gotstdin = 0;
90dba1d6eaSray dflags = 0;
91cb9b5491Smillert lastch = '\0';
92cb9b5491Smillert prevoptind = 1;
93cb9b5491Smillert newarg = 1;
944ec4b3d5Smillert while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) {
95c42aed39Smillert switch (ch) {
9668cd7c43Stedu case '0': case '1': case '2': case '3': case '4':
9768cd7c43Stedu case '5': case '6': case '7': case '8': case '9':
98cb9b5491Smillert if (newarg)
99cb9b5491Smillert usage(); /* disallow -[0-9]+ */
100cb9b5491Smillert else if (lastch == 'c' || lastch == 'u')
10157003866Sray diff_context = 0;
10257003866Sray else if (!isdigit(lastch) || diff_context > INT_MAX / 10)
103cb9b5491Smillert usage();
10457003866Sray diff_context = (diff_context * 10) + (ch - '0');
10568cd7c43Stedu break;
106d5d5ac6cStedu case 'a':
107dba1d6eaSray dflags |= D_FORCEASCII;
108d5d5ac6cStedu break;
109ae8d569bSderaadt case 'b':
110dba1d6eaSray dflags |= D_FOLDBLANKS;
111c42aed39Smillert break;
112c42aed39Smillert case 'C':
113ae8d569bSderaadt case 'c':
11457003866Sray diff_format = D_CONTEXT;
1154ec4b3d5Smillert if (optarg != NULL) {
1164ec4b3d5Smillert l = strtol(optarg, &ep, 10);
1174ec4b3d5Smillert if (*ep != '\0' || l < 0 || l >= INT_MAX)
1184ec4b3d5Smillert usage();
11957003866Sray diff_context = (int)l;
1204ec4b3d5Smillert } else
12157003866Sray diff_context = 3;
122c42aed39Smillert break;
1236e18f850Sotto case 'd':
124dba1d6eaSray dflags |= D_MINIMAL;
1256e18f850Sotto break;
126c42aed39Smillert case 'D':
12757003866Sray diff_format = D_IFDEF;
12890f56ad8Smillert ifdefname = optarg;
129c42aed39Smillert break;
130c42aed39Smillert case 'e':
13157003866Sray diff_format = D_EDIT;
132c42aed39Smillert break;
133c42aed39Smillert case 'f':
13457003866Sray diff_format = D_REVERSE;
135c42aed39Smillert break;
136a0daf5ccSmillert case 'h':
137a0daf5ccSmillert /* silently ignore for backwards compatibility */
138a0daf5ccSmillert break;
139ccd55a2cSotto case 'I':
140ccd55a2cSotto push_ignore_pats(optarg);
141ccd55a2cSotto break;
142c42aed39Smillert case 'i':
143dba1d6eaSray dflags |= D_IGNORECASE;
1444ec4b3d5Smillert break;
1451f9aa9e0Smillert case 'L':
1467bdb251cSmillert if (label[0] == NULL)
1477bdb251cSmillert label[0] = optarg;
1487bdb251cSmillert else if (label[1] == NULL)
1497bdb251cSmillert label[1] = optarg;
1507bdb251cSmillert else
1517bdb251cSmillert usage();
1521f9aa9e0Smillert break;
1534ec4b3d5Smillert case 'N':
1544ec4b3d5Smillert Nflag = 1;
155c42aed39Smillert break;
156c42aed39Smillert case 'n':
15757003866Sray diff_format = D_NREVERSE;
158c42aed39Smillert break;
15996e45528Sotto case 'p':
160dba1d6eaSray dflags |= D_PROTOTYPE;
16196e45528Sotto break;
162aeb82612Smillert case 'P':
163aeb82612Smillert Pflag = 1;
164aeb82612Smillert break;
165c42aed39Smillert case 'r':
1664ec4b3d5Smillert rflag = 1;
167c42aed39Smillert break;
168cab5d83cSmillert case 'q':
16957003866Sray diff_format = D_BRIEF;
170cab5d83cSmillert break;
171c42aed39Smillert case 'S':
172c42aed39Smillert start = optarg;
173c42aed39Smillert break;
174c42aed39Smillert case 's':
1754ec4b3d5Smillert sflag = 1;
176c42aed39Smillert break;
1771f9aa9e0Smillert case 'T':
1781f9aa9e0Smillert Tflag = 1;
1791f9aa9e0Smillert break;
180c42aed39Smillert case 't':
181dba1d6eaSray dflags |= D_EXPANDTABS;
182c42aed39Smillert break;
1839de32c1bSmillert case 'U':
1849de32c1bSmillert case 'u':
18557003866Sray diff_format = D_UNIFIED;
1864ec4b3d5Smillert if (optarg != NULL) {
1874ec4b3d5Smillert l = strtol(optarg, &ep, 10);
1884ec4b3d5Smillert if (*ep != '\0' || l < 0 || l >= INT_MAX)
1894ec4b3d5Smillert usage();
19057003866Sray diff_context = (int)l;
1914ec4b3d5Smillert } else
19257003866Sray diff_context = 3;
1939de32c1bSmillert break;
194c42aed39Smillert case 'w':
195dba1d6eaSray dflags |= D_IGNOREBLANKS;
1964ec4b3d5Smillert break;
1974ec4b3d5Smillert case 'X':
1984ec4b3d5Smillert read_excludes_file(optarg);
1994ec4b3d5Smillert break;
2004ec4b3d5Smillert case 'x':
2014ec4b3d5Smillert push_excludes(optarg);
202c42aed39Smillert break;
203ae8d569bSderaadt default:
204c42aed39Smillert usage();
205c42aed39Smillert break;
206ae8d569bSderaadt }
20768cd7c43Stedu lastch = ch;
208cb9b5491Smillert newarg = optind != prevoptind;
209cb9b5491Smillert prevoptind = optind;
210ae8d569bSderaadt }
211c42aed39Smillert argc -= optind;
212c42aed39Smillert argv += optind;
213c42aed39Smillert
2140bd1216cSderaadt if (pledge("stdio rpath tmppath", NULL) == -1)
215b4e5b6a2Sgsoares err(2, "pledge");
21640e7295bSmillert
2174ec4b3d5Smillert /*
2184ec4b3d5Smillert * Do sanity checks, fill in stb1 and stb2 and call the appropriate
2194ec4b3d5Smillert * driver routine. Both drivers use the contents of stb1 and stb2.
2204ec4b3d5Smillert */
221c42aed39Smillert if (argc != 2)
2224ec4b3d5Smillert usage();
223ccd55a2cSotto if (ignore_pats != NULL) {
224ccd55a2cSotto char buf[BUFSIZ];
225ccd55a2cSotto int error;
226ccd55a2cSotto
227ccd55a2cSotto if ((error = regcomp(&ignore_re, ignore_pats,
228ccd55a2cSotto REG_NEWLINE | REG_EXTENDED)) != 0) {
229ccd55a2cSotto regerror(error, &ignore_re, buf, sizeof(buf));
230ccd55a2cSotto if (*ignore_pats != '\0')
231ccd55a2cSotto errx(2, "%s: %s", ignore_pats, buf);
232ccd55a2cSotto else
233ccd55a2cSotto errx(2, "%s", buf);
234ccd55a2cSotto }
235ccd55a2cSotto }
2364ec4b3d5Smillert if (strcmp(argv[0], "-") == 0) {
237b1a26502Smillert fstat(STDIN_FILENO, &stb1);
2384ec4b3d5Smillert gotstdin = 1;
2394ec4b3d5Smillert } else if (stat(argv[0], &stb1) != 0)
2407b6ec9e4Smillert err(2, "%s", argv[0]);
2414ec4b3d5Smillert if (strcmp(argv[1], "-") == 0) {
242b1a26502Smillert fstat(STDIN_FILENO, &stb2);
2434ec4b3d5Smillert gotstdin = 1;
2444ec4b3d5Smillert } else if (stat(argv[1], &stb2) != 0)
2457b6ec9e4Smillert err(2, "%s", argv[1]);
2464ec4b3d5Smillert if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
2477b6ec9e4Smillert errx(2, "can't compare - to a directory");
2485e50de09Sespie set_argstr(oargv, argv);
2494ec4b3d5Smillert if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
25057003866Sray if (diff_format == D_IFDEF)
2517b6ec9e4Smillert errx(2, "-D option not supported with directories");
2523f8e756bSray diffdir(argv[0], argv[1], dflags);
253b4bca33fSmillert } else {
2547b6ec9e4Smillert if (S_ISDIR(stb1.st_mode)) {
2557b6ec9e4Smillert argv[0] = splice(argv[0], argv[1]);
2563aaa63ebSderaadt if (stat(argv[0], &stb1) == -1)
2577b6ec9e4Smillert err(2, "%s", argv[0]);
2587b6ec9e4Smillert }
2597b6ec9e4Smillert if (S_ISDIR(stb2.st_mode)) {
2607b6ec9e4Smillert argv[1] = splice(argv[1], argv[0]);
2613aaa63ebSderaadt if (stat(argv[1], &stb2) == -1)
2627b6ec9e4Smillert err(2, "%s", argv[1]);
2637b6ec9e4Smillert }
2643f8e756bSray print_status(diffreg(argv[0], argv[1], dflags), argv[0], argv[1],
265d2ea36f5Sray "");
266b4bca33fSmillert }
2674ec4b3d5Smillert exit(status);
268ae8d569bSderaadt }
269ae8d569bSderaadt
2704ec4b3d5Smillert void
set_argstr(char ** av,char ** ave)2714ec4b3d5Smillert set_argstr(char **av, char **ave)
2724ec4b3d5Smillert {
2734ec4b3d5Smillert size_t argsize;
2744ec4b3d5Smillert char **ap;
2754ec4b3d5Smillert
27677aa65d5Smillert argsize = 4 + *ave - *av + 1;
2774a034c3aSray diffargs = xmalloc(argsize);
2784ec4b3d5Smillert strlcpy(diffargs, "diff", argsize);
2794ec4b3d5Smillert for (ap = av + 1; ap < ave; ap++) {
2804ec4b3d5Smillert if (strcmp(*ap, "--") != 0) {
2814ec4b3d5Smillert strlcat(diffargs, " ", argsize);
2824ec4b3d5Smillert strlcat(diffargs, *ap, argsize);
2834ec4b3d5Smillert }
2844ec4b3d5Smillert }
2854ec4b3d5Smillert }
2864ec4b3d5Smillert
2874ec4b3d5Smillert /*
2884ec4b3d5Smillert * Read in an excludes file and push each line.
2894ec4b3d5Smillert */
2904ec4b3d5Smillert void
read_excludes_file(char * file)2914ec4b3d5Smillert read_excludes_file(char *file)
2924ec4b3d5Smillert {
2934ec4b3d5Smillert FILE *fp;
2944ec4b3d5Smillert char *buf, *pattern;
2954ec4b3d5Smillert size_t len;
2964ec4b3d5Smillert
2974ec4b3d5Smillert if (strcmp(file, "-") == 0)
2984ec4b3d5Smillert fp = stdin;
2994ec4b3d5Smillert else if ((fp = fopen(file, "r")) == NULL)
3007b6ec9e4Smillert err(2, "%s", file);
3014ec4b3d5Smillert while ((buf = fgetln(fp, &len)) != NULL) {
3024ec4b3d5Smillert if (buf[len - 1] == '\n')
3034ec4b3d5Smillert len--;
3044a034c3aSray pattern = xmalloc(len + 1);
3054ec4b3d5Smillert memcpy(pattern, buf, len);
3064ec4b3d5Smillert pattern[len] = '\0';
3074ec4b3d5Smillert push_excludes(pattern);
3084ec4b3d5Smillert }
3094ec4b3d5Smillert if (strcmp(file, "-") != 0)
3104ec4b3d5Smillert fclose(fp);
3114ec4b3d5Smillert }
3124ec4b3d5Smillert
3134ec4b3d5Smillert /*
3144ec4b3d5Smillert * Push a pattern onto the excludes list.
3154ec4b3d5Smillert */
3164ec4b3d5Smillert void
push_excludes(char * pattern)3174ec4b3d5Smillert push_excludes(char *pattern)
3184ec4b3d5Smillert {
3194ec4b3d5Smillert struct excludes *entry;
3204ec4b3d5Smillert
3214a034c3aSray entry = xmalloc(sizeof(*entry));
3224ec4b3d5Smillert entry->pattern = pattern;
3234ec4b3d5Smillert entry->next = excludes_list;
3244ec4b3d5Smillert excludes_list = entry;
3254ec4b3d5Smillert }
3264ec4b3d5Smillert
327b4bca33fSmillert void
push_ignore_pats(char * pattern)328ccd55a2cSotto push_ignore_pats(char *pattern)
329ccd55a2cSotto {
330ccd55a2cSotto size_t len;
331ccd55a2cSotto
3324a034c3aSray if (ignore_pats == NULL)
3334a034c3aSray ignore_pats = xstrdup(pattern);
3344a034c3aSray else {
335ccd55a2cSotto /* old + "|" + new + NUL */
336ccd55a2cSotto len = strlen(ignore_pats) + strlen(pattern) + 2;
337371275caSderaadt ignore_pats = xreallocarray(ignore_pats, 1, len);
338ccd55a2cSotto strlcat(ignore_pats, "|", len);
339ccd55a2cSotto strlcat(ignore_pats, pattern, len);
340ccd55a2cSotto }
341ccd55a2cSotto }
342ccd55a2cSotto
343ccd55a2cSotto void
print_only(const char * path,size_t dirlen,const char * entry)3444893e147Smillert print_only(const char *path, size_t dirlen, const char *entry)
3454893e147Smillert {
3464893e147Smillert if (dirlen > 1)
3474893e147Smillert dirlen--;
3484893e147Smillert printf("Only in %.*s: %s\n", (int)dirlen, path, entry);
3494893e147Smillert }
3504893e147Smillert
3514893e147Smillert void
print_status(int val,char * path1,char * path2,char * entry)352b4bca33fSmillert print_status(int val, char *path1, char *path2, char *entry)
353b4bca33fSmillert {
354b4bca33fSmillert switch (val) {
355b4bca33fSmillert case D_BINARY:
356b4bca33fSmillert printf("Binary files %s%s and %s%s differ\n",
357d2ea36f5Sray path1, entry, path2, entry);
358b4bca33fSmillert break;
359b4bca33fSmillert case D_DIFFER:
36057003866Sray if (diff_format == D_BRIEF)
361b4bca33fSmillert printf("Files %s%s and %s%s differ\n",
362d2ea36f5Sray path1, entry, path2, entry);
363b4bca33fSmillert break;
364b4bca33fSmillert case D_SAME:
365b4bca33fSmillert if (sflag)
366b4bca33fSmillert printf("Files %s%s and %s%s are identical\n",
367d2ea36f5Sray path1, entry, path2, entry);
368b4bca33fSmillert break;
369fed3a06dSmillert case D_MISMATCH1:
370de414158Smillert printf("File %s%s is a directory while file %s%s is a regular file\n",
371d2ea36f5Sray path1, entry, path2, entry);
372fed3a06dSmillert break;
373fed3a06dSmillert case D_MISMATCH2:
374de414158Smillert printf("File %s%s is a regular file while file %s%s is a directory\n",
375d2ea36f5Sray path1, entry, path2, entry);
3767b6ec9e4Smillert break;
3775f4c3fa8Smillert case D_SKIPPED1:
3785f4c3fa8Smillert printf("File %s%s is not a regular file or directory and was skipped\n",
379d2ea36f5Sray path1, entry);
3805f4c3fa8Smillert break;
3815f4c3fa8Smillert case D_SKIPPED2:
3825f4c3fa8Smillert printf("File %s%s is not a regular file or directory and was skipped\n",
383d2ea36f5Sray path2, entry);
3845f4c3fa8Smillert break;
385b4bca33fSmillert }
386b4bca33fSmillert }
387b4bca33fSmillert
388c42aed39Smillert __dead void
usage(void)389c42aed39Smillert usage(void)
390c42aed39Smillert {
391c012fe98Sderaadt (void)fprintf(stderr,
39240e7295bSmillert "usage: diff [-abdipTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L label]\n"
3939d40d95cSsobrado " file1 file2\n"
39440e7295bSmillert " diff [-abdipTtw] [-I pattern] [-L label] -C number file1 file2\n"
39540e7295bSmillert " diff [-abditw] [-I pattern] -D string file1 file2\n"
39640e7295bSmillert " diff [-abdipTtw] [-I pattern] [-L label] -U number file1 file2\n"
39740e7295bSmillert " diff [-abdiNPprsTtw] [-c | -e | -f | -n | -q | -u] [-I pattern]\n"
3989d40d95cSsobrado " [-L label] [-S name] [-X file] [-x pattern] dir1 dir2\n");
399c42aed39Smillert
40066e5764eSmillert exit(2);
401c42aed39Smillert }
402