X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-stripspace.c;h=c0b21301ba4c126a49ed38b6983756b99a25aae0;hb=fd631d5828ec6b89e86e0568e5e798787fed9bbd;hp=f0d4d9e2d10446a229094c991363f5a17ce4c666;hpb=c288a2f1316b642ff073d4213cf691297610503c;p=git.git

diff --git a/builtin-stripspace.c b/builtin-stripspace.c
index f0d4d9e2d..c0b21301b 100644
--- a/builtin-stripspace.c
+++ b/builtin-stripspace.c
@@ -1,58 +1,89 @@
 #include "builtin.h"
+#include "cache.h"
 
 /*
- * Remove empty lines from the beginning and end.
+ * Returns the length of a line, without trailing spaces.
  *
- * Turn multiple consecutive empty lines into just one
- * empty line.  Return true if it is an incomplete line.
+ * If the line ends with newline, it will be removed too.
  */
-static int cleanup(char *line)
+static size_t cleanup(char *line, size_t len)
 {
-	int len = strlen(line);
-
-	if (len && line[len-1] == '\n') {
-		if (len == 1)
-			return 0;
-		do {
-			unsigned char c = line[len-2];
-			if (!isspace(c))
-				break;
-			line[len-2] = '\n';
-			len--;
-			line[len] = 0;
-		} while (len > 1);
-		return 0;
+	while (len) {
+		unsigned char c = line[len - 1];
+		if (!isspace(c))
+			break;
+		len--;
 	}
-	return 1;
+
+	return len;
 }
 
-void stripspace(FILE *in, FILE *out)
+/*
+ * Remove empty lines from the beginning and end
+ * and also trailing spaces from every line.
+ *
+ * Note that the buffer will not be NUL-terminated.
+ *
+ * Turn multiple consecutive empty lines between paragraphs
+ * into just one empty line.
+ *
+ * If the input has only empty lines and spaces,
+ * no output will be produced.
+ *
+ * If last line does not have a newline at the end, one is added.
+ *
+ * Enable skip_comments to skip every line starting with "#".
+ */
+void stripspace(struct strbuf *sb, int skip_comments)
 {
-	int empties = -1;
-	int incomplete = 0;
-	char line[1024];
+	int empties = 0;
+	size_t i, j, len, newlen;
+	char *eol;
 
-	while (fgets(line, sizeof(line), in)) {
-		incomplete = cleanup(line);
+	/* We may have to add a newline. */
+	strbuf_grow(sb, 1);
+
+	for (i = j = 0; i < sb->len; i += len, j += newlen) {
+		eol = memchr(sb->buf + i, '\n', sb->len - i);
+		len = eol ? eol - (sb->buf + i) + 1 : sb->len - i;
+
+		if (skip_comments && len && sb->buf[i] == '#') {
+			newlen = 0;
+			continue;
+		}
+		newlen = cleanup(sb->buf + i, len);
 
 		/* Not just an empty line? */
-		if (line[0] != '\n') {
-			if (empties > 0)
-				fputc('\n', out);
+		if (newlen) {
+			if (empties > 0 && j > 0)
+				sb->buf[j++] = '\n';
 			empties = 0;
-			fputs(line, out);
-			continue;
+			memmove(sb->buf + j, sb->buf + i, newlen);
+			sb->buf[newlen + j++] = '\n';
+		} else {
+			empties++;
 		}
-		if (empties < 0)
-			continue;
-		empties++;
 	}
-	if (incomplete)
-		fputc('\n', out);
+
+	strbuf_setlen(sb, j);
 }
 
 int cmd_stripspace(int argc, const char **argv, const char *prefix)
 {
-	stripspace(stdin, stdout);
+	struct strbuf buf;
+	int strip_comments = 0;
+
+	if (argc > 1 && (!strcmp(argv[1], "-s") ||
+				!strcmp(argv[1], "--strip-comments")))
+		strip_comments = 1;
+
+	strbuf_init(&buf, 0);
+	if (strbuf_read(&buf, 0, 1024) < 0)
+		die("could not read the input");
+
+	stripspace(&buf, strip_comments);
+
+	write_or_die(1, buf.buf, buf.len);
+	strbuf_release(&buf);
 	return 0;
 }