1*1f9aa9e0Smillert /* $OpenBSD: diff.c,v 1.33 2003/07/22 01:16:01 millert Exp $ */ 2d0c3f575Sderaadt 3d0c3f575Sderaadt /* 44ec4b3d5Smillert * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com> 5d0c3f575Sderaadt * 64ec4b3d5Smillert * Permission to use, copy, modify, and distribute this software for any 74ec4b3d5Smillert * purpose with or without fee is hereby granted, provided that the above 84ec4b3d5Smillert * copyright notice and this permission notice appear in all copies. 9d0c3f575Sderaadt * 104ec4b3d5Smillert * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 114ec4b3d5Smillert * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 124ec4b3d5Smillert * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 134ec4b3d5Smillert * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 144ec4b3d5Smillert * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 154ec4b3d5Smillert * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 164ec4b3d5Smillert * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 174ec4b3d5Smillert * 184ec4b3d5Smillert * Sponsored in part by the Defense Advanced Research Projects 194ec4b3d5Smillert * Agency (DARPA) and Air Force Research Laboratory, Air Force 204ec4b3d5Smillert * Materiel Command, USAF, under agreement number F39502-99-1-0512. 21d0c3f575Sderaadt */ 22d0c3f575Sderaadt 234ec4b3d5Smillert #ifndef lint 24*1f9aa9e0Smillert static const char rcsid[] = "$OpenBSD: diff.c,v 1.33 2003/07/22 01:16:01 millert Exp $"; 254ec4b3d5Smillert #endif /* not lint */ 264ec4b3d5Smillert 274ec4b3d5Smillert #include <sys/param.h> 284ec4b3d5Smillert #include <sys/stat.h> 294ec4b3d5Smillert 304ec4b3d5Smillert #include <err.h> 3166e5764eSmillert #include <errno.h> 324ec4b3d5Smillert #include <getopt.h> 337b6ec9e4Smillert #include <signal.h> 3426da422aStedu #include <stdlib.h> 354ec4b3d5Smillert #include <stdio.h> 3666e5764eSmillert #include <stdarg.h> 37e582024bSdavid #include <string.h> 3826da422aStedu #include <unistd.h> 39ae8d569bSderaadt 40ae8d569bSderaadt #include "diff.h" 41ae8d569bSderaadt 42*1f9aa9e0Smillert int aflag, bflag, iflag, lflag, Nflag, Pflag, rflag, sflag, tflag, Tflag, 43*1f9aa9e0Smillert wflag; 444ec4b3d5Smillert int format, context, status; 45*1f9aa9e0Smillert char *start, *ifdefname, *diffargs, *label; 46d5d5ac6cStedu struct stat stb1, stb2; 474ec4b3d5Smillert struct excludes *excludes_list; 484ec4b3d5Smillert 49*1f9aa9e0Smillert #define OPTIONS "abC:cD:efhiL:lnNPqrS:sTtU:uwX:x:" 504ec4b3d5Smillert static struct option longopts[] = { 514ec4b3d5Smillert { "text", no_argument, 0, 'a' }, 524ec4b3d5Smillert { "ignore-space-change", no_argument, 0, 'b' }, 534ec4b3d5Smillert { "context", optional_argument, 0, 'C' }, 544ec4b3d5Smillert { "ifdef", required_argument, 0, 'D' }, 554ec4b3d5Smillert { "ed", no_argument, 0, 'e' }, 564ec4b3d5Smillert { "forward-ed", no_argument, 0, 'f' }, 574ec4b3d5Smillert { "ignore-case", no_argument, 0, 'i' }, 58b4bca33fSmillert { "paginate", no_argument, 0, 'l' }, 59*1f9aa9e0Smillert { "label", required_argument, 0, 'L' }, 604ec4b3d5Smillert { "new-file", no_argument, 0, 'N' }, 614ec4b3d5Smillert { "rcs", no_argument, 0, 'n' }, 62aeb82612Smillert { "unidirectional-new-file", no_argument, 0, 'P' }, 63cab5d83cSmillert { "brief", no_argument, 0, 'q' }, 644ec4b3d5Smillert { "recursive", no_argument, 0, 'r' }, 654ec4b3d5Smillert { "report-identical-files", no_argument, 0, 's' }, 664ec4b3d5Smillert { "starting-file", required_argument, 0, 'S' }, 674ec4b3d5Smillert { "expand-tabs", no_argument, 0, 't' }, 68*1f9aa9e0Smillert { "intial-tab", no_argument, 0, 'T' }, 694ec4b3d5Smillert { "unified", optional_argument, 0, 'U' }, 704ec4b3d5Smillert { "ignore-all-space", no_argument, 0, 'w' }, 714ec4b3d5Smillert { "exclude", required_argument, 0, 'x' }, 724ec4b3d5Smillert { "exclude-from", required_argument, 0, 'X' }, 734ec4b3d5Smillert }; 74ae8d569bSderaadt 75c42aed39Smillert __dead void usage(void); 764ec4b3d5Smillert void push_excludes(char *); 774ec4b3d5Smillert void read_excludes_file(char *file); 784ec4b3d5Smillert void set_argstr(char **, char **); 79ae8d569bSderaadt 8026da422aStedu int 8126da422aStedu main(int argc, char **argv) 8226da422aStedu { 834ec4b3d5Smillert char *ep, **oargv; 844ec4b3d5Smillert long l; 854ec4b3d5Smillert int ch, gotstdin; 8626da422aStedu 874ec4b3d5Smillert oargv = argv; 884ec4b3d5Smillert gotstdin = 0; 89c42aed39Smillert 904ec4b3d5Smillert while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) { 91c42aed39Smillert switch (ch) { 92d5d5ac6cStedu case 'a': 934ec4b3d5Smillert aflag = 1; 94d5d5ac6cStedu break; 95ae8d569bSderaadt case 'b': 964ec4b3d5Smillert bflag = 1; 97c42aed39Smillert break; 98c42aed39Smillert case 'C': 99ae8d569bSderaadt case 'c': 1004ec4b3d5Smillert format = D_CONTEXT; 1014ec4b3d5Smillert if (optarg != NULL) { 1024ec4b3d5Smillert l = strtol(optarg, &ep, 10); 1034ec4b3d5Smillert if (*ep != '\0' || l < 0 || l >= INT_MAX) 1044ec4b3d5Smillert usage(); 1054ec4b3d5Smillert context = (int)l; 1064ec4b3d5Smillert } else 107ae8d569bSderaadt context = 3; 108c42aed39Smillert break; 109c42aed39Smillert case 'D': 1104ec4b3d5Smillert format = D_IFDEF; 11190f56ad8Smillert ifdefname = optarg; 112c42aed39Smillert break; 113c42aed39Smillert case 'e': 1144ec4b3d5Smillert format = D_EDIT; 115c42aed39Smillert break; 116c42aed39Smillert case 'f': 1174ec4b3d5Smillert format = D_REVERSE; 118c42aed39Smillert break; 119a0daf5ccSmillert case 'h': 120a0daf5ccSmillert /* silently ignore for backwards compatibility */ 121a0daf5ccSmillert break; 122c42aed39Smillert case 'i': 1234ec4b3d5Smillert iflag = 1; 1244ec4b3d5Smillert break; 125*1f9aa9e0Smillert case 'L': 126*1f9aa9e0Smillert label = optarg; 127*1f9aa9e0Smillert break; 128b4bca33fSmillert case 'l': 129b4bca33fSmillert lflag = 1; 1307b6ec9e4Smillert signal(SIGPIPE, SIG_IGN); 131b4bca33fSmillert break; 1324ec4b3d5Smillert case 'N': 1334ec4b3d5Smillert Nflag = 1; 134c42aed39Smillert break; 135c42aed39Smillert case 'n': 1364ec4b3d5Smillert format = D_NREVERSE; 137c42aed39Smillert break; 138aeb82612Smillert case 'P': 139aeb82612Smillert Pflag = 1; 140aeb82612Smillert break; 141c42aed39Smillert case 'r': 1424ec4b3d5Smillert rflag = 1; 143c42aed39Smillert break; 144cab5d83cSmillert case 'q': 145cab5d83cSmillert format = D_BRIEF; 146cab5d83cSmillert break; 147c42aed39Smillert case 'S': 148c42aed39Smillert start = optarg; 149c42aed39Smillert break; 150c42aed39Smillert case 's': 1514ec4b3d5Smillert sflag = 1; 152c42aed39Smillert break; 153*1f9aa9e0Smillert case 'T': 154*1f9aa9e0Smillert Tflag = 1; 155*1f9aa9e0Smillert break; 156c42aed39Smillert case 't': 1574ec4b3d5Smillert tflag = 1; 158c42aed39Smillert break; 1599de32c1bSmillert case 'U': 1609de32c1bSmillert case 'u': 1614ec4b3d5Smillert format = D_UNIFIED; 1624ec4b3d5Smillert if (optarg != NULL) { 1634ec4b3d5Smillert l = strtol(optarg, &ep, 10); 1644ec4b3d5Smillert if (*ep != '\0' || l < 0 || l >= INT_MAX) 1654ec4b3d5Smillert usage(); 1664ec4b3d5Smillert context = (int)l; 1674ec4b3d5Smillert } else 1689de32c1bSmillert context = 3; 1699de32c1bSmillert break; 170c42aed39Smillert case 'w': 1714ec4b3d5Smillert wflag = 1; 1724ec4b3d5Smillert break; 1734ec4b3d5Smillert case 'X': 1744ec4b3d5Smillert read_excludes_file(optarg); 1754ec4b3d5Smillert break; 1764ec4b3d5Smillert case 'x': 1774ec4b3d5Smillert push_excludes(optarg); 178c42aed39Smillert break; 179ae8d569bSderaadt default: 180c42aed39Smillert usage(); 181c42aed39Smillert break; 182ae8d569bSderaadt } 183ae8d569bSderaadt } 184c42aed39Smillert argc -= optind; 185c42aed39Smillert argv += optind; 186c42aed39Smillert 1874ec4b3d5Smillert /* 1884ec4b3d5Smillert * Do sanity checks, fill in stb1 and stb2 and call the appropriate 1894ec4b3d5Smillert * driver routine. Both drivers use the contents of stb1 and stb2. 1904ec4b3d5Smillert */ 191c42aed39Smillert if (argc != 2) 1924ec4b3d5Smillert usage(); 1934ec4b3d5Smillert if (strcmp(argv[0], "-") == 0) { 194b1a26502Smillert fstat(STDIN_FILENO, &stb1); 1954ec4b3d5Smillert gotstdin = 1; 1964ec4b3d5Smillert } else if (stat(argv[0], &stb1) != 0) 1977b6ec9e4Smillert err(2, "%s", argv[0]); 1984ec4b3d5Smillert if (strcmp(argv[1], "-") == 0) { 199b1a26502Smillert fstat(STDIN_FILENO, &stb2); 2004ec4b3d5Smillert gotstdin = 1; 2014ec4b3d5Smillert } else if (stat(argv[1], &stb2) != 0) 2027b6ec9e4Smillert err(2, "%s", argv[1]); 2034ec4b3d5Smillert if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode))) 2047b6ec9e4Smillert errx(2, "can't compare - to a directory"); 205b4bca33fSmillert set_argstr(oargv, argv); 2064ec4b3d5Smillert if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { 2074ec4b3d5Smillert if (format == D_IFDEF) 2087b6ec9e4Smillert errx(2, "-D option not supported with directories"); 2094ec4b3d5Smillert diffdir(argv[0], argv[1]); 210b4bca33fSmillert } else { 2117b6ec9e4Smillert if (S_ISDIR(stb1.st_mode)) { 2127b6ec9e4Smillert argv[0] = splice(argv[0], argv[1]); 2137b6ec9e4Smillert if (stat(argv[0], &stb1) < 0) 2147b6ec9e4Smillert err(2, "%s", argv[0]); 2157b6ec9e4Smillert } 2167b6ec9e4Smillert if (S_ISDIR(stb2.st_mode)) { 2177b6ec9e4Smillert argv[1] = splice(argv[1], argv[0]); 2187b6ec9e4Smillert if (stat(argv[1], &stb2) < 0) 2197b6ec9e4Smillert err(2, "%s", argv[1]); 2207b6ec9e4Smillert } 221b4bca33fSmillert print_status(diffreg(argv[0], argv[1], 0), argv[0], argv[1], 222b4bca33fSmillert NULL); 223b4bca33fSmillert } 2244ec4b3d5Smillert exit(status); 225ae8d569bSderaadt } 226ae8d569bSderaadt 22726da422aStedu void * 22849dffe13Smillert emalloc(size_t n) 229ae8d569bSderaadt { 23026da422aStedu void *p; 231ae8d569bSderaadt 23226da422aStedu if ((p = malloc(n)) == NULL) 2337b6ec9e4Smillert err(2, NULL); 23426da422aStedu return (p); 23526da422aStedu } 23626da422aStedu 23726da422aStedu void * 23849dffe13Smillert erealloc(void *p, size_t n) 23926da422aStedu { 24026da422aStedu void *q; 24126da422aStedu 24226da422aStedu if ((q = realloc(p, n)) == NULL) 2437b6ec9e4Smillert err(2, NULL); 244ae8d569bSderaadt return (q); 245ae8d569bSderaadt } 246ae8d569bSderaadt 247b4bca33fSmillert int 248b4bca33fSmillert easprintf(char **ret, const char *fmt, ...) 249b4bca33fSmillert { 250b4bca33fSmillert int len; 251b4bca33fSmillert va_list ap; 252b4bca33fSmillert 253b4bca33fSmillert va_start(ap, fmt); 254b4bca33fSmillert len = vasprintf(ret, fmt, ap); 255b4bca33fSmillert va_end(ap); 256b4bca33fSmillert 257b4bca33fSmillert if (len == -1) 2587b6ec9e4Smillert err(2, NULL); 259b4bca33fSmillert return (len); 260b4bca33fSmillert } 261b4bca33fSmillert 2624ec4b3d5Smillert void 2634ec4b3d5Smillert set_argstr(char **av, char **ave) 2644ec4b3d5Smillert { 2654ec4b3d5Smillert size_t argsize; 2664ec4b3d5Smillert char **ap; 2674ec4b3d5Smillert 2684ec4b3d5Smillert argsize = 4 + (char *)ave - (char *)av + 1; 2694ec4b3d5Smillert diffargs = emalloc(argsize); 2704ec4b3d5Smillert strlcpy(diffargs, "diff", argsize); 2714ec4b3d5Smillert for (ap = av + 1; ap < ave; ap++) { 2724ec4b3d5Smillert if (strcmp(*ap, "--") != 0) { 2734ec4b3d5Smillert strlcat(diffargs, " ", argsize); 2744ec4b3d5Smillert strlcat(diffargs, *ap, argsize); 2754ec4b3d5Smillert } 2764ec4b3d5Smillert } 2774ec4b3d5Smillert } 2784ec4b3d5Smillert 2794ec4b3d5Smillert /* 2804ec4b3d5Smillert * Read in an excludes file and push each line. 2814ec4b3d5Smillert */ 2824ec4b3d5Smillert void 2834ec4b3d5Smillert read_excludes_file(char *file) 2844ec4b3d5Smillert { 2854ec4b3d5Smillert FILE *fp; 2864ec4b3d5Smillert char *buf, *pattern; 2874ec4b3d5Smillert size_t len; 2884ec4b3d5Smillert 2894ec4b3d5Smillert if (strcmp(file, "-") == 0) 2904ec4b3d5Smillert fp = stdin; 2914ec4b3d5Smillert else if ((fp = fopen(file, "r")) == NULL) 2927b6ec9e4Smillert err(2, "%s", file); 2934ec4b3d5Smillert while ((buf = fgetln(fp, &len)) != NULL) { 2944ec4b3d5Smillert if (buf[len - 1] == '\n') 2954ec4b3d5Smillert len--; 2964ec4b3d5Smillert pattern = emalloc(len + 1); 2974ec4b3d5Smillert memcpy(pattern, buf, len); 2984ec4b3d5Smillert pattern[len] = '\0'; 2994ec4b3d5Smillert push_excludes(pattern); 3004ec4b3d5Smillert } 3014ec4b3d5Smillert if (strcmp(file, "-") != 0) 3024ec4b3d5Smillert fclose(fp); 3034ec4b3d5Smillert } 3044ec4b3d5Smillert 3054ec4b3d5Smillert /* 3064ec4b3d5Smillert * Push a pattern onto the excludes list. 3074ec4b3d5Smillert */ 3084ec4b3d5Smillert void 3094ec4b3d5Smillert push_excludes(char *pattern) 3104ec4b3d5Smillert { 3114ec4b3d5Smillert struct excludes *entry; 3124ec4b3d5Smillert 3134ec4b3d5Smillert entry = emalloc(sizeof(*entry)); 3144ec4b3d5Smillert entry->pattern = pattern; 3154ec4b3d5Smillert entry->next = excludes_list; 3164ec4b3d5Smillert excludes_list = entry; 3174ec4b3d5Smillert } 3184ec4b3d5Smillert 319b4bca33fSmillert void 320b4bca33fSmillert print_status(int val, char *path1, char *path2, char *entry) 321b4bca33fSmillert { 322b4bca33fSmillert switch (val) { 323b4bca33fSmillert case D_ONLY: 32437e8779fSmillert /* must strip off the trailing '/' */ 32537e8779fSmillert printf("Only in %.*s: %s\n", (int)(strlen(path1) - 1), 32637e8779fSmillert path1, entry); 327b4bca33fSmillert break; 328b4bca33fSmillert case D_COMMON: 329b4bca33fSmillert printf("Common subdirectories: %s%s and %s%s\n", 330b4bca33fSmillert path1, entry ? entry : "", path2, entry ? entry : ""); 331b4bca33fSmillert break; 332b4bca33fSmillert case D_BINARY: 333b4bca33fSmillert printf("Binary files %s%s and %s%s differ\n", 334b4bca33fSmillert path1, entry ? entry : "", path2, entry ? entry : ""); 335b4bca33fSmillert break; 336b4bca33fSmillert case D_DIFFER: 337b4bca33fSmillert if (format == D_BRIEF) 338b4bca33fSmillert printf("Files %s%s and %s%s differ\n", 339b4bca33fSmillert path1, entry ? entry : "", 340b4bca33fSmillert path2, entry ? entry : ""); 341b4bca33fSmillert break; 342b4bca33fSmillert case D_SAME: 343b4bca33fSmillert if (sflag) 344b4bca33fSmillert printf("Files %s%s and %s%s are identical\n", 345b4bca33fSmillert path1, entry ? entry : "", 346b4bca33fSmillert path2, entry ? entry : ""); 347b4bca33fSmillert break; 348fed3a06dSmillert case D_MISMATCH1: 349de414158Smillert printf("File %s%s is a directory while file %s%s is a regular file\n", 350fed3a06dSmillert path1, entry ? entry : "", path2, entry ? entry : ""); 351fed3a06dSmillert break; 352fed3a06dSmillert case D_MISMATCH2: 353de414158Smillert printf("File %s%s is a regular file while file %s%s is a directory\n", 3547b6ec9e4Smillert path1, entry ? entry : "", path2, entry ? entry : ""); 3557b6ec9e4Smillert break; 356b4bca33fSmillert } 357b4bca33fSmillert } 358b4bca33fSmillert 359c42aed39Smillert __dead void 360c42aed39Smillert usage(void) 361c42aed39Smillert { 362c012fe98Sderaadt (void)fprintf(stderr, 363*1f9aa9e0Smillert "usage: diff [-bilqtTw] [-c | -e | -f | -n | -u] [-L label] file1 file2\n" 364*1f9aa9e0Smillert " diff [-bilqtTw] [-L label] -C number file1 file2\n" 365*1f9aa9e0Smillert " diff [-bilqtw] -D string file1 file2\n" 366*1f9aa9e0Smillert " diff [-bilqtTw] [-L label] -U number file1 file2\n" 367*1f9aa9e0Smillert " diff [-bilNPqwtT] [-c | -e | -f | -n | -u ] [-L label] [-r] [-s] [-S name]\n" 368*1f9aa9e0Smillert " [-X file] [-x pattern] dir1 dir2\n"); 369c42aed39Smillert 37066e5764eSmillert exit(2); 371c42aed39Smillert } 372