From: Art Cancro <ajc@citadel.org>
Date: Sat, 1 Jun 2024 16:31:49 +0000 (+0000)
Subject: Still working on sixel
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;ds=sidebyside;h=refs%2Fheads%2Fmaster;p=citadel.git

Still working on sixel
---

diff --git a/libcitadel/lib/html_to_ascii.c b/libcitadel/lib/html_to_ascii.c
index 47e0f0c8b..8f3c9eca0 100644
--- a/libcitadel/lib/html_to_ascii.c
+++ b/libcitadel/lib/html_to_ascii.c
@@ -50,7 +50,7 @@ int u8_wc_toutf8(char *dest, u_int32_t ch) {
 void h2a_embed_image(StrBuf *out, char *url, int display_protocol) {
 
 	char buf[4096];
-	snprintf(buf, sizeof(buf), "curl -s '%s' | img2sixel -", url);
+	snprintf(buf, sizeof(buf), "curl -s '%s' | img2sixel - | fold", url);
 
 	FILE *cmd = popen(buf, "r");
 	if (!cmd) {
diff --git a/textclient/README.txt b/textclient/README.txt
index 88fca9d5b..72abda458 100644
--- a/textclient/README.txt
+++ b/textclient/README.txt
@@ -2,7 +2,7 @@
 This is a text mode user interface for the Citadel system.  It presents
 a Citadel site to users in the form of a traditional BBS.
 
-All code is Copyright (c) 1987-2022 by the citadel.org team.
+All code is Copyright (c) 1987-2024 by the citadel.org team.
 
 This program is open source software.  Use, duplication, and/or
 disclosure are subject to the GNU General Purpose License, version 3.
diff --git a/textclient/citadel.rc b/textclient/citadel.rc
index 263577e2b..a21113ee4 100644
--- a/textclient/citadel.rc
+++ b/textclient/citadel.rc
@@ -36,11 +36,11 @@ encrypt=default
 #
 ansi_color=user
 
-# Sixel graphics support (experimental)
+# Sixel graphics support (experimental and probably insecure)
 # Set this to "on" to output images embedded in HTML messages to the terminal
 # in Sixel graphics format.  This obviously requires a terminal that has
-# support for Sixel.  It also requires the "curl" and "img2sixel" commands to
-# be available on your system.
+# support for Sixel.  It also requires the "curl", "img2sixel", and "fold"
+# commands to be available on your system.
 use_sixel=off
 
 # USE_BACKGROUND controls Citadel's use of the background.  If it is turned