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