Add strbuf_add_wrapped_text() to utf8.[ch]

The newly added function can rewrap text according to a given first-line
indent, other-indent and text width.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

diff --git a/utf8.c b/utf8.c
index 2aace1d42cd224e578e667290515daadf006e71c..da996695ccf06315f10f9c837d62784f1c34ed05 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -1,4 +1,5 @@
 #include "git-compat-util.h"
 #include "git-compat-util.h"

+#include "strbuf.h"

 #include "utf8.h"
 
 /* This code is originally from http://www.cl.cam.ac.uk/~mgk25/ucs/ */
 #include "utf8.h"
 
 /* This code is originally from http://www.cl.cam.ac.uk/~mgk25/ucs/ */


@@ -279,14 +280,22 @@ int is_utf8(const char *text)
        return 1;
 }
 
        return 1;
 }
 

-static void print_spaces(int count)
+static inline void strbuf_write(struct strbuf *sb, const char *buf, int len)
+{
+       if (sb)
+               strbuf_insert(sb, sb->len, buf, len);
+       else
+               fwrite(buf, len, 1, stdout);
+}
+
+static void print_spaces(struct strbuf *buf, int count)

 {
        static const char s[] = "                    ";
        while (count >= sizeof(s)) {
 {
        static const char s[] = "                    ";
        while (count >= sizeof(s)) {

-               fwrite(s, sizeof(s) - 1, 1, stdout);
+               strbuf_write(buf, s, sizeof(s) - 1);

                count -= sizeof(s) - 1;
        }
                count -= sizeof(s) - 1;
        }

-       fwrite(s, count, 1, stdout);
+       strbuf_write(buf, s, count);

 }
 
 /*
 }
 
 /*


@@ -295,7 +304,8 @@ static void print_spaces(int count)
  * If indent is negative, assume that already -indent columns have been
  * consumed (and no extra indent is necessary for the first line).
  */
  * If indent is negative, assume that already -indent columns have been
  * consumed (and no extra indent is necessary for the first line).
  */

-int print_wrapped_text(const char *text, int indent, int indent2, int width)
+int strbuf_add_wrapped_text(struct strbuf *buf,
+               const char *text, int indent, int indent2, int width)

 {
        int w = indent, assume_utf8 = is_utf8(text);
        const char *bol = text, *space = NULL;
 {
        int w = indent, assume_utf8 = is_utf8(text);
        const char *bol = text, *space = NULL;


@@ -315,8 +325,8 @@ int print_wrapped_text(const char *text, int indent, int indent2, int width)
                                if (space)
                                        start = space;
                                else
                                if (space)
                                        start = space;
                                else

-                                       print_spaces(indent);
-                               fwrite(start, text - start, 1, stdout);
+                                       print_spaces(buf, indent);
+                               strbuf_write(buf, start, text - start);

                                if (!c)
                                        return w;
                                space = text;
                                if (!c)
                                        return w;
                                space = text;


@@ -325,20 +335,20 @@ int print_wrapped_text(const char *text, int indent, int indent2, int width)
                                else if (c == '\n') {
                                        space++;
                                        if (*space == '\n') {
                                else if (c == '\n') {
                                        space++;
                                        if (*space == '\n') {

-                                               putchar('\n');
+                                               strbuf_write(buf, "\n", 1);

                                                goto new_line;
                                        }
                                        else if (!isalnum(*space))
                                                goto new_line;
                                        else
                                                goto new_line;
                                        }
                                        else if (!isalnum(*space))
                                                goto new_line;
                                        else

-                                               putchar(' ');
+                                               strbuf_write(buf, " ", 1);

                                }
                                w++;
                                text++;
                        }
                        else {
 new_line:
                                }
                                w++;
                                text++;
                        }
                        else {
 new_line:

-                               putchar('\n');
+                               strbuf_write(buf, "\n", 1);

                                text = bol = space + isspace(*space);
                                space = NULL;
                                w = indent = indent2;
                                text = bol = space + isspace(*space);
                                space = NULL;
                                w = indent = indent2;


@@ -354,6 +364,11 @@ int print_wrapped_text(const char *text, int indent, int indent2, int width)
        }
 }
 
        }
 }
 

+int print_wrapped_text(const char *text, int indent, int indent2, int width)
+{
+       return strbuf_add_wrapped_text(NULL, text, indent, indent2, width);
+}
+

 int is_encoding_utf8(const char *name)
 {
        if (!name)
 int is_encoding_utf8(const char *name)
 {
        if (!name)

diff --git a/utf8.h b/utf8.h
index 2f1b14ff49ef3c73bee6f298ba396b96120c34b7..ae30ae4c6e501e4766db93c94253fd404cd29357 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -10,6 +10,8 @@ int is_utf8(const char *text);
 int is_encoding_utf8(const char *name);
 
 int print_wrapped_text(const char *text, int indent, int indent2, int len);
 int is_encoding_utf8(const char *name);
 
 int print_wrapped_text(const char *text, int indent, int indent2, int len);

+int strbuf_add_wrapped_text(struct strbuf *buf,
+               const char *text, int indent, int indent2, int width);

 
 #ifndef NO_ICONV
 char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding);
 
 #ifndef NO_ICONV
 char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding);