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);
}
void
cvs_diff_local(struct cvs_file *cf)
{
BUF *b1;
int fd1, fd2;
struct stat st;
struct timespec tv[2], tv2[2];
struct tm datetm;
char rbuf[CVS_REV_BUFSZ], tbuf[CVS_TIME_BUFSZ], *p1, *p2;
b1 = NULL;
fd1 = fd2 = -1;
p1 = p2 = NULL;
cvs_log(LP_TRACE, "cvs_diff_local(%s)", cf->file_path);
if (cf->file_type == CVS_DIR) {
if (verbosity > 1)
cvs_log(LP_ERR, "Diffing inside %s", cf->file_path);
return;
}
cvs_file_classify(cf, cvs_directory_tag);
if (cvs_cmdop == CVS_OP_DIFF) {
if (cf->file_ent == NULL) {
cvs_log(LP_ERR, "I know nothing about %s",
cf->file_path);
return;
}
switch (cf->file_ent->ce_status) {
case CVS_ENT_ADDED:
if (Nflag == 0) {
cvs_log(LP_ERR, "%s is a new entry, no "
"comparison available", cf->file_path);
return;
}
if (!(cf->file_flags & FILE_ON_DISK)) {
cvs_log(LP_ERR, "cannot find %s",
cf->file_path);
return;
}
break;
case CVS_ENT_REMOVED:
if (Nflag == 0) {
cvs_log(LP_ERR, "%s was removed, no "
"comparison available", cf->file_path);
return;
}
if (cf->file_rcs == NULL) {
cvs_log(LP_ERR, "cannot find RCS file for %s",
cf->file_path);
return;
}
break;
default:
if (!(cf->file_flags & FILE_ON_DISK)) {
cvs_printf("? %s\n", cf->file_path);
return;
}
if (cf->file_rcs == NULL) {
cvs_log(LP_ERR, "cannot find RCS file for %s",
cf->file_path);
return;
}
break;
}
}
if (cf->file_status == FILE_UPTODATE && rev1 == NULL && rev2 == NULL &&
date1 == -1 && date2 == -1)
return;
if (cf->file_rcs != NULL && cf->file_rcs->rf_head == NULL) {
cvs_log(LP_ERR, "no head revision in RCS file for %s\n",
cf->file_path);
return;
}
if (kflag && cf->file_rcs != NULL)
rcs_kwexp_set(cf->file_rcs, kflag);
if (cf->file_rcs == NULL)
diff_rev1 = NULL;
else if (rev1 != NULL || date1 != -1) {
cvs_specified_date = date1;
diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs);
if (diff_rev1 == NULL && cvs_cmdop == CVS_OP_DIFF) {
if (rev1 != NULL) {
cvs_log(LP_ERR, "tag %s not in file %s", rev1,
cf->file_path);
goto cleanup;
} else if (Nflag) {
diff_rev1 = NULL;
} else {
gmtime_r(&cvs_specified_date, &datetm);
strftime(tbuf, sizeof(tbuf),
"%Y.%m.%d.%H.%M.%S", &datetm);
cvs_log(LP_ERR, "no revision for date %s in "
"file %s", tbuf, cf->file_path);
goto cleanup;
}
} else if (diff_rev1 == NULL && cvs_cmdop == CVS_OP_RDIFF &&
force_head) {
/* -f is not allowed for unknown symbols */
if ((diff_rev1 = rcsnum_parse(rev1)) == NULL)
fatal("no such tag %s", rev1);
rcsnum_free(diff_rev1);
diff_rev1 = cf->file_rcs->rf_head;
}
cvs_specified_date = -1;
} else if (cvs_cmdop == CVS_OP_DIFF) {
if (cf->file_ent->ce_status == CVS_ENT_ADDED)
diff_rev1 = NULL;
else
diff_rev1 = cf->file_ent->ce_rev;
}
if (cf->file_rcs == NULL)
diff_rev2 = NULL;
else if (rev2 != NULL || date2 != -1) {
cvs_specified_date = date2;
diff_rev2 = rcs_translate_tag(rev2, cf->file_rcs);
if (diff_rev2 == NULL && cvs_cmdop == CVS_OP_DIFF) {
if (rev2 != NULL) {
cvs_log(LP_ERR, "tag %s not in file %s", rev2,
cf->file_path);
goto cleanup;
} else if (Nflag) {
diff_rev2 = NULL;
} else {
gmtime_r(&cvs_specified_date, &datetm);
strftime(tbuf, sizeof(tbuf),
"%Y.%m.%d.%H.%M.%S", &datetm);
cvs_log(LP_ERR, "no revision for date %s in "
"file %s", tbuf, cf->file_path);
goto cleanup;
}
} else if (diff_rev2 == NULL && cvs_cmdop == CVS_OP_RDIFF &&
force_head) {
/* -f is not allowed for unknown symbols */
if ((diff_rev2 = rcsnum_parse(rev2)) == NULL)
fatal("no such tag %s", rev2);
rcsnum_free(diff_rev2);
diff_rev2 = cf->file_rcs->rf_head;
}
cvs_specified_date = -1;
} else if (cvs_cmdop == CVS_OP_RDIFF)
diff_rev2 = cf->file_rcs->rf_head;
else if (cf->file_ent->ce_status == CVS_ENT_REMOVED)
diff_rev2 = NULL;
if (diff_rev1 != NULL && diff_rev2 != NULL &&
rcsnum_cmp(diff_rev1, diff_rev2, 0) == 0)
goto cleanup;
switch (cvs_cmdop) {
case CVS_OP_DIFF:
if (cf->file_status == FILE_UPTODATE) {
if (diff_rev2 == NULL &&
!rcsnum_cmp(diff_rev1, cf->file_rcsrev, 0))
goto cleanup;
}
break;
case CVS_OP_RDIFF:
if (diff_rev1 == NULL && diff_rev2 == NULL)
goto cleanup;
break;
}
cvs_printf("Index: %s\n", cf->file_path);
if (cvs_cmdop == CVS_OP_DIFF)
cvs_printf("%s\nRCS file: %s\n", RCS_DIFF_DIV,
cf->file_rcs != NULL ? cf->file_rpath : cf->file_path);
if (diff_rev1 != NULL) {
if (cvs_cmdop == CVS_OP_DIFF && diff_rev1 != NULL) {
(void)rcsnum_tostr(diff_rev1, rbuf, sizeof(rbuf));
cvs_printf("retrieving revision %s\n", rbuf);
}
tv[0].tv_sec = rcs_rev_getdate(cf->file_rcs, diff_rev1);
tv[0].tv_nsec = 0;
tv[1] = tv[0];
(void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
fd1 = rcs_rev_write_stmp(cf->file_rcs, diff_rev1, p1, 0);
if (futimens(fd1, tv) == -1)
fatal("cvs_diff_local: futimens failed");
}
if (diff_rev2 != NULL) {
if (cvs_cmdop == CVS_OP_DIFF && rev2 != NULL) {
(void)rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
cvs_printf("retrieving revision %s\n", rbuf);
}
tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs, diff_rev2);
tv2[0].tv_nsec = 0;
tv2[1] = tv2[0];
(void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
fd2 = rcs_rev_write_stmp(cf->file_rcs, diff_rev2, p2, 0);
if (futimens(fd2, tv2) == -1)
fatal("cvs_diff_local: futimens failed");
} else if (cvs_cmdop == CVS_OP_DIFF &&
(cf->file_flags & FILE_ON_DISK) &&
cf->file_ent->ce_status != CVS_ENT_REMOVED) {
(void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
if (cvs_server_active == 1 && cf->fd == -1) {
tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs,
cf->file_ent->ce_rev);
tv2[0].tv_nsec = 0;
tv2[1] = tv2[0];
fd2 = rcs_rev_write_stmp(cf->file_rcs,
cf->file_ent->ce_rev, p2, 0);
if (futimens(fd2, tv2) == -1)
fatal("cvs_diff_local: futimens failed");
} else {
if (fstat(cf->fd, &st) == -1)
fatal("fstat failed %s", strerror(errno));
b1 = buf_load_fd(cf->fd);
tv2[0].tv_sec = st.st_mtime;
tv2[0].tv_nsec = 0;
tv2[1] = tv2[0];
fd2 = buf_write_stmp(b1, p2, tv2);
buf_free(b1);
}
}
switch (cvs_cmdop) {
case CVS_OP_DIFF:
cvs_printf("%s", diffargs);
if (rev1 != NULL && diff_rev1 != NULL) {
(void)rcsnum_tostr(diff_rev1, rbuf, sizeof(rbuf));
cvs_printf(" -r%s", rbuf);
if (rev2 != NULL && diff_rev2 != NULL) {
(void)rcsnum_tostr(diff_rev2, rbuf,
sizeof(rbuf));
cvs_printf(" -r%s", rbuf);
}
}
if (diff_rev2 == NULL)
cvs_printf(" %s", cf->file_path);
cvs_printf("\n");
break;
case CVS_OP_RDIFF:
cvs_printf("diff ");
switch (diff_format) {
case D_CONTEXT:
cvs_printf("-c ");
break;
case D_RCSDIFF:
cvs_printf("-n ");
break;
case D_UNIFIED:
cvs_printf("-u ");
break;
default:
break;
}
if (diff_rev1 == NULL) {
cvs_printf("%s ", CVS_PATH_DEVNULL);
} else {
(void)rcsnum_tostr(diff_rev1, rbuf, sizeof(rbuf));
cvs_printf("%s:%s ", cf->file_path, rbuf);
}
if (diff_rev2 == NULL) {
cvs_printf("%s:removed\n", cf->file_path);
} else {
(void)rcsnum_tostr(diff_rev2 != NULL ? diff_rev2 :
cf->file_rcs->rf_head, rbuf, sizeof(rbuf));
cvs_printf("%s:%s\n", cf->file_path, rbuf);
}
break;
}
if (fd1 == -1) {
if ((fd1 = open(CVS_PATH_DEVNULL, O_RDONLY, 0)) == -1)
fatal("cannot open %s", CVS_PATH_DEVNULL);
}
if (fd2 == -1) {
if ((fd2 = open(CVS_PATH_DEVNULL, O_RDONLY, 0)) == -1)
fatal("cannot open %s", CVS_PATH_DEVNULL);
}
if (diffreg(p1 != NULL ? cf->file_path : CVS_PATH_DEVNULL,
p2 != NULL ? cf->file_path : CVS_PATH_DEVNULL, fd1, fd2, NULL,
dflags) == D_ERROR)
fatal("cvs_diff_local: failed to get RCS patch");
close(fd1);
close(fd2);
worklist_run(&temp_files, worklist_unlink);
if (p1 != NULL)
xfree(p1);
if (p2 != NULL)
xfree(p2);
cleanup:
if (diff_rev1 != NULL &&
(cf->file_rcs == NULL || diff_rev1 != cf->file_rcs->rf_head) &&
(cf->file_ent == NULL || diff_rev1 != cf->file_ent->ce_rev))
xfree(diff_rev1);
diff_rev1 = NULL;
if (diff_rev2 != NULL &&
(cf->file_rcs == NULL || diff_rev2 != cf->file_rcs->rf_head))
xfree(diff_rev2);
diff_rev2 = NULL;
}
