1 /* $OpenBSD: diff.c,v 1.67 2019/06/28 13:35:00 deraadt Exp $ */
4 * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 * Sponsored in part by the Defense Advanced Research Projects
19 * Agency (DARPA) and Air Force Research Laboratory, Air Force
20 * Materiel Command, USAF, under agreement number F39502-99-1-0512.
23 #include <sys/cdefs.h>
24 __FBSDID("$FreeBSD$");
40 int lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag;
41 int diff_format, diff_context, status, ignore_file_case;
43 char *start, *ifdefname, *diffargs, *label[2], *ignore_pats;
44 char *group_format = NULL;
45 struct stat stb1, stb2;
46 struct excludes *excludes_list;
49 #define OPTIONS "0123456789aBbC:cdD:efHhI:iL:lnNPpqrS:sTtU:uwX:x:"
51 OPT_TSIZE = CHAR_MAX + 1,
57 OPT_CHANGED_GROUP_FORMAT,
60 static struct option longopts[] = {
61 { "text", no_argument, 0, 'a' },
62 { "ignore-space-change", no_argument, 0, 'b' },
63 { "context", optional_argument, 0, 'C' },
64 { "ifdef", required_argument, 0, 'D' },
65 { "minimal", no_argument, 0, 'd' },
66 { "ed", no_argument, 0, 'e' },
67 { "forward-ed", no_argument, 0, 'f' },
68 { "speed-large-files", no_argument, NULL, 'H' },
69 { "ignore-blank-lines", no_argument, 0, 'B' },
70 { "ignore-matching-lines", required_argument, 0, 'I' },
71 { "ignore-case", no_argument, 0, 'i' },
72 { "paginate", no_argument, NULL, 'l' },
73 { "label", required_argument, 0, 'L' },
74 { "new-file", no_argument, 0, 'N' },
75 { "rcs", no_argument, 0, 'n' },
76 { "unidirectional-new-file", no_argument, 0, 'P' },
77 { "show-c-function", no_argument, 0, 'p' },
78 { "brief", no_argument, 0, 'q' },
79 { "recursive", no_argument, 0, 'r' },
80 { "report-identical-files", no_argument, 0, 's' },
81 { "starting-file", required_argument, 0, 'S' },
82 { "expand-tabs", no_argument, 0, 't' },
83 { "initial-tab", no_argument, 0, 'T' },
84 { "unified", optional_argument, 0, 'U' },
85 { "ignore-all-space", no_argument, 0, 'w' },
86 { "exclude", required_argument, 0, 'x' },
87 { "exclude-from", required_argument, 0, 'X' },
88 { "ignore-file-name-case", no_argument, NULL, OPT_IGN_FN_CASE },
89 { "horizon-lines", required_argument, NULL, OPT_HORIZON_LINES },
90 { "no-ignore-file-name-case", no_argument, NULL, OPT_NO_IGN_FN_CASE },
91 { "normal", no_argument, NULL, OPT_NORMAL },
92 { "strip-trailing-cr", no_argument, NULL, OPT_STRIPCR },
93 { "tabsize", optional_argument, NULL, OPT_TSIZE },
94 { "changed-group-format", required_argument, NULL, OPT_CHANGED_GROUP_FORMAT},
98 void usage(void) __dead2;
99 void push_excludes(char *);
100 void push_ignore_pats(char *);
101 void read_excludes_file(char *file);
102 void set_argstr(char **, char **);
105 main(int argc, char **argv)
107 const char *errstr = NULL;
110 int ch, dflags, lastch, gotstdin, prevoptind, newarg;
120 while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) {
122 case '0': case '1': case '2': case '3': case '4':
123 case '5': case '6': case '7': case '8': case '9':
125 usage(); /* disallow -[0-9]+ */
126 else if (lastch == 'c' || lastch == 'u')
128 else if (!isdigit(lastch) || diff_context > INT_MAX / 10)
130 diff_context = (diff_context * 10) + (ch - '0');
133 dflags |= D_FORCEASCII;
136 dflags |= D_FOLDBLANKS;
141 diff_format = D_CONTEXT;
142 if (optarg != NULL) {
143 l = strtol(optarg, &ep, 10);
144 if (*ep != '\0' || l < 0 || l >= INT_MAX)
146 diff_context = (int)l;
153 diff_format = D_IFDEF;
157 diff_format = D_EDIT;
160 diff_format = D_REVERSE;
163 /* ignore but needed for compatibility with GNU diff */
166 /* silently ignore for backwards compatibility */
169 dflags |= D_SKIPBLANKLINES;
172 push_ignore_pats(optarg);
175 dflags |= D_IGNORECASE;
178 if (label[0] == NULL)
180 else if (label[1] == NULL)
192 diff_format = D_NREVERSE;
195 if (diff_format == 0)
196 diff_format = D_CONTEXT;
197 dflags |= D_PROTOTYPE;
206 diff_format = D_BRIEF;
218 dflags |= D_EXPANDTABS;
222 diff_format = D_UNIFIED;
223 if (optarg != NULL) {
224 l = strtol(optarg, &ep, 10);
225 if (*ep != '\0' || l < 0 || l >= INT_MAX)
227 diff_context = (int)l;
231 dflags |= D_IGNOREBLANKS;
234 read_excludes_file(optarg);
237 push_excludes(optarg);
239 case OPT_CHANGED_GROUP_FORMAT:
240 diff_format = D_GFORMAT;
241 group_format = optarg;
243 case OPT_HORIZON_LINES:
244 break; /* XXX TODO for compatibility with GNU diff3 */
245 case OPT_IGN_FN_CASE:
246 ignore_file_case = 1;
248 case OPT_NO_IGN_FN_CASE:
249 ignore_file_case = 0;
252 diff_format = D_NORMAL;
255 tabsize = (int) strtonum(optarg, 1, INT_MAX, &errstr);
257 warnx("Invalid argument for tabsize");
269 newarg = optind != prevoptind;
276 if (pledge("stdio rpath tmppath", NULL) == -1)
281 * Do sanity checks, fill in stb1 and stb2 and call the appropriate
282 * driver routine. Both drivers use the contents of stb1 and stb2.
286 if (ignore_pats != NULL) {
290 if ((error = regcomp(&ignore_re, ignore_pats,
291 REG_NEWLINE | REG_EXTENDED)) != 0) {
292 regerror(error, &ignore_re, buf, sizeof(buf));
293 if (*ignore_pats != '\0')
294 errx(2, "%s: %s", ignore_pats, buf);
299 if (strcmp(argv[0], "-") == 0) {
300 fstat(STDIN_FILENO, &stb1);
302 } else if (stat(argv[0], &stb1) != 0)
303 err(2, "%s", argv[0]);
304 if (strcmp(argv[1], "-") == 0) {
305 fstat(STDIN_FILENO, &stb2);
307 } else if (stat(argv[1], &stb2) != 0)
308 err(2, "%s", argv[1]);
309 if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
310 errx(2, "can't compare - to a directory");
311 set_argstr(oargv, argv);
312 if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
313 if (diff_format == D_IFDEF)
314 errx(2, "-D option not supported with directories");
315 diffdir(argv[0], argv[1], dflags);
317 if (S_ISDIR(stb1.st_mode)) {
318 argv[0] = splice(argv[0], argv[1]);
319 if (stat(argv[0], &stb1) == -1)
320 err(2, "%s", argv[0]);
322 if (S_ISDIR(stb2.st_mode)) {
323 argv[1] = splice(argv[1], argv[0]);
324 if (stat(argv[1], &stb2) == -1)
325 err(2, "%s", argv[1]);
327 print_status(diffreg(argv[0], argv[1], dflags, 1), argv[0],
334 set_argstr(char **av, char **ave)
339 argsize = 4 + *ave - *av + 1;
340 diffargs = xmalloc(argsize);
341 strlcpy(diffargs, "diff", argsize);
342 for (ap = av + 1; ap < ave; ap++) {
343 if (strcmp(*ap, "--") != 0) {
344 strlcat(diffargs, " ", argsize);
345 strlcat(diffargs, *ap, argsize);
351 * Read in an excludes file and push each line.
354 read_excludes_file(char *file)
360 if (strcmp(file, "-") == 0)
362 else if ((fp = fopen(file, "r")) == NULL)
364 while ((buf = fgetln(fp, &len)) != NULL) {
365 if (buf[len - 1] == '\n')
367 if ((pattern = strndup(buf, len)) == NULL)
369 push_excludes(pattern);
371 if (strcmp(file, "-") != 0)
376 * Push a pattern onto the excludes list.
379 push_excludes(char *pattern)
381 struct excludes *entry;
383 entry = xmalloc(sizeof(*entry));
384 entry->pattern = pattern;
385 entry->next = excludes_list;
386 excludes_list = entry;
390 push_ignore_pats(char *pattern)
394 if (ignore_pats == NULL)
395 ignore_pats = xstrdup(pattern);
397 /* old + "|" + new + NUL */
398 len = strlen(ignore_pats) + strlen(pattern) + 2;
399 ignore_pats = xreallocarray(ignore_pats, 1, len);
400 strlcat(ignore_pats, "|", len);
401 strlcat(ignore_pats, pattern, len);
406 print_only(const char *path, size_t dirlen, const char *entry)
410 printf("Only in %.*s: %s\n", (int)dirlen, path, entry);
414 print_status(int val, char *path1, char *path2, const char *entry)
418 printf("Binary files %s%s and %s%s differ\n",
419 path1, entry, path2, entry);
422 if (diff_format == D_BRIEF)
423 printf("Files %s%s and %s%s differ\n",
424 path1, entry, path2, entry);
428 printf("Files %s%s and %s%s are identical\n",
429 path1, entry, path2, entry);
432 printf("File %s%s is a directory while file %s%s is a regular file\n",
433 path1, entry, path2, entry);
436 printf("File %s%s is a regular file while file %s%s is a directory\n",
437 path1, entry, path2, entry);
440 printf("File %s%s is not a regular file or directory and was skipped\n",
444 printf("File %s%s is not a regular file or directory and was skipped\n",
453 (void)fprintf(stderr,
454 "usage: diff [-aBbdilpTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n"
455 " [--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]\n"
456 " [-I pattern] [-L label] file1 file2\n"
457 " diff [-aBbdilpTtw] [-I pattern] [-L label] [--ignore-case]\n"
458 " [--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]\n"
459 " -C number file1 file2\n"
460 " diff [-aBbdiltw] [-I pattern] [--ignore-case] [--no-ignore-case]\n"
461 " [--normal] [--strip-trailing-cr] [--tabsize] -D string file1 file2\n"
462 " diff [-aBbdilpTtw] [-I pattern] [-L label] [--ignore-case]\n"
463 " [--no-ignore-case] [--normal] [--tabsize] [--strip-trailing-cr]\n"
464 " -U number file1 file2\n"
465 " diff [-aBbdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n"
466 " [--no-ignore-case] [--normal] [--tabsize] [-I pattern] [-L label]\n"
467 " [-S name] [-X file] [-x pattern] dir1 dir2\n");