diff options
Diffstat (limited to 'src/bin/psql/mbprint.c')
| -rw-r--r-- | src/bin/psql/mbprint.c | 49 |
1 files changed, 36 insertions, 13 deletions
diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c index 794561b54c3..85c3a249e2f 100644 --- a/src/bin/psql/mbprint.c +++ b/src/bin/psql/mbprint.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.29 2008/01/01 19:45:56 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.29.2.1 2008/05/29 19:34:43 tgl Exp $ * * XXX this file does not really belong in psql/. Perhaps move to libpq? * It also seems that the mbvalidate function is redundant with existing @@ -204,13 +204,16 @@ pg_wcswidth(const unsigned char *pwcs, size_t len, int encoding) /* * pg_wcssize takes the given string in the given encoding and returns three * values: - * result_width: Width in display character of longest line in string - * result_hieght: Number of lines in display output - * result_format_size: Number of bytes required to store formatted representation of string + * result_width: Width in display characters of the longest line in string + * result_height: Number of lines in display output + * result_format_size: Number of bytes required to store formatted + * representation of string + * + * This MUST be kept in sync with pg_wcsformat! */ -int -pg_wcssize(unsigned char *pwcs, size_t len, int encoding, int *result_width, - int *result_height, int *result_format_size) +void +pg_wcssize(unsigned char *pwcs, size_t len, int encoding, + int *result_width, int *result_height, int *result_format_size) { int w, chlen = 0, @@ -241,6 +244,14 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding, int *result_width, linewidth += 2; format_size += 2; } + else if (*pwcs == '\t') /* Tab */ + { + do + { + linewidth++; + format_size++; + } while (linewidth % 8 != 0); + } else if (w < 0) /* Other control char */ { linewidth += 4; @@ -266,7 +277,7 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding, int *result_width, } if (linewidth > width) width = linewidth; - format_size += 1; + format_size += 1; /* For NUL char */ /* Set results */ if (result_width) @@ -275,10 +286,14 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding, int *result_width, *result_height = height; if (result_format_size) *result_format_size = format_size; - - return width; } +/* + * Format a string into one or more "struct lineptr" lines. + * lines[i].ptr == NULL indicates the end of the array. + * + * This MUST be kept in sync with pg_wcssize! + */ void pg_wcsformat(unsigned char *pwcs, size_t len, int encoding, struct lineptr * lines, int count) @@ -304,7 +319,7 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding, linewidth = 0; lines++; count--; - if (count == 0) + if (count <= 0) exit(1); /* Screwup */ lines->ptr = ptr; @@ -315,6 +330,14 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding, linewidth += 2; ptr += 2; } + else if (*pwcs == '\t') /* Tab */ + { + do + { + *ptr++ = ' '; + linewidth++; + } while (linewidth % 8 != 0); + } else if (w < 0) /* Other control char */ { sprintf((char *) ptr, "\\x%02X", *pwcs); @@ -332,14 +355,14 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding, if (encoding == PG_UTF8) sprintf((char *) ptr, "\\u%04X", utf2ucs(pwcs)); else - + { /* * This case cannot happen in the current code because only * UTF-8 signals multibyte control characters. But we may need * to support it at some stage */ sprintf((char *) ptr, "\\u????"); - + } ptr += 6; linewidth += 6; } |