| version 1.22, 2006/04/05 01:38:55 |
version 1.23, 2006/04/14 02:49:41 |
|
|
| if ((diffb = cvs_patchfile(data, patch, ed_patch_lines)) == NULL) |
if ((diffb = cvs_patchfile(data, patch, ed_patch_lines)) == NULL) |
| goto out; |
goto out; |
| |
|
| if ((verbose ==1) && (diff3_conflicts != 0)) { |
if (verbose == 1 && diff3_conflicts != 0) { |
| cvs_log(LP_WARN, "%d conflict%s found during merge, " |
cvs_log(LP_WARN, "%d conflict%s found during merge, " |
| "please correct.", diff3_conflicts, |
"please correct.", diff3_conflicts, |
| (diff3_conflicts > 1) ? "s" : ""); |
(diff3_conflicts > 1) ? "s" : ""); |
|
|
| op = lp->l_line[strlen(lp->l_line) - 1]; |
op = lp->l_line[strlen(lp->l_line) - 1]; |
| start = (int)strtol(lp->l_line, &ep, 10); |
start = (int)strtol(lp->l_line, &ep, 10); |
| if (op == 'a') { |
if (op == 'a') { |
| if ((start > dlines->l_nblines) || |
if (start > dlines->l_nblines || |
| (start < 0) || (*ep != 'a')) |
start < 0 || *ep != 'a') |
| fatal("ed_patch_lines"); |
fatal("ed_patch_lines"); |
| } else if (op == 'c') { |
} else if (op == 'c') { |
| if ((start > dlines->l_nblines) || |
if (start > dlines->l_nblines || |
| (start < 0) || ((*ep != ',') && (*ep != 'c'))) |
start < 0 || (*ep != ',' && *ep != 'c')) |
| fatal("ed_patch_lines"); |
fatal("ed_patch_lines"); |
| |
|
| if (*ep == ',') { |
if (*ep == ',') { |
| ep++; |
ep++; |
| end = (int)strtol(ep, &ep, 10); |
end = (int)strtol(ep, &ep, 10); |
| if ((end < 0) || (*ep != 'c')) |
if (end < 0 || *ep != 'c') |
| fatal("ed_patch_lines"); |
fatal("ed_patch_lines"); |
| } else { |
} else { |
| end = start; |
end = start; |
![[BACK]](/icons/back.gif){kind=icon}
Return to diff3.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs