version 1.36, 2006/04/26 02:55:13 |
version 1.37, 2006/04/26 21:55:22 |
|
|
int |
int |
rcsmerge_main(int argc, char **argv) |
rcsmerge_main(int argc, char **argv) |
{ |
{ |
int i, ch, flags, kflag; |
int fd, i, ch, flags, kflag; |
char *fcont, fpath[MAXPATHLEN], r1[16], r2[16], *rev_str1, *rev_str2; |
char *fcont, fpath[MAXPATHLEN], r1[16], r2[16], *rev_str1, *rev_str2; |
RCSFILE *file; |
RCSFILE *file; |
RCSNUM *rev1, *rev2; |
RCSNUM *rev1, *rev2; |
|
|
} |
} |
|
|
for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
if (rcs_statfile(argv[i], fpath, sizeof(fpath), flags) < 0) |
fd = rcs_statfile(argv[i], fpath, sizeof(fpath), flags); |
|
if (fd < 0) |
continue; |
continue; |
|
|
if ((file = rcs_open(fpath, RCS_READ)) == NULL) |
if ((file = rcs_open(fpath, fd, RCS_READ)) == NULL) |
continue; |
continue; |
|
|
if (!(flags & QUIET)) |
if (!(flags & QUIET)) |