1*f5537e38Sjmc /* $OpenBSD: diff.c,v 1.41 2003/09/07 18:50:58 jmc 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*f5537e38Sjmc static const char rcsid[] = "$OpenBSD: diff.c,v 1.41 2003/09/07 18:50:58 jmc 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 4968cd7c43Stedu #define OPTIONS "0123456789abC: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' }, 69049b39f6Sdavid { "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; 8768cd7c43Stedu int ch, lastch, gotstdin; 8826da422aStedu 894ec4b3d5Smillert oargv = argv; 904ec4b3d5Smillert gotstdin = 0; 91c42aed39Smillert 9268cd7c43Stedu lastch = 0; 934ec4b3d5Smillert while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) { 94c42aed39Smillert switch (ch) { 9568cd7c43Stedu case '0': case '1': case '2': case '3': case '4': 9668cd7c43Stedu case '5': case '6': case '7': case '8': case '9': 9768cd7c43Stedu if (!(lastch == 'c' || lastch == 'u' || 9868cd7c43Stedu (lastch >= '0' && lastch <= '9'))) 9968cd7c43Stedu usage(); 10068cd7c43Stedu if (lastch == 'c' || lastch == 'u') 10168cd7c43Stedu context = 0; 10268cd7c43Stedu context = context * 10 + ch - '0'; 10368cd7c43Stedu break; 104d5d5ac6cStedu case 'a': 1054ec4b3d5Smillert aflag = 1; 106d5d5ac6cStedu break; 107ae8d569bSderaadt case 'b': 1084ec4b3d5Smillert bflag = 1; 109c42aed39Smillert break; 110c42aed39Smillert case 'C': 111ae8d569bSderaadt case 'c': 1124ec4b3d5Smillert format = D_CONTEXT; 1134ec4b3d5Smillert if (optarg != NULL) { 1144ec4b3d5Smillert l = strtol(optarg, &ep, 10); 1154ec4b3d5Smillert if (*ep != '\0' || l < 0 || l >= INT_MAX) 1164ec4b3d5Smillert usage(); 1174ec4b3d5Smillert context = (int)l; 1184ec4b3d5Smillert } else 119ae8d569bSderaadt context = 3; 120c42aed39Smillert break; 1216e18f850Sotto case 'd': 1226e18f850Sotto dflag = 1; 1236e18f850Sotto break; 124c42aed39Smillert case 'D': 1254ec4b3d5Smillert format = D_IFDEF; 12690f56ad8Smillert ifdefname = optarg; 127c42aed39Smillert break; 128c42aed39Smillert case 'e': 1294ec4b3d5Smillert format = D_EDIT; 130c42aed39Smillert break; 131c42aed39Smillert case 'f': 1324ec4b3d5Smillert format = D_REVERSE; 133c42aed39Smillert break; 134a0daf5ccSmillert case 'h': 135a0daf5ccSmillert /* silently ignore for backwards compatibility */ 136a0daf5ccSmillert break; 137c42aed39Smillert case 'i': 1384ec4b3d5Smillert iflag = 1; 1394ec4b3d5Smillert break; 1401f9aa9e0Smillert case 'L': 1411f9aa9e0Smillert label = optarg; 1421f9aa9e0Smillert break; 143b4bca33fSmillert case 'l': 144b4bca33fSmillert lflag = 1; 1457b6ec9e4Smillert signal(SIGPIPE, SIG_IGN); 146b4bca33fSmillert break; 1474ec4b3d5Smillert case 'N': 1484ec4b3d5Smillert Nflag = 1; 149c42aed39Smillert break; 150c42aed39Smillert case 'n': 1514ec4b3d5Smillert format = D_NREVERSE; 152c42aed39Smillert break; 153aeb82612Smillert case 'P': 154aeb82612Smillert Pflag = 1; 155aeb82612Smillert break; 156c42aed39Smillert case 'r': 1574ec4b3d5Smillert rflag = 1; 158c42aed39Smillert break; 159cab5d83cSmillert case 'q': 160cab5d83cSmillert format = D_BRIEF; 161cab5d83cSmillert break; 162c42aed39Smillert case 'S': 163c42aed39Smillert start = optarg; 164c42aed39Smillert break; 165c42aed39Smillert case 's': 1664ec4b3d5Smillert sflag = 1; 167c42aed39Smillert break; 1681f9aa9e0Smillert case 'T': 1691f9aa9e0Smillert Tflag = 1; 1701f9aa9e0Smillert break; 171c42aed39Smillert case 't': 1724ec4b3d5Smillert tflag = 1; 173c42aed39Smillert break; 1749de32c1bSmillert case 'U': 1759de32c1bSmillert case 'u': 1764ec4b3d5Smillert format = D_UNIFIED; 1774ec4b3d5Smillert if (optarg != NULL) { 1784ec4b3d5Smillert l = strtol(optarg, &ep, 10); 1794ec4b3d5Smillert if (*ep != '\0' || l < 0 || l >= INT_MAX) 1804ec4b3d5Smillert usage(); 1814ec4b3d5Smillert context = (int)l; 1824ec4b3d5Smillert } else 1839de32c1bSmillert context = 3; 1849de32c1bSmillert break; 185c42aed39Smillert case 'w': 1864ec4b3d5Smillert wflag = 1; 1874ec4b3d5Smillert break; 1884ec4b3d5Smillert case 'X': 1894ec4b3d5Smillert read_excludes_file(optarg); 1904ec4b3d5Smillert break; 1914ec4b3d5Smillert case 'x': 1924ec4b3d5Smillert push_excludes(optarg); 193c42aed39Smillert break; 194ae8d569bSderaadt default: 195c42aed39Smillert usage(); 196c42aed39Smillert break; 197ae8d569bSderaadt } 19868cd7c43Stedu lastch = ch; 199ae8d569bSderaadt } 200c42aed39Smillert argc -= optind; 201c42aed39Smillert argv += optind; 202c42aed39Smillert 2034ec4b3d5Smillert /* 2044ec4b3d5Smillert * Do sanity checks, fill in stb1 and stb2 and call the appropriate 2054ec4b3d5Smillert * driver routine. Both drivers use the contents of stb1 and stb2. 2064ec4b3d5Smillert */ 207c42aed39Smillert if (argc != 2) 2084ec4b3d5Smillert usage(); 2094ec4b3d5Smillert if (strcmp(argv[0], "-") == 0) { 210b1a26502Smillert fstat(STDIN_FILENO, &stb1); 2114ec4b3d5Smillert gotstdin = 1; 2124ec4b3d5Smillert } else if (stat(argv[0], &stb1) != 0) 2137b6ec9e4Smillert err(2, "%s", argv[0]); 2144ec4b3d5Smillert if (strcmp(argv[1], "-") == 0) { 215b1a26502Smillert fstat(STDIN_FILENO, &stb2); 2164ec4b3d5Smillert gotstdin = 1; 2174ec4b3d5Smillert } else if (stat(argv[1], &stb2) != 0) 2187b6ec9e4Smillert err(2, "%s", argv[1]); 2194ec4b3d5Smillert if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode))) 2207b6ec9e4Smillert errx(2, "can't compare - to a directory"); 22177aa65d5Smillert set_argstr(oargv + 1, argv); 2224ec4b3d5Smillert if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { 2234ec4b3d5Smillert if (format == D_IFDEF) 2247b6ec9e4Smillert errx(2, "-D option not supported with directories"); 2254ec4b3d5Smillert diffdir(argv[0], argv[1]); 226b4bca33fSmillert } else { 2277b6ec9e4Smillert if (S_ISDIR(stb1.st_mode)) { 2287b6ec9e4Smillert argv[0] = splice(argv[0], argv[1]); 2297b6ec9e4Smillert if (stat(argv[0], &stb1) < 0) 2307b6ec9e4Smillert err(2, "%s", argv[0]); 2317b6ec9e4Smillert } 2327b6ec9e4Smillert if (S_ISDIR(stb2.st_mode)) { 2337b6ec9e4Smillert argv[1] = splice(argv[1], argv[0]); 2347b6ec9e4Smillert if (stat(argv[1], &stb2) < 0) 2357b6ec9e4Smillert err(2, "%s", argv[1]); 2367b6ec9e4Smillert } 237b4bca33fSmillert print_status(diffreg(argv[0], argv[1], 0), argv[0], argv[1], 238b4bca33fSmillert NULL); 239b4bca33fSmillert } 2404ec4b3d5Smillert exit(status); 241ae8d569bSderaadt } 242ae8d569bSderaadt 24326da422aStedu void * 24449dffe13Smillert emalloc(size_t n) 245ae8d569bSderaadt { 24626da422aStedu void *p; 247ae8d569bSderaadt 24826da422aStedu if ((p = malloc(n)) == NULL) 2497b6ec9e4Smillert err(2, NULL); 25026da422aStedu return (p); 25126da422aStedu } 25226da422aStedu 25326da422aStedu void * 25449dffe13Smillert erealloc(void *p, size_t n) 25526da422aStedu { 25626da422aStedu void *q; 25726da422aStedu 25826da422aStedu if ((q = realloc(p, n)) == NULL) 2597b6ec9e4Smillert err(2, NULL); 260ae8d569bSderaadt return (q); 261ae8d569bSderaadt } 262ae8d569bSderaadt 263b4bca33fSmillert int 264b4bca33fSmillert easprintf(char **ret, const char *fmt, ...) 265b4bca33fSmillert { 266b4bca33fSmillert int len; 267b4bca33fSmillert va_list ap; 268b4bca33fSmillert 269b4bca33fSmillert va_start(ap, fmt); 270b4bca33fSmillert len = vasprintf(ret, fmt, ap); 271b4bca33fSmillert va_end(ap); 272b4bca33fSmillert 273b4bca33fSmillert if (len == -1) 2747b6ec9e4Smillert err(2, NULL); 275b4bca33fSmillert return (len); 276b4bca33fSmillert } 277b4bca33fSmillert 2784ec4b3d5Smillert void 2794ec4b3d5Smillert set_argstr(char **av, char **ave) 2804ec4b3d5Smillert { 2814ec4b3d5Smillert size_t argsize; 2824ec4b3d5Smillert char **ap; 2834ec4b3d5Smillert 28477aa65d5Smillert argsize = 4 + *ave - *av + 1; 2854ec4b3d5Smillert diffargs = emalloc(argsize); 2864ec4b3d5Smillert strlcpy(diffargs, "diff", argsize); 2874ec4b3d5Smillert for (ap = av + 1; ap < ave; ap++) { 2884ec4b3d5Smillert if (strcmp(*ap, "--") != 0) { 2894ec4b3d5Smillert strlcat(diffargs, " ", argsize); 2904ec4b3d5Smillert strlcat(diffargs, *ap, argsize); 2914ec4b3d5Smillert } 2924ec4b3d5Smillert } 2934ec4b3d5Smillert } 2944ec4b3d5Smillert 2954ec4b3d5Smillert /* 2964ec4b3d5Smillert * Read in an excludes file and push each line. 2974ec4b3d5Smillert */ 2984ec4b3d5Smillert void 2994ec4b3d5Smillert read_excludes_file(char *file) 3004ec4b3d5Smillert { 3014ec4b3d5Smillert FILE *fp; 3024ec4b3d5Smillert char *buf, *pattern; 3034ec4b3d5Smillert size_t len; 3044ec4b3d5Smillert 3054ec4b3d5Smillert if (strcmp(file, "-") == 0) 3064ec4b3d5Smillert fp = stdin; 3074ec4b3d5Smillert else if ((fp = fopen(file, "r")) == NULL) 3087b6ec9e4Smillert err(2, "%s", file); 3094ec4b3d5Smillert while ((buf = fgetln(fp, &len)) != NULL) { 3104ec4b3d5Smillert if (buf[len - 1] == '\n') 3114ec4b3d5Smillert len--; 3124ec4b3d5Smillert pattern = emalloc(len + 1); 3134ec4b3d5Smillert memcpy(pattern, buf, len); 3144ec4b3d5Smillert pattern[len] = '\0'; 3154ec4b3d5Smillert push_excludes(pattern); 3164ec4b3d5Smillert } 3174ec4b3d5Smillert if (strcmp(file, "-") != 0) 3184ec4b3d5Smillert fclose(fp); 3194ec4b3d5Smillert } 3204ec4b3d5Smillert 3214ec4b3d5Smillert /* 3224ec4b3d5Smillert * Push a pattern onto the excludes list. 3234ec4b3d5Smillert */ 3244ec4b3d5Smillert void 3254ec4b3d5Smillert push_excludes(char *pattern) 3264ec4b3d5Smillert { 3274ec4b3d5Smillert struct excludes *entry; 3284ec4b3d5Smillert 3294ec4b3d5Smillert entry = emalloc(sizeof(*entry)); 3304ec4b3d5Smillert entry->pattern = pattern; 3314ec4b3d5Smillert entry->next = excludes_list; 3324ec4b3d5Smillert excludes_list = entry; 3334ec4b3d5Smillert } 3344ec4b3d5Smillert 335b4bca33fSmillert void 336b4bca33fSmillert print_status(int val, char *path1, char *path2, char *entry) 337b4bca33fSmillert { 338b4bca33fSmillert switch (val) { 339b4bca33fSmillert case D_ONLY: 34037e8779fSmillert /* must strip off the trailing '/' */ 34137e8779fSmillert printf("Only in %.*s: %s\n", (int)(strlen(path1) - 1), 34237e8779fSmillert path1, entry); 343b4bca33fSmillert break; 344b4bca33fSmillert case D_COMMON: 345b4bca33fSmillert printf("Common subdirectories: %s%s and %s%s\n", 346b4bca33fSmillert path1, entry ? entry : "", path2, entry ? entry : ""); 347b4bca33fSmillert break; 348b4bca33fSmillert case D_BINARY: 349b4bca33fSmillert printf("Binary files %s%s and %s%s differ\n", 350b4bca33fSmillert path1, entry ? entry : "", path2, entry ? entry : ""); 351b4bca33fSmillert break; 352b4bca33fSmillert case D_DIFFER: 353b4bca33fSmillert if (format == D_BRIEF) 354b4bca33fSmillert printf("Files %s%s and %s%s differ\n", 355b4bca33fSmillert path1, entry ? entry : "", 356b4bca33fSmillert path2, entry ? entry : ""); 357b4bca33fSmillert break; 358b4bca33fSmillert case D_SAME: 359b4bca33fSmillert if (sflag) 360b4bca33fSmillert printf("Files %s%s and %s%s are identical\n", 361b4bca33fSmillert path1, entry ? entry : "", 362b4bca33fSmillert path2, entry ? entry : ""); 363b4bca33fSmillert break; 364fed3a06dSmillert case D_MISMATCH1: 365de414158Smillert printf("File %s%s is a directory while file %s%s is a regular file\n", 366fed3a06dSmillert path1, entry ? entry : "", path2, entry ? entry : ""); 367fed3a06dSmillert break; 368fed3a06dSmillert case D_MISMATCH2: 369de414158Smillert printf("File %s%s is a regular file while file %s%s is a directory\n", 3707b6ec9e4Smillert path1, entry ? entry : "", path2, entry ? entry : ""); 3717b6ec9e4Smillert break; 372b4bca33fSmillert } 373b4bca33fSmillert } 374b4bca33fSmillert 375c42aed39Smillert __dead void 376c42aed39Smillert usage(void) 377c42aed39Smillert { 378c012fe98Sderaadt (void)fprintf(stderr, 379*f5537e38Sjmc "usage: diff [-abdilqtTw] [-c | -e | -f | -n | -u] [-L label] file1 file2\n" 380*f5537e38Sjmc " diff [-abdilqtTw] [-L label] -C number file1 file2\n" 381*f5537e38Sjmc " diff [-abdilqtw] -D string file1 file2\n" 382*f5537e38Sjmc " diff [-abdilqtTw] [-L label] -U number file1 file2\n" 383*f5537e38Sjmc " diff [-abdilNPqtTw] [-c | -e | -f | -n | -u ] [-L label] [-r] [-s]\n" 384*f5537e38Sjmc " [-S name] [-X file] [-x pattern] dir1 dir2\n"); 385c42aed39Smillert 38666e5764eSmillert exit(2); 387c42aed39Smillert } 388