From 2c396fce53100cad4e472f29851f07030a80ee50 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 13 Jul 2023 13:30:16 -0400
Subject: bfstd: Support wordesc() without allocating

---
 src/color.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'src/color.c')

diff --git a/src/color.c b/src/color.c
index 2e039f4..0f5829f 100644
--- a/src/color.c
+++ b/src/color.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -891,6 +892,11 @@ static int print_reset(CFILE *cfile) {
 	}
 }
 
+/** Print a shell-escaped string. */
+static int print_wordesc(CFILE *cfile, const char *str, size_t n, enum wesc_flags flags) {
+	return dstrnescat(&cfile->buffer, str, n, flags);
+}
+
 /** Print a string with an optional color. */
 static int print_colored(CFILE *cfile, const struct esc_seq *esc, const char *str, size_t len) {
 	if (print_esc(cfile, esc) != 0) {
@@ -1069,18 +1075,6 @@ static int print_link_target(CFILE *cfile, const struct BFTW *ftwbuf) {
 	return ret;
 }
 
-/** Print an shell-escaped string. */
-static int print_wordesc(CFILE *cfile, const char *str) {
-	char *esc = wordesc(str);
-	if (!esc) {
-		return -1;
-	}
-
-	int ret = dstrcat(&cfile->buffer, esc);
-	free(esc);
-	return ret;
-}
-
 /** Format some colored output to the buffer. */
 BFS_FORMATTER(2, 3)
 static int cbuff(CFILE *cfile, const char *format, ...);
@@ -1224,7 +1218,7 @@ static int cvbuff(CFILE *cfile, const char *format, va_list args) {
 			case 'p':
 				switch (*++i) {
 				case 'q':
-					if (print_wordesc(cfile, va_arg(args, const char *)) != 0) {
+					if (print_wordesc(cfile, va_arg(args, const char *), SIZE_MAX, WESC_SHELL | WESC_TTY) != 0) {
 						return -1;
 					}
 					break;
-- 
cgit v1.2.3