1*049b39f6Sdavid /* $OpenBSD: diff.c,v 1.38 2003/08/18 02:04:42 david 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*049b39f6Sdavid static const char rcsid[] = "$OpenBSD: diff.c,v 1.38 2003/08/18 02:04:42 david 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 42a65ef95eSderaadt int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, rflag; 43a65ef95eSderaadt int sflag, tflag, Tflag, wflag; 444ec4b3d5Smillert int format, context, status; 451f9aa9e0Smillert char *start, *ifdefname, *diffargs, *label; 46d5d5ac6cStedu struct stat stb1, stb2; 474ec4b3d5Smillert struct excludes *excludes_list; 484ec4b3d5Smillert 496e18f850Sotto #define OPTIONS "abC:cdD: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' }, 556e18f850Sotto { "minimal", no_argument, 0, 'd' }, 564ec4b3d5Smillert { "ed", no_argument, 0, 'e' }, 574ec4b3d5Smillert { "forward-ed", no_argument, 0, 'f' }, 584ec4b3d5Smillert { "ignore-case", no_argument, 0, 'i' }, 59b4bca33fSmillert { "paginate", no_argument, 0, 'l' }, 601f9aa9e0Smillert { "label", required_argument, 0, 'L' }, 614ec4b3d5Smillert { "new-file", no_argument, 0, 'N' }, 624ec4b3d5Smillert { "rcs", no_argument, 0, 'n' }, 63aeb82612Smillert { "unidirectional-new-file", no_argument, 0, 'P' }, 64cab5d83cSmillert { "brief", no_argument, 0, 'q' }, 654ec4b3d5Smillert { "recursive", no_argument, 0, 'r' }, 664ec4b3d5Smillert { "report-identical-files", no_argument, 0, 's' }, 674ec4b3d5Smillert { "starting-file", required_argument, 0, 'S' }, 684ec4b3d5Smillert { "expand-tabs", no_argument, 0, 't' }, 69*049b39f6Sdavid { "initial-tab", no_argument, 0, 'T' }, 704ec4b3d5Smillert { "unified", optional_argument, 0, 'U' }, 714ec4b3d5Smillert { "ignore-all-space", no_argument, 0, 'w' }, 724ec4b3d5Smillert { "exclude", required_argument, 0, 'x' }, 734ec4b3d5Smillert { "exclude-from", required_argument, 0, 'X' }, 74d6c18fb8Smillert { NULL, 0, 0, '\0'} 754ec4b3d5Smillert }; 76ae8d569bSderaadt 77c42aed39Smillert __dead void usage(void); 784ec4b3d5Smillert void push_excludes(char *); 794ec4b3d5Smillert void read_excludes_file(char *file); 804ec4b3d5Smillert void set_argstr(char **, char **); 81ae8d569bSderaadt 8226da422aStedu int 8326da422aStedu main(int argc, char **argv) 8426da422aStedu { 854ec4b3d5Smillert char *ep, **oargv; 864ec4b3d5Smillert long l; 874ec4b3d5Smillert int ch, gotstdin; 8826da422aStedu 894ec4b3d5Smillert oargv = argv; 904ec4b3d5Smillert gotstdin = 0; 91c42aed39Smillert 924ec4b3d5Smillert while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) { 93c42aed39Smillert switch (ch) { 94d5d5ac6cStedu case 'a': 954ec4b3d5Smillert aflag = 1; 96d5d5ac6cStedu break; 97ae8d569bSderaadt case 'b': 984ec4b3d5Smillert bflag = 1; 99c42aed39Smillert break; 100c42aed39Smillert case 'C': 101ae8d569bSderaadt case 'c': 1024ec4b3d5Smillert format = D_CONTEXT; 1034ec4b3d5Smillert if (optarg != NULL) { 1044ec4b3d5Smillert l = strtol(optarg, &ep, 10); 1054ec4b3d5Smillert if (*ep != '\0' || l < 0 || l >= INT_MAX) 1064ec4b3d5Smillert usage(); 1074ec4b3d5Smillert context = (int)l; 1084ec4b3d5Smillert } else 109ae8d569bSderaadt context = 3; 110c42aed39Smillert break; 1116e18f850Sotto case 'd': 1126e18f850Sotto dflag = 1; 1136e18f850Sotto break; 114c42aed39Smillert case 'D': 1154ec4b3d5Smillert format = D_IFDEF; 11690f56ad8Smillert ifdefname = optarg; 117c42aed39Smillert break; 118c42aed39Smillert case 'e': 1194ec4b3d5Smillert format = D_EDIT; 120c42aed39Smillert break; 121c42aed39Smillert case 'f': 1224ec4b3d5Smillert format = D_REVERSE; 123c42aed39Smillert break; 124a0daf5ccSmillert case 'h': 125a0daf5ccSmillert /* silently ignore for backwards compatibility */ 126a0daf5ccSmillert break; 127c42aed39Smillert case 'i': 1284ec4b3d5Smillert iflag = 1; 1294ec4b3d5Smillert break; 1301f9aa9e0Smillert case 'L': 1311f9aa9e0Smillert label = optarg; 1321f9aa9e0Smillert break; 133b4bca33fSmillert case 'l': 134b4bca33fSmillert lflag = 1; 1357b6ec9e4Smillert signal(SIGPIPE, SIG_IGN); 136b4bca33fSmillert break; 1374ec4b3d5Smillert case 'N': 1384ec4b3d5Smillert Nflag = 1; 139c42aed39Smillert break; 140c42aed39Smillert case 'n': 1414ec4b3d5Smillert format = D_NREVERSE; 142c42aed39Smillert break; 143aeb82612Smillert case 'P': 144aeb82612Smillert Pflag = 1; 145aeb82612Smillert break; 146c42aed39Smillert case 'r': 1474ec4b3d5Smillert rflag = 1; 148c42aed39Smillert break; 149cab5d83cSmillert case 'q': 150cab5d83cSmillert format = D_BRIEF; 151cab5d83cSmillert break; 152c42aed39Smillert case 'S': 153c42aed39Smillert start = optarg; 154c42aed39Smillert break; 155c42aed39Smillert case 's': 1564ec4b3d5Smillert sflag = 1; 157c42aed39Smillert break; 1581f9aa9e0Smillert case 'T': 1591f9aa9e0Smillert Tflag = 1; 1601f9aa9e0Smillert break; 161c42aed39Smillert case 't': 1624ec4b3d5Smillert tflag = 1; 163c42aed39Smillert break; 1649de32c1bSmillert case 'U': 1659de32c1bSmillert case 'u': 1664ec4b3d5Smillert format = D_UNIFIED; 1674ec4b3d5Smillert if (optarg != NULL) { 1684ec4b3d5Smillert l = strtol(optarg, &ep, 10); 1694ec4b3d5Smillert if (*ep != '\0' || l < 0 || l >= INT_MAX) 1704ec4b3d5Smillert usage(); 1714ec4b3d5Smillert context = (int)l; 1724ec4b3d5Smillert } else 1739de32c1bSmillert context = 3; 1749de32c1bSmillert break; 175c42aed39Smillert case 'w': 1764ec4b3d5Smillert wflag = 1; 1774ec4b3d5Smillert break; 1784ec4b3d5Smillert case 'X': 1794ec4b3d5Smillert read_excludes_file(optarg); 1804ec4b3d5Smillert break; 1814ec4b3d5Smillert case 'x': 1824ec4b3d5Smillert push_excludes(optarg); 183c42aed39Smillert break; 184ae8d569bSderaadt default: 185c42aed39Smillert usage(); 186c42aed39Smillert break; 187ae8d569bSderaadt } 188ae8d569bSderaadt } 189c42aed39Smillert argc -= optind; 190c42aed39Smillert argv += optind; 191c42aed39Smillert 1924ec4b3d5Smillert /* 1934ec4b3d5Smillert * Do sanity checks, fill in stb1 and stb2 and call the appropriate 1944ec4b3d5Smillert * driver routine. Both drivers use the contents of stb1 and stb2. 1954ec4b3d5Smillert */ 196c42aed39Smillert if (argc != 2) 1974ec4b3d5Smillert usage(); 1984ec4b3d5Smillert if (strcmp(argv[0], "-") == 0) { 199b1a26502Smillert fstat(STDIN_FILENO, &stb1); 2004ec4b3d5Smillert gotstdin = 1; 2014ec4b3d5Smillert } else if (stat(argv[0], &stb1) != 0) 2027b6ec9e4Smillert err(2, "%s", argv[0]); 2034ec4b3d5Smillert if (strcmp(argv[1], "-") == 0) { 204b1a26502Smillert fstat(STDIN_FILENO, &stb2); 2054ec4b3d5Smillert gotstdin = 1; 2064ec4b3d5Smillert } else if (stat(argv[1], &stb2) != 0) 2077b6ec9e4Smillert err(2, "%s", argv[1]); 2084ec4b3d5Smillert if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode))) 2097b6ec9e4Smillert errx(2, "can't compare - to a directory"); 21077aa65d5Smillert set_argstr(oargv + 1, argv); 2114ec4b3d5Smillert if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { 2124ec4b3d5Smillert if (format == D_IFDEF) 2137b6ec9e4Smillert errx(2, "-D option not supported with directories"); 2144ec4b3d5Smillert diffdir(argv[0], argv[1]); 215b4bca33fSmillert } else { 2167b6ec9e4Smillert if (S_ISDIR(stb1.st_mode)) { 2177b6ec9e4Smillert argv[0] = splice(argv[0], argv[1]); 2187b6ec9e4Smillert if (stat(argv[0], &stb1) < 0) 2197b6ec9e4Smillert err(2, "%s", argv[0]); 2207b6ec9e4Smillert } 2217b6ec9e4Smillert if (S_ISDIR(stb2.st_mode)) { 2227b6ec9e4Smillert argv[1] = splice(argv[1], argv[0]); 2237b6ec9e4Smillert if (stat(argv[1], &stb2) < 0) 2247b6ec9e4Smillert err(2, "%s", argv[1]); 2257b6ec9e4Smillert } 226b4bca33fSmillert print_status(diffreg(argv[0], argv[1], 0), argv[0], argv[1], 227b4bca33fSmillert NULL); 228b4bca33fSmillert } 2294ec4b3d5Smillert exit(status); 230ae8d569bSderaadt } 231ae8d569bSderaadt 23226da422aStedu void * 23349dffe13Smillert emalloc(size_t n) 234ae8d569bSderaadt { 23526da422aStedu void *p; 236ae8d569bSderaadt 23726da422aStedu if ((p = malloc(n)) == NULL) 2387b6ec9e4Smillert err(2, NULL); 23926da422aStedu return (p); 24026da422aStedu } 24126da422aStedu 24226da422aStedu void * 24349dffe13Smillert erealloc(void *p, size_t n) 24426da422aStedu { 24526da422aStedu void *q; 24626da422aStedu 24726da422aStedu if ((q = realloc(p, n)) == NULL) 2487b6ec9e4Smillert err(2, NULL); 249ae8d569bSderaadt return (q); 250ae8d569bSderaadt } 251ae8d569bSderaadt 252b4bca33fSmillert int 253b4bca33fSmillert easprintf(char **ret, const char *fmt, ...) 254b4bca33fSmillert { 255b4bca33fSmillert int len; 256b4bca33fSmillert va_list ap; 257b4bca33fSmillert 258b4bca33fSmillert va_start(ap, fmt); 259b4bca33fSmillert len = vasprintf(ret, fmt, ap); 260b4bca33fSmillert va_end(ap); 261b4bca33fSmillert 262b4bca33fSmillert if (len == -1) 2637b6ec9e4Smillert err(2, NULL); 264b4bca33fSmillert return (len); 265b4bca33fSmillert } 266b4bca33fSmillert 2674ec4b3d5Smillert void 2684ec4b3d5Smillert set_argstr(char **av, char **ave) 2694ec4b3d5Smillert { 2704ec4b3d5Smillert size_t argsize; 2714ec4b3d5Smillert char **ap; 2724ec4b3d5Smillert 27377aa65d5Smillert argsize = 4 + *ave - *av + 1; 2744ec4b3d5Smillert diffargs = emalloc(argsize); 2754ec4b3d5Smillert strlcpy(diffargs, "diff", argsize); 2764ec4b3d5Smillert for (ap = av + 1; ap < ave; ap++) { 2774ec4b3d5Smillert if (strcmp(*ap, "--") != 0) { 2784ec4b3d5Smillert strlcat(diffargs, " ", argsize); 2794ec4b3d5Smillert strlcat(diffargs, *ap, argsize); 2804ec4b3d5Smillert } 2814ec4b3d5Smillert } 2824ec4b3d5Smillert } 2834ec4b3d5Smillert 2844ec4b3d5Smillert /* 2854ec4b3d5Smillert * Read in an excludes file and push each line. 2864ec4b3d5Smillert */ 2874ec4b3d5Smillert void 2884ec4b3d5Smillert read_excludes_file(char *file) 2894ec4b3d5Smillert { 2904ec4b3d5Smillert FILE *fp; 2914ec4b3d5Smillert char *buf, *pattern; 2924ec4b3d5Smillert size_t len; 2934ec4b3d5Smillert 2944ec4b3d5Smillert if (strcmp(file, "-") == 0) 2954ec4b3d5Smillert fp = stdin; 2964ec4b3d5Smillert else if ((fp = fopen(file, "r")) == NULL) 2977b6ec9e4Smillert err(2, "%s", file); 2984ec4b3d5Smillert while ((buf = fgetln(fp, &len)) != NULL) { 2994ec4b3d5Smillert if (buf[len - 1] == '\n') 3004ec4b3d5Smillert len--; 3014ec4b3d5Smillert pattern = emalloc(len + 1); 3024ec4b3d5Smillert memcpy(pattern, buf, len); 3034ec4b3d5Smillert pattern[len] = '\0'; 3044ec4b3d5Smillert push_excludes(pattern); 3054ec4b3d5Smillert } 3064ec4b3d5Smillert if (strcmp(file, "-") != 0) 3074ec4b3d5Smillert fclose(fp); 3084ec4b3d5Smillert } 3094ec4b3d5Smillert 3104ec4b3d5Smillert /* 3114ec4b3d5Smillert * Push a pattern onto the excludes list. 3124ec4b3d5Smillert */ 3134ec4b3d5Smillert void 3144ec4b3d5Smillert push_excludes(char *pattern) 3154ec4b3d5Smillert { 3164ec4b3d5Smillert struct excludes *entry; 3174ec4b3d5Smillert 3184ec4b3d5Smillert entry = emalloc(sizeof(*entry)); 3194ec4b3d5Smillert entry->pattern = pattern; 3204ec4b3d5Smillert entry->next = excludes_list; 3214ec4b3d5Smillert excludes_list = entry; 3224ec4b3d5Smillert } 3234ec4b3d5Smillert 324b4bca33fSmillert void 325b4bca33fSmillert print_status(int val, char *path1, char *path2, char *entry) 326b4bca33fSmillert { 327b4bca33fSmillert switch (val) { 328b4bca33fSmillert case D_ONLY: 32937e8779fSmillert /* must strip off the trailing '/' */ 33037e8779fSmillert printf("Only in %.*s: %s\n", (int)(strlen(path1) - 1), 33137e8779fSmillert path1, entry); 332b4bca33fSmillert break; 333b4bca33fSmillert case D_COMMON: 334b4bca33fSmillert printf("Common subdirectories: %s%s and %s%s\n", 335b4bca33fSmillert path1, entry ? entry : "", path2, entry ? entry : ""); 336b4bca33fSmillert break; 337b4bca33fSmillert case D_BINARY: 338b4bca33fSmillert printf("Binary files %s%s and %s%s differ\n", 339b4bca33fSmillert path1, entry ? entry : "", path2, entry ? entry : ""); 340b4bca33fSmillert break; 341b4bca33fSmillert case D_DIFFER: 342b4bca33fSmillert if (format == D_BRIEF) 343b4bca33fSmillert printf("Files %s%s and %s%s differ\n", 344b4bca33fSmillert path1, entry ? entry : "", 345b4bca33fSmillert path2, entry ? entry : ""); 346b4bca33fSmillert break; 347b4bca33fSmillert case D_SAME: 348b4bca33fSmillert if (sflag) 349b4bca33fSmillert printf("Files %s%s and %s%s are identical\n", 350b4bca33fSmillert path1, entry ? entry : "", 351b4bca33fSmillert path2, entry ? entry : ""); 352b4bca33fSmillert break; 353fed3a06dSmillert case D_MISMATCH1: 354de414158Smillert printf("File %s%s is a directory while file %s%s is a regular file\n", 355fed3a06dSmillert path1, entry ? entry : "", path2, entry ? entry : ""); 356fed3a06dSmillert break; 357fed3a06dSmillert case D_MISMATCH2: 358de414158Smillert printf("File %s%s is a regular file while file %s%s is a directory\n", 3597b6ec9e4Smillert path1, entry ? entry : "", path2, entry ? entry : ""); 3607b6ec9e4Smillert break; 361b4bca33fSmillert } 362b4bca33fSmillert } 363b4bca33fSmillert 364c42aed39Smillert __dead void 365c42aed39Smillert usage(void) 366c42aed39Smillert { 367c012fe98Sderaadt (void)fprintf(stderr, 3686e18f850Sotto "usage: diff [-bdilqtTw] [-c | -e | -f | -n | -u] [-L label] file1 file2\n" 3696e18f850Sotto " diff [-bdilqtTw] [-L label] -C number file1 file2\n" 3706e18f850Sotto " diff [-bdilqtw] -D string file1 file2\n" 3716e18f850Sotto " diff [-bdilqtTw] [-L label] -U number file1 file2\n" 3726e18f850Sotto " diff [-bdilNPqwtT] [-c | -e | -f | -n | -u ] [-L label] [-r] [-s] [-S name]\n" 3731f9aa9e0Smillert " [-X file] [-x pattern] dir1 dir2\n"); 374c42aed39Smillert 37566e5764eSmillert exit(2); 376c42aed39Smillert } 377