PATCH: Column alignment with print -c -P

PATCH: Column alignment with print -c -P

[Michael Hwang]

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

This fixes misaligned columns when using %B, %U, %S, %F, or %K prompt expansions with the -c/-C option of the print builtin. This fix only affects those who have multibyte enabled.



      

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: col_align.patch --]
[-- Type: text/x-diff; name="col_align.patch", Size: 674 bytes --]

diff --git a/Src/builtin.c b/Src/builtin.c
index 95aca06..250aa3e 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -3741,6 +3741,16 @@ bin_print(char *name, char **args, Options ops, int func)
 
 		memset(&mbs, 0, sizeof(mbstate_t));
 		while (l > 0) {
+		    /* Prevent misaligned columns due to escape sequences by
+		     * skipping over them. Octals \033 and \233 are the
+		     * possible escape characters recognized by ANSI. */
+		    if (*aptr == '\033' || *aptr == '\233') {
+			for (aptr++, l--; l && !isalpha(*aptr); aptr++, l--);
+			aptr++;
+			l--;
+			continue;
+		    }
+
 		    wchar_t wc;
 		    size_t cnt = mbrtowc(&wc, aptr, l, &mbs);
 		    int wcw;

Re: PATCH: Column alignment with print -c -P

[Peter Stephenson]

On Tue, 24 Mar 2009 16:11:12 -0700 (PDT)
Michael Hwang <nomex45@yahoo.com> wrote:
> This fixes misaligned columns when using %B, %U, %S, %F, or %K prompt
> expansions with the -c/-C option of the print builtin. This fix only
> affects those who have multibyte enabled.

Thanks, that's an improvement: it ought in principle to be able to do this
by propagating the information that's generated for real prompts about the
presence of escape sequences.  However, that's an extremely minor case and
the print code is complicated enough already, so I've just made a comment
about it.

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070