From c1825a6f6bee9b9c562905db7f682cd950410878 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 26 Jan 2007 15:50:48 +0000 Subject: [PATCH] *** empty log message *** --- ase/test/awk/awk.c | 24 ++++++++---------------- ase/test/awk/t1.awk | 1 + ase/utl/main.c | 9 ++------- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/ase/test/awk/awk.c b/ase/test/awk/awk.c index 3ace7b58..925af61f 100644 --- a/ase/test/awk/awk.c +++ b/ase/test/awk/awk.c @@ -1,5 +1,5 @@ /* - * $Id: awk.c,v 1.153 2007-01-25 14:14:56 bacon Exp $ + * $Id: awk.c,v 1.154 2007-01-26 15:50:47 bacon Exp $ */ #include @@ -25,12 +25,8 @@ #include #include #include - - #include - #include - #include - #include - #include + #include "../../etc/printf.c" + #include "../../etc/main.c" #endif #if defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG) @@ -82,7 +78,7 @@ static int awk_sprintf ( #elif defined(ASE_CHAR_IS_MCHAR) n = vsnprintf (buf, len, fmt, ap); #else - n = xp_vsprintf (buf, len, fmt, ap); + n = ase_vsprintf (buf, len, fmt, ap); #endif va_end (ap); return n; @@ -111,7 +107,7 @@ static void awk_aprintf (const ase_char_t* fmt, ...) #elif defined(ASE_CHAR_IS_MCHAR) vprintf (fmt, ap); #else - xp_vprintf (fmt, ap); + ase_vprintf (fmt, ap); #endif va_end (ap); } @@ -126,7 +122,7 @@ static void awk_dprintf (const ase_char_t* fmt, ...) #elif defined(ASE_CHAR_IS_MCHAR) vfprintf (stderr, fmt, ap); #else - xp_vfprintf (stderr, fmt, ap); + ase_vfprintf (stderr, fmt, ap); #endif va_end (ap); @@ -142,7 +138,7 @@ static void awk_printf (const ase_char_t* fmt, ...) #elif defined(ASE_CHAR_IS_MCHAR) vprintf (fmt, ap); #else - xp_vprintf (fmt, ap); + ase_vprintf (fmt, ap); #endif va_end (ap); } @@ -1116,7 +1112,7 @@ int _tmain (int argc, ase_char_t* argv[]) #elif defined(__MSDOS__) || defined(ASE_CHAR_IS_MCHAR) int main (int argc, ase_char_t* argv[]) #else -int xp_main (int argc, ase_char_t* argv[]) +int ase_main (int argc, ase_char_t* argv[]) #endif { int n; @@ -1142,10 +1138,6 @@ int xp_main (int argc, ase_char_t* argv[]) } #endif -#if defined(__unix) - setlocale (LC_ALL, ""); -#endif - n = __main (argc, argv); #if defined(__linux) && defined(_DEBUG) diff --git a/ase/test/awk/t1.awk b/ase/test/awk/t1.awk index deffd3ed..9cffc875 100644 --- a/ase/test/awk/t1.awk +++ b/ase/test/awk/t1.awk @@ -14,6 +14,7 @@ function sum(i, k, y) BEGIN { /*s = sum(10000000);*/ s = sum (100); + print s; return s; } diff --git a/ase/utl/main.c b/ase/utl/main.c index f58d4fc1..88babc58 100644 --- a/ase/utl/main.c +++ b/ase/utl/main.c @@ -1,5 +1,5 @@ /* - * $Id: main.c,v 1.1 2006-12-17 12:33:31 bacon Exp $ + * $Id: main.c,v 1.2 2007-01-26 15:50:47 bacon Exp $ */ #include @@ -59,13 +59,8 @@ int main (int argc, char* argv[]/*, char** envp*/) if (n == len) v[i][len] = ASE_T('\0'); } - for (i = 0; i < argc; i++) - { - printf ("[%ls]\n", v[i]); - } - /* TODO: envp... */ - //ret = _tmain (argc, v, NULL); + ret = ase_main (argc, v, NULL); exit_main: for (i = 0; i < argc; i++)