Update of /cvsroot/easyh10/easyh10/cui
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24899/cui
Modified Files:
Makefile.in main.c
Log Message:
Automatic detection of the character encoding is now working.
Index: main.c
===================================================================
RCS file: /cvsroot/easyh10/easyh10/cui/main.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** main.c 8 Oct 2006 19:18:02 -0000 1.93
--- main.c 8 Oct 2006 19:29:18 -0000 1.94
***************
*** 849,853 ****
case 'e':
if (set_encoding(optarg) != 0) {
! fprintf(fe, "ERROR: Initialization failed to convert %s <-> UCS-2LE.\n", optarg);
ret = 1;
goto exit_main;
--- 849,853 ----
case 'e':
if (set_encoding(optarg) != 0) {
! fprintf(fpe, "ERROR: Initialization failed to convert %s <-> UCS-2LE.\n", optarg);
ret = 1;
goto exit_main;
***************
*** 857,861 ****
case 'w':
if (set_encoding_music(optarg) != 0) {
! fprintf(fe, "ERROR: Initialization failed to convert %s <-> UCS-2LE.\n", optarg);
ret = 1;
goto exit_main;
--- 857,861 ----
case 'w':
if (set_encoding_music(optarg) != 0) {
! fprintf(fpe, "ERROR: Initialization failed to convert %s <-> UCS-2LE.\n", optarg);
ret = 1;
goto exit_main;
***************
*** 899,904 ****
/* EasyH10 could detect the character encoding. */
if (set_encoding(encoding) != 0) {
! fprintf(fe, "ERROR: Initialization failed to convert %s <-> UCS-2LE.\n", encoding);
! fprintf(fp, " Specify a character encoding manually by using -e option.\n");
ret = 1;
goto exit_main;
--- 899,904 ----
/* EasyH10 could detect the character encoding. */
if (set_encoding(encoding) != 0) {
! fprintf(fpe, "ERROR: Initialization failed to convert %s <-> UCS-2LE.\n", encoding);
! fprintf(fpe, " Specify a character encoding manually by using -e option.\n");
ret = 1;
goto exit_main;
***************
*** 906,911 ****
} else {
/* EasyH10 could not detect the character encoding. */
! fprintf(fe, "ERROR: Failed to detect the default character encoding of the current OS.\n");
! fprintf(fp, " Specify the character encoding manually by using -e option.\n");
ret = 1;
goto exit_main;
--- 906,911 ----
} else {
/* EasyH10 could not detect the character encoding. */
! fprintf(fpe, "ERROR: Failed to detect the default character encoding of the current OS.\n");
! fprintf(fpe, " Specify the character encoding manually by using -e option.\n");
ret = 1;
goto exit_main;
|
