File: [local] / src / usr.bin / rcs / rcsdiff.c (download)
Revision 1.42, Thu Mar 30 23:19:20 2006 UTC (18 years, 2 months ago) by joris
Branch: MAIN
Changes since 1.41: +9 -5 lines
add temporary files to the worklist before creating them, this prevents
a race when the user would interrupt the program when it was returning
from cvs_buf_write_stmp() and leave the temporary files behind.
|
/* $OpenBSD: rcsdiff.c,v 1.42 2006/03/30 23:19:20 joris Exp $ */
/*
* Copyright (c) 2005 Joris Vink <joris@openbsd.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
#include "rcsprog.h"
#include "diff.h"
static int rcsdiff_file(RCSFILE *, RCSNUM *, const char *);
static int rcsdiff_rev(RCSFILE *, RCSNUM *, RCSNUM *);
static int kflag = RCS_KWEXP_ERR;
int
rcsdiff_main(int argc, char **argv)
{
int i, ch, status;
RCSNUM *rev, *rev2, *frev;
RCSFILE *file;
char fpath[MAXPATHLEN];
rev = RCS_HEAD_REV;
rev2 = NULL;
status = 0;
strlcpy(diffargs, "diff", sizeof(diffargs));
while ((ch = rcs_getopt(argc, argv, "ck:nqr:TuVx::z:")) != -1) {
switch (ch) {
case 'c':
strlcat(diffargs, " -c", sizeof(diffargs));
diff_format = D_CONTEXT;
break;
case 'k':
kflag = rcs_kflag_get(rcs_optarg);
if (RCS_KWEXP_INVAL(kflag)) {
cvs_log(LP_ERR,
"invalid RCS keyword expansion mode");
(usage)();
exit(1);
}
break;
case 'n':
strlcat(diffargs, " -n", sizeof(diffargs));
diff_format = D_RCSDIFF;
break;
case 'q':
verbose = 0;
break;
case 'u':
strlcat(diffargs, " -u", sizeof(diffargs));
diff_format = D_UNIFIED;
break;
case 'r':
if (rev == RCS_HEAD_REV) {
if ((rev = rcsnum_parse(rcs_optarg)) == NULL)
fatal("bad revision number");
} else {
if ((rev2 = rcsnum_parse(rcs_optarg)) == NULL)
fatal("bad revision number");
}
break;
case 'T':
/*
* kept for compatibility
*/
break;
case 'V':
printf("%s\n", rcs_version);
exit(0);
/* NOTREACHED */
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 (1);
}
}
argc -= rcs_optind;
argv += rcs_optind;
if (argc == 0) {
cvs_log(LP_ERR, "no input file");
(usage)();
exit(1);
}
for (i = 0; i < argc; i++) {
if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
continue;
if ((file = rcs_open(fpath, RCS_READ|RCS_PARSE_FULLY)) == NULL)
continue;
if (kflag != RCS_KWEXP_ERR)
rcs_kwexp_set(file, kflag);
if (rev == RCS_HEAD_REV)
frev = file->rf_head;
else
frev = rev;
if (verbose == 1) {
fprintf(stderr, "%s\n", RCS_DIFF_DIV);
fprintf(stderr, "RCS file: %s\n", fpath);
}
diff_file = argv[i];
if (rev2 == NULL) {
if (rcsdiff_file(file, frev, argv[i]) < 0) {
rcs_close(file);
status = 2;
continue;
}
} else {
if (rcsdiff_rev(file, rev, rev2) < 0) {
rcs_close(file);
status = 2;
continue;
}
}
rcs_close(file);
}
return (status);
}
void
rcsdiff_usage(void)
{
fprintf(stderr,
"usage: rcsdiff [-cnquV] [-kmode] [-rrev1 [-rrev2]] "
"[-xsuffixes] [-ztz] file ...\n");
}
static int
rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
{
int ret;
char path1[MAXPATHLEN], path2[MAXPATHLEN];
BUF *b1, *b2;
char rbuf[64];
struct stat st;
struct timeval tv[2], tv2[2];
memset(&tv, 0, sizeof(tv));
memset(&tv2, 0, sizeof(tv2));
ret = -1;
b1 = b2 = NULL;
if (stat(filename, &st) == -1) {
cvs_log(LP_ERRNO, "%s", filename);
goto out;
}
rcsnum_tostr(rev, rbuf, sizeof(rbuf));
if (verbose == 1) {
fprintf(stderr, "retrieving revision %s\n", rbuf);
fprintf(stderr, "%s -r%s %s\n", diffargs, rbuf, filename);
}
if ((b1 = rcs_getrev(file, rev)) == NULL) {
cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf);
goto out;
}
b1 = rcs_kwexp_buf(b1, file, rev);
tv[0].tv_sec = (long)rcs_rev_getdate(file, rev);
tv[1].tv_sec = tv[0].tv_sec;
if ((b2 = cvs_buf_load(filename, BUF_AUTOEXT)) == NULL) {
cvs_log(LP_ERR, "failed to load file: '%s'", filename);
goto out;
}
tv2[0].tv_sec = st.st_mtime;
tv2[1].tv_sec = st.st_mtime;
strlcpy(path1, rcs_tmpdir, sizeof(path1));
strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1));
cvs_worklist_add(path1, &rcs_temp_files);
cvs_buf_write_stmp(b1, path1, 0600);
cvs_buf_free(b1);
b1 = NULL;
if (utimes(path1, (const struct timeval *)&tv) < 0)
cvs_log(LP_ERRNO, "error setting utimes");
strlcpy(path2, rcs_tmpdir, sizeof(path2));
strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
cvs_worklist_add(path2, &rcs_temp_files);
cvs_buf_write_stmp(b2, path2, 0600);
cvs_buf_free(b2);
b2 = NULL;
if (utimes(path2, (const struct timeval *)&tv2) < 0)
cvs_log(LP_ERRNO, "error setting utimes");
cvs_diffreg(path1, path2, NULL);
ret = 0;
out:
cvs_worklist_run(&rcs_temp_files, cvs_worklist_unlink);
if (b1 != NULL)
cvs_buf_free(b1);
if (b2 != NULL)
cvs_buf_free(b2);
return (ret);
}
static int
rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2)
{
int ret;
char path1[MAXPATHLEN], path2[MAXPATHLEN];
BUF *b1, *b2;
char rbuf1[64], rbuf2[64];
struct timeval tv[2], tv2[2];
ret = -1;
b1 = b2 = NULL;
memset(&tv, 0, sizeof(tv));
memset(&tv2, 0, sizeof(tv2));
rcsnum_tostr(rev1, rbuf1, sizeof(rbuf1));
if (verbose == 1)
printf("retrieving revision %s\n", rbuf1);
if ((b1 = rcs_getrev(file, rev1)) == NULL) {
cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf1);
goto out;
}
b1 = rcs_kwexp_buf(b1, file, rev1);
tv[0].tv_sec = (long)rcs_rev_getdate(file, rev1);
tv[1].tv_sec = tv[0].tv_sec;
rcsnum_tostr(rev2, rbuf2, sizeof(rbuf2));
if (verbose == 1)
fprintf(stderr, "retrieving revision %s\n", rbuf2);
if ((b2 = rcs_getrev(file, rev2)) == NULL) {
cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf2);
goto out;
}
b2 = rcs_kwexp_buf(b2, file, rev2);
tv2[0].tv_sec = (long)rcs_rev_getdate(file, rev2);
tv2[1].tv_sec = tv2[0].tv_sec;
if (verbose == 1)
fprintf(stderr, "%s -r%s -r%s\n", diffargs, rbuf1, rbuf2);
strlcpy(path1, rcs_tmpdir, sizeof(path1));
strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1));
cvs_worklist_add(path1, &rcs_temp_files);
cvs_buf_write_stmp(b1, path1, 0600);
cvs_buf_free(b1);
b1 = NULL;
if (utimes(path1, (const struct timeval *)&tv) < 0)
cvs_log(LP_ERRNO, "error setting utimes");
strlcpy(path2, rcs_tmpdir, sizeof(path2));
strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
cvs_worklist_add(path2, &rcs_temp_files);
cvs_buf_write_stmp(b2, path2, 0600);
cvs_buf_free(b2);
b2 = NULL;
if (utimes(path2, (const struct timeval *)&tv2) < 0)
cvs_log(LP_ERRNO, "error setting utimes");
cvs_diffreg(path1, path2, NULL);
ret = 0;
out:
cvs_worklist_run(&rcs_temp_files, cvs_worklist_unlink);
if (b1 != NULL)
cvs_buf_free(b1);
if (b2 != NULL)
cvs_buf_free(b2);
return (ret);
}