Changeset 1784 for trunk/src/kash/shinstance.h

Timestamp:

Sep 13, 2008, 5:27:59 AM (17 years ago)

Author:

bird

Message:

kash: hacking.

File:

• trunk/src/kash/shinstance.h (modified) (5 diffs)

trunk/src/kash/shinstance.h

@@ -43 +43 @@
 #include "shthread.h"
 #include "shfile.h"
+#include "shell.h"
 #include "output.h"
 #include "options.h"
@@ -128 +129 @@
     shtid               tid;            /**< The thread identifier of the thread for this shell. */
     shfdtab             fdtab;          /**< The file descriptor table. */
+    shsigaction_t       sigactions[NSIG]; /**< The signal actions registered with this shell instance. */
 
     /* alias.c */
@@ -332 +334 @@
 
 /* signals */
-typedef void (*shsig_t)(shinstance *, int);
-#ifdef _MSC_VER
-    typedef uint32_t shsigset_t;
-#else
-    typedef sigset_t shsigset_t;
-#endif
-struct shsigaction
-{
-    shsig_t     sh_handler;
-    shsigset_t  sh_mask;
-    int         sh_flags;
-};
+#define SH_SIG_UNK ((shsig_t)(intptr_t)-199)
 #define SH_SIG_DFL ((shsig_t)SIG_DFL)
 #define SH_SIG_IGN ((shsig_t)SIG_IGN)
+#define SH_SIG_ERR ((shsig_t)SIG_ERR)
 #ifdef _MSC_VER
 #   define SIG_BLOCK         1
@@ -370 +362 @@
 int sh_siginterrupt(shinstance *, int, int);
 void sh_sigemptyset(shsigset_t *);
+int sh_sigfillset(shsigset_t *);
+void sh_sigaddset(shsigset_t *, int);
+void sh_sigdelset(shsigset_t *, int);
+int sh_sigismember(shsigset_t *, int);
 int sh_sigprocmask(shinstance *, int, shsigset_t const *, shsigset_t *);
 void sh_abort(shinstance *) __attribute__((__noreturn__));
@@ -418 +414 @@
 pid_t sh_fork(shinstance *);
 pid_t sh_waitpid(shinstance *, pid_t, int *, int);
-void sh__exit(shinstance *, int) __attribute__((__noreturn__));;
+void sh__exit(shinstance *, int) __attribute__((__noreturn__));
 int sh_execve(shinstance *, const char *, const char * const*, const char * const *);
 uid_t sh_getuid(shinstance *);