Introduce Buf_StripNewLines() and use it where appropriate.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>

1 files changed, 30 insertions, 0 deletions

diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index b3748f0..dc19282 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -213,6 +213,36 @@ Buf_AppendRange(Buffer *bp, const char str[], const char *end)
 }
 
 /**
+ * Convert newlines in buffer to spaces.  The trailing newline is
+ * removed.
+ */
+void
+Buf_StripNewlines(Buffer *bp)
+{
+	char *ptr = bp->end;
+
+	/*
+	 * If there is anything in the buffer, remove the last
+	 * newline character.
+	 */
+	if (ptr != bp->buf) {
+		if (*(ptr - 1) == '\n') {
+			/* shorten buffer */
+			*(ptr - 1) = '\0';
+			--bp->end;
+		}
+		--ptr;
+	}
+
+	/* Convert newline characters to a space characters.  */
+	while (ptr != bp->buf) {
+		if (*ptr == '\n') {
+			*ptr = ' ';
+		}
+		--ptr;
+	}
+}
+/**
  * Clear the contents of the buffer.
  */
 void