version 1.59, 2010/07/23 21:46:05 |
version 1.60, 2010/07/28 09:07:11 |
|
|
|
|
len = rdp->rd_tlen; |
len = rdp->rd_tlen; |
if (len == 0) { |
if (len == 0) { |
rbuf = buf_alloc(1, 0); |
rbuf = buf_alloc(1); |
buf_empty(rbuf); |
buf_empty(rbuf); |
return (rbuf); |
return (rbuf); |
} |
} |
|
|
rbuf = buf_alloc(len, BUF_AUTOEXT); |
rbuf = buf_alloc(len); |
buf_append(rbuf, rdp->rd_text, len); |
buf_append(rbuf, rdp->rd_text, len); |
|
|
isbranch = 0; |
isbranch = 0; |
|
|
if ((nextbuf = rcs_getrev(rf, nextrdp->rd_num)) == NULL) |
if ((nextbuf = rcs_getrev(rf, nextrdp->rd_num)) == NULL) |
errx(1, "error getting revision"); |
errx(1, "error getting revision"); |
|
|
newdiff = buf_alloc(64, BUF_AUTOEXT); |
newdiff = buf_alloc(64); |
|
|
/* calculate new diff */ |
/* calculate new diff */ |
(void)xasprintf(&path_tmp1, "%s/diff1.XXXXXXXXXX", rcs_tmpdir); |
(void)xasprintf(&path_tmp1, "%s/diff1.XXXXXXXXXX", rcs_tmpdir); |
|
|
errx(1, "rcs_expand_keywords: string truncated"); |
errx(1, "rcs_expand_keywords: string truncated"); |
|
|
/* Concatenate everything together. */ |
/* Concatenate everything together. */ |
tmpbuf = buf_alloc(len + strlen(expbuf), BUF_AUTOEXT); |
tmpbuf = buf_alloc(len + strlen(expbuf)); |
/* Append everything before keyword. */ |
/* Append everything before keyword. */ |
buf_append(tmpbuf, buf_get(newbuf), |
buf_append(tmpbuf, buf_get(newbuf), |
start - (unsigned char *)buf_get(newbuf)); |
start - (unsigned char *)buf_get(newbuf)); |