changed awk to less sensitive about encoding when loading environment.

fixed a bug of setting encoding wrongly with --script-encoding in cmd/awk/awk.c
This commit is contained in:
2013-11-04 17:37:08 +00:00
parent 9588bf2910
commit ca1d1ede66
4 changed files with 12 additions and 17 deletions

View File

@ -812,7 +812,7 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg)
for (i = 0; i < isfl ; i++)
{
if (isf[i].type == QSE_AWK_PARSESTD_FILE)
isf[isfl].u.file.cmgr = arg->script_cmgr;
isf[i].u.file.cmgr = arg->script_cmgr;
}
isf[isfl].type = QSE_AWK_PARSESTD_NULL;
@ -1225,7 +1225,6 @@ int qse_main (int argc, qse_achar_t* argv[])
/* nothing special */
#endif
qse_openstdsios ();
#if defined(_WIN32)
codepage = GetConsoleOutputCP();
@ -1256,7 +1255,9 @@ int qse_main (int argc, qse_achar_t* argv[])
open_mpi (&mpi, argc, argv);
qse_openstdsios ();
ret = qse_runmain (argc, argv, awk_main);
qse_closestdsios ();
close_mpi (&mpi);
@ -1264,7 +1265,6 @@ int qse_main (int argc, qse_achar_t* argv[])
WSACleanup ();
#endif
qse_closestdsios ();
return ret;
}