*** empty log message ***

This commit is contained in:
2006-05-06 16:05:12 +00:00
parent dee681b939
commit cda47ef0e5
8 changed files with 4437 additions and 1525 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: awk.c,v 1.28 2006-04-30 18:09:47 bacon Exp $
* $Id: awk.c,v 1.29 2006-05-06 16:05:12 bacon Exp $
*/
#include <xp/awk/awk.h>
@ -9,26 +9,16 @@
#include <wchar.h>
#endif
#ifdef __STAND_ALONE
#define xp_printf xp_awk_printf
extern int xp_awk_printf (const xp_char_t* fmt, ...);
#else
#ifdef XP_CHAR_IS_MCHAR
#define xp_printf printf
#else
#define xp_printf wprintf
#endif
#ifndef __STAND_ALONE
#include <xp/bas/stdio.h>
#include <xp/bas/string.h>
#endif
#ifdef __STAND_ALONE
#define xp_strcmp xp_awk_strcmp
extern int xp_awk_strcmp (const xp_char_t* s1, const xp_char_t* s2);
#else
#ifdef XP_CHAR_IS_MCHAR
#define xp_strcmp strcmp
#else
#define xp_strcmp wcscmp
#endif
#define xp_printf xp_awk_printf
extern int xp_awk_printf (const xp_char_t* fmt, ...);
#define xp_strcmp xp_awk_strcmp
extern int xp_awk_strcmp (const xp_char_t* s1, const xp_char_t* s2);
#endif
static xp_ssize_t process_source (
@ -130,14 +120,14 @@ int xp_main (int argc, xp_char_t* argv[])
#endif
if ((awk = xp_awk_open()) == XP_NULL)
{
xp_printf (XP_TEXT("Error: cannot open awk\n"));
xp_printf (XP_T("Error: cannot open awk\n"));
return -1;
}
if (xp_awk_attsrc(awk, process_source, XP_NULL) == -1)
{
xp_awk_close (awk);
xp_printf (XP_TEXT("Error: cannot attach source\n"));
xp_printf (XP_T("Error: cannot attach source\n"));
return -1;
}
@ -150,7 +140,7 @@ int xp_main (int argc, xp_char_t* argv[])
#if defined(__STAND_ALONE) && !defined(_WIN32)
if (strcmp(argv[1], "-m") == 0)
#else
if (xp_strcmp(argv[1], XP_TEXT("-m")) == 0)
if (xp_strcmp(argv[1], XP_T("-m")) == 0)
#endif
{
xp_awk_setrunopt (awk, XP_AWK_RUNMAIN);
@ -161,11 +151,11 @@ int xp_main (int argc, xp_char_t* argv[])
{
#if defined(__STAND_ALONE) && !defined(_WIN32) && defined(XP_CHAR_IS_WCHAR)
xp_printf (
XP_TEXT("error: cannot parse program - [%d] %ls\n"),
XP_T("error: cannot parse program - [%d] %ls\n"),
xp_awk_geterrnum(awk), xp_awk_geterrstr(awk));
#else
xp_printf (
XP_TEXT("error: cannot parse program - [%d] %s\n"),
XP_T("error: cannot parse program - [%d] %s\n"),
xp_awk_geterrnum(awk), xp_awk_geterrstr(awk));
#endif
xp_awk_close (awk);
@ -176,11 +166,11 @@ int xp_main (int argc, xp_char_t* argv[])
{
#if defined(__STAND_ALONE) && !defined(_WIN32) && defined(XP_CHAR_IS_WCHAR)
xp_printf (
XP_TEXT("error: cannot run program - [%d] %ls\n"),
XP_T("error: cannot run program - [%d] %ls\n"),
xp_awk_geterrnum(awk), xp_awk_geterrstr(awk));
#else
xp_printf (
XP_TEXT("error: cannot run program - [%d] %s\n"),
XP_T("error: cannot run program - [%d] %s\n"),
xp_awk_geterrnum(awk), xp_awk_geterrstr(awk));
#endif
xp_awk_close (awk);