hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
hyung-hwan 2007-01-31 08:23:59 +00:00
parent 9dfac6ebdb
commit 53718209e3
2 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ase/awk/StdAwk.java
View File

@ -1,5 +1,5 @@
/* /*
* $Id: StdAwk.java,v 1.14 2007-01-30 11:24:40 bacon Exp $ * $Id: StdAwk.java,v 1.15 2007-01-31 08:23:59 bacon Exp $
*/ */
package ase.awk; package ase.awk;
@ -180,7 +180,7 @@ public abstract class StdAwk extends Awk
/* == console interface == */ /* == console interface == */
protected int openConsole (Extio extio) protected int openConsole (Extio extio)
{ {
System.err.println ("[open_console called.... name: " + extio.getName() + " mode: " + extio.getMode()); //System.err.println ("[openConsole called.... name: " + extio.getName() + " mode: " + extio.getMode());
int mode = extio.getMode (); int mode = extio.getMode ();
@ -210,13 +210,11 @@ public abstract class StdAwk extends Awk
osw = get_stream_writer (cout[cout_no]); osw = get_stream_writer (cout[cout_no]);
if (osw == null) return -1; if (osw == null) return -1;
System.out.println ("setting console output name ....");
extio.setHandle (osw); extio.setHandle (osw);
try { setConsoleOutputName (extio, cout[cout_no]); } try { setConsoleOutputName (extio, cout[cout_no]); }
catch (Exception e) { return -1; } catch (Exception e) { return -1; }
cout_no++; cout_no++;
System.out.println ("open ok....");
return 1; return 1;
} }
@ -225,7 +223,7 @@ System.out.println ("open ok....");
protected int closeConsole (Extio extio) protected int closeConsole (Extio extio)
{ {
//System.err.println ("[close_console called.... name: " + extio.getName() + " mode: " + extio.getMode()); //System.err.println ("[closeConsole called.... name: " + extio.getName() + " mode: " + extio.getMode());
int mode = extio.getMode (); int mode = extio.getMode ();

67
ase/awk/jni.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: jni.c,v 1.61 2007-01-30 11:24:40 bacon Exp $ * $Id: jni.c,v 1.62 2007-01-31 08:23:59 bacon Exp $
*/ */
#include <stdio.h> #include <stdio.h>
@ -157,6 +157,7 @@ static void throw_exception (
jmethodID except_cons; jmethodID except_cons;
jstring except_msg; jstring except_msg;
jthrowable except_obj; jthrowable except_obj;
ase_size_t len;
except_class = (*env)->FindClass (env, CLASS_EXCEPTION); except_class = (*env)->FindClass (env, CLASS_EXCEPTION);
if (except_class == NULL) if (except_class == NULL)
@ -181,9 +182,10 @@ static void throw_exception (
return; return;
} }
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t)) len = ase_awk_strlen(msg);
if (len > 0 && ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i, len = ase_awk_strlen(msg); ase_size_t i;
jchar* tmp = (jchar*) malloc (ASE_SIZEOF(jchar)*len); jchar* tmp = (jchar*) malloc (ASE_SIZEOF(jchar)*len);
if (tmp == NULL) if (tmp == NULL)
{ {
@ -204,8 +206,7 @@ static void throw_exception (
} }
else else
{ {
except_msg = (*env)->NewString ( except_msg = (*env)->NewString (env, (jchar*)msg, len);
env, (jchar*)msg, ase_awk_strlen(msg));
} }
if (except_msg == NULL) if (except_msg == NULL)
@ -704,6 +705,7 @@ static ase_ssize_t __java_open_extio (
jstring extio_name; jstring extio_name;
jint ret; jint ret;
ase_awk_t* awk; ase_awk_t* awk;
ase_size_t len;
/* get the method - meth */ /* get the method - meth */
class = (*env)->GetObjectClass(env, obj); class = (*env)->GetObjectClass(env, obj);
@ -746,9 +748,10 @@ static ase_ssize_t __java_open_extio (
} }
/* construct the name */ /* construct the name */
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t)) len = ase_awk_strlen(extio->name);
if (len > 0 && ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i, len = ase_awk_strlen(extio->name); ase_size_t i;
jchar* tmp = (jchar*) malloc (ASE_SIZEOF(jchar)*len); jchar* tmp = (jchar*) malloc (ASE_SIZEOF(jchar)*len);
if (tmp == NULL) if (tmp == NULL)
{ {
@ -762,9 +765,7 @@ static ase_ssize_t __java_open_extio (
} }
else else
{ {
extio_name = (*env)->NewString ( extio_name = (*env)->NewString (env, (jchar*)extio->name, len);
env, (jchar*)extio->name,
ase_awk_strlen(extio->name));
} }
if (extio_name == NULL) if (extio_name == NULL)
@ -778,7 +779,7 @@ static ase_ssize_t __java_open_extio (
/* construct the extio object */ /* construct the extio object */
extio_object = (*env)->NewObject ( extio_object = (*env)->NewObject (
env, extio_class, extio_cons, env, extio_class, extio_cons,
extio_name, extio->type & 0xFF, extio->mode, extio->run); extio_name, extio->type & 0xFF, extio->mode, (jlong)extio->run);
(*env)->DeleteLocalRef (env, extio_class); (*env)->DeleteLocalRef (env, extio_class);
if (extio_object == NULL) if (extio_object == NULL)
{ {
@ -1177,7 +1178,7 @@ static int __handle_bfn (
ASE_T("out of memory in handling %.*s"), ASE_T("out of memory in handling %.*s"),
fnl, fnm); fnl, fnm);
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t)) if (fnl > 0 && ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i; ase_size_t i;
jchar* tmp = (jchar*) malloc (ASE_SIZEOF(jchar)*fnl); jchar* tmp = (jchar*) malloc (ASE_SIZEOF(jchar)*fnl);
@ -1192,7 +1193,10 @@ static int __handle_bfn (
name = (*env)->NewString (env, tmp, fnl); name = (*env)->NewString (env, tmp, fnl);
free (tmp); free (tmp);
} }
else name = (*env)->NewString (env, (jchar*)fnm, fnl); else
{
name = (*env)->NewString (env, (jchar*)fnm, fnl);
}
if (name == NULL) if (name == NULL)
{ {
@ -1262,12 +1266,13 @@ static int __handle_bfn (
} }
else if (v->type == ASE_AWK_VAL_STR) else if (v->type == ASE_AWK_VAL_STR)
{ {
ase_size_t len = ((ase_awk_val_str_t*)v)->len;
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t)) if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i; ase_size_t i;
jchar* tmp = (jchar*) malloc ( jchar* tmp = (jchar*) malloc (ASE_SIZEOF(jchar)*len);
((ase_awk_val_str_t*)v)->len * ASE_SIZEOF(jchar));
if (tmp == NULL) if (tmp == NULL)
{ {
(*env)->DeleteLocalRef (env, args); (*env)->DeleteLocalRef (env, args);
@ -1275,19 +1280,17 @@ static int __handle_bfn (
return -1; return -1;
} }
for (i = 0; i < ((ase_awk_val_str_t*)v)->len; i++) for (i = 0; i < len; i++)
tmp[i] = (jchar)((ase_awk_val_str_t*)v)->buf[i]; tmp[i] = (jchar)((ase_awk_val_str_t*)v)->buf[i];
arg = (*env)->NewString ( arg = (*env)->NewString (env, tmp, len);
env, tmp, ((ase_awk_val_str_t*)v)->len);
free (tmp); free (tmp);
} }
else else
{ {
arg = (*env)->NewString (env, arg = (*env)->NewString (
(jchar*)((ase_awk_val_str_t*)v)->buf, env, (jchar*)((ase_awk_val_str_t*)v)->buf, len);
((ase_awk_val_str_t*)v)->len);
} }
} }
@ -1418,7 +1421,7 @@ static int __handle_bfn (
return -1; return -1;
} }
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t)) if (len > 0 && ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i; ase_size_t i;
ase_char_t* tmp = (ase_char_t*) ase_char_t* tmp = (ase_char_t*)
@ -1500,7 +1503,7 @@ JNIEXPORT void JNICALL Java_ase_awk_Awk_addbfn (
return; return;
} }
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t)) if (len > 0 && ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i; ase_size_t i;
ase_char_t* tmp = (ase_char_t*) ase_char_t* tmp = (ase_char_t*)
@ -1577,7 +1580,7 @@ JNIEXPORT void JNICALL Java_ase_awk_Awk_delbfn (
return; return;
} }
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t)) if (len > 0 && ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i; ase_size_t i;
ase_char_t* tmp = (ase_char_t*) ase_char_t* tmp = (ase_char_t*)
@ -1761,7 +1764,7 @@ JNIEXPORT void JNICALL Java_ase_awk_Awk_setfilename (
return; return;
} }
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t)) if (len > 0 && ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i; ase_size_t i;
ase_char_t* tmp = (ase_char_t*) ase_char_t* tmp = (ase_char_t*)
@ -1807,7 +1810,6 @@ JNIEXPORT void JNICALL Java_ase_awk_Awk_setofilename (
jsize len; jsize len;
jint n; jint n;
printf ("setofilename....\n");
len = (*env)->GetStringLength (env, name); len = (*env)->GetStringLength (env, name);
ptr = (*env)->GetStringChars (env, name, JNI_FALSE); ptr = (*env)->GetStringChars (env, name, JNI_FALSE);
if (ptr == NULL) if (ptr == NULL)
@ -1821,12 +1823,11 @@ printf ("setofilename....\n");
return; return;
} }
printf ("setofilename 11111....\n"); if (len > 0 && ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i; ase_size_t i;
ase_char_t* tmp = (ase_char_t*) ase_char_t* tmp = (ase_char_t*)
malloc (ASE_SIZEOF(ase_char_t)*(len+1)); malloc (ASE_SIZEOF(ase_char_t)*len);
if (tmp == ASE_NULL) if (tmp == ASE_NULL)
{ {
(*env)->ReleaseStringChars (env, name, ptr); (*env)->ReleaseStringChars (env, name, ptr);
@ -1839,12 +1840,8 @@ printf ("setofilename 11111....\n");
return; return;
} }
printf ("setofilename 22222....%d\n", len);
for (i = 0; i < len; i++) tmp[i] = (ase_char_t)ptr[i]; for (i = 0; i < len; i++) tmp[i] = (ase_char_t)ptr[i];
tmp[len] = ASE_T('\0');
printf ("setofilename 333333....[%ls], %d\n", tmp, len);
n = ase_awk_setofilename (run, tmp, len); n = ase_awk_setofilename (run, tmp, len);
printf ("setofilename 444444....\n");
free (tmp); free (tmp);
} }
else else
@ -1888,7 +1885,7 @@ JNIEXPORT jobject JNICALL Java_ase_awk_Awk_strtonum (
return NULL; return NULL;
} }
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t)) if (len > 0 && ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i; ase_size_t i;
ase_char_t* tmp = (ase_char_t*) ase_char_t* tmp = (ase_char_t*)
@ -2057,7 +2054,7 @@ JNIEXPORT jstring JNICALL Java_ase_awk_Awk_valtostr (
return NULL; return NULL;
} }
if (ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t)) if (len > 0 && ASE_SIZEOF(jchar) != ASE_SIZEOF(ase_char_t))
{ {
ase_size_t i; ase_size_t i;
jchar* tmp = (jchar*) malloc (ASE_SIZEOF(jchar)*len); jchar* tmp = (jchar*) malloc (ASE_SIZEOF(jchar)*len);