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