File: [local] / src / usr.bin / rcs / rcsdiff.c (download)
Revision 1.6, Sat Oct 8 20:30:39 2005 UTC (18 years, 8 months ago) by niallo
Branch: MAIN
Changes since 1.5: +2 -2 lines
sync rcsdiff_usage()
|
/* $OpenBSD: rcsdiff.c,v 1.6 2005/10/08 20:30:39 niallo 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 <sys/param.h>
#include <sys/stat.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "log.h"
#include "rcs.h"
#include "diff.h"
#include "rcsprog.h"
extern char *__progname;
static int rcsdiff_file(RCSFILE *, RCSNUM *, const char *);
static int rcsdiff_rev(RCSFILE *rfp, RCSNUM *rev, RCSNUM *rev2);
int
rcsdiff_main(int argc, char **argv)
{
int i, ch;
RCSNUM *rev, *rev2, *frev;
RCSFILE *file;
char fpath[MAXPATHLEN];
rev = RCS_HEAD_REV;
rev2 = NULL;
while ((ch = getopt(argc, argv, "cnqr:uV")) != -1) {
switch (ch) {
case 'c':
diff_format = D_CONTEXT;
break;
case 'n':
diff_format = D_RCSDIFF;
break;
case 'q':
verbose = 0;
break;
case 'u':
diff_format = D_UNIFIED;
break;
case 'V':
printf("%s\n", rcs_version);
exit(0);
case 'r':
if (rev == RCS_HEAD_REV) {
if ((rev = rcsnum_parse(optarg)) == NULL) {
cvs_log(LP_ERR, "bad revision number");
exit(1);
}
} else {
if ((rev2 = rcsnum_parse(optarg)) == NULL) {
cvs_log(LP_ERR, "bad revision number");
exit(1);
}
}
break;
default:
break;
}
}
argc -= optind;
argv += optind;
if (argc == 0) {
cvs_log(LP_ERR, "no input file");
(usage)();
exit(1);
}
for (i = 0; i < argc; i++) {
if (verbose)
cvs_printf("%s\n", RCS_DIFF_DIV);
if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
continue;
if ((file = rcs_open(fpath, RCS_READ)) == NULL)
continue;
if (rev == RCS_HEAD_REV)
frev = file->rf_head;
else
frev = rev;
if (rev2 == NULL) {
if (rcsdiff_file(file, frev, argv[i]) < 0) {
cvs_log(LP_ERR, "failed to rcsdiff");
rcs_close(file);
continue;
}
} else {
if (rcsdiff_rev(file, rev, rev2) < 0) {
cvs_log(LP_ERR, "failed to rcsdiff");
rcs_close(file);
continue;
}
}
rcs_close(file);
}
return (0);
}
void
rcsdiff_usage(void)
{
fprintf(stderr, "usage %s [-cnquV] [-r rev1 [-r rev2]] file ...\n",
__progname);
}
static int
rcsdiff_file(RCSFILE *rfp, RCSNUM *rev, const char *filename)
{
char path1[MAXPATHLEN], path2[MAXPATHLEN];
BUF *b1, *b2;
char rbuf[64];
rcsnum_tostr(rev, rbuf, sizeof(rbuf));
if (verbose)
printf("retrieving revision %s\n", rbuf);
if ((b1 = rcs_getrev(rfp, rev)) == NULL) {
cvs_log(LP_ERR, "failed to retrieve revision");
return (-1);
}
if ((b2 = cvs_buf_load(filename, BUF_AUTOEXT)) == NULL) {
cvs_log(LP_ERR, "failed to load file: '%s'", filename);
cvs_buf_free(b1);
return (-1);
}
strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
if (cvs_buf_write_stmp(b1, path1, 0600) == -1) {
cvs_log(LP_ERRNO, "could not write temporary file");
cvs_buf_free(b1);
cvs_buf_free(b2);
return (-1);
}
cvs_buf_free(b1);
strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2));
if (cvs_buf_write_stmp(b2, path2, 0600) == -1) {
cvs_buf_free(b2);
(void)unlink(path1);
return (-1);
}
cvs_buf_free(b2);
cvs_diffreg(path1, path2, NULL);
(void)unlink(path1);
(void)unlink(path2);
return (0);
}
static int
rcsdiff_rev(RCSFILE *rfp, RCSNUM *rev1, RCSNUM *rev2)
{
char path1[MAXPATHLEN], path2[MAXPATHLEN];
BUF *b1, *b2;
char rbuf[64];
rcsnum_tostr(rev1, rbuf, sizeof(rbuf));
if (verbose)
printf("retrieving revision %s\n", rbuf);
if ((b1 = rcs_getrev(rfp, rev1)) == NULL) {
cvs_log(LP_ERR, "failed to retrieve revision");
return (-1);
}
rcsnum_tostr(rev2, rbuf, sizeof(rbuf));
if (verbose)
printf("retrieving revision %s\n", rbuf);
if ((b2 = rcs_getrev(rfp, rev2)) == NULL) {
cvs_log(LP_ERR, "failed to retrieve revision");
return (-1);
}
strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
if (cvs_buf_write_stmp(b1, path1, 0600) == -1) {
cvs_log(LP_ERRNO, "could not write temporary file");
cvs_buf_free(b1);
cvs_buf_free(b2);
return (-1);
}
cvs_buf_free(b1);
strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2));
if (cvs_buf_write_stmp(b2, path2, 0600) == -1) {
cvs_buf_free(b2);
(void)unlink(path1);
return (-1);
}
cvs_buf_free(b2);
cvs_diffreg(path1, path2, NULL);
(void)unlink(path1);
(void)unlink(path2);
return (0);
}