Annotation of src/usr.bin/diff/diff.c, Revision 1.36
1.36 ! millert 1: /* $OpenBSD: diff.c,v 1.35 2003/07/27 07:39:52 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.36 ! millert 24: static const char rcsid[] = "$OpenBSD: diff.c,v 1.35 2003/07/27 07:39:52 otto Exp $";
1.23 millert 25: #endif /* not lint */
26:
27: #include <sys/param.h>
28: #include <sys/stat.h>
29:
30: #include <err.h>
1.15 millert 31: #include <errno.h>
1.23 millert 32: #include <getopt.h>
1.28 millert 33: #include <signal.h>
1.3 tedu 34: #include <stdlib.h>
1.23 millert 35: #include <stdio.h>
1.15 millert 36: #include <stdarg.h>
1.18 david 37: #include <string.h>
1.3 tedu 38: #include <unistd.h>
1.1 deraadt 39:
40: #include "diff.h"
1.12 tedu 41:
1.35 otto 42: int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, rflag, sflag, tflag,
43: Tflag, wflag;
1.23 millert 44: int format, context, status;
1.33 millert 45: char *start, *ifdefname, *diffargs, *label;
1.23 millert 46: struct stat stb1, stb2;
47: struct excludes *excludes_list;
48:
1.35 otto 49: #define OPTIONS "abC:cdD:efhiL:lnNPqrS:sTtU:uwX:x:"
1.23 millert 50: static struct option longopts[] = {
51: { "text", no_argument, 0, 'a' },
52: { "ignore-space-change", no_argument, 0, 'b' },
53: { "context", optional_argument, 0, 'C' },
54: { "ifdef", required_argument, 0, 'D' },
1.35 otto 55: { "minimal", no_argument, 0, 'd' },
1.23 millert 56: { "ed", no_argument, 0, 'e' },
57: { "forward-ed", no_argument, 0, 'f' },
58: { "ignore-case", no_argument, 0, 'i' },
1.27 millert 59: { "paginate", no_argument, 0, 'l' },
1.33 millert 60: { "label", required_argument, 0, 'L' },
1.23 millert 61: { "new-file", no_argument, 0, 'N' },
62: { "rcs", no_argument, 0, 'n' },
1.24 millert 63: { "unidirectional-new-file", 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.33 millert 69: { "intial-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 *);
79: void read_excludes_file(char *file);
80: void set_argstr(char **, char **);
1.3 tedu 81:
82: int
83: main(int argc, char **argv)
1.1 deraadt 84: {
1.23 millert 85: char *ep, **oargv;
86: long l;
87: int ch, gotstdin;
1.1 deraadt 88:
1.23 millert 89: oargv = argv;
90: gotstdin = 0;
1.6 millert 91:
1.23 millert 92: while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) {
1.6 millert 93: switch (ch) {
1.12 tedu 94: case 'a':
1.23 millert 95: aflag = 1;
1.12 tedu 96: break;
1.6 millert 97: case 'b':
1.23 millert 98: bflag = 1;
1.6 millert 99: break;
100: case 'C':
101: case 'c':
1.23 millert 102: format = D_CONTEXT;
103: if (optarg != NULL) {
104: l = strtol(optarg, &ep, 10);
105: if (*ep != '\0' || l < 0 || l >= INT_MAX)
106: usage();
107: context = (int)l;
108: } else
109: context = 3;
1.6 millert 110: break;
1.35 otto 111: case 'd':
112: dflag = 1;
113: break;
1.6 millert 114: case 'D':
1.23 millert 115: format = D_IFDEF;
1.17 millert 116: ifdefname = optarg;
1.6 millert 117: break;
118: case 'e':
1.23 millert 119: format = D_EDIT;
1.6 millert 120: break;
121: case 'f':
1.23 millert 122: format = D_REVERSE;
1.6 millert 123: break;
1.22 millert 124: case 'h':
125: /* silently ignore for backwards compatibility */
126: break;
1.6 millert 127: case 'i':
1.23 millert 128: iflag = 1;
129: break;
1.33 millert 130: case 'L':
131: label = optarg;
132: break;
1.27 millert 133: case 'l':
134: lflag = 1;
1.28 millert 135: signal(SIGPIPE, SIG_IGN);
1.27 millert 136: break;
1.23 millert 137: case 'N':
138: Nflag = 1;
1.6 millert 139: break;
140: case 'n':
1.23 millert 141: format = D_NREVERSE;
1.6 millert 142: break;
1.24 millert 143: case 'P':
144: Pflag = 1;
145: break;
1.6 millert 146: case 'r':
1.23 millert 147: rflag = 1;
1.6 millert 148: break;
1.25 millert 149: case 'q':
150: format = D_BRIEF;
151: break;
1.6 millert 152: case 'S':
153: start = optarg;
154: break;
155: case 's':
1.23 millert 156: sflag = 1;
1.6 millert 157: break;
1.33 millert 158: case 'T':
159: Tflag = 1;
160: break;
1.6 millert 161: case 't':
1.23 millert 162: tflag = 1;
1.6 millert 163: break;
1.9 millert 164: case 'U':
165: case 'u':
1.23 millert 166: format = D_UNIFIED;
167: if (optarg != NULL) {
168: l = strtol(optarg, &ep, 10);
169: if (*ep != '\0' || l < 0 || l >= INT_MAX)
170: usage();
171: context = (int)l;
172: } else
173: context = 3;
1.9 millert 174: break;
1.6 millert 175: case 'w':
1.23 millert 176: wflag = 1;
177: break;
178: case 'X':
179: read_excludes_file(optarg);
180: break;
181: case 'x':
182: push_excludes(optarg);
1.6 millert 183: break;
184: default:
185: usage();
186: break;
187: }
1.1 deraadt 188: }
1.6 millert 189: argc -= optind;
190: argv += optind;
191:
1.23 millert 192: /*
193: * Do sanity checks, fill in stb1 and stb2 and call the appropriate
194: * driver routine. Both drivers use the contents of stb1 and stb2.
195: */
1.6 millert 196: if (argc != 2)
1.23 millert 197: usage();
198: if (strcmp(argv[0], "-") == 0) {
1.26 millert 199: fstat(STDIN_FILENO, &stb1);
1.23 millert 200: gotstdin = 1;
201: } else if (stat(argv[0], &stb1) != 0)
1.28 millert 202: err(2, "%s", argv[0]);
1.23 millert 203: if (strcmp(argv[1], "-") == 0) {
1.26 millert 204: fstat(STDIN_FILENO, &stb2);
1.23 millert 205: gotstdin = 1;
206: } else if (stat(argv[1], &stb2) != 0)
1.28 millert 207: err(2, "%s", argv[1]);
1.23 millert 208: if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
1.28 millert 209: errx(2, "can't compare - to a directory");
1.36 ! millert 210: set_argstr(oargv + 1, argv);
1.23 millert 211: if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
212: if (format == D_IFDEF)
1.28 millert 213: errx(2, "-D option not supported with directories");
1.23 millert 214: diffdir(argv[0], argv[1]);
1.27 millert 215: } else {
1.28 millert 216: if (S_ISDIR(stb1.st_mode)) {
217: argv[0] = splice(argv[0], argv[1]);
218: if (stat(argv[0], &stb1) < 0)
219: err(2, "%s", argv[0]);
220: }
221: if (S_ISDIR(stb2.st_mode)) {
222: argv[1] = splice(argv[1], argv[0]);
223: if (stat(argv[1], &stb2) < 0)
224: err(2, "%s", argv[1]);
225: }
1.27 millert 226: print_status(diffreg(argv[0], argv[1], 0), argv[0], argv[1],
227: NULL);
228: }
1.23 millert 229: exit(status);
1.1 deraadt 230: }
231:
1.3 tedu 232: void *
1.8 millert 233: emalloc(size_t n)
1.3 tedu 234: {
235: void *p;
236:
237: if ((p = malloc(n)) == NULL)
1.28 millert 238: err(2, NULL);
1.3 tedu 239: return (p);
1.1 deraadt 240: }
241:
1.3 tedu 242: void *
1.8 millert 243: erealloc(void *p, size_t n)
1.1 deraadt 244: {
1.3 tedu 245: void *q;
1.1 deraadt 246:
1.3 tedu 247: if ((q = realloc(p, n)) == NULL)
1.28 millert 248: err(2, NULL);
1.3 tedu 249: return (q);
1.1 deraadt 250: }
251:
1.27 millert 252: int
253: easprintf(char **ret, const char *fmt, ...)
254: {
255: int len;
256: va_list ap;
257:
258: va_start(ap, fmt);
259: len = vasprintf(ret, fmt, ap);
260: va_end(ap);
261:
262: if (len == -1)
1.28 millert 263: err(2, NULL);
1.30 henning 264: return (len);
1.27 millert 265: }
266:
1.23 millert 267: void
268: set_argstr(char **av, char **ave)
269: {
270: size_t argsize;
271: char **ap;
272:
1.36 ! millert 273: argsize = 4 + *ave - *av + 1;
1.23 millert 274: diffargs = emalloc(argsize);
275: strlcpy(diffargs, "diff", argsize);
276: for (ap = av + 1; ap < ave; ap++) {
277: if (strcmp(*ap, "--") != 0) {
278: strlcat(diffargs, " ", argsize);
279: strlcat(diffargs, *ap, argsize);
280: }
281: }
282: }
283:
284: /*
285: * Read in an excludes file and push each line.
286: */
287: void
288: read_excludes_file(char *file)
289: {
290: FILE *fp;
291: char *buf, *pattern;
292: size_t len;
293:
294: if (strcmp(file, "-") == 0)
295: fp = stdin;
296: else if ((fp = fopen(file, "r")) == NULL)
1.28 millert 297: err(2, "%s", file);
1.23 millert 298: while ((buf = fgetln(fp, &len)) != NULL) {
299: if (buf[len - 1] == '\n')
300: len--;
301: pattern = emalloc(len + 1);
302: memcpy(pattern, buf, len);
303: pattern[len] = '\0';
304: push_excludes(pattern);
305: }
306: if (strcmp(file, "-") != 0)
307: fclose(fp);
308: }
309:
310: /*
311: * Push a pattern onto the excludes list.
312: */
313: void
314: push_excludes(char *pattern)
315: {
316: struct excludes *entry;
317:
318: entry = emalloc(sizeof(*entry));
319: entry->pattern = pattern;
320: entry->next = excludes_list;
321: excludes_list = entry;
1.27 millert 322: }
323:
324: void
325: print_status(int val, char *path1, char *path2, char *entry)
326: {
327: switch (val) {
328: case D_ONLY:
1.32 millert 329: /* must strip off the trailing '/' */
330: printf("Only in %.*s: %s\n", (int)(strlen(path1) - 1),
331: path1, entry);
1.27 millert 332: break;
333: case D_COMMON:
334: printf("Common subdirectories: %s%s and %s%s\n",
335: path1, entry ? entry : "", path2, entry ? entry : "");
336: break;
337: case D_BINARY:
338: printf("Binary files %s%s and %s%s differ\n",
339: path1, entry ? entry : "", path2, entry ? entry : "");
340: break;
341: case D_DIFFER:
342: if (format == D_BRIEF)
343: printf("Files %s%s and %s%s differ\n",
344: path1, entry ? entry : "",
345: path2, entry ? entry : "");
346: break;
347: case D_SAME:
348: if (sflag)
349: printf("Files %s%s and %s%s are identical\n",
350: path1, entry ? entry : "",
351: path2, entry ? entry : "");
1.28 millert 352: break;
1.29 millert 353: case D_MISMATCH1:
1.31 millert 354: printf("File %s%s is a directory while file %s%s is a regular file\n",
1.29 millert 355: path1, entry ? entry : "", path2, entry ? entry : "");
356: break;
357: case D_MISMATCH2:
1.31 millert 358: printf("File %s%s is a regular file while file %s%s is a directory\n",
1.28 millert 359: path1, entry ? entry : "", path2, entry ? entry : "");
1.27 millert 360: break;
361: }
1.23 millert 362: }
363:
1.6 millert 364: __dead void
365: usage(void)
366: {
1.14 deraadt 367: (void)fprintf(stderr,
1.35 otto 368: "usage: diff [-bdilqtTw] [-c | -e | -f | -n | -u] [-L label] file1 file2\n"
369: " diff [-bdilqtTw] [-L label] -C number file1 file2\n"
370: " diff [-bdilqtw] -D string file1 file2\n"
371: " diff [-bdilqtTw] [-L label] -U number file1 file2\n"
372: " diff [-bdilNPqwtT] [-c | -e | -f | -n | -u ] [-L label] [-r] [-s] [-S name]\n"
1.33 millert 373: " [-X file] [-x pattern] dir1 dir2\n");
1.6 millert 374:
1.15 millert 375: exit(2);
1.1 deraadt 376: }
![[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