version 1.208, 2010/07/23 23:59:32 |
version 1.209, 2010/07/28 09:07:11 |
|
|
b1 = b2 = b3 = NULL; |
b1 = b2 = b3 = NULL; |
path1 = path2 = NULL; |
path1 = path2 = NULL; |
|
|
if ((b1 = buf_load(pb->filename, BUF_AUTOEXT)) == NULL) { |
if ((b1 = buf_load(pb->filename)) == NULL) { |
warnx("failed to load file: `%s'", pb->filename); |
warnx("failed to load file: `%s'", pb->filename); |
goto out; |
goto out; |
} |
} |
|
|
goto out; |
goto out; |
} |
} |
b2 = rcs_kwexp_buf(b2, pb->file, pb->frev); |
b2 = rcs_kwexp_buf(b2, pb->file, pb->frev); |
|
b3 = buf_alloc(128); |
|
|
if ((b3 = buf_alloc(128, BUF_AUTOEXT)) == NULL) { |
|
warnx("failed to allocated buffer for diff"); |
|
goto out; |
|
} |
|
|
|
(void)xasprintf(&path1, "%s/diff1.XXXXXXXXXX", rcs_tmpdir); |
(void)xasprintf(&path1, "%s/diff1.XXXXXXXXXX", rcs_tmpdir); |
buf_write_stmp(b1, path1); |
buf_write_stmp(b1, path1); |
|
|
|
|
pb->frev = pb->file->rf_head; |
pb->frev = pb->file->rf_head; |
|
|
/* Load file contents */ |
/* Load file contents */ |
if ((bp = buf_load(pb->filename, BUF_AUTOEXT)) == NULL) |
if ((bp = buf_load(pb->filename)) == NULL) |
return (-1); |
return (-1); |
|
|
/* If this is a zero-ending RCSNUM eg 4.0, increment it (eg to 4.1) */ |
/* If this is a zero-ending RCSNUM eg 4.0, increment it (eg to 4.1) */ |
|
|
} |
} |
|
|
/* Load file contents */ |
/* Load file contents */ |
if ((bp = buf_load(pb->filename, BUF_AUTOEXT)) == NULL) |
if ((bp = buf_load(pb->filename)) == NULL) |
return (-1); |
return (-1); |
|
|
/* Get default values from working copy if -k specified */ |
/* Get default values from working copy if -k specified */ |
|
|
} |
} |
|
|
len = c - start + 1; |
len = c - start + 1; |
buf = buf_alloc(len + 1, 0); |
buf = buf_alloc(len + 1); |
buf_append(buf, start, len); |
buf_append(buf, start, len); |
|
|
/* XXX - Not binary safe. */ |
/* XXX - Not binary safe. */ |