Release 2.1.1.

[nkf/nkf.git] / nkf32dll.c

diff --git a/nkf32dll.c b/nkf32dll.c
index b85f2ea..0ec2a63 100644 (file)
--- a/nkf32dll.c
+++ b/nkf32dll.c
@@ -4,11 +4,11 @@
 
 /*WIN32DLL*/
 /* \82±\82¿\82ç\82Ì\83o\81[\83W\83\87\83\93\82à\8dX\90V\82µ\82Ä\82­\82¾\82³\82¢\81B */
 
 /*WIN32DLL*/
 /* \82±\82¿\82ç\82Ì\83o\81[\83W\83\87\83\93\82à\8dX\90V\82µ\82Ä\82­\82¾\82³\82¢\81B */

-#define NKF_VERSIONW L"2.0.9"
+#define NKF_VERSIONW L"2.1.1"

 /* NKF_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */
 /* NKF_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */

-#define DLL_VERSION   "2.0.9.0 0"
+#define DLL_VERSION   "2.1.1.0 2"

 /* DLL\82ª\95Ô\82· */
 /* DLL\82ª\95Ô\82· */

-#define DLL_VERSIONW L"2.0.9.0 0"
+#define DLL_VERSIONW L"2.1.1.0 2"

 /* DLL\82ª\95Ô\82· DLL_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */
 
 /* nkf32.dll main */
 /* DLL\82ª\95Ô\82· DLL_VERSION \82Ì\83\8f\83C\83h\95¶\8e\9a */
 
 /* nkf32.dll main */


@@ -127,8 +127,8 @@ int
 std_getc(f)
 FILE *f;
 {
 std_getc(f)
 FILE *f;
 {

-    if (std_gc_ndx){
-        return std_gc_buf[--std_gc_ndx];
+    if (!nkf_buf_empty_p(nkf_state->std_gc_buf)) {
+        return nkf_buf_pop(nkf_state->std_gc_buf);

     } else {
         if ( std_getc_mode == 1 ) {
             return getc(f);
     } else {
         if ( std_getc_mode == 1 ) {
             return getc(f);


@@ -458,6 +458,7 @@ void CALLBACK NkfFileConvert1(LPCSTR fName)
     DWORD len;
     BOOL sts;
 
     DWORD len;
     BOOL sts;
 

+    options0();

     len = GetTempPath(sizeof d,d);
     tempdname = malloc(len + 1);
     if ( tempdname == NULL ) return;
     len = GetTempPath(sizeof d,d);
     tempdname = malloc(len + 1);
     if ( tempdname == NULL ) return;


@@ -499,6 +500,7 @@ BOOL WINAPI NkfFileConvert1SafeA(LPCSTR fName,DWORD nBufferLength /*in TCHARs*/)
     BOOL ret;
     LPCSTR p;
 
     BOOL ret;
     LPCSTR p;
 

+    options0();

     ret = FALSE;
     p = fName;
     for ( ;; ) {
     ret = FALSE;
     p = fName;
     for ( ;; ) {


@@ -551,6 +553,7 @@ BOOL WINAPI NkfFileConvert1SafeW(LPCWSTR fName,DWORD nBufferLength /*in TCHARs*/
     BOOL ret;
     LPCWSTR p;
 
     BOOL ret;
     LPCWSTR p;
 

+    options0();

     ret = FALSE;
     p = fName;
     for ( ;; ) {
     ret = FALSE;
     p = fName;
     for ( ;; ) {


@@ -599,6 +602,7 @@ void CALLBACK NkfFileConvert2(LPCSTR fInName,LPCSTR fOutName)
 {
     FILE *fin;
 
 {
     FILE *fin;
 

+    options0();

     if ((fin = fopen(fInName, "rb")) == NULL) return;
     if((fout=fopen(fOutName, "wb")) == NULL) {
         fclose(fin);
     if ((fin = fopen(fInName, "rb")) == NULL) return;
     if((fout=fopen(fOutName, "wb")) == NULL) {
         fclose(fin);


@@ -625,6 +629,7 @@ BOOL WINAPI NkfFileConvert2SafeA(LPCSTR fInName,DWORD fInBufferLength /*in TCHAR
     BOOL ret;
     LPCSTR p;
 
     BOOL ret;
     LPCSTR p;
 

+    options0();

     ret = FALSE;
     p = fInName;
     for ( ;; ) {
     ret = FALSE;
     p = fInName;
     for ( ;; ) {


@@ -667,6 +672,7 @@ BOOL WINAPI NkfFileConvert2SafeW(LPCWSTR fInName,DWORD fInBufferLength /*in TCHA
     BOOL ret;
     LPCWSTR p;
 
     BOOL ret;
     LPCWSTR p;
 

+    options0();

     ret = FALSE;
     p = fInName;
     for ( ;; ) {
     ret = FALSE;
     p = fInName;
     for ( ;; ) {