Commit: b204e9d92a326dbb973d530c928cca6e96b3cb49 - sjisctype (git)

This is a slow ctype library for sjis characters. 高速ではない シフトジス用の ctype 文字類識別ライブラリです。

Commit MetaInfo

• Revision: b204e9d92a326dbb973d530c928cca6e96b3cb49 (tree)
• Zeit: 2014-01-03 14:49:26
• Autor: Joel Matthew Rees <reiisi@user...>
• Commiter: Joel Matthew Rees

Log Message

Improvemements to the shift JIS hexdump

Ändern Zusammenfassung

• modified: sjhexdump.c

Diff

--- a/sjhexdump.c
+++ b/sjhexdump.c
@@ -70,25 +70,54 @@ int main( int argc, char * argv[] )
 			hexbuff[ hexcolumn ] = '\0';	/* 念のため、ここ */
 			chbuff[ column ] = '\0';
 			/* 表示のための置き換え */
-			for ( scan = offset; scan < columnLimit; ++scan )
+			for ( scan = 0; scan < column; ++scan )
 			{
-				if ( slowsjIsPOneByte( &chbuff[ scan ] ) )
+				if ( ( scan == 0 ) && ( offset > 0 ) )
+				{
+					chbuff[ scan ] = '.';	/* 前の行の末尾 */
+					offset = 0;
+				}
+				else if ( slowsjIsPOneByte( &chbuff[ scan ] ) )
 				{
 					if ( !isprint( chbuff[ scan ] ) )
 					{
 						chbuff[ scan ] = '.';
 					}
 				}
-				else if ( slowsjIsP2Byte( &chbuff[ scan ] ) )
+				else if ( slowsjIsPHighByte( &chbuff[ scan ] ) )
 				{
-					++scan;
+					if ( scan == column - 1 )
+					{
+						if ( ( ch = fgetc( in ) ) != EOF )
+						{
+							chbuff[ scan + 1 ] = (char) ch;	/* 行の末尾 */
+							ungetc( ch, in );
+							chbuff[ scan + 2 ] = '\0';
+						}
+					}
+					if ( slowsjIsP2Byte( &chbuff[ scan ] ) )
+					{
+						if ( scan < column - 1 )
+						{
+							++scan;
+						}
+						else
+						{
+							offset = 1;	/* 末尾在り */
+						}
+					}
+					else
+					{
+						chbuff[ scan ] = '.';
+						chbuff[ scan + 1 ] = '\0';
+					}
 				}
 				else
 				{
 					chbuff[ scan ] = '.';
 				}
 			}
-			/* 最後のバイトがしつこい。 */
+			/* 最後のバイトがしつこいかも知れません。 */
 			/* 置き換え完了 */
 			printf( "0x%08x: %*s  %*s\n", 
 				address,