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

cleaned up source code a little more

Browse Source
This commit is contained in:
hyung-hwan
2009-01-19 08:32:51 +00:00
parent 524f2e34c9
commit 2220eda162
5 changed files with 188 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
qse/cmd/awk/Awk.cpp
View File

@ -11,21 +11,30 @@
#include <math.h>
#if defined(_WIN32)
#include <windows.h>
# include <windows.h>
#else
#include <unistd.h>
#include <signal.h>
# include <unistd.h>
# include <signal.h>
# include <errno.h>
#endif
#if defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG)
#define _CRTDBG_MAP_ALLOC
#include <crtdbg.h>
# define _CRTDBG_MAP_ALLOC
# include <crtdbg.h>
#endif
#if defined(__linux) && defined(_DEBUG)
#include <mcheck.h>
# include <mcheck.h>
#endif
class TestAwk;
#ifdef _WIN32
static BOOL WINAPI stop_run (DWORD ctrl_type);
#else
static void stop_run (int sig);
#endif
TestAwk* app_awk = QSE_NULL;
static bool verbose = false;
class TestAwk: public QSE::StdAwk
@ -226,6 +235,17 @@ protected:
void onRunStart (Run& run)
{
if (verbose) qse_printf (QSE_T("*** awk run started ***\n"));
app_awk = this;
#ifdef _WIN32
SetConsoleCtrlHandler (stop_run, TRUE);
#else
struct sigaction sa_int;
sa_int.sa_handler = stop_run;
sigemptyset (&sa_int.sa_mask);
sa_int.sa_flags = 0;
sigaction (SIGINT, &sa_int, NULL);
#endif
}
void onRunEnd (Run& run)
@ -238,6 +258,16 @@ protected:
run.getErrorLine(), run.getErrorMessage());
}
#ifdef _WIN32
SetConsoleCtrlHandler (stop_run, FALSE);
#else
struct sigaction sa_int;
sa_int.sa_handler = SIG_DFL;
sigemptyset (&sa_int.sa_mask);
sa_int.sa_flags = 0;
sigaction (SIGINT, &sa_int, NULL);
#endif
app_awk = QSE_NULL;
if (verbose) qse_printf (QSE_T("*** awk run ended ***\n"));
}
@ -597,6 +627,28 @@ private:
#endif
};
#ifdef _WIN32
static BOOL WINAPI stop_run (DWORD ctrl_type)
{
if (ctrl_type == CTRL_C_EVENT ||
ctrl_type == CTRL_CLOSE_EVENT)
{
if (app_awk) app_awk->stop ();
return TRUE;
}
return FALSE;
}
#else
static void stop_run (int sig)
{
int e = errno;
if (app_awk) app_awk->stop ();
errno = e;
}
#endif
#ifndef NDEBUG
void qse_assert_abort (void)
{
@ -690,49 +742,6 @@ static void print_usage (const qse_char_t* argv0)
}
}
TestAwk* app_awk = QSE_NULL;
#ifdef _WIN32
static BOOL WINAPI stop_run (DWORD ctrl_type)
{
if (ctrl_type == CTRL_C_EVENT ||
ctrl_type == CTRL_CLOSE_EVENT)
{
if (app_awk) app_awk->stop ();
return TRUE;
}
return FALSE;
}
#else
static void stop_run (int sig)
{
signal (SIGINT, SIG_IGN);
if (app_awk) app_awk->stop ();
signal (SIGINT, stop_run);
}
#endif
static void set_intr_run (TestAwk* awk)
{
app_awk = awk;
#ifdef _WIN32
SetConsoleCtrlHandler (stop_run, TRUE);
#else
signal (SIGINT, stop_run);
#endif
}
static void unset_intr_run ()
{
app_awk = QSE_NULL;
#ifdef _WIN32
SetConsoleCtrlHandler (stop_run, FALSE);
#else
signal (SIGINT, SIG_DFL);
#endif
}
static int awk_main (int argc, qse_char_t* argv[])
{
TestAwk awk;
@ -918,8 +927,6 @@ static int awk_main (int argc, qse_char_t* argv[])
awk.enableRunCallback ();
set_intr_run (&awk);
if (awk.run (mainfn, args, nargs) == -1)
{
qse_fprintf (stderr, QSE_T("cannot run: LINE[%d] %s\n"),
@ -927,7 +934,6 @@ static int awk_main (int argc, qse_char_t* argv[])
awk.close ();
return -1;
}
unset_intr_run ();
awk.close ();

65
qse/cmd/awk/awk.c
View File

@ -19,18 +19,17 @@
#define ABORT(label) goto label
#if defined(_WIN32)
#include <windows.h>
#include <tchar.h>
#include <process.h>
#pragma warning (disable: 4996)
#pragma warning (disable: 4296)
# include <windows.h>
# include <tchar.h>
# include <process.h>
#if defined(_MSC_VER) && defined(_DEBUG)
#define _CRTDBG_MAP_ALLOC
#include <crtdbg.h>
#endif
# if defined(_MSC_VER) && defined(_DEBUG)
# define _CRTDBG_MAP_ALLOC
# include <crtdbg.h>
# endif
#else
#include <unistd.h>
# include <unistd.h>
# include <errno.h>
#endif
static qse_awk_t* app_awk = NULL;
@ -48,7 +47,6 @@ static void dprint (const qse_char_t* fmt, ...)
}
}
#ifdef _WIN32
static BOOL WINAPI stop_run (DWORD ctrl_type)
{
@ -64,15 +62,48 @@ static BOOL WINAPI stop_run (DWORD ctrl_type)
#else
static void stop_run (int sig)
{
signal (SIGINT, SIG_IGN);
int e = errno;
qse_awk_stop (app_run);
signal (SIGINT, stop_run);
errno = e;
}
#endif
static void set_intr_run (void)
{
#ifdef _WIN32
SetConsoleCtrlHandler (stop_run, TRUE);
#else
{
struct sigaction sa_int;
sa_int.sa_handler = stop_run;
sigemptyset (&sa_int.sa_mask);
sa_int.sa_flags = 0;
sigaction (SIGINT, &sa_int, NULL);
}
#endif
}
static void unset_intr_run (void)
{
#ifdef _WIN32
SetConsoleCtrlHandler (stop_run, FALSE);
#else
{
struct sigaction sa_int;
sa_int.sa_handler = SIG_DFL;
sigemptyset (&sa_int.sa_mask);
sa_int.sa_flags = 0;
sigaction (SIGINT, &sa_int, NULL);
}
#endif
}
static void on_run_start (qse_awk_run_t* run, void* custom)
{
app_run = run;
set_intr_run ();
dprint (QSE_T("[AWK ABOUT TO START]\n"));
}
@ -146,6 +177,7 @@ static void on_run_end (qse_awk_run_t* run, int errnum, void* data)
}
else dprint (QSE_T("[AWK ENDED SUCCESSFULLY]\n"));
unset_intr_run ();
app_run = NULL;
}
@ -515,8 +547,8 @@ static qse_awk_t* open_awk (void)
static int awk_main (int argc, qse_char_t* argv[])
{
qse_awk_t* awk;
qse_awk_runcbs_t runcbs;
struct sigaction sa_int;
int i, file_count = 0;
const qse_char_t* mfn = QSE_NULL;
@ -561,7 +593,10 @@ static int awk_main (int argc, qse_char_t* argv[])
#ifdef _WIN32
SetConsoleCtrlHandler (stop_run, TRUE);
#else
signal (SIGINT, stop_run);
sa_int.sa_handler = stop_run;
sigemptyset (&sa_int.sa_mask);
sa_int.sa_flags = 0;
sigaction (SIGINT, &sa_int, NULL);
#endif
runcbs.on_start = on_run_start;