version 1.35, 2006/04/25 13:36:35 |
version 1.36, 2006/04/26 02:55:13 |
|
|
(flags & PIPEOUT) ? "; result to stdout":""); |
(flags & PIPEOUT) ? "; result to stdout":""); |
} |
} |
|
|
if ((bp = cvs_diff3(file, argv[i], rev1, rev2, |
if ((bp = rcs_diff3(file, argv[i], rev1, rev2, |
!(flags & QUIET))) == NULL) { |
!(flags & QUIET))) == NULL) { |
warnx("failed to merge"); |
warnx("failed to merge"); |
rcs_close(file); |
rcs_close(file); |
|
|
} |
} |
|
|
if (flags & PIPEOUT) { |
if (flags & PIPEOUT) { |
cvs_buf_putc(bp, '\0'); |
rcs_buf_putc(bp, '\0'); |
fcont = cvs_buf_release(bp); |
fcont = rcs_buf_release(bp); |
printf("%s", fcont); |
printf("%s", fcont); |
xfree(fcont); |
xfree(fcont); |
} else { |
} else { |
/* XXX mode */ |
/* XXX mode */ |
if (cvs_buf_write(bp, argv[i], 0644) < 0) |
if (rcs_buf_write(bp, argv[i], 0644) < 0) |
warnx("cvs_buf_write failed"); |
warnx("rcs_buf_write failed"); |
|
|
cvs_buf_free(bp); |
rcs_buf_free(bp); |
} |
} |
rcs_close(file); |
rcs_close(file); |
} |
} |