diff --git a/src/include/lib3270/charset.h b/src/include/lib3270/charset.h index 8d940e6..6ecf2f5 100644 --- a/src/include/lib3270/charset.h +++ b/src/include/lib3270/charset.h @@ -47,9 +47,6 @@ unsigned short ebc2asc[256]; unsigned short asc2ebc[256]; -// unsigned short asc2ft[256]; -// unsigned short ft2asc[256]; - unsigned short asc2uc[256]; }; diff --git a/src/include/lib3270/session.h b/src/include/lib3270/session.h index 4463ca1..73d2bad 100644 --- a/src/include/lib3270/session.h +++ b/src/include/lib3270/session.h @@ -375,10 +375,6 @@ void * ns_write_id; void * ns_exception_id; -// int reading : 1; -// int writing : 1; -// int excepting : 1; - // SSL Data (Always defined to mantain the same structure size) unsigned long ssl_error; SSL * ssl_con; diff --git a/src/lib3270/ft.c b/src/lib3270/ft.c index 505d89f..ab70384 100644 --- a/src/lib3270/ft.c +++ b/src/lib3270/ft.c @@ -181,8 +181,49 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state); LIB3270_EXPORT H3270FT * lib3270_ft_new(H3270 *session, LIB3270_FT_OPTION flags, const char *local, const char *remote, int lrecl, int blksize, int primspace, int secspace, int dft) { + static const unsigned short asc2ft[256] = + { + 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, + 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f, + 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f, + 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f, + 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f, + 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0xe2,0x5c,0xe3,0xd8,0x5f, + 0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f, + 0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x5d,0x7d,0x7e,0x7f, + 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f, + 0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x00, + 0xa0,0xd2,0x5b,0xd9,0xd0,0xda,0x7c,0xdd,0xe5,0xdc,0xcb,0xc4,0x5e,0xe8,0xd7,0xe4, + 0xca,0xc9,0xf4,0xfa,0xe6,0xd1,0xde,0xdb,0xce,0xee,0xcc,0xc5,0xdf,0xe0,0xe1,0xd3, + 0xb4,0xb5,0xb2,0xb6,0xb3,0xb7,0xcf,0xb8,0xbe,0xbb,0xbc,0xbd,0xc2,0xbf,0xc0,0xc1, + 0xd4,0xb9,0xf7,0xf8,0xf5,0xf9,0xf6,0xe7,0xc3,0xfd,0xfe,0xfb,0xfc,0xd5,0xd6,0xb1, + 0xa3,0xa4,0xa1,0xa5,0xa2,0xa6,0xcd,0xa7,0xac,0xa9,0xaa,0xab,0xb0,0xad,0xae,0xaf, + 0xc6,0xa8,0xeb,0xec,0xe9,0xed,0xea,0x9f,0xba,0xf1,0xf2,0xef,0xf0,0xc7,0xc8,0xf3 + }; + + static const unsigned short ft2asc[256] = + { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0xa2, 0x5c, 0x7c, 0xac, 0x5f, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0xa6, 0x7d, 0x7e, 0x7f, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0xf7, + 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5, 0xe7, 0xf1, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef, + 0xec, 0xdf, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5, 0xc7, 0xd1, 0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, + 0xce, 0xcf, 0xcc, 0xd8, 0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, 0xb0, 0xaa, 0xba, 0xe6, 0xb8, 0xc6, + 0xa4, 0xb5, 0xa1, 0xbf, 0xd0, 0x5b, 0xde, 0xae, 0x5e, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc, + 0xbd, 0xbe, 0xdd, 0xa8, 0xaf, 0x5d, 0xb4, 0xd7, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5, 0xb9, 0xfb, + 0xfc, 0xf9, 0xfa, 0xff, 0xb2, 0xd4, 0xd6, 0xd2, 0xd3, 0xd5, 0xb3, 0xdb, 0xdc, 0xd9, 0xda, 0xff + }; + H3270FT * ftHandle = (H3270FT *) session->ft; FILE * ft_local_file = NULL; + int f; // unsigned long length = 0L; // trace("%s(%s)",__FUNCTION__,local); @@ -274,8 +315,17 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state); ftHandle->dft = dft; ftHandle->quadrant = -1; + // Setup file transfer charset. memcpy(&ftHandle->charset,&session->charset,sizeof(struct lib3270_charset)); + // Copy "IND$FILE" charset. + for(f=0;f<0x0100;f++) + { + ftHandle->charset.ebc2asc[f] = ft2asc[f]; + ftHandle->charset.asc2ebc[f] = asc2ft[f]; + } + + // Setup files. ftHandle->local = (char *) (ftHandle+1); strcpy((char *) ftHandle->local,local); diff --git a/src/lib3270/tables.c b/src/lib3270/tables.c index 6fa3880..bce259b 100644 --- a/src/lib3270/tables.c +++ b/src/lib3270/tables.c @@ -340,31 +340,6 @@ static const unsigned short ebc2uc[256] = { unsigned short ebc2asc7[256]; #endif //EXTENDED_TABLES -/* -LIB3270_INTERNAL void initialize_tables(H3270 *hSession) -{ - // Go to defaults first. - memcpy(hSession->charset.ebc2asc, ebc2asc0, sizeof(hSession->charset.ebc2asc)); - memcpy(hSession->charset.asc2ebc, asc2ebc0, sizeof(hSession->charset.asc2ebc)); - memcpy(hSession->charset.asc2uc, asc2uc, sizeof(hSession->charset.asc2uc)); - -// memcpy(hSession->charset.ebc2cg, ebc2cg0, sizeof(hSession->charset.ebc2cg)); -// memcpy(hSession->charset.cg2ebc, cg2ebc0, sizeof(hSession->charset.cg2ebc)); -// memcpy(hSession->charset.asc2cg, asc2cg, sizeof(hSession->charset.asc2cg)); -// memcpy(hSession->charset.cg2asc, cg2asc, sizeof(hSession->charset.cg2asc)); - -#ifdef EXTENDED_TABLES - #error Need implementation to the new format - memcpy(ebc2asc7, ebc2asc70, sizeof(ebc2asc7)); -#endif // EXTENDED_TABLES - -#if defined(X3270_FT) - memcpy(hSession->charset.ft2asc, ft2asc0, sizeof(hSession->charset.ft2asc)); - memcpy(hSession->charset.asc2ft, asc2ft0, sizeof(hSession->charset.asc2ft)); -#endif - -} -*/ /* void charset_defaults(H3270 *hSession) -- libgit2 0.21.2