updated README.md and the rpm spec file

README.md

@@ -45,7 +45,7 @@ The library is stable, portable, and designed for projects that need a scripting
 	- [@include and @include\_once](#include-and-include_once)
 	- [Comments](#comments)
 	- [Reserved Words](#reserved-words)
-	- [More Examples](#more-examples)
+	- [Some Examples](#some-examples)
 	- [Garbage Collection](#garbage-collection)
 	- [Modules](#modules)
 		- [Hawk](#hawk)
@@ -182,6 +182,44 @@ $ gcc -Wall -O2 -o hawk02 hawk02.c -lhawk
 
 The actual command may vary depending on the compiler used and the `configure` options used.
 
+## Embedding Signal Handling
+
+Signal handling is provided via a callback hook. The core library does not install OS-level signal handlers; the embedding application must do that and notify the runtime.
+
+- Register a runtime callback with `hawk_rtx_pushecb()` and fill `hawk_rtx_ecb_t.sigset` (type `hawk_rtx_ecb_sigset_t`).
+- Your callback is invoked when `sys::signal()` sets or clears a handler; use it to install or reset the OS signal handler.
+- When the OS handler runs, call `hawk_rtx_raisesig()` on the target runtime.
+
+Example:
+
+```c
+static hawk_rtx_t* g_rtx = HAWK_NULL;
+
+static void on_os_signal (int sig)
+{
+	if (g_rtx) hawk_rtx_raisesig(g_rtx, sig);
+}
+
+static void on_sigset (hawk_rtx_t* rtx, int sig, hawk_fun_t* fun)
+{
+	if (fun)
+	{
+		g_rtx = rtx;
+		signal(sig, on_os_signal);
+	}
+	else
+	{
+		if (g_rtx == rtx) g_rtx = HAWK_NULL;
+		signal(sig, SIG_DFL);
+	}
+}
+
+hawk_rtx_ecb_t ecb;
+memset(&ecb, 0, HAWK_SIZEOF(ecb));
+ecb.sigset = on_sigset;
+hawk_rtx_pushecb(rtx, &ecb);
+```
+
 # Embedding Hawk in C++ Applications
 
 Hawk can also be embedded in C++ applications. Here's an example:
@@ -1002,9 +1040,11 @@ The `sys` module provides various functions concerning the underlying operation
 - sys::opendir
 - sys::openfd
 - sys::pipe
+- sys::raise
 - sys::read
 - sys::readdir
 - sys::setttime
+- sys::signal
 - sys::sleep
 - sys::strftime
 - sys::system
@@ -1012,6 +1052,29 @@ The `sys` module provides various functions concerning the underlying operation
 - sys::wait
 - sys::write
 
+#### Signals
+
+Use these to register handlers and raise signals from Hawk.
+
+- sys::signal(sig, func) sets a handler function for a signal number. pass nil to clear it.
+- sys::raise(sig) raises a signal to the current runtime.
+- sys::kill(pid, sig) sends a signal to another process or to self.
+
+Example:
+
+```awk
+function on_int(sig) { print "got", sig }
+
+BEGIN {
+	sys::signal(sys::SIGINT, on_int);
+	sys::raise(sys::SIGINT);
+	## sys::kill(sys::getpid(), sys::SIGINT);
+	sys::signal(sys::SIGINT, @nil);
+}
+```
+
+
+#### Raw byte reads
 
 You may read the file in raw bytes.
 
@@ -1025,6 +1088,8 @@ BEGIN {
 }
 ```
 
+#### Wrap a file descriptor
+
 You can map a raw file descriptor to a handle created by this module and use it.
 
 ```awk
@@ -1037,6 +1102,8 @@ BEGIN {
 }
 ```
 
+#### Pipe to a child process
+
 Creating pipes and sharing them with a child process is not big an issue.
 
 ```awk
@@ -1091,6 +1158,8 @@ BEGIN {
 }
 ```
 
+#### Read child stdout
+
 You can read standard output of a child process in a parent process.
 
 ```awk
@@ -1142,6 +1211,8 @@ BEGIN {
 }
 ```
 
+#### Duplicate file handles
+
 You can duplicate file handles as necessary.
 
 ```awk
@@ -1165,6 +1236,8 @@ BEGIN {
 }
 ```
 
+#### Directory traversal
+
 Directory traversal is easy.
 
 ```awk
@@ -1183,6 +1256,8 @@ BEGIN {
 }
 ```
 
+#### Network interface info
+
 You can get information of a network interface.
 
 ```awk
@@ -1194,6 +1269,8 @@ BEGIN {
 }
 ```
 
+#### Sockets
+
 Socket functions are available.
 
 ```awk

bin/hawk.c

@@ -341,7 +341,14 @@ static void on_sigset (hawk_rtx_t* rtx, int sig, hawk_fun_t* fun)
 	else
 	{
 		int back_to_stop_run = 0;
-		hawk_main_unset_signal_handler(sig);
+
+	#if defined(SIGPIPE)
+		if (sig == SIGPIPE)
+		{
+			set_intr_pipe(); // to application default. not OS default.
+			return;
+		}
+	#endif
 	#if defined(SIGTERM)
 		if (sig == SIGTERM) back_to_stop_run = 1;
 	#endif
@@ -351,7 +358,10 @@ static void on_sigset (hawk_rtx_t* rtx, int sig, hawk_fun_t* fun)
 	#if defined(SIGINT)
 		if (sig == SIGINT) back_to_stop_run = 1;
 	#endif
-		if (back_to_stop_run) hawk_main_set_signal_handler(sig, stop_run, 0);
+		if (back_to_stop_run)
+			hawk_main_set_signal_handler(sig, stop_run, 0);
+		else
+			hawk_main_unset_signal_handler(sig);
 	}
 }
 

bin/hawkgo.go

@@ -211,7 +211,7 @@ func run_script(h *hawk.Hawk, fs_idx int, data_idx int, cfg* Config, rtx_chan ch
 				}
 			}
 
-			rtx.SetSigsetHandler(func(rtx *hawk.Rtx, signo int, reset bool) {
+			rtx.OnSigset(func(rtx *hawk.Rtx, signo int, reset bool) {
 				var s os.Signal
 				s = syscall.Signal(signo)
 				if reset {
@@ -229,7 +229,7 @@ func run_script(h *hawk.Hawk, fs_idx int, data_idx int, cfg* Config, rtx_chan ch
 				args[idx].Close()
 			}
 		} else {
-			rtx.SetSigsetHandler(func(rtx *hawk.Rtx, signo int, reset bool) {
+			rtx.OnSigset(func(rtx *hawk.Rtx, signo int, reset bool) {
 				var s os.Signal
 				s = syscall.Signal(signo)
 				if reset {

hawk.go

@@ -632,7 +632,7 @@ func (rtx* Rtx) Halt() {
 	C.hawk_rtx_halt(rtx.c)
 }
 
-func (rtx *Rtx) SetSigsetHandler(f RtxSigsetHandler) {
+func (rtx *Rtx) OnSigset(f RtxSigsetHandler) {
 	rtx.sigset_handler = f
 }
 
@@ -814,6 +814,8 @@ func (rtx *Rtx) GetNamedVars(vars map[string]*Val) {
 
 //export hawk_go_sigset_handler
 func hawk_go_sigset_handler(rtx_xtn *C.rtx_xtn_t, sig C.int, reset C.int) {
+	// this handler is called when sys::signal() is invoked in a script.
+
 	//var inst HawkInstance
 	var rtx_inst RtxInstance
 	var rtx *Rtx
@@ -822,8 +824,10 @@ func hawk_go_sigset_handler(rtx_xtn *C.rtx_xtn_t, sig C.int, reset C.int) {
 	rtx_inst = rtx_inst_table.slot_to_instance(int(rtx_xtn.rtx_inst_no))
 	rtx = rtx_inst.g.Value()
 
+	if rtx.sigset_handler != nil {
 		rtx.sigset_handler(rtx, int(sig), reset != 0)
 	}
+}
 
 // -----------------------------------------------------------
 

lib/Hawk.cpp

@@ -132,6 +132,17 @@ static HAWK_INLINE rxtn_t* GET_RXTN(hawk_rtx_t* rtx) { return (rxtn_t*)((hawk_ui
 #define GET_RXTN(rtx) ((rxtn_t*)((hawk_uint8_t*)hawk_rtx_getxtn(rtx) - HAWK_SIZEOF(rxtn_t)))
 #endif
 
+static void rtx_on_sigset (hawk_rtx_t* rtx, int sig, hawk_fun_t* fun)
+{
+	rxtn_t* rxtn = GET_RXTN(rtx);
+	Hawk::Run* run = rxtn->run;
+	if (run)
+	{
+		Hawk* hawk = (Hawk*)*run; // call operator Hawk*
+		if (hawk) hawk->uponSigset(*run, sig, fun == HAWK_NULL);
+	}
+}
+
 //////////////////////////////////////////////////////////////////
 // Hawk::Pipe
 //////////////////////////////////////////////////////////////////
@@ -1935,6 +1946,11 @@ void Hawk::uponClearing ()
 	// nothing to do
 }
 
+void Hawk::uponSigset (Run& run, int sig, bool reset)
+{
+	// nothing to do
+}
+
 Hawk::Run* Hawk::parse (Source& in, Source& out)
 {
 	HAWK_ASSERT(this->hawk != HAWK_NULL);
@@ -2096,6 +2112,12 @@ void Hawk::halt ()
 	hawk_haltall (this->hawk);
 }
 
+int Hawk::raiseSignal (int sig)
+{
+	if (this->runctx.rtx) return hawk_rtx_raisesig(this->runctx.rtx, sig);
+	return -1;
+}
+
 int Hawk::init_runctx ()
 {
 	if (this->runctx.rtx) return 0;
@@ -2118,6 +2140,9 @@ int Hawk::init_runctx ()
 
 	rxtn_t* rxtn = GET_RXTN(rtx);
 	rxtn->run = &this->runctx;
+	HAWK_MEMSET(&this->runctx.rtx_ecb, 0, HAWK_SIZEOF(this->runctx.rtx_ecb));
+	this->runctx.rtx_ecb.sigset = rtx_on_sigset;
+	hawk_rtx_pushecb(rtx, &this->runctx.rtx_ecb);
 
 	return 0;
 }
@@ -2179,11 +2204,11 @@ int Hawk::setIncludeDirs (const hawk_bch_t* dirs)
 {
 #if defined(HAWK_OOCH_IS_UCH)
 	hawk_ooch_t* tmp;
-	tmp = hawk_dupbtoucstr(hawk, dirs, HAWK_NULL, 1);
+	tmp = hawk_dupbtoucstr(this->hawk, dirs, HAWK_NULL, 1);
 	if (HAWK_UNLIKELY(!tmp)) return -1;
 
-	int n = hawk_setopt(hawk, HAWK_OPT_INCLUDEDIRS, tmp);
+	int n = hawk_setopt(this->hawk, HAWK_OPT_INCLUDEDIRS, tmp);
-	hawk_freemem(hawk, tmp);
+	hawk_freemem(this->hawk, tmp);
 	return n;
 #else
 	return hawk_setopt(this->hawk, HAWK_OPT_INCLUDEDIRS, dirs);

lib/Hawk.hpp

@@ -1330,6 +1330,7 @@ public:
 	protected:
 		Hawk* hawk;
 		hawk_rtx_t* rtx;
+		hawk_rtx_ecb_t rtx_ecb;
 	};
 
 	///
@@ -1389,6 +1390,11 @@ public:
 	///
 	virtual void uponClearing ();
 
+	/// The uponSigset() function is called back when sys::signal()
+	/// attempts to set or unset a signal handler. This maps to the
+	/// sigset callback of #hawk_rtx_ecb_t.
+	virtual void uponSigset (Run& run, int sig, bool reset);
+
 	///
 	/// The parse() function parses the source code read from the input
 	/// stream \a in and writes the parse tree to the output stream \a out.
@@ -1477,6 +1483,7 @@ public:
 	/// The halt() function makes request to abort execution
 	///
 	void halt ();
+	int raiseSignal (int sig);
 	/// \}
 
 	///

lib/Std.cpp

@@ -244,7 +244,7 @@ HawkStd::Run* HawkStd::parse (Source& in, Source& out)
 		this->cmgrtab_inited = true;
 	}
 
-	if (run && make_additional_globals(run) <= -1) return HAWK_NULL;
+	if (run && this->make_additional_globals(run) <= -1) return HAWK_NULL;
 
 	return run;
 }
@@ -1326,7 +1326,7 @@ int HawkStd::SourceFile::open (Data& io)
 					if (totlen >= HAWK_COUNTOF(fbuf))
 					{
 						dbuf = (hawk_ooch_t*)hawk_allocmem((hawk_t*)io, HAWK_SIZEOF(hawk_ooch_t) * (totlen + 1));
-						if (!dbuf) return -1;
+						if (HAWK_UNLIKELY(!dbuf)) return -1;
 						path = dbuf;
 					}
 					else path = fbuf;

pkgs/hawk.spec.in

@@ -5,11 +5,11 @@
 %define __brp_remove_la_files /bin/true
 %define source_date_epoch_from_changelog 0
 
-%define enable_mod_ffi 1
+%{!?enable_mod_ffi:%define enable_mod_ffi 1}
-%define enable_mod_memc 0
+%{!?enable_mod_memc:%define enable_mod_memc 0}
-%define enable_mod_mysql 1
+%{!?enable_mod_mysql:%define enable_mod_mysql 1}
-%define enable_mod_sqlite 1
+%{!?enable_mod_sqlite:%define enable_mod_sqlite 1}
-%define enable_mod_uci 0
+%{!?enable_mod_uci:%define enable_mod_uci 0}
 
 Summary: Hawk Interpreter
 Name: @PACKAGE_NAME@
@@ -26,20 +26,31 @@ Requires: %{name}-libs%{?_isa}
 ## prep_cif_var() available since 3.0.11
 BuildRequires: libffi-devel%{?_isa} >= 3.0.11
 %endif
+
 %if %{enable_mod_memc}
 BuildRequires: libmemcached-devel%{?_isa} >= 1.0.18
 %endif
+
 %if %{enable_mod_mysql}
-##BuildRequires: mariadb-connector-c-devel%{?_isa}
+
+%if 0%{?fedora} > 22
+BuildRequires: mariadb-connector-c-devel%{?_isa}
+%else
+
 %if 0%{?suse_version} > 0
 BuildRequires: libmariadb-devel%{?_isa}
 %else
 BuildRequires: mysql-devel%{?_isa}
 %endif
+
 %endif
+
+%endif
+
 %if %{enable_mod_sqlite}
 BuildRequires: sqlite-devel%{?_isa}
 %endif
+
 %if %{enable_mod_uci}
 BuildRequires: libuci-devel%{?_isa}
 %endif
@@ -83,8 +94,19 @@ This package contains the memc module file for Hawk.
 Summary: Hawk mysql module
 Group: System Environment/Libraries
 Requires: %{name}-libs%{?_isa} = %{version}
+
+%if 0%{?fedora} > 22
+Requires: mariadb-connector-c%{?_isa}
+%else
+
+%if 0%{?suse_version} > 0
+Requires: libmariadb%{?_isa}
+%else
 ## tricky to specify the right mysql/mariadb client library.
-##Requires: mariadb-connector-c%{?_isa}
+Requires:
+%endif
+
+%endif
 
 %description mysql
 This package contains the mysql module file for Hawk.

samples/hawk51.cpp

@@ -54,6 +54,15 @@ typedef HAWK::HawkStd HawkStd;
 typedef HAWK::HawkStd::Run Run;
 typedef HAWK::HawkStd::Value Value;
 
+#ifdef _WIN32
+static BOOL WINAPI stop_run (DWORD ctrl_type);
+#else
+static void stop_run (int sig);
+static void do_nothing (int sig);
+#endif
+static void relay_signal (int sig);
+static int setsignal (int sig, void(*handler)(int), int restart);
+
 class MyHawk: public HawkStd
 {
 public:
@@ -80,6 +89,26 @@ public:
 		return -1;
 	}
 
+	void uponSigset (Run& run, int sig, bool reset)
+	{
+		if (reset)
+		{
+			/* this part must be in sync with set_singal() */
+			if (sig == SIGINT)
+				setsignal(sig, stop_run, 0);
+		#if defined(SIGPIPE)
+			else if (sig == SIGPIPE)
+				setsignal(sig, do_nothing, 0);
+		#endif
+			else
+				setsignal(sig, SIG_DFL, 0);
+		}
+		else
+		{
+			setsignal(sig, relay_signal, 0);
+		}
+	}
+
 	int sleep (Run& run, Value& ret, Value* args, hawk_oow_t nargs, const hawk_ooch_t* name, hawk_oow_t len)
 	{
 		if (args[0].isIndexed())
@@ -169,6 +198,11 @@ private:
 
 static MyHawk* app_hawk = HAWK_NULL;
 
+static void relay_signal (int sig)
+{
+	if (app_hawk) app_hawk->raiseSignal(sig);
+}
+
 static void print_error (const hawk_bch_t* fmt, ...)
 {
 	va_list va;
@@ -201,7 +235,7 @@ static BOOL WINAPI stop_run (DWORD ctrl_type)
 	if (ctrl_type == CTRL_C_EVENT ||
 	    ctrl_type == CTRL_CLOSE_EVENT)
 	{
-		if (app_hawk) app_hawk->stop ();
+		if (app_hawk) app_hawk->halt();
 		return TRUE;
 	}