int rcsdiff_main(int argc, char **argv) { int fd, i, ch, dflags, status; RCSNUM *rev1, *rev2; RCSFILE *file; char fpath[MAXPATHLEN], *rev_str1, *rev_str2; const char *errstr; rev1 = rev2 = NULL; rev_str1 = rev_str2 = NULL; status = D_SAME; dflags = 0; if (strlcpy(diffargs, "diff", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); while ((ch = rcs_getopt(argc, argv, "abC:cdI:ik:npqr:TtU:uVwx::z::")) != -1) { switch (ch) { case 'a': if (strlcat(diffargs, " -a", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); dflags |= D_FORCEASCII; break; case 'b': if (strlcat(diffargs, " -b", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); dflags |= D_FOLDBLANKS; break; case 'C': (void)strlcat(diffargs, " -C", sizeof(diffargs)); if (strlcat(diffargs, rcs_optarg, sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); diff_context = strtonum(rcs_optarg, 0, INT_MAX, &errstr); if (errstr) errx(D_ERROR, "context is %s: %s", errstr, rcs_optarg); diff_format = D_CONTEXT; break; case 'c': if (strlcat(diffargs, " -c", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); diff_format = D_CONTEXT; break; case 'd': if (strlcat(diffargs, " -d", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); dflags |= D_MINIMAL; break; case 'i': if (strlcat(diffargs, " -i", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); dflags |= D_IGNORECASE; break; case 'I': (void)strlcat(diffargs, " -I", sizeof(diffargs)); if (strlcat(diffargs, rcs_optarg, sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); push_ignore_pats(rcs_optarg); break; case 'k': kflag = rcs_kflag_get(rcs_optarg); if (RCS_KWEXP_INVAL(kflag)) { warnx("invalid RCS keyword substitution mode"); (usage)(); exit(D_ERROR); } break; case 'n': if (strlcat(diffargs, " -n", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); diff_format = D_RCSDIFF; break; case 'p': if (strlcat(diffargs, " -p", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); dflags |= D_PROTOTYPE; break; case 'q': quiet = 1; break; case 'r': rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg); break; case 'T': /* * kept for compatibility */ break; case 't': if (strlcat(diffargs, " -t", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); dflags |= D_EXPANDTABS; break; case 'U': (void)strlcat(diffargs, " -U", sizeof(diffargs)); if (strlcat(diffargs, rcs_optarg, sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); diff_context = strtonum(rcs_optarg, 0, INT_MAX, &errstr); if (errstr) errx(D_ERROR, "context is %s: %s", errstr, rcs_optarg); diff_format = D_UNIFIED; break; case 'u': if (strlcat(diffargs, " -u", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); diff_format = D_UNIFIED; break; case 'V': printf("%s\n", rcs_version); exit(0); case 'w': if (strlcat(diffargs, " -w", sizeof(diffargs)) >= sizeof(diffargs)) errx(D_ERROR, "diffargs too long"); dflags |= D_IGNOREBLANKS; break; case 'x': /* Use blank extension if none given. */ rcs_suffixes = rcs_optarg ? rcs_optarg : ""; break; case 'z': timezone_flag = rcs_optarg; break; default: (usage)(); exit(D_ERROR); } } argc -= rcs_optind; argv += rcs_optind; if (argc == 0) { warnx("no input file"); (usage)(); exit(D_ERROR); } if (diff_ignore_pats != NULL) { char buf[BUFSIZ]; int error; diff_ignore_re = xmalloc(sizeof(*diff_ignore_re)); if ((error = regcomp(diff_ignore_re, diff_ignore_pats, REG_NEWLINE | REG_EXTENDED)) != 0) { regerror(error, diff_ignore_re, buf, sizeof(buf)); if (*diff_ignore_pats != '\0') errx(D_ERROR, "%s: %s", diff_ignore_pats, buf); else errx(D_ERROR, "%s", buf); } } for (i = 0; i < argc; i++) { fd = rcs_choosefile(argv[i], fpath, sizeof(fpath)); if (fd < 0) { warn("%s", fpath); continue; } if ((file = rcs_open(fpath, fd, RCS_READ|RCS_PARSE_FULLY)) == NULL) continue; rcs_kwexp_set(file, kflag); if (rev_str1 != NULL) { if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL) errx(D_ERROR, "bad revision number"); } if (rev_str2 != NULL) { if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL) errx(D_ERROR, "bad revision number"); } if (!quiet) { fprintf(stderr, "%s\n", RCS_DIFF_DIV); fprintf(stderr, "RCS file: %s\n", fpath); } diff_file = argv[i]; /* No revisions given. */ if (rev_str1 == NULL) status = rcsdiff_file(file, file->rf_head, argv[i], dflags); /* One revision given. */ else if (rev_str2 == NULL) status = rcsdiff_file(file, rev1, argv[i], dflags); /* Two revisions given. */ else status = rcsdiff_rev(file, rev1, rev2, dflags); rcs_close(file); if (rev1 != NULL) { rcsnum_free(rev1); rev1 = NULL; } if (rev2 != NULL) { rcsnum_free(rev2); rev2 = NULL; } } return (status); }
int rcsmerge_main(int argc, char **argv) { int fd, ch, flags, kflag, status; char fpath[PATH_MAX], r1[RCS_REV_BUFSZ], r2[RCS_REV_BUFSZ]; char *rev_str1, *rev_str2; RCSFILE *file; RCSNUM *rev1, *rev2; BUF *bp; flags = 0; status = D_ERROR; rev1 = rev2 = NULL; rev_str1 = rev_str2 = NULL; while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r::TVx::z:")) != -1) { switch (ch) { case 'A': /* * kept for compatibility */ break; case 'E': flags |= MERGE_EFLAG; flags |= MERGE_OFLAG; break; case 'e': flags |= MERGE_EFLAG; break; case 'k': kflag = rcs_kflag_get(rcs_optarg); if (RCS_KWEXP_INVAL(kflag)) { warnx("invalid RCS keyword substitution mode"); (usage)(); } break; case 'p': rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg); flags |= PIPEOUT; break; case 'q': rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg); flags |= QUIET; break; case 'r': rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg ? rcs_optarg : ""); break; case 'T': /* * kept for compatibility */ break; case 'V': printf("%s\n", rcs_version); exit(0); case 'x': /* Use blank extension if none given. */ rcs_suffixes = rcs_optarg ? rcs_optarg : ""; break; case 'z': timezone_flag = rcs_optarg; break; default: (usage)(); } } argc -= rcs_optind; argv += rcs_optind; if (rev_str1 == NULL) { warnx("no base revision number given"); (usage)(); } if (argc < 1) { warnx("no input file"); (usage)(); } if (argc > 2 || (argc == 2 && argv[1] != NULL)) warnx("warning: excess arguments ignored"); if ((fd = rcs_choosefile(argv[0], fpath, sizeof(fpath))) < 0) err(status, "%s", fpath); if (!(flags & QUIET)) (void)fprintf(stderr, "RCS file: %s\n", fpath); if ((file = rcs_open(fpath, fd, RCS_READ)) == NULL) return (status); if (strcmp(rev_str1, "") == 0) { rev1 = rcsnum_alloc(); rcsnum_cpy(file->rf_head, rev1, 0); } else if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL) errx(D_ERROR, "invalid revision: %s", rev_str1); if (rev_str2 != NULL && strcmp(rev_str2, "") != 0) { if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL) errx(D_ERROR, "invalid revision: %s", rev_str2); } else { rev2 = rcsnum_alloc(); rcsnum_cpy(file->rf_head, rev2, 0); } if (rcsnum_cmp(rev1, rev2, 0) == 0) goto out; if ((bp = rcs_diff3(file, argv[0], rev1, rev2, flags)) == NULL) errx(D_ERROR, "failed to merge"); if (!(flags & QUIET)) { (void)rcsnum_tostr(rev1, r1, sizeof(r1)); (void)rcsnum_tostr(rev2, r2, sizeof(r2)); (void)fprintf(stderr, "Merging differences between %s and " "%s into %s%s\n", r1, r2, argv[0], (flags & PIPEOUT) ? "; result to stdout":""); } if (diff3_conflicts != 0) status = D_OVERLAPS; else status = 0; if (flags & PIPEOUT) buf_write_fd(bp, STDOUT_FILENO); else { /* XXX mode */ if (buf_write(bp, argv[0], 0644) < 0) warnx("buf_write failed"); } buf_free(bp); out: rcs_close(file); rcsnum_free(rev1); rcsnum_free(rev2); return (status); }