*** empty log message ***

This commit is contained in:
2007-01-19 03:23:47 +00:00
parent 277e6d593f
commit 3208b3b2ff
3 changed files with 82 additions and 54 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: Awk.java,v 1.17 2007-01-18 14:34:17 bacon Exp $
* $Id: Awk.java,v 1.18 2007-01-19 03:23:47 bacon Exp $
*/
package ase.awk;
@ -20,12 +20,17 @@ public abstract class Awk
System.getProperty("os.name")); os.arch / os.version;
*/
//System.load ("c://projects//ase/awk/aseawk.dll");
URL url = ase.awk.Awk.class.getResource("aseawk.dll");
if (url == null) url = ase.awk.Awk.class.getResource("libaseawk_jni.so");
if (url != null) System.load (url.getFile());
/*
AccessController.doPrivileged (new PrivilegedAction ()
{
public Object run ()
{
URL url = ase.awk.Awk.class.getResource("aseawk.dll");
if (url == null) url = ase.awk.Awk.class.getResource("libaseawk.so");
if (url == null) url = ase.awk.Awk.class.getResource("libaseawk_jni.so");
if (url != null) System.load (url.getFile());
//System.load ("c://projects//ase/awk/aseawk.dll");
@ -33,6 +38,7 @@ public abstract class Awk
return null;
}
});
*/
}
private long handle;

View File

@ -1,5 +1,5 @@
/*
* $Id: jni.c,v 1.48 2007-01-07 07:30:40 bacon Exp $
* $Id: jni.c,v 1.49 2007-01-19 03:23:47 bacon Exp $
*/
#include <stdio.h>
@ -13,6 +13,8 @@
#include <ase/awk/jni.h>
#include <ase/awk/awk_i.h>
#include "../etc/printf.c"
#ifdef _WIN32
#include <windows.h>
#include <tchar.h>
@ -125,7 +127,7 @@ static int __awk_sprintf (
/* TODO: check buffer overflow */
n = vsprintf (buf, fmt, ap);
#else
n = xp_vsprintf (buf, len, fmt, ap);
n = ase_vsprintf (buf, len, fmt, ap);
#endif
va_end (ap);
return n;
@ -154,7 +156,7 @@ static void __awk_aprintf (const ase_char_t* fmt, ...)
#elif defined(__MSDOS__)
vprintf (fmt, ap);
#else
xp_vprintf (fmt, ap);
ase_vprintf (fmt, ap);
#endif
va_end (ap);
}
@ -169,7 +171,7 @@ static void __awk_dprintf (const ase_char_t* fmt, ...)
#elif defined(__MSDOS__)
vfprintf (stderr, fmt, ap);
#else
xp_vfprintf (stderr, fmt, ap);
ase_vfprintf (stderr, fmt, ap);
#endif
va_end (ap);