Commit: 1c093f9b32e6c2fe75d69d3a31ffd8efb138b0c0 - sjisctype (git)

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

Commit MetaInfo

• Revisión: 1c093f9b32e6c2fe75d69d3a31ffd8efb138b0c0 (tree)
• Tiempo: 2014-01-03 14:45:01
• Autor: Joel Matthew Rees <reiisi@user...>
• Commiter: Joel Matthew Rees

Log Message

working on the shift jis hexdump

Cambiar Resumen

• modified: sjhexdump.c

Diferencia incremental

--- a/sjhexdump.c
+++ b/sjhexdump.c
@@ -16,7 +16,23 @@
 #define READSIZE	128
 #define BUFFSIZE	( READSIZE + 4 )
 
-char buffer[ BUFFSIZE ];
+char chbuff[ BUFFSIZE ];
+
+char hexbuff[ BUFFSIZE * 3 ];
+
+
+#define TOHEX( c ) ( (char) ( ( (c) <= 9 ) ? (c) + '0' : (c) + 'A' - 1 ) ) 
+
+int formatHexByte( int byte, char * target )
+{
+	char out = (char) ( ( byte & 0xf0 ) >> 4 );
+	
+	* target++ = TOHEX( out );
+	out = (char) ( byte & 0x0f );
+	* target++ = TOHEX( out );
+	* target++ = ' ';
+	return 3;
+}
 
 
 int main( void )
@@ -25,27 +41,25 @@ int main( void )
 	unsigned long address = 0;	/* 4ギガより小さいファイル。 */
 	int column = 0;
 	int columnLimit = DEFAULTWIDTH;
+	int hexcolumn = 0;
 	int ch;
 	
-	while ( ( ch = fgetc( in ) ) != EOF )
+	do 
 	{
-		if ( column == 0 )
-		{
-			printf( "0x%08x: ", address );
+		if ( ( ch = fgetc( in ) ) != EOF )
+		{	hexcolumn += formatHexByte( ch, hexbuff + hexcolumn );
+			chbuff[ column ] = (char) ( isprint( ch ) ?  ch : '.' );
+			++column;
 		}
-		buffer[ column ] = isprint( ch) ? (char) ch : '.';
-		printf( "%02x ", ch );
-		++address;
-		++column;
-		if ( column >= columnLimit )
+		if ( ( column >= columnLimit ) || ( ch == EOF ) )
 		{
-			buffer[ column ] = '\0';
-			printf( "  %s\n", buffer );
+			hexbuff[ hexcolumn ] = chbuff[ column ] = '\0';
+			printf( "0x%08x: %s  %s\n", address, hexbuff, chbuff );
 			column = 0;
+			hexcolumn = 0;
+			address += columnLimit;
 		}
-	}
-	if ( column > 0 )
-	fputc( '\n', stdout );
+	} while ( ch != EOF );
 	
 	return EXIT_SUCCESS;
 }