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