Thread: [KoCo-CVS] [Commit] cjkcodecs/src _hz.c
Brought to you by:
perky
Menu
▾
▴
koco-cvs
|
From: Hye-Shik C. <pe...@us...> - 2003-05-28 09:18:16
|
perky 03/05/28 02:18:14
Added: src _hz.c
Log:
Add 'hz' codec.
Revision Changes Path
1.1 cjkcodecs/src/_hz.c
Index: _hz.c
===================================================================
/*
* _hz.c: the HZ codec (RFC1843)
*
* Copyright (C) 2003 Hye-Shik Chang <pe...@Fr...>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* $Id: _hz.c,v 1.1 2003/05/28 09:18:14 perky Exp $
*/
#include "codeccommon.h"
ENCMAP(gbcommon)
DECMAP(gb2312)
ENCODER(hz)
{
while (inleft > 0) {
Py_UNICODE c = **inbuf;
DBCHAR code;
if (c < 0x80) {
if (state->i == 0) {
RESERVE_OUTBUF(1)
**outbuf = c;
NEXT(1, 1)
} else {
RESERVE_OUTBUF(3)
(*outbuf)[0] = '~';
(*outbuf)[1] = '}';
(*outbuf)[2] = (unsigned char)c;
NEXT(1, 3)
state->i = 0;
}
continue;
}
UCS4INVALID(c)
TRYMAP_ENC(gbcommon, code, c);
else return 1;
if (code & 0x8000) /* MSB set: GBK */
return 1;
if (state->i == 0) {
RESERVE_OUTBUF(4)
(*outbuf)[0] = '~';
(*outbuf)[1] = '{';
(*outbuf)[2] = code >> 8;
(*outbuf)[3] = code & 0xFF;
NEXT(1, 4)
state->i = 1;
} else {
RESERVE_OUTBUF(2)
(*outbuf)[0] = code >> 8;
(*outbuf)[1] = code & 0xFF;
NEXT(1, 2)
}
}
return 0;
}
DECODER(hz)
{
while (inleft > 0) {
unsigned char c = **inbuf;
if (c == '~') {
unsigned char c2 = (*inbuf)[1];
RESERVE_INBUF(2)
if (c2 == '~') {
RESERVE_OUTBUF(1)
**outbuf = '~';
NEXT(2, 1)
continue;
} else if (c2 == '{' && state->i == 0)
state->i = 1; /* set GB */
else if (c2 == '}' && state->i == 1)
state->i = 0; /* set ASCII */
else if (c2 == '\n')
; /* line-continuation */
else
return 2;
NEXT(2, 0);
continue;
}
if (c & 0x80)
return 1;
if (state->i == 0) { /* ASCII mode */
RESERVE_OUTBUF(1)
**outbuf = c;
NEXT(1, 1)
} else { /* GB mode */
RESERVE_INBUF(2)
TRYMAP_DEC(gb2312, **outbuf, c, (*inbuf)[1]) {
RESERVE_OUTBUF(1)
NEXT(2, 1)
} else
return 2;
}
}
return 0;
}
BEGIN_CODEC_REGISTRY(hz)
MAPOPEN(zh_CN)
IMPORTMAP_DEC(gb2312)
IMPORTMAP_ENC(gbcommon)
MAPCLOSE()
END_CODEC_REGISTRY(hz)
/*
* ex: ts=8 sts=4 et
*/
|
|
From: Hye-Shik C. <pe...@us...> - 2003-07-09 21:00:49
|
perky 03/07/09 14:00:48
Modified: src _hz.c
Log:
Fix hz codec's bug that doesn't initialize the encoding mode to
ASCII.
Revision Changes Path
1.3 +44 -24 cjkcodecs/src/_hz.c
Index: _hz.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_hz.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _hz.c 31 May 2003 11:50:19 -0000 1.2
+++ _hz.c 9 Jul 2003 21:00:48 -0000 1.3
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: _hz.c,v 1.2 2003/05/31 11:50:19 perky Exp $
+ * $Id: _hz.c,v 1.3 2003/07/09 21:00:48 perky Exp $
*/
#include "codeccommon.h"
@@ -34,22 +34,36 @@
ENCMAP(gbcommon)
DECMAP(gb2312)
+#define HAVE_ENCODER_INIT
+ENCODER_INIT(hz)
+{
+ state->i = 0;
+ return 0;
+}
+
+#define HAVE_ENCODER_RESET
+ENCODER_RESET(hz)
+{
+ if (state->i != 0) {
+ WRITE2('~', '}')
+ state->i = 0;
+ NEXT_OUT(2)
+ }
+ return 0;
+}
+
ENCODER(hz)
{
while (inleft > 0) {
- Py_UNICODE c = **inbuf;
+ Py_UNICODE c = IN1;
DBCHAR code;
if (c < 0x80) {
if (state->i == 0) {
- RESERVE_OUTBUF(1)
- **outbuf = c;
+ WRITE1(c)
NEXT(1, 1)
} else {
- RESERVE_OUTBUF(3)
- (*outbuf)[0] = '~';
- (*outbuf)[1] = '}';
- (*outbuf)[2] = (unsigned char)c;
+ WRITE3('~', '}', c)
NEXT(1, 3)
state->i = 0;
}
@@ -65,17 +79,11 @@
return 1;
if (state->i == 0) {
- RESERVE_OUTBUF(4)
- (*outbuf)[0] = '~';
- (*outbuf)[1] = '{';
- (*outbuf)[2] = code >> 8;
- (*outbuf)[3] = code & 0xFF;
+ WRITE4('~', '{', code >> 8, code & 0xff)
NEXT(1, 4)
state->i = 1;
} else {
- RESERVE_OUTBUF(2)
- (*outbuf)[0] = code >> 8;
- (*outbuf)[1] = code & 0xFF;
+ WRITE2(code >> 8, code & 0xff)
NEXT(1, 2)
}
}
@@ -83,18 +91,31 @@
return 0;
}
+#define HAVE_DECODER_INIT
+DECODER_INIT(hz)
+{
+ state->i = 0;
+ return 0;
+}
+
+#define HAVE_DECODER_RESET
+DECODER_RESET(hz)
+{
+ state->i = 0;
+ return 0;
+}
+
DECODER(hz)
{
while (inleft > 0) {
- unsigned char c = **inbuf;
+ unsigned char c = IN1;
if (c == '~') {
- unsigned char c2 = (*inbuf)[1];
+ unsigned char c2 = IN2;
RESERVE_INBUF(2)
if (c2 == '~') {
- RESERVE_OUTBUF(1)
- **outbuf = '~';
+ WRITE1('~')
NEXT(2, 1)
continue;
} else if (c2 == '{' && state->i == 0)
@@ -113,13 +134,12 @@
return 1;
if (state->i == 0) { /* ASCII mode */
- RESERVE_OUTBUF(1)
- **outbuf = c;
+ WRITE1(c)
NEXT(1, 1)
} else { /* GB mode */
RESERVE_INBUF(2)
- TRYMAP_DEC(gb2312, **outbuf, c, (*inbuf)[1]) {
- RESERVE_OUTBUF(1)
+ RESERVE_OUTBUF(1)
+ TRYMAP_DEC(gb2312, **outbuf, c, IN2) {
NEXT(2, 1)
} else
return 2;
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X