Annotation of src/usr.bin/diff/diff.c, Revision 1.63
1.63 ! deraadt 1: /* $OpenBSD: diff.c,v 1.62 2015/10/05 20:15:00 millert Exp $ */
1.2 deraadt 2:
3: /*
1.23 millert 4: * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
1.2 deraadt 5: *
1.23 millert 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.
1.2 deraadt 9: *
1.23 millert 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.
17: *
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.
1.2 deraadt 21: */
1.23 millert 22:
23: #include <sys/stat.h>
24:
1.42 millert 25: #include <ctype.h>
1.23 millert 26: #include <err.h>
1.15 millert 27: #include <errno.h>
1.23 millert 28: #include <getopt.h>
1.3 tedu 29: #include <stdlib.h>
1.23 millert 30: #include <stdio.h>
1.15 millert 31: #include <stdarg.h>
1.18 david 32: #include <string.h>
1.3 tedu 33: #include <unistd.h>
1.58 deraadt 34: #include <limits.h>
1.1 deraadt 35:
36: #include "diff.h"
1.50 ray 37: #include "xmalloc.h"
1.12 tedu 38:
1.62 millert 39: int Nflag, Pflag, rflag, sflag, Tflag;
1.53 ray 40: int diff_format, diff_context, status;
1.48 millert 41: char *start, *ifdefname, *diffargs, *label[2], *ignore_pats;
1.23 millert 42: struct stat stb1, stb2;
43: struct excludes *excludes_list;
1.46 otto 44: regex_t ignore_re;
1.23 millert 45:
1.46 otto 46: #define OPTIONS "0123456789abC:cdD:efhI:iL:lnNPpqrS:sTtU:uwX:x:"
1.23 millert 47: static struct option longopts[] = {
48: { "text", no_argument, 0, 'a' },
49: { "ignore-space-change", no_argument, 0, 'b' },
50: { "context", optional_argument, 0, 'C' },
51: { "ifdef", required_argument, 0, 'D' },
1.35 otto 52: { "minimal", no_argument, 0, 'd' },
1.23 millert 53: { "ed", no_argument, 0, 'e' },
54: { "forward-ed", no_argument, 0, 'f' },
1.46 otto 55: { "ignore-matching-lines", required_argument, 0, 'I' },
1.23 millert 56: { "ignore-case", no_argument, 0, 'i' },
1.33 millert 57: { "label", required_argument, 0, 'L' },
1.23 millert 58: { "new-file", no_argument, 0, 'N' },
59: { "rcs", no_argument, 0, 'n' },
1.24 millert 60: { "unidirectional-new-file", no_argument, 0, 'P' },
1.44 otto 61: { "show-c-function", no_argument, 0, 'p' },
1.25 millert 62: { "brief", no_argument, 0, 'q' },
1.23 millert 63: { "recursive", no_argument, 0, 'r' },
64: { "report-identical-files", no_argument, 0, 's' },
65: { "starting-file", required_argument, 0, 'S' },
66: { "expand-tabs", no_argument, 0, 't' },
1.38 david 67: { "initial-tab", no_argument, 0, 'T' },
1.23 millert 68: { "unified", optional_argument, 0, 'U' },
69: { "ignore-all-space", no_argument, 0, 'w' },
70: { "exclude", required_argument, 0, 'x' },
71: { "exclude-from", required_argument, 0, 'X' },
1.34 millert 72: { NULL, 0, 0, '\0'}
1.23 millert 73: };
1.1 deraadt 74:
1.6 millert 75: __dead void usage(void);
1.23 millert 76: void push_excludes(char *);
1.46 otto 77: void push_ignore_pats(char *);
1.23 millert 78: void read_excludes_file(char *file);
79: void set_argstr(char **, char **);
1.3 tedu 80:
81: int
82: main(int argc, char **argv)
1.1 deraadt 83: {
1.23 millert 84: char *ep, **oargv;
85: long l;
1.51 ray 86: int ch, dflags, lastch, gotstdin, prevoptind, newarg;
1.1 deraadt 87:
1.23 millert 88: oargv = argv;
89: gotstdin = 0;
1.51 ray 90: dflags = 0;
1.42 millert 91: lastch = '\0';
92: prevoptind = 1;
93: newarg = 1;
1.23 millert 94: while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) {
1.6 millert 95: switch (ch) {
1.40 tedu 96: case '0': case '1': case '2': case '3': case '4':
97: case '5': case '6': case '7': case '8': case '9':
1.42 millert 98: if (newarg)
99: usage(); /* disallow -[0-9]+ */
100: else if (lastch == 'c' || lastch == 'u')
1.53 ray 101: diff_context = 0;
102: else if (!isdigit(lastch) || diff_context > INT_MAX / 10)
1.40 tedu 103: usage();
1.53 ray 104: diff_context = (diff_context * 10) + (ch - '0');
1.40 tedu 105: break;
1.12 tedu 106: case 'a':
1.51 ray 107: dflags |= D_FORCEASCII;
1.12 tedu 108: break;
1.6 millert 109: case 'b':
1.51 ray 110: dflags |= D_FOLDBLANKS;
1.6 millert 111: break;
112: case 'C':
113: case 'c':
1.53 ray 114: diff_format = D_CONTEXT;
1.23 millert 115: if (optarg != NULL) {
116: l = strtol(optarg, &ep, 10);
117: if (*ep != '\0' || l < 0 || l >= INT_MAX)
118: usage();
1.53 ray 119: diff_context = (int)l;
1.23 millert 120: } else
1.53 ray 121: diff_context = 3;
1.6 millert 122: break;
1.35 otto 123: case 'd':
1.51 ray 124: dflags |= D_MINIMAL;
1.35 otto 125: break;
1.6 millert 126: case 'D':
1.53 ray 127: diff_format = D_IFDEF;
1.17 millert 128: ifdefname = optarg;
1.6 millert 129: break;
130: case 'e':
1.53 ray 131: diff_format = D_EDIT;
1.6 millert 132: break;
133: case 'f':
1.53 ray 134: diff_format = D_REVERSE;
1.6 millert 135: break;
1.22 millert 136: case 'h':
137: /* silently ignore for backwards compatibility */
138: break;
1.46 otto 139: case 'I':
140: push_ignore_pats(optarg);
141: break;
1.6 millert 142: case 'i':
1.51 ray 143: dflags |= D_IGNORECASE;
1.23 millert 144: break;
1.33 millert 145: case 'L':
1.48 millert 146: if (label[0] == NULL)
147: label[0] = optarg;
148: else if (label[1] == NULL)
149: label[1] = optarg;
150: else
151: usage();
1.33 millert 152: break;
1.23 millert 153: case 'N':
154: Nflag = 1;
1.6 millert 155: break;
156: case 'n':
1.53 ray 157: diff_format = D_NREVERSE;
1.6 millert 158: break;
1.44 otto 159: case 'p':
1.51 ray 160: dflags |= D_PROTOTYPE;
1.44 otto 161: break;
1.24 millert 162: case 'P':
163: Pflag = 1;
164: break;
1.6 millert 165: case 'r':
1.23 millert 166: rflag = 1;
1.6 millert 167: break;
1.25 millert 168: case 'q':
1.53 ray 169: diff_format = D_BRIEF;
1.25 millert 170: break;
1.6 millert 171: case 'S':
172: start = optarg;
173: break;
174: case 's':
1.23 millert 175: sflag = 1;
1.6 millert 176: break;
1.33 millert 177: case 'T':
178: Tflag = 1;
179: break;
1.6 millert 180: case 't':
1.51 ray 181: dflags |= D_EXPANDTABS;
1.6 millert 182: break;
1.9 millert 183: case 'U':
184: case 'u':
1.53 ray 185: diff_format = D_UNIFIED;
1.23 millert 186: if (optarg != NULL) {
187: l = strtol(optarg, &ep, 10);
188: if (*ep != '\0' || l < 0 || l >= INT_MAX)
189: usage();
1.53 ray 190: diff_context = (int)l;
1.23 millert 191: } else
1.53 ray 192: diff_context = 3;
1.9 millert 193: break;
1.6 millert 194: case 'w':
1.51 ray 195: dflags |= D_IGNOREBLANKS;
1.23 millert 196: break;
197: case 'X':
198: read_excludes_file(optarg);
199: break;
200: case 'x':
201: push_excludes(optarg);
1.6 millert 202: break;
203: default:
204: usage();
205: break;
206: }
1.40 tedu 207: lastch = ch;
1.42 millert 208: newarg = optind != prevoptind;
209: prevoptind = optind;
1.1 deraadt 210: }
1.6 millert 211: argc -= optind;
212: argv += optind;
213:
1.62 millert 214: if (getenv("TMPDIR")) {
1.63 ! deraadt 215: if (pledge("stdio rpath wpath cpath", NULL) == -1)
! 216: err(1, "pledge");
1.62 millert 217: } else {
1.63 ! deraadt 218: if (pledge("stdio rpath tmppath", NULL) == -1)
! 219: err(1, "pledge");
1.60 deraadt 220: }
1.62 millert 221:
1.23 millert 222: /*
223: * Do sanity checks, fill in stb1 and stb2 and call the appropriate
224: * driver routine. Both drivers use the contents of stb1 and stb2.
225: */
1.6 millert 226: if (argc != 2)
1.23 millert 227: usage();
1.46 otto 228: if (ignore_pats != NULL) {
229: char buf[BUFSIZ];
230: int error;
231:
232: if ((error = regcomp(&ignore_re, ignore_pats,
233: REG_NEWLINE | REG_EXTENDED)) != 0) {
234: regerror(error, &ignore_re, buf, sizeof(buf));
235: if (*ignore_pats != '\0')
236: errx(2, "%s: %s", ignore_pats, buf);
237: else
238: errx(2, "%s", buf);
239: }
240: }
1.23 millert 241: if (strcmp(argv[0], "-") == 0) {
1.26 millert 242: fstat(STDIN_FILENO, &stb1);
1.23 millert 243: gotstdin = 1;
244: } else if (stat(argv[0], &stb1) != 0)
1.28 millert 245: err(2, "%s", argv[0]);
1.23 millert 246: if (strcmp(argv[1], "-") == 0) {
1.26 millert 247: fstat(STDIN_FILENO, &stb2);
1.23 millert 248: gotstdin = 1;
249: } else if (stat(argv[1], &stb2) != 0)
1.28 millert 250: err(2, "%s", argv[1]);
1.23 millert 251: if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
1.28 millert 252: errx(2, "can't compare - to a directory");
1.47 espie 253: set_argstr(oargv, argv);
1.23 millert 254: if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
1.53 ray 255: if (diff_format == D_IFDEF)
1.28 millert 256: errx(2, "-D option not supported with directories");
1.52 ray 257: diffdir(argv[0], argv[1], dflags);
1.27 millert 258: } else {
1.28 millert 259: if (S_ISDIR(stb1.st_mode)) {
260: argv[0] = splice(argv[0], argv[1]);
261: if (stat(argv[0], &stb1) < 0)
262: err(2, "%s", argv[0]);
263: }
264: if (S_ISDIR(stb2.st_mode)) {
265: argv[1] = splice(argv[1], argv[0]);
266: if (stat(argv[1], &stb2) < 0)
267: err(2, "%s", argv[1]);
268: }
1.52 ray 269: print_status(diffreg(argv[0], argv[1], dflags), argv[0], argv[1],
1.57 ray 270: "");
1.27 millert 271: }
1.23 millert 272: exit(status);
1.1 deraadt 273: }
274:
1.23 millert 275: void
276: set_argstr(char **av, char **ave)
277: {
278: size_t argsize;
279: char **ap;
280:
1.36 millert 281: argsize = 4 + *ave - *av + 1;
1.50 ray 282: diffargs = xmalloc(argsize);
1.23 millert 283: strlcpy(diffargs, "diff", argsize);
284: for (ap = av + 1; ap < ave; ap++) {
285: if (strcmp(*ap, "--") != 0) {
286: strlcat(diffargs, " ", argsize);
287: strlcat(diffargs, *ap, argsize);
288: }
289: }
290: }
291:
292: /*
293: * Read in an excludes file and push each line.
294: */
295: void
296: read_excludes_file(char *file)
297: {
298: FILE *fp;
299: char *buf, *pattern;
300: size_t len;
301:
302: if (strcmp(file, "-") == 0)
303: fp = stdin;
304: else if ((fp = fopen(file, "r")) == NULL)
1.28 millert 305: err(2, "%s", file);
1.23 millert 306: while ((buf = fgetln(fp, &len)) != NULL) {
307: if (buf[len - 1] == '\n')
308: len--;
1.50 ray 309: pattern = xmalloc(len + 1);
1.23 millert 310: memcpy(pattern, buf, len);
311: pattern[len] = '\0';
312: push_excludes(pattern);
313: }
314: if (strcmp(file, "-") != 0)
315: fclose(fp);
316: }
317:
318: /*
319: * Push a pattern onto the excludes list.
320: */
321: void
322: push_excludes(char *pattern)
323: {
324: struct excludes *entry;
325:
1.50 ray 326: entry = xmalloc(sizeof(*entry));
1.23 millert 327: entry->pattern = pattern;
328: entry->next = excludes_list;
329: excludes_list = entry;
1.27 millert 330: }
331:
332: void
1.46 otto 333: push_ignore_pats(char *pattern)
334: {
335: size_t len;
336:
1.50 ray 337: if (ignore_pats == NULL)
338: ignore_pats = xstrdup(pattern);
339: else {
1.46 otto 340: /* old + "|" + new + NUL */
341: len = strlen(ignore_pats) + strlen(pattern) + 2;
1.59 deraadt 342: ignore_pats = xreallocarray(ignore_pats, 1, len);
1.46 otto 343: strlcat(ignore_pats, "|", len);
344: strlcat(ignore_pats, pattern, len);
345: }
346: }
347:
348: void
1.43 millert 349: print_only(const char *path, size_t dirlen, const char *entry)
350: {
351: if (dirlen > 1)
352: dirlen--;
353: printf("Only in %.*s: %s\n", (int)dirlen, path, entry);
354: }
355:
356: void
1.27 millert 357: print_status(int val, char *path1, char *path2, char *entry)
358: {
359: switch (val) {
360: case D_BINARY:
361: printf("Binary files %s%s and %s%s differ\n",
1.57 ray 362: path1, entry, path2, entry);
1.27 millert 363: break;
364: case D_DIFFER:
1.53 ray 365: if (diff_format == D_BRIEF)
1.27 millert 366: printf("Files %s%s and %s%s differ\n",
1.57 ray 367: path1, entry, path2, entry);
1.27 millert 368: break;
369: case D_SAME:
370: if (sflag)
371: printf("Files %s%s and %s%s are identical\n",
1.57 ray 372: path1, entry, path2, entry);
1.28 millert 373: break;
1.29 millert 374: case D_MISMATCH1:
1.31 millert 375: printf("File %s%s is a directory while file %s%s is a regular file\n",
1.57 ray 376: path1, entry, path2, entry);
1.29 millert 377: break;
378: case D_MISMATCH2:
1.31 millert 379: printf("File %s%s is a regular file while file %s%s is a directory\n",
1.57 ray 380: path1, entry, path2, entry);
1.45 millert 381: break;
382: case D_SKIPPED1:
383: printf("File %s%s is not a regular file or directory and was skipped\n",
1.57 ray 384: path1, entry);
1.45 millert 385: break;
386: case D_SKIPPED2:
387: printf("File %s%s is not a regular file or directory and was skipped\n",
1.57 ray 388: path2, entry);
1.27 millert 389: break;
390: }
1.23 millert 391: }
392:
1.6 millert 393: __dead void
394: usage(void)
395: {
1.14 deraadt 396: (void)fprintf(stderr,
1.62 millert 397: "usage: diff [-abdipTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L label]\n"
1.56 sobrado 398: " file1 file2\n"
1.62 millert 399: " diff [-abdipTtw] [-I pattern] [-L label] -C number file1 file2\n"
400: " diff [-abditw] [-I pattern] -D string file1 file2\n"
401: " diff [-abdipTtw] [-I pattern] [-L label] -U number file1 file2\n"
402: " diff [-abdiNPprsTtw] [-c | -e | -f | -n | -q | -u] [-I pattern]\n"
1.56 sobrado 403: " [-L label] [-S name] [-X file] [-x pattern] dir1 dir2\n");
1.6 millert 404:
1.15 millert 405: exit(2);
1.1 deraadt 406: }
![[BACK]](/icons/back.gif){kind=icon}
Return to diff.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / diff