1
0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00

Current multi-byte related codes have a bug with SQL_ASCII

support. Included patches will solve it and should be applied to
both trees.  Also, it fix the problem with \c command of psql when
switching different encoding databases.

Regression tests passed.
--
Tatsuo Ishii
t-ishii@sra.co.jp
This commit is contained in:
Bruce Momjian
1998-12-14 04:59:58 +00:00
parent 4140c2f30e
commit ffb90a01fd
2 changed files with 25 additions and 3 deletions

View File

@@ -2,7 +2,7 @@
* conversion between client encoding and server internal encoding
* (currently mule internal code (mic) is used)
* Tatsuo Ishii
* $Id: conv.c,v 1.3 1998/09/01 04:33:21 momjian Exp $
* $Id: conv.c,v 1.4 1998/12/14 04:59:58 momjian Exp $
*/
#include <stdio.h>
#include <string.h>
@@ -487,7 +487,7 @@ mic2ascii(unsigned char *mic, unsigned char *p, int len)
{
int c1;
while (len > 0 && (c1 = *mic))
while (len-- > 0 && (c1 = *mic))
{
if (c1 > 0x7f)
printBogusChar(&mic, &p);
@@ -495,6 +495,7 @@ mic2ascii(unsigned char *mic, unsigned char *p, int len)
{ /* should be ASCII */
*p++ = c1;
}
mic++;
}
*p = '\0';
}