version 1.295, 2010/07/21 09:22:17 |
version 1.296, 2010/07/23 08:31:19 |
|
|
fatal("fdopen %s: %s", fn, strerror(saved_errno)); |
fatal("fdopen %s: %s", fn, strerror(saved_errno)); |
} |
} |
|
|
cvs_worklist_add(fn, &temp_files); |
worklist_add(fn, &temp_files); |
|
|
if (rfp->rf_head != NULL) |
if (rfp->rf_head != NULL) |
rcsnum_tostr(rfp->rf_head, numbuf, sizeof(numbuf)); |
rcsnum_tostr(rfp->rf_head, numbuf, sizeof(numbuf)); |
|
|
fputc('\n', fp); |
fputc('\n', fp); |
} |
} |
fputs("@\ntext\n@", fp); |
fputs("@\ntext\n@", fp); |
if (rdp->rd_text != NULL) { |
if (rdp->rd_text != NULL) |
rcs_strprint(rdp->rd_text, rdp->rd_tlen, fp); |
rcs_strprint(rdp->rd_text, rdp->rd_tlen, fp); |
} |
|
fputs("@\n", fp); |
fputs("@\n", fp); |
} |
} |
|
|
|
|
if (dlp->l_lineno == lineno) |
if (dlp->l_lineno == lineno) |
break; |
break; |
if (dlp->l_lineno > lineno) { |
if (dlp->l_lineno > lineno) { |
dlp = TAILQ_PREV(dlp, cvs_tqh, l_list); |
dlp = TAILQ_PREV(dlp, tqh, l_list); |
} else if (dlp->l_lineno < lineno) { |
} else if (dlp->l_lineno < lineno) { |
if (((ndlp = TAILQ_NEXT(dlp, l_list)) == NULL) || |
if (((ndlp = TAILQ_NEXT(dlp, l_list)) == NULL) || |
ndlp->l_lineno > lineno) |
ndlp->l_lineno > lineno) |
|
|
/* last line is gone - reset dlp */ |
/* last line is gone - reset dlp */ |
if (dlp == NULL) { |
if (dlp == NULL) { |
ndlp = TAILQ_LAST(&(dlines->l_lines), |
ndlp = TAILQ_LAST(&(dlines->l_lines), |
cvs_tqh); |
tqh); |
dlp = ndlp; |
dlp = ndlp; |
} |
} |
} |
} |
|
|
* When the first revision got specified, prevrdp will be NULL. |
* When the first revision got specified, prevrdp will be NULL. |
*/ |
*/ |
prevrdp = (struct rcs_delta *)TAILQ_NEXT(rdp, rd_list); |
prevrdp = (struct rcs_delta *)TAILQ_NEXT(rdp, rd_list); |
nextrdp = (struct rcs_delta *)TAILQ_PREV(rdp, cvs_tqh, rd_list); |
nextrdp = (struct rcs_delta *)TAILQ_PREV(rdp, tqh, rd_list); |
|
|
newdeltatext = NULL; |
newdeltatext = NULL; |
prevbuf = NULL; |
prevbuf = NULL; |
|
|
if ((fd = mkstemp(template)) == -1) |
if ((fd = mkstemp(template)) == -1) |
fatal("mkstemp: `%s': %s", template, strerror(errno)); |
fatal("mkstemp: `%s': %s", template, strerror(errno)); |
|
|
cvs_worklist_add(template, &temp_files); |
worklist_add(template, &temp_files); |
rcs_rev_write_fd(rfp, rev, fd, mode); |
rcs_rev_write_fd(rfp, rev, fd, mode); |
|
|
if (lseek(fd, 0, SEEK_SET) < 0) |
if (lseek(fd, 0, SEEK_SET) < 0) |