rebase: Document --no-verify option to bypass pre-rebase hook

[git.git] / builtin-stripspace.c

diff --git a/builtin-stripspace.c b/builtin-stripspace.c
index d8358e28f01e2ed74a847767f52d90d84feb25ee..c0b21301ba4c126a49ed38b6983756b99a25aae0 100644 (file)
--- a/builtin-stripspace.c
+++ b/builtin-stripspace.c
@@ -2,25 +2,19 @@
 #include "cache.h"
 
 /*
- * Remove trailing spaces from a line.
+ * Returns the length of a line, without trailing spaces.
  *
  * If the line ends with newline, it will be removed too.
- * Returns the new length of the string.
  */
-static int cleanup(char *line, int len)
+static size_t cleanup(char *line, size_t len)
 {
-       if (len) {
-               if (line[len - 1] == '\n')
-                       len--;
-
-               while (len) {
-                       unsigned char c = line[len - 1];
-                       if (!isspace(c))
-                               break;
-                       len--;
-               }
-               line[len] = 0;
+       while (len) {
+               unsigned char c = line[len - 1];
+               if (!isspace(c))
+                       break;
+               len--;
        }
+
        return len;
 }
 
@@ -28,52 +22,68 @@ static int cleanup(char *line, int len)
  * 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(FILE *in, FILE *out, int skip_comments)
+void stripspace(struct strbuf *sb, int skip_comments)
 {
-       int empties = -1;
-       int alloc = 1024;
-       char *line = xmalloc(alloc);
+       int empties = 0;
+       size_t i, j, len, newlen;
+       char *eol;
 
-       while (fgets(line, alloc, in)) {
-               int len = strlen(line);
+       /* We may have to add a newline. */
+       strbuf_grow(sb, 1);
 
-               while (len == alloc - 1 && line[len - 1] != '\n') {
-                       alloc = alloc_nr(alloc);
-                       line = xrealloc(line, alloc);
-                       fgets(line + len, alloc - len, in);
-                       len += strlen(line + len);
-               }
+       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 && line[0] == '#')
+               if (skip_comments && len && sb->buf[i] == '#') {
+                       newlen = 0;
                        continue;
-               len = cleanup(line, len);
+               }
+               newlen = cleanup(sb->buf + i, len);
 
                /* Not just an empty line? */
-               if (len) {
-                       if (empties > 0)
-                               fputc('\n', out);
+               if (newlen) {
+                       if (empties > 0 && j > 0)
+                               sb->buf[j++] = '\n';
                        empties = 0;
-                       fputs(line, out);
-                       fputc('\n', out);
-                       continue;
+                       memmove(sb->buf + j, sb->buf + i, newlen);
+                       sb->buf[newlen + j++] = '\n';
+               } else {
+                       empties++;
                }
-               if (empties < 0)
-                       continue;
-               empties++;
        }
-       free(line);
+
+       strbuf_setlen(sb, j);
 }
 
 int cmd_stripspace(int argc, const char **argv, const char *prefix)
 {
-       stripspace(stdin, stdout, 0);
+       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;
 }