diff options
| author |   joris <joris@openbsd.org> | 2019-01-09 17:57:05 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2019-01-09 17:57:05 +0000 |
| commit | cfc6befad20d95fb936a8a741d88bf61ae209ff0 (patch) | |
| tree | 0b9d95320f5dc7d126be5783cb60fc2e2a3e1238 /usr.bin/rcs/rcs.c | |
| parent | Make sure rcs_lock_add() and rcs_lock_remove() properly update the (diff) | |
| download | wireguard-openbsd-cfc6befad20d95fb936a8a741d88bf61ae209ff0.tar.xz wireguard-openbsd-cfc6befad20d95fb936a8a741d88bf61ae209ff0.zip | |
When expanding $Log$ make sure a newline is added if rd_log has none.
This can happen on new RCS files.
Fixes $Log$ keyword expansion.
Diffstat (limited to 'usr.bin/rcs/rcs.c')
| -rw-r--r-- | usr.bin/rcs/rcs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/rcs/rcs.c b/usr.bin/rcs/rcs.c index f4aca8cd97c..30415b9de17 100644 --- a/usr.bin/rcs/rcs.c +++ b/usr.bin/rcs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.87 2019/01/09 17:55:28 joris Exp $ */ +/* $OpenBSD: rcs.c,v 1.88 2019/01/09 17:57:05 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -1672,6 +1672,10 @@ rcs_expand_keywords(char *rcsfile_in, struct rcs_delta *rdp, BUF *bp, int mode) ++j; buf_append(newbuf, rdp->rd_log + i, j); } + + if (i > 0 && rdp->rd_log[i - 1] != '\n') + buf_putc(newbuf, '\n'); + buf_append(newbuf, line, line2 - line); for (j = 0; c + j < fin; ++j) { if (c[j] != ' ') |