bcachefs: printbufs: prt_printf() now handles \t\r\n

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/printbuf.c b/fs/bcachefs/printbuf.c
index 46ce63312a3fb4a6a2f66890c5c90853f1c41c0b..8b0369185f5cfd41c61b4a79449d0abb3463a129 100644 (file)
--- a/fs/bcachefs/printbuf.c
+++ b/fs/bcachefs/printbuf.c
@@ -10,9 +10,24 @@
 
 #include "printbuf.h"
 
+static inline unsigned __printbuf_linelen(struct printbuf *buf, unsigned pos)
+{
+       return pos - buf->last_newline;
+}
+
 static inline unsigned printbuf_linelen(struct printbuf *buf)
 {
-       return buf->pos - buf->last_newline;
+       return __printbuf_linelen(buf, buf->pos);
+}
+
+/*
+ * Returns spaces from start of line, if set, or 0 if unset:
+ */
+static inline unsigned cur_tabstop(struct printbuf *buf)
+{
+       return buf->cur_tabstop < buf->nr_tabstops
+               ? buf->_tabstops[buf->cur_tabstop]
+               : 0;
 }
 
 int bch2_printbuf_make_room(struct printbuf *out, unsigned extra)
@@ -52,6 +67,87 @@ static void printbuf_advance_pos(struct printbuf *out, unsigned len)
        out->pos += min(len, printbuf_remaining(out));
 }
 
+static void printbuf_insert_spaces(struct printbuf *out, unsigned pos, unsigned nr)
+{
+       unsigned move = out->pos - pos;
+
+       bch2_printbuf_make_room(out, nr);
+
+       if (pos + nr < out->size)
+               memmove(out->buf + pos + nr,
+                       out->buf + pos,
+                       min(move, out->size - 1 - pos - nr));
+
+       if (pos < out->size)
+               memset(out->buf + pos, ' ', min(nr, out->size - pos));
+
+       printbuf_advance_pos(out, nr);
+       printbuf_nul_terminate_reserved(out);
+}
+
+static void __printbuf_do_indent(struct printbuf *out, unsigned pos)
+{
+       while (true) {
+               int pad;
+               unsigned len = out->pos - pos;
+               char *p = out->buf + pos;
+               char *n = memscan(p, '\n', len);
+               if (cur_tabstop(out)) {
+                       n = min(n, (char *) memscan(p, '\r', len));
+                       n = min(n, (char *) memscan(p, '\t', len));
+               }
+
+               pos = n - out->buf;
+               if (pos == out->pos)
+                       break;
+
+               switch (*n) {
+               case '\n':
+                       pos++;
+                       out->last_newline = pos;
+
+                       printbuf_insert_spaces(out, pos, out->indent);
+
+                       pos = min(pos + out->indent, out->pos);
+                       out->last_field = pos;
+                       out->cur_tabstop = 0;
+                       break;
+               case '\r':
+                       memmove(n, n + 1, out->pos - pos);
+                       --out->pos;
+                       pad = (int) cur_tabstop(out) - (int) __printbuf_linelen(out, pos);
+                       if (pad > 0) {
+                               printbuf_insert_spaces(out, out->last_field, pad);
+                               pos += pad;
+                       }
+
+                       out->last_field = pos;
+                       out->cur_tabstop++;
+                       break;
+               case '\t':
+                       pad = (int) cur_tabstop(out) - (int) __printbuf_linelen(out, pos) - 1;
+                       if (pad > 0) {
+                               *n = ' ';
+                               printbuf_insert_spaces(out, pos, pad - 1);
+                               pos += pad;
+                       } else {
+                               memmove(n, n + 1, out->pos - pos);
+                               --out->pos;
+                       }
+
+                       out->last_field = pos;
+                       out->cur_tabstop++;
+                       break;
+               }
+       }
+}
+
+static inline void printbuf_do_indent(struct printbuf *out, unsigned pos)
+{
+       if (out->has_indent_or_tabstops && !out->suppress_indent_tabstop_handling)
+               __printbuf_do_indent(out, pos);
+}
+
 void bch2_prt_vprintf(struct printbuf *out, const char *fmt, va_list args)
 {
        int len;
@@ -65,7 +161,9 @@ void bch2_prt_vprintf(struct printbuf *out, const char *fmt, va_list args)
        } while (len > printbuf_remaining(out) &&
                 !bch2_printbuf_make_room(out, len));
 
+       unsigned indent_pos = out->pos;
        printbuf_advance_pos(out, len);
+       printbuf_do_indent(out, indent_pos);
 }
 
 void bch2_prt_printf(struct printbuf *out, const char *fmt, ...)
@@ -80,7 +178,9 @@ void bch2_prt_printf(struct printbuf *out, const char *fmt, ...)
        } while (len > printbuf_remaining(out) &&
                 !bch2_printbuf_make_room(out, len));
 
+       unsigned indent_pos = out->pos;
        printbuf_advance_pos(out, len);
+       printbuf_do_indent(out, indent_pos);
 }
 
 /**
@@ -209,16 +309,6 @@ void bch2_prt_newline(struct printbuf *buf)
        buf->cur_tabstop        = 0;
 }
 
-/*
- * Returns spaces from start of line, if set, or 0 if unset:
- */
-static inline unsigned cur_tabstop(struct printbuf *buf)
-{
-       return buf->cur_tabstop < buf->nr_tabstops
-               ? buf->_tabstops[buf->cur_tabstop]
-               : 0;
-}
-
 static void __prt_tab(struct printbuf *out)
 {
        int spaces = max_t(int, 0, cur_tabstop(out) - printbuf_linelen(out));
@@ -245,24 +335,9 @@ void bch2_prt_tab(struct printbuf *out)
 
 static void __prt_tab_rjust(struct printbuf *buf)
 {
-       unsigned move = buf->pos - buf->last_field;
        int pad = (int) cur_tabstop(buf) - (int) printbuf_linelen(buf);
-
-       if (pad > 0) {
-               bch2_printbuf_make_room(buf, pad);
-
-               if (buf->last_field + pad < buf->size)
-                       memmove(buf->buf + buf->last_field + pad,
-                               buf->buf + buf->last_field,
-                               min(move, buf->size - 1 - buf->last_field - pad));
-
-               if (buf->last_field < buf->size)
-                       memset(buf->buf + buf->last_field, ' ',
-                              min((unsigned) pad, buf->size - buf->last_field));
-
-               printbuf_advance_pos(buf, pad);
-               printbuf_nul_terminate(buf);
-       }
+       if (pad > 0)
+               printbuf_insert_spaces(buf, buf->last_field, pad);
 
        buf->last_field = buf->pos;
        buf->cur_tabstop++;
@@ -299,41 +374,9 @@ void bch2_prt_tab_rjust(struct printbuf *buf)
  */
 void bch2_prt_bytes_indented(struct printbuf *out, const char *str, unsigned count)
 {
-       const char *unprinted_start = str;
-       const char *end = str + count;
-
-       if (!out->has_indent_or_tabstops || out->suppress_indent_tabstop_handling) {
-               prt_bytes(out, str, count);
-               return;
-       }
-
-       while (str != end) {
-               switch (*str) {
-               case '\n':
-                       prt_bytes(out, unprinted_start, str - unprinted_start);
-                       unprinted_start = str + 1;
-                       bch2_prt_newline(out);
-                       break;
-               case '\t':
-                       if (likely(cur_tabstop(out))) {
-                               prt_bytes(out, unprinted_start, str - unprinted_start);
-                               unprinted_start = str + 1;
-                               __prt_tab(out);
-                       }
-                       break;
-               case '\r':
-                       if (likely(cur_tabstop(out))) {
-                               prt_bytes(out, unprinted_start, str - unprinted_start);
-                               unprinted_start = str + 1;
-                               __prt_tab_rjust(out);
-                       }
-                       break;
-               }
-
-               str++;
-       }
-
-       prt_bytes(out, unprinted_start, str - unprinted_start);
+       unsigned indent_pos = out->pos;
+       prt_bytes(out, str, count);
+       printbuf_do_indent(out, indent_pos);
 }
 
 /**