===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcs.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- src/usr.bin/rcs/rcs.c	2011/05/20 19:21:10	1.76
+++ src/usr.bin/rcs/rcs.c	2011/07/06 15:36:52	1.77
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.c,v 1.76 2011/05/20 19:21:10 nicm Exp $	*/
+/*	$OpenBSD: rcs.c,v 1.77 2011/07/06 15:36:52 nicm Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -53,6 +53,7 @@
 struct rcs_kw rcs_expkw[] =  {
 	{ "Author",	RCS_KW_AUTHOR   },
 	{ "Date",	RCS_KW_DATE     },
+	{ "Locker",	RCS_KW_LOCKER   },
 	{ "Header",	RCS_KW_HEADER   },
 	{ "Id",		RCS_KW_ID       },
 	{ "OpenBSD",	RCS_KW_ID       },
@@ -1479,221 +1480,209 @@
  * On error, return NULL.
  */
 static BUF *
-rcs_expand_keywords(char *rcsfile, struct rcs_delta *rdp, BUF *bp, int mode)
+rcs_expand_keywords(char *rcsfile_in, struct rcs_delta *rdp, BUF *bp, int mode)
 {
 	BUF *newbuf;
+	u_char *c, *kw, *fin;
+	char buf[256], *tmpf, resolved[MAXPATHLEN], *rcsfile;
+	u_char *line, *line2;
+	u_int i, j;
 	int kwtype;
-	u_int j, found;
-	u_char *c, *kwstr, *start, *end, *fin;
-	char expbuf[256], buf[256];
+	int found;
 	struct tm tb;
-	char *fmt;
-	size_t len;
 
-	kwtype = 0;
-	kwstr = NULL;
-
-	/*
-	 * -z support for RCS
-	 */
 	tb = rdp->rd_date;
 	if (timezone_flag != NULL)
 		rcs_set_tz(timezone_flag, rdp, &tb);
 
-	len = buf_len(bp);
+	if (realpath(rcsfile_in, resolved) == NULL)
+		rcsfile = rcsfile_in;
+	else
+		rcsfile = resolved;
 
-	c = buf_get(bp);
-	found = 0;
-	/* Final character in buffer. */
-	fin = c + len - 1;
+	newbuf = buf_alloc(buf_len(bp));
 
-	/* If no keywords are found, return original buffer. */
-	newbuf = bp;
-
 	/*
 	 * Keyword formats:
 	 * $Keyword$
 	 * $Keyword: value$
 	 */
-	for (; c < fin; c++) {
-		if (*c == '$') {
-			BUF *tmpbuf;
-			size_t clen;
+	c = buf_get(bp);
+	fin = c + buf_len(bp);
+	/* Copying to newbuf is deferred until the first keyword. */
+	found = 0;
 
-			/* remember start of this possible keyword */
-			start = c;
+	while (c < fin) {
+		kw = memchr(c, '$', fin - c);
+		if (kw == NULL)
+			break;
+		++kw;
+		if (found) {
+			/* Copy everything up to and including the $. */
+			buf_append(newbuf, c, kw - c);
+		}
+		c = kw;
+		/* c points after the $ now. */
+		if (c == fin)
+			break;
+		if (!isalpha(*c)) /* all valid keywords start with a letter */
+			continue;
 
-			/* first following character has to be alphanumeric */
-			c++;
-			if (!isalpha(*c)) {
-				c = start;
-				continue;
+		for (i = 0; i < RCS_NKWORDS; ++i) {
+			size_t kwlen;
+
+			kwlen = strlen(rcs_expkw[i].kw_str);
+			/*
+			 * kwlen must be less than clen since clen includes
+			 * either a terminating `$' or a `:'.
+			 */
+			if (c + kwlen < fin &&
+			    memcmp(c , rcs_expkw[i].kw_str, kwlen) == 0 &&
+			    (c[kwlen] == '$' || c[kwlen] == ':')) {
+				c += kwlen;
+				break;
 			}
+		}
+		if (i == RCS_NKWORDS)
+			continue;
+		kwtype = rcs_expkw[i].kw_type;
 
-			/* Number of characters between c and fin, inclusive. */
-			clen = fin - c + 1;
-
-			/* look for any matching keywords */
-			found = 0;
-			for (j = 0; j < RCS_NKWORDS; j++) {
-				size_t kwlen;
-
-				kwlen = strlen(rcs_expkw[j].kw_str);
-				/*
-				 * kwlen must be less than clen since clen
-				 * includes either a terminating `$' or a `:'.
-				 */
-				if (kwlen < clen &&
-				    memcmp(c, rcs_expkw[j].kw_str, kwlen) == 0 &&
-				    (c[kwlen] == '$' || c[kwlen] == ':')) {
-					found = 1;
-					kwstr = rcs_expkw[j].kw_str;
-					kwtype = rcs_expkw[j].kw_type;
-					c += kwlen;
+		/*
+		 * If the next character is ':' we need to look for an '$'
+		 * before the end of the line to be sure it is in fact a
+		 * keyword.
+		 */
+		if (*c == ':') {
+			for (; c < fin; ++c) {
+				if (*c == '$' || *c == '\n')
 					break;
-				}
 			}
 
-			/* unknown keyword, continue looking */
-			if (found == 0) {
-				c = start;
+			if (*c != '$') {
+				if (found)
+					buf_append(newbuf, kw, c - kw);
 				continue;
 			}
+		}
+		++c;
 
-			/*
-			 * if the next character was ':' we need to look for
-			 * an '$' before the end of the line to be sure it is
-			 * in fact a keyword.
-			 */
-			if (*c == ':') {
-				for (; c <= fin; ++c) {
-					if (*c == '$' || *c == '\n')
-						break;
-				}
+		if (!found) {
+			found = 1;
+			/* Copy everything up to and including the $. */
+			buf_append(newbuf, buf_get(bp), kw - buf_get(bp));
+		}
 
-				if (*c != '$') {
-					c = start;
-					continue;
-				}
+		if (mode & RCS_KWEXP_NAME) {
+			buf_puts(newbuf, rcs_expkw[i].kw_str);
+			if (mode & RCS_KWEXP_VAL)
+				buf_puts(newbuf, ": ");
+		}
+
+		/* Order matters because of RCS_KW_ID and RCS_KW_HEADER. */
+		if (mode & RCS_KWEXP_VAL) {
+			if (kwtype & (RCS_KW_RCSFILE|RCS_KW_LOG)) {
+				if ((kwtype & RCS_KW_FULLPATH) ||
+				    (tmpf = strrchr(rcsfile, '/')) == NULL)
+					buf_puts(newbuf, rcsfile);
+				else
+					buf_puts(newbuf, tmpf + 1);
+				buf_putc(newbuf, ' ');
 			}
-			end = c + 1;
 
-			/* start constructing the expansion */
-			expbuf[0] = '\0';
+			if (kwtype & RCS_KW_REVISION) {
+				rcsnum_tostr(rdp->rd_num, buf, sizeof(buf));
+				buf_puts(newbuf, buf);
+				buf_putc(newbuf, ' ');
+			}
 
-			if (mode & RCS_KWEXP_NAME) {
-				char *tmp;
+			if (kwtype & RCS_KW_DATE) {
+				strftime(buf, sizeof(buf),
+				    "%Y/%m/%d %H:%M:%S ", &tb);
+				buf_puts(newbuf, buf);
+			}
 
-				(void)xasprintf(&tmp, "$%s%s", kwstr,
-				    (mode & RCS_KWEXP_VAL) ? ": " : "");
-				if (strlcat(expbuf, tmp, sizeof(expbuf)) >= sizeof(expbuf))
-					errx(1, "rcs_expand_keywords: string truncated");
-				xfree(tmp);
+			if (kwtype & RCS_KW_AUTHOR) {
+				buf_puts(newbuf, rdp->rd_author);
+				buf_putc(newbuf, ' ');
 			}
 
-			/*
-			 * order matters because of RCS_KW_ID and
-			 * RCS_KW_HEADER here
-			 */
-			if (mode & RCS_KWEXP_VAL) {
-				if (kwtype & RCS_KW_RCSFILE) {
-					char *tmp;
+			if (kwtype & RCS_KW_STATE) {
+				buf_puts(newbuf, rdp->rd_state);
+				buf_putc(newbuf, ' ');
+			}
 
-					(void)xasprintf(&tmp, "%s ",
-					    (kwtype & RCS_KW_FULLPATH) ? rcsfile : basename(rcsfile));
-					if (strlcat(expbuf, tmp, sizeof(expbuf)) >= sizeof(expbuf))
-						errx(1, "rcs_expand_keywords: string truncated");
-					xfree(tmp);
-				}
+			/* Order does not matter anymore below. */
+			if (kwtype & RCS_KW_SOURCE) {
+				buf_puts(newbuf, rcsfile);
+				buf_putc(newbuf, ' ');
+			}
 
-				if (kwtype & RCS_KW_REVISION) {
-					char *tmp;
+			if (kwtype & RCS_KW_NAME)
+				buf_putc(newbuf, ' ');
 
-					rcsnum_tostr(rdp->rd_num, buf, sizeof(buf));
-					(void)xasprintf(&tmp, "%s ", buf);
-					if (strlcat(expbuf, tmp, sizeof(expbuf)) >= sizeof(buf))
-						errx(1, "rcs_expand_keywords: string truncated");
-					xfree(tmp);
+			if ((kwtype & RCS_KW_LOCKER)) {
+				if (rdp->rd_locker) {
+					buf_puts(newbuf, rdp->rd_locker);
+					buf_putc(newbuf, ' ');
 				}
+			}
+		}
 
-				if (kwtype & RCS_KW_DATE) {
-					if (timezone_flag != NULL)
-						fmt = "%Y/%m/%d %H:%M:%S%z ";
-					else
-						fmt = "%Y/%m/%d %H:%M:%S ";
+		/* End the expansion. */
+		if (mode & RCS_KWEXP_NAME)
+			buf_putc(newbuf, '$');
 
-					strftime(buf, sizeof(buf), fmt, &tb);
-					if (strlcat(expbuf, buf, sizeof(expbuf)) >= sizeof(expbuf))
-						errx(1, "rcs_expand_keywords: string truncated");
-				}
+		if (kwtype & RCS_KW_LOG) {
+			line = memrchr(buf_get(bp), '\n', kw - buf_get(bp) - 1);
+			if (line == NULL)
+				line = buf_get(bp);
+			else
+				++line;
+			line2 = kw - 1;
+			while (line2 > line && line2[-1] == ' ')
+				--line2;
 
-				if (kwtype & RCS_KW_AUTHOR) {
-					char *tmp;
+			buf_putc(newbuf, '\n');
+			buf_append(newbuf, line, kw - 1 - line);
+			buf_puts(newbuf, "Revision ");
+			rcsnum_tostr(rdp->rd_num, buf, sizeof(buf));
+			buf_puts(newbuf, buf);
+			buf_puts(newbuf, "  ");
+			strftime(buf, sizeof(buf), "%Y/%m/%d %H:%M:%S", &tb);
+			buf_puts(newbuf, buf);
 
-					(void)xasprintf(&tmp, "%s ", rdp->rd_author);
-					if (strlcat(expbuf, tmp, sizeof(expbuf)) >= sizeof(expbuf))
-						errx(1, "rcs_expand_keywords: string truncated");
-					xfree(tmp);
-				}
+			buf_puts(newbuf, "  ");
+			buf_puts(newbuf, rdp->rd_author);
+			buf_putc(newbuf, '\n');
 
-				if (kwtype & RCS_KW_STATE) {
-					char *tmp;
-
-					(void)xasprintf(&tmp, "%s ", rdp->rd_state);
-					if (strlcat(expbuf, tmp, sizeof(expbuf)) >= sizeof(expbuf))
-						errx(1, "rcs_expand_keywords: string truncated");
-					xfree(tmp);
-				}
-
-				/* order does not matter anymore below */
-				if (kwtype & RCS_KW_LOG)
-					if (strlcat(expbuf, " ", sizeof(expbuf)) >= sizeof(expbuf))
-						errx(1, "rcs_expand_keywords: string truncated");
-
-				if (kwtype & RCS_KW_SOURCE) {
-					char *tmp;
-
-					(void)xasprintf(&tmp, "%s ", rcsfile);
-					if (strlcat(expbuf, tmp, sizeof(expbuf)) >= sizeof(expbuf))
-						errx(1, "rcs_expand_keywords: string truncated");
-					xfree(tmp);
-				}
-
-				if (kwtype & RCS_KW_NAME)
-					if (strlcat(expbuf, " ", sizeof(expbuf)) >= sizeof(expbuf))
-						errx(1, "rcs_expand_keywords: string truncated");
+			for (i = 0; rdp->rd_log[i]; i += j) {
+				j = strcspn(rdp->rd_log + i, "\n");
+				if (j == 0)
+					buf_append(newbuf, line, line2 - line);
+				else
+					buf_append(newbuf, line, kw - 1 - line);
+				if (rdp->rd_log[i + j])
+					++j;
+				buf_append(newbuf, rdp->rd_log + i, j);
 			}
-
-			/* end the expansion */
-			if (mode & RCS_KWEXP_NAME)
-				if (strlcat(expbuf, "$", sizeof(expbuf)) >= sizeof(expbuf))
-					errx(1, "rcs_expand_keywords: string truncated");
-
-			/* Concatenate everything together. */
-			tmpbuf = buf_alloc(len + strlen(expbuf));
-			/* Append everything before keyword. */
-			buf_append(tmpbuf, buf_get(newbuf),
-			    start - (unsigned char *)buf_get(newbuf));
-			/* Append keyword. */
-			buf_append(tmpbuf, expbuf, strlen(expbuf));
-			/* Point c to end of keyword. */
-			c = buf_get(tmpbuf) + buf_len(tmpbuf) - 1;
-			/* Append everything after keyword. */
-			buf_append(tmpbuf, end,
-			    ((unsigned char *)buf_get(newbuf) + buf_len(newbuf)) - end);
-			/* Point fin to end of data. */
-			fin = buf_get(tmpbuf) + buf_len(tmpbuf) - 1;
-			/* Recalculate new length. */
-			len = buf_len(tmpbuf);
-
-			/* tmpbuf is now ready, free old newbuf if allocated here. */
-			if (newbuf != bp)
-				buf_free(newbuf);
-			newbuf = tmpbuf;
+			buf_append(newbuf, line, line2 - line);
+			for (j = 0; c + j < fin; ++j) {
+				if (c[j] != ' ')
+					break;
+			}
+			if (c + j == fin || c[j] == '\n')
+				c += j;
 		}
 	}
 
-	return (newbuf);
+	if (found) {
+		buf_append(newbuf, c, fin - c);
+		buf_free(bp);
+		return (newbuf);
+	} else {
+		buf_free(newbuf);
+		return (bp);
+	}
 }
 
 /*