diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2003-07-17 19:16:32 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2003-07-17 19:16:32 +0000 |
| commit | a35fbb20dadabd0766b4f955207bd886c40dc456 (patch) | |
| tree | 83e2eec9174093b663df7c1e9ac739e153f74bc1 /usr.bin/patch | |
| parent | f2373e2196abfdbd8f1c02b8f0a77702c0ea9e1b (diff) | |
Fix merge error.
ok millert@ tedu@
Diffstat (limited to 'usr.bin/patch')
| -rw-r--r-- | usr.bin/patch/pch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index a2228d080ed..44228d869dd 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -1,7 +1,7 @@ -/* $OpenBSD: pch.c,v 1.14 2003/07/16 18:09:20 otto Exp $ */ +/* $OpenBSD: pch.c,v 1.15 2003/07/17 19:16:31 otto Exp $ */ #ifndef lint -static char rcsid[] = "$OpenBSD: pch.c,v 1.14 2003/07/16 18:09:20 otto Exp $"; +static char rcsid[] = "$OpenBSD: pch.c,v 1.15 2003/07/17 19:16:31 otto Exp $"; #endif /* not lint */ #include "EXTERN.h" @@ -920,8 +920,8 @@ another_hunk() p_len[filldst++] = strlen(s); if (fillsrc > p_ptrn_lines) { if (remove_special_line()) { - p_len[fillsrc - 1] -= 1; - s[p_len[fillsrc - 1]] = 0; + p_len[filldst - 1] -= 1; + s[p_len[filldst - 1]] = 0; } } break; |